From f96542f52a755d8631222a358e8d34cd7f167b1e Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Fri, 7 Oct 2022 14:45:58 -0400 Subject: [PATCH] area_trd (#807) * EVT_PLAY_EFFECT * area_trd data * forgot a flag name * fix bobomb spelling * todo note * fix macros * fixed a couple more Co-authored-by: HailSanta --- include/common_structs.h | 2 +- include/effects.h | 270 +-- include/enums.h | 1 + include/functions.h | 2 +- include/map.h | 2 + include/npc.h | 12 +- include/script_api/common.h | 2 +- include/script_api/macros.h | 77 +- include/variables.h | 6 +- src/111f0_len_860.c | 89 +- src/1AF120.c | 6 +- src/1a1f0_len_5390.c | 60 +- src/38F00.c | 2 +- src/EDEA00.c | 2 +- src/battle/area_sbk/stage/sbk_02.c | 2 +- src/cd180_len_38f0.c | 2 +- src/encounter_api.c | 6 +- src/evt/map_api.c | 12 +- src/hud_element.h | 2 +- src/move_table.inc.c | 2 +- src/world/area_dgb/dgb_02/C2EBA0.c | 2 +- src/world/area_dgb/dgb_03/C31730.c | 2 +- src/world/area_dgb/dgb_05/C3AA10.c | 2 +- src/world/area_dgb/dgb_06/C3D080.c | 2 +- src/world/area_dgb/dgb_07/C3DBF0.c | 2 +- src/world/area_dgb/dgb_08/C3FDB0.c | 2 +- src/world/area_dgb/dgb_09/C46BE0.c | 2 +- src/world/area_dgb/dgb_12/C4DEF0.c | 2 +- src/world/area_dgb/dgb_15/C4F510.c | 2 +- src/world/area_dgb/dgb_16/C52540.c | 2 +- src/world/area_dgb/dgb_18/C56EF0.c | 4 +- src/world/area_end/end_00/end_00_4_allies.c | 6 +- src/world/area_end/end_00/end_00_5_koopas.c | 16 +- src/world/area_end/end_00/end_00_7_boos.c | 2 +- .../area_end/end_00/end_00_9_huff_n_puff.c | 6 +- .../area_end/end_00/end_00_A_crystal_king.c | 4 +- src/world/area_end/end_00/end_00_B_bowser.c | 28 +- .../area_end/end_01/end_01_4_opera_float.c | 2 +- .../area_end/end_01/end_01_5_flower_float.c | 6 +- src/world/area_flo/flo_13/CC3850.c | 6 +- src/world/area_flo/flo_13/flo_13.h | 2 +- src/world/area_flo/flo_17/CD7350.c | 2 +- src/world/area_hos/hos_06/A3B4B0.c | 2 +- src/world/area_isk/isk_04/97BF60.c | 2 +- src/world/area_isk/isk_09/9864E0.c | 2 +- src/world/area_iwa/iwa_03/918BB0.c | 2 +- src/world/area_iwa/iwa_10/91F5A0.c | 2 +- src/world/area_jan/jan_04/B44AC0.c | 2 +- src/world/area_jan/jan_04/B44D80.c | 2 +- src/world/area_kkj/kkj_17/AF1C60.c | 2 +- src/world/area_kkj/kkj_20/AFDB40.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 2 +- src/world/area_kmr/kmr_03/8C7F90.c | 2 +- src/world/area_kmr/kmr_03/8C8140.c | 2 +- src/world/area_kmr/kmr_03/kmr_03.h | 2 +- src/world/area_kmr/kmr_10/8D84D0.c | 2 +- src/world/area_kpa/kpa_14/A57830.c | 2 +- src/world/area_kpa/kpa_15/A596A0.c | 2 +- src/world/area_kzn/kzn_02/kzn_02_3_npc.c | 2 +- src/world/area_kzn/kzn_02/kzn_02_4_demo.c | 5 +- src/world/area_kzn/kzn_04/kzn_04_3_npc.c | 2 +- src/world/area_kzn/kzn_08/kzn_08_2_entity.c | 2 +- src/world/area_kzn/kzn_10/kzn_10_2_extra.c | 12 +- src/world/area_kzn/kzn_11/kzn_11_3_npc.c | 2 +- src/world/area_kzn/kzn_17/kzn_17_4_extra.c | 2 +- src/world/area_kzn/kzn_20/kzn_20_1_main.c | 2 +- src/world/area_kzn/kzn_20/kzn_20_2_npc.c | 6 +- src/world/area_kzn/kzn_23/kzn_23_2_extra.c | 8 +- src/world/area_mac/mac_06/mac_06_3.c | 4 +- src/world/area_mgm/mgm_02/mgm_02.h | 10 +- src/world/area_mgm/mgm_02/mgm_02_2_npc.c | 72 +- src/world/area_nok/nok_04/9EDBF0.c | 2 +- src/world/area_obk/obk_07/BCEBF0.c | 2 +- src/world/area_obk/obk_09/BDA7B0.c | 2 +- src/world/area_omo/omo_04/DAD400.c | 2 +- src/world/area_omo/omo_06/DB8180.c | 2 +- src/world/area_omo/omo_07/DC01D0.c | 2 +- src/world/area_omo/omo_09/DCD3F0.c | 2 +- src/world/area_omo/omo_12/DDF310.c | 2 +- src/world/area_omo/omo_13/DE36C0.c | 2 +- src/world/area_pra/pra_05/D55BD0.c | 2 +- src/world/area_pra/pra_11/D61520.c | 2 +- src/world/area_pra/pra_12/D62D10.c | 2 +- src/world/area_pra/pra_14/D67D20.c | 2 +- src/world/area_pra/pra_27/D799F0.c | 2 +- src/world/area_pra/pra_28/D7B2A0.c | 2 +- src/world/area_pra/pra_35/D8FBA0.c | 2 +- src/world/area_sam/sam_01/CF7E80.c | 4 +- src/world/area_sam/sam_10/D37800.c | 2 +- src/world/area_sbk/sbk_02/sbk_02_1_main.c | 2 +- src/world/area_sbk/sbk_02/sbk_02_2_ruins.c | 44 +- src/world/area_sbk/sbk_02/sbk_02_3_npc.c | 12 +- src/world/area_sbk/sbk_20/sbk_20_2_entity.c | 6 +- src/world/area_tik/tik_02/86CA50.c | 2 +- src/world/area_tik/tik_05/8750D0.c | 2 +- src/world/area_tik/tik_09/882BF0.c | 2 +- src/world/area_tik/tik_12/8891C0.c | 2 +- src/world/area_trd/trd.h | 22 +- src/world/area_trd/trd_00/999C70.c | 9 - src/world/area_trd/trd_00/999F80.c | 9 - src/world/area_trd/trd_00/99A240.c | 13 - src/world/area_trd/trd_00/trd_00.h | 13 +- src/world/area_trd/trd_00/trd_00_0_header.c | 36 + src/world/area_trd/trd_00/trd_00_1_main.c | 160 ++ src/world/area_trd/trd_00/trd_00_2_entity.c | 20 + src/world/area_trd/trd_00/trd_00_3_npc.c | 405 +++++ src/world/area_trd/trd_01/99C990.c | 9 - src/world/area_trd/trd_01/99CCA0.c | 6 - src/world/area_trd/trd_01/99CD80.c | 18 - src/world/area_trd/trd_01/trd_01.h | 24 +- src/world/area_trd/trd_01/trd_01_0_header.c | 24 + src/world/area_trd/trd_01/trd_01_1_main.c | 346 ++++ src/world/area_trd/trd_01/trd_01_2_entity.c | 83 + src/world/area_trd/trd_01/trd_01_3_npc.c | 353 ++++ src/world/area_trd/trd_02/9A0FE0.c | 8 - src/world/area_trd/trd_02/9A10C0.c | 5 - src/world/area_trd/trd_02/trd_02.h | 18 +- src/world/area_trd/trd_02/trd_02_0_header.c | 25 + src/world/area_trd/trd_02/trd_02_1_main.c | 194 +++ src/world/area_trd/trd_02/trd_02_2_entity.c | 55 + src/world/area_trd/trd_02/trd_02_3_npc.c | 167 ++ src/world/area_trd/trd_03/9A4650.c | 25 - src/world/area_trd/trd_03/9A46F0.c | 3 - src/world/area_trd/trd_03/9A4ED0.c | 3 - src/world/area_trd/trd_03/trd_03.h | 22 +- src/world/area_trd/trd_03/trd_03_0_header.c | 39 + src/world/area_trd/trd_03/trd_03_1_main.c | 241 +++ src/world/area_trd/trd_03/trd_03_2_entity.c | 18 + src/world/area_trd/trd_03/trd_03_3_npc.c | 376 +++++ src/world/area_trd/trd_03/trd_03_4_puzzle.c | 273 +++ src/world/area_trd/trd_04/trd_04_1_main.c | 24 +- src/world/area_trd/trd_04/trd_04_2_entity.c | 2 +- src/world/area_trd/trd_05/9AE700.c | 141 -- src/world/area_trd/trd_05/9AEE20.c | 7 - src/world/area_trd/trd_05/trd_05.h | 12 +- src/world/area_trd/trd_05/trd_05_0_header.c | 38 + src/world/area_trd/trd_05/trd_05_1_main.c | 126 ++ src/world/area_trd/trd_05/trd_05_2_entity.c | 13 + src/world/area_trd/trd_05/trd_05_3_trap.c | 369 ++++ src/world/area_trd/trd_05/trd_05_4_npc.c | 272 +++ src/world/area_trd/trd_06/9B1790.c | 7 - src/world/area_trd/trd_06/9B1AA0.c | 103 -- src/world/area_trd/trd_06/9B2280.c | 3 - src/world/area_trd/trd_06/9B2410.c | 6 - src/world/area_trd/trd_06/trd_06.h | 26 +- src/world/area_trd/trd_06/trd_06_0_header.c | 43 + src/world/area_trd/trd_06/trd_06_1_main.c | 182 ++ src/world/area_trd/trd_06/trd_06_2_falling.c | 358 ++++ .../area_trd/trd_06/trd_06_3_npc_prisoners.c | 639 +++++++ .../area_trd/trd_06/trd_06_4_npc_koopa_bros.c | 221 +++ src/world/area_trd/trd_06/trd_06_5_entity.c | 8 + .../area_trd/trd_06/trd_06_6_party_image.c | 4 + src/world/area_trd/trd_07/9B6980.c | 7 - src/world/area_trd/trd_07/9B6C90.c | 31 - src/world/area_trd/trd_07/trd_07.h | 20 +- src/world/area_trd/trd_07/trd_07_0_header.c | 22 + src/world/area_trd/trd_07/trd_07_1_main.c | 56 + src/world/area_trd/trd_07/trd_07_2_npc.c | 196 +++ .../area_trd/trd_07/trd_07_3_magic_doors.c | 310 ++++ src/world/area_trd/trd_08/trd_08_3_npc.c | 2 +- src/world/area_trd/trd_09/9BD660.c | 27 - src/world/area_trd/trd_09/9BD720.c | 31 - src/world/area_trd/trd_09/trd_09.h | 34 +- src/world/area_trd/trd_09/trd_09_0_header.c | 32 + src/world/area_trd/trd_09/trd_09_1_main.c | 70 + src/world/area_trd/trd_09/trd_09_2_entity.c | 21 + src/world/area_trd/trd_09/trd_09_3_npcs.c | 1479 +++++++++++++++++ src/world/area_trd/trd_09/trd_09_4_demo.c | 115 ++ src/world/area_trd/trd_10/9C2910.c | 12 - src/world/area_trd/trd_10/9C3130.c | 10 - src/world/area_trd/trd_10/trd_10.h | 14 +- src/world/area_trd/trd_10/trd_10_0_header.c | 29 + src/world/area_trd/trd_10/trd_10_1_main.c | 156 ++ src/world/area_trd/trd_10/trd_10_2_npc.c | 464 ++++++ .../area_trd/trd_10/trd_10_3_fake_bowser.c | 73 + src/world/common/Bandit_DropCoin.inc.c | 39 - src/world/common/GetLeftRightPoints.inc.c | 15 + ...eckItemFlags40.inc.c => IsItemBadge.inc.c} | 4 +- src/world/common/SomeItemEntityFunc.inc.c | 7 +- src/world/common/UnkTrigFunc001.inc.c | 15 - src/world/common/atomic/Chest.inc.c | 82 +- src/world/common/atomic/Chest.old.inc.c | 75 + src/world/common/enemy/StationaryAI.inc.c | 2 +- src/world/common/enemy/complete/Bandit.inc.c | 41 +- .../enemy/complete/Bobomb_Stationary.inc.c | 30 + .../common/enemy/complete/Bobomb_Wander.inc.c | 31 + .../common/enemy/complete/PutridPiranha.inc.c | 6 +- .../ChangeNpcToPartner.inc.c} | 4 +- .../{ => util}/GetDefeatedEnemyCount.inc.c | 0 src/world/world.c | 26 +- tools/splat_ext/msg.yaml | 20 +- ver/us/asm/bss.s | 6 +- ver/us/asm/data/dead/EE20E0.data.s | 2 +- .../data/world/area_isk/isk_07/982CA0.data.s | 2 +- .../data/world/area_iwa/iwa_01/9135D0.data.s | 2 +- .../data/world/area_iwa/iwa_10/9247B0.data.s | 2 +- .../data/world/area_jan/jan_04/B461B0.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/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_kmr/kmr_02/8B5640.data.s | 2 +- .../data/world/area_kpa/kpa_03/A4A750.data.s | 4 +- .../data/world/area_kpa/kpa_08/A4E710.data.s | 4 +- .../data/world/area_kpa/kpa_09/A50B90.data.s | 2 +- .../data/world/area_kpa/kpa_102/A97690.data.s | 6 +- .../data/world/area_kpa/kpa_111/A9ACF0.data.s | 2 +- .../data/world/area_kpa/kpa_115/AA0B20.data.s | 2 +- .../data/world/area_kpa/kpa_130/AA3870.data.s | 6 +- .../data/world/area_kpa/kpa_50/A624D0.data.s | 2 +- .../data/world/area_kpa/kpa_51/A660E0.data.s | 4 +- .../data/world/area_kpa/kpa_52/A68B40.data.s | 2 +- .../data/world/area_kpa/kpa_61/A70FE0.data.s | 4 +- .../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_nok/nok_04/9EEEB0.data.s | 2 +- .../data/world/area_obk/obk_09/BDB140.data.s | 2 +- .../data/world/area_omo/omo_01/D9C200.data.s | 2 +- .../data/world/area_omo/omo_02/DA1CD0.data.s | 2 +- .../data/world/area_omo/omo_09/DD4150.data.s | 2 +- .../data/world/area_omo/omo_12/DDFB60.data.s | 2 +- .../data/world/area_omo/omo_17/DF4EB0.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_01/D01D90.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/D31E80.data.s | 2 +- .../data/world/area_sam/sam_10/D38840.data.s | 2 +- .../data/world/area_trd/trd_00/99A2A0.data.s | 6 - .../data/world/area_trd/trd_00/99A410.data.s | 33 - .../data/world/area_trd/trd_00/99AFB0.data.s | 18 - .../data/world/area_trd/trd_00/99B280.data.s | 33 - .../data/world/area_trd/trd_01/99E050.data.s | 6 - .../data/world/area_trd/trd_01/99E110.data.s | 30 - .../data/world/area_trd/trd_01/99F960.data.s | 9 - .../data/world/area_trd/trd_01/99FD80.data.s | 45 - .../data/world/area_trd/trd_02/9A2A30.data.s | 6 - .../data/world/area_trd/trd_02/9A2B00.data.s | 36 - .../data/world/area_trd/trd_02/9A3870.data.s | 9 - .../data/world/area_trd/trd_02/9A3AB0.data.s | 36 - .../data/world/area_trd/trd_03/9A5040.data.s | 6 - .../data/world/area_trd/trd_03/9A51A0.data.s | 39 - .../data/world/area_trd/trd_03/9A5FF0.data.s | 6 - .../data/world/area_trd/trd_03/9A60F0.data.s | 54 - .../data/world/area_trd/trd_05/9AEE70.data.s | 6 - .../data/world/area_trd/trd_05/9AEFC0.data.s | 30 - .../data/world/area_trd/trd_05/9AF7C0.data.s | 6 - .../data/world/area_trd/trd_05/9AF820.data.s | 21 - .../data/world/area_trd/trd_06/9B24B0.data.s | 6 - .../data/world/area_trd/trd_06/9B2610.data.s | 96 -- .../data/world/area_trd/trd_06/9B5FC0.data.s | 15 - .../data/world/area_trd/trd_07/9B9270.data.s | 6 - .../data/world/area_trd/trd_07/9B9310.data.s | 18 - .../data/world/area_trd/trd_07/9B9760.data.s | 39 - .../data/world/area_trd/trd_07/9BA050.data.s | 15 - .../data/world/area_trd/trd_09/9BD830.data.s | 6 - .../data/world/area_trd/trd_09/9BD960.data.s | 15 - .../data/world/area_trd/trd_09/9BDD80.data.s | 6 - .../data/world/area_trd/trd_09/9BDE80.data.s | 138 -- .../data/world/area_trd/trd_09/9C24C0.data.s | 12 - .../data/world/area_trd/trd_10/9C3160.data.s | 24 - .../data/world/area_trd/trd_10/9C3A30.data.s | 90 - .../data/world/area_trd/trd_10/9C4FC0.data.s | 15 - .../kmr_02/8B0070/func_80240370_8B03E0.s | 2 +- .../kmr_11/8DA100/func_8024027C_8DA37C.s | 2 +- .../trd_06/9B1AA0/func_80240724_9B1EB4.s | 73 - .../trd_06/9B1AA0/func_8024081C_9B1FAC.s | 18 - .../trd_06/9B1AA0/func_80240854_9B1FE4.s | 69 - .../trd_06/9B1AA0/func_8024093C_9B20CC.s | 78 - .../trd_06/9B1AA0/func_80240AD0_9B2260.s | 12 - .../trd_06/9B2410/func_80240C80_9B2410.s | 51 - ver/us/splat.yaml | 118 +- ver/us/symbol_addrs.txt | 179 +- 279 files changed, 9268 insertions(+), 2544 deletions(-) delete mode 100644 src/world/area_trd/trd_00/999C70.c delete mode 100644 src/world/area_trd/trd_00/999F80.c delete mode 100644 src/world/area_trd/trd_00/99A240.c create mode 100644 src/world/area_trd/trd_00/trd_00_0_header.c create mode 100644 src/world/area_trd/trd_00/trd_00_1_main.c create mode 100644 src/world/area_trd/trd_00/trd_00_2_entity.c create mode 100644 src/world/area_trd/trd_00/trd_00_3_npc.c delete mode 100644 src/world/area_trd/trd_01/99C990.c delete mode 100644 src/world/area_trd/trd_01/99CCA0.c delete mode 100644 src/world/area_trd/trd_01/99CD80.c create mode 100644 src/world/area_trd/trd_01/trd_01_0_header.c create mode 100644 src/world/area_trd/trd_01/trd_01_1_main.c create mode 100644 src/world/area_trd/trd_01/trd_01_2_entity.c create mode 100644 src/world/area_trd/trd_01/trd_01_3_npc.c delete mode 100644 src/world/area_trd/trd_02/9A0FE0.c delete mode 100644 src/world/area_trd/trd_02/9A10C0.c create mode 100644 src/world/area_trd/trd_02/trd_02_0_header.c create mode 100644 src/world/area_trd/trd_02/trd_02_1_main.c create mode 100644 src/world/area_trd/trd_02/trd_02_2_entity.c create mode 100644 src/world/area_trd/trd_02/trd_02_3_npc.c delete mode 100644 src/world/area_trd/trd_03/9A4650.c delete mode 100644 src/world/area_trd/trd_03/9A46F0.c delete mode 100644 src/world/area_trd/trd_03/9A4ED0.c create mode 100644 src/world/area_trd/trd_03/trd_03_0_header.c create mode 100644 src/world/area_trd/trd_03/trd_03_1_main.c create mode 100644 src/world/area_trd/trd_03/trd_03_2_entity.c create mode 100644 src/world/area_trd/trd_03/trd_03_3_npc.c create mode 100644 src/world/area_trd/trd_03/trd_03_4_puzzle.c delete mode 100644 src/world/area_trd/trd_05/9AE700.c delete mode 100644 src/world/area_trd/trd_05/9AEE20.c create mode 100644 src/world/area_trd/trd_05/trd_05_0_header.c create mode 100644 src/world/area_trd/trd_05/trd_05_1_main.c create mode 100644 src/world/area_trd/trd_05/trd_05_2_entity.c create mode 100644 src/world/area_trd/trd_05/trd_05_3_trap.c create mode 100644 src/world/area_trd/trd_05/trd_05_4_npc.c delete mode 100644 src/world/area_trd/trd_06/9B1790.c delete mode 100644 src/world/area_trd/trd_06/9B1AA0.c delete mode 100644 src/world/area_trd/trd_06/9B2280.c delete mode 100644 src/world/area_trd/trd_06/9B2410.c create mode 100644 src/world/area_trd/trd_06/trd_06_0_header.c create mode 100644 src/world/area_trd/trd_06/trd_06_1_main.c create mode 100644 src/world/area_trd/trd_06/trd_06_2_falling.c create mode 100644 src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c create mode 100644 src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c create mode 100644 src/world/area_trd/trd_06/trd_06_5_entity.c create mode 100644 src/world/area_trd/trd_06/trd_06_6_party_image.c delete mode 100644 src/world/area_trd/trd_07/9B6980.c delete mode 100644 src/world/area_trd/trd_07/9B6C90.c create mode 100644 src/world/area_trd/trd_07/trd_07_0_header.c create mode 100644 src/world/area_trd/trd_07/trd_07_1_main.c create mode 100644 src/world/area_trd/trd_07/trd_07_2_npc.c create mode 100644 src/world/area_trd/trd_07/trd_07_3_magic_doors.c delete mode 100644 src/world/area_trd/trd_09/9BD660.c delete mode 100644 src/world/area_trd/trd_09/9BD720.c create mode 100644 src/world/area_trd/trd_09/trd_09_0_header.c create mode 100644 src/world/area_trd/trd_09/trd_09_1_main.c create mode 100644 src/world/area_trd/trd_09/trd_09_2_entity.c create mode 100644 src/world/area_trd/trd_09/trd_09_3_npcs.c create mode 100644 src/world/area_trd/trd_09/trd_09_4_demo.c delete mode 100644 src/world/area_trd/trd_10/9C2910.c delete mode 100644 src/world/area_trd/trd_10/9C3130.c create mode 100644 src/world/area_trd/trd_10/trd_10_0_header.c create mode 100644 src/world/area_trd/trd_10/trd_10_1_main.c create mode 100644 src/world/area_trd/trd_10/trd_10_2_npc.c create mode 100644 src/world/area_trd/trd_10/trd_10_3_fake_bowser.c delete mode 100644 src/world/common/Bandit_DropCoin.inc.c create mode 100644 src/world/common/GetLeftRightPoints.inc.c rename src/world/common/{CheckItemFlags40.inc.c => IsItemBadge.inc.c} (65%) delete mode 100644 src/world/common/UnkTrigFunc001.inc.c create mode 100644 src/world/common/atomic/Chest.old.inc.c create mode 100644 src/world/common/enemy/complete/Bobomb_Stationary.inc.c create mode 100644 src/world/common/enemy/complete/Bobomb_Wander.inc.c rename src/world/common/{UnkFunc41.inc.c => util/ChangeNpcToPartner.inc.c} (93%) rename src/world/common/{ => util}/GetDefeatedEnemyCount.inc.c (100%) delete mode 100644 ver/us/asm/data/world/area_trd/trd_00/99A2A0.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_00/99A410.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_00/99B280.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_01/99E050.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_01/99E110.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_01/99F960.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_01/99FD80.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_02/9A2A30.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_02/9A2B00.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_02/9A3870.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_02/9A3AB0.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_03/9A5040.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_03/9A51A0.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_03/9A5FF0.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_05/9AEE70.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_05/9AEFC0.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_05/9AF7C0.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_05/9AF820.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_06/9B24B0.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_06/9B2610.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_06/9B5FC0.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_07/9B9270.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_07/9B9310.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_07/9B9760.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_07/9BA050.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_09/9BD830.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_09/9BD960.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_09/9BDD80.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_09/9BDE80.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_09/9C24C0.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_10/9C3160.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_10/9C3A30.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_10/9C4FC0.data.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024081C_9B1FAC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240AD0_9B2260.s delete mode 100644 ver/us/asm/nonmatchings/world/area_trd/trd_06/9B2410/func_80240C80_9B2410.s diff --git a/include/common_structs.h b/include/common_structs.h index 4da287688d..9e84b047f6 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1380,7 +1380,7 @@ typedef struct GameStatus { /* 0x098 */ Vec3f playerPos; /* 0x0A4 */ f32 playerYaw; /* 0x0A8 */ s8 creditsViewportMode; - /* 0x0A9 */ s8 unk_A9; + /* 0x0A9 */ s8 unk_A9; // selected language? /* 0x0AA */ s8 demoFlags; /* 0x0AB */ u8 soundOutputMode; /* 0x0AC */ s8 introState; diff --git a/include/effects.h b/include/effects.h index 175da33f86..5fd343f4fb 100644 --- a/include/effects.h +++ b/include/effects.h @@ -5,141 +5,141 @@ #include "common_structs.h" enum EffectID { - EFFECT_00 = 0x00, - EFFECT_BIG_SMOKE_PUFF, - EFFECT_02, // unused - EFFECT_03, // unused - EFFECT_04, // unused - EFFECT_05, // unused - EFFECT_LANDING_DUST, - EFFECT_WALKING_DUST, - EFFECT_FLOWER_SPLASH, - EFFECT_FLOWER_TRAIL, - EFFECT_CLOUD_PUFF, - EFFECT_CLOUD_TRAIL, - EFFECT_FOOTPRINT, - EFFECT_FLOATING_FLOWER, - EFFECT_SNOWFLAKE, - EFFECT_STAR, - EFFECT_EMOTE, - EFFECT_SPARKLES, - EFFECT_SHAPE_SPELL, - EFFECT_GATHER_ENERGY_PINK, - EFFECT_DROP_LEAVES, - EFFECT_DUST, - EFFECT_SHATTERING_STONES, - EFFECT_SMOKE_RING, - EFFECT_DAMAGE_STARS, - EFFECT_EXPLOSION, - EFFECT_LENS_FLARE, - EFFECT_GOT_ITEM_OUTLINE, - EFFECT_SPIKY_WHITE_AURA, - EFFECT_SMOKE_IMPACT, - EFFECT_DAMAGE_INDICATOR, - EFFECT_PURPLE_RING, - EFFECT_FLAME, - EFFECT_STARS_BURST, - EFFECT_STARS_SHIMMER, - EFFECT_RISING_BUBBLE, - EFFECT_RING_BLAST, - EFFECT_SHOCKWAVE, - EFFECT_MUSIC_NOTE, - EFFECT_SMOKE_BURST, - EFFECT_SWEAT, - EFFECT_SLEEP_BUBBLE, - EFFECT_2A, // unused - EFFECT_WINDY_LEAVES, - EFFECT_FALLING_LEAVES, - EFFECT_STARS_SPREAD, - EFFECT_STEAM_BURST, - EFFECT_STARS_ORBITING, - EFFECT_BIG_SNOWFLAKES, - EFFECT_DEBUFF, - EFFECT_GREEN_IMPACT, - EFFECT_RADIAL_SHIMMER, - EFFECT_ENDING_DECALS, - EFFECT_LIGHT_RAYS, - EFFECT_LIGHTNING, - EFFECT_FIRE_BREATH, - EFFECT_SHIMMER_BURST, - EFFECT_ENERGY_SHOCKWAVE, - EFFECT_SHIMMER_WAVE, - EFFECT_AURA, - EFFECT_BULB_GLOW, - EFFECT_3D, - EFFECT_BLAST, - EFFECT_FIRE_FLOWER, - EFFECT_RECOVER, - EFFECT_DISABLE_X, - EFFECT_BOMBETTE_BREAKING, - EFFECT_FIREWORK, - EFFECT_CONFETTI, - EFFECT_SNOWFALL, - EFFECT_46, - EFFECT_GATHER_MAGIC, - EFFECT_ATTACK_RESULT_TEXT, - EFFECT_SMALL_GOLD_SPARKLE, - EFFECT_FLASHING_BOX_SHOCKWAVE, - EFFECT_BALLOON, - EFFECT_FLOATING_ROCK, - EFFECT_CHOMP_DROP, - EFFECT_QUIZMO_STAGE, - EFFECT_RADIATING_ENERGY_ORB, - EFFECT_QUIZMO_ANSWER, // unused - EFFECT_MOTION_BLUR_FLAME, // three orbs emanating from super block during upgrading animation - EFFECT_ENERGY_ORB_WAVE, - EFFECT_MERLIN_HOUSE_STARS, - EFFECT_QUIZMO_AUDIENCE, // unused - EFFECT_BUTTERFLIES, - EFFECT_STAT_CHANGE, - EFFECT_SNAKING_STATIC, - EFFECT_THUNDERBOLT_RING, - EFFECT_SQUIRT, - EFFECT_WATER_BLOCK, - EFFECT_WATERFALL, - EFFECT_WATER_FOUNTAIN, - EFFECT_UNDERWATER, - EFFECT_LIGHTNING_BOLT, - EFFECT_WATER_SPLASH, - EFFECT_SNOWMAN_DOLL, - EFFECT_FRIGHT_JAR, - EFFECT_STOP_WATCH, - EFFECT_63, - EFFECT_THROW_SPINY, - EFFECT_65, - EFFECT_TUBBA_HEART_ATTACK, - EFFECT_WHIRLWIND, - EFFECT_RED_IMPACT, - EFFECT_FLOATING_CLOUD_PUFF, - EFFECT_6A, // unused - EFFECT_ENERGY_IN_OUT, - EFFECT_TATTLE_WINDOW, - EFFECT_SHINY_FLARE, - EFFECT_HUFF_PUFF_BREATH, - EFFECT_COLD_BREATH, - EFFECT_EMBERS, - EFFECT_HIEROGLYPHS, - EFFECT_MISC_PARTICLES, - EFFECT_STATIC_STATUS, - EFFECT_MOVING_CLOUD, - EFFECT_75, - EFFECT_76, // unused - EFFECT_FIREWORK_ROCKET, - EFFECT_PEACH_STAR_BEAM, - EFFECT_CHAPTER_CHANGE, - EFFECT_ICE_SHARD, - EFFECT_SPIRIT_CARD, - EFFECT_LIL_OINK, - EFFECT_SOMETHING_ROTATING, - EFFECT_BREAKING_JUNK, - EFFECT_PARTNER_BUFF, - EFFECT_QUIZMO_ASSISTANT, - EFFECT_ICE_PILLAR, - EFFECT_SUN, - EFFECT_STAR_SPIRITS_ENERGY, - EFFECT_PINK_SPARKLES, - EFFECT_STAR_OUTLINE, - EFFECT_86, + EFFECT_00 = 0x00, + EFFECT_BIG_SMOKE_PUFF = 0x01, + EFFECT_02 = 0x02, // unused + EFFECT_03 = 0x03, // unused + EFFECT_04 = 0x04, // unused + EFFECT_05 = 0x05, // unused + EFFECT_LANDING_DUST = 0x06, + EFFECT_WALKING_DUST = 0x07, + EFFECT_FLOWER_SPLASH = 0x08, + EFFECT_FLOWER_TRAIL = 0x09, + EFFECT_CLOUD_PUFF = 0x0A, + EFFECT_CLOUD_TRAIL = 0x0B, + EFFECT_FOOTPRINT = 0x0C, + EFFECT_FLOATING_FLOWER = 0x0D, + EFFECT_SNOWFLAKE = 0x0E, + EFFECT_STAR = 0x0F, + EFFECT_EMOTE = 0x10, + EFFECT_SPARKLES = 0x11, + EFFECT_SHAPE_SPELL = 0x12, + EFFECT_GATHER_ENERGY_PINK = 0x13, + EFFECT_DROP_LEAVES = 0x14, + EFFECT_DUST = 0x15, + EFFECT_SHATTERING_STONES = 0x16, + EFFECT_SMOKE_RING = 0x17, + EFFECT_DAMAGE_STARS = 0x18, + EFFECT_EXPLOSION = 0x19, + EFFECT_LENS_FLARE = 0x1A, + EFFECT_GOT_ITEM_OUTLINE = 0x1B, + EFFECT_SPIKY_WHITE_AURA = 0x1C, + EFFECT_SMOKE_IMPACT = 0x1D, + EFFECT_DAMAGE_INDICATOR = 0x1E, + EFFECT_PURPLE_RING = 0x1F, + EFFECT_FLAME = 0x20, + EFFECT_STARS_BURST = 0x21, + EFFECT_STARS_SHIMMER = 0x22, + EFFECT_RISING_BUBBLE = 0x23, + EFFECT_RING_BLAST = 0x24, + EFFECT_SHOCKWAVE = 0x25, + EFFECT_MUSIC_NOTE = 0x26, + EFFECT_SMOKE_BURST = 0x27, + EFFECT_SWEAT = 0x28, + EFFECT_SLEEP_BUBBLE = 0x29, + EFFECT_2A = 0x2A, // unused + EFFECT_WINDY_LEAVES = 0x2B, + EFFECT_FALLING_LEAVES = 0x2C, + EFFECT_STARS_SPREAD = 0x2D, + EFFECT_STEAM_BURST = 0x2E, + EFFECT_STARS_ORBITING = 0x2F, + EFFECT_BIG_SNOWFLAKES = 0x30, + EFFECT_DEBUFF = 0x31, + EFFECT_GREEN_IMPACT = 0x32, + EFFECT_RADIAL_SHIMMER = 0x33, + EFFECT_ENDING_DECALS = 0x34, + EFFECT_LIGHT_RAYS = 0x35, + EFFECT_LIGHTNING = 0x36, + EFFECT_FIRE_BREATH = 0x37, + EFFECT_SHIMMER_BURST = 0x38, + EFFECT_ENERGY_SHOCKWAVE = 0x39, + EFFECT_SHIMMER_WAVE = 0x3A, + EFFECT_AURA = 0x3B, + EFFECT_BULB_GLOW = 0x3C, + EFFECT_3D = 0x3D, + EFFECT_BLAST = 0x3E, + EFFECT_FIRE_FLOWER = 0x3F, + EFFECT_RECOVER = 0x40, + EFFECT_DISABLE_X = 0x41, + EFFECT_BOMBETTE_BREAKING = 0x42, + EFFECT_FIREWORK = 0x43, + EFFECT_CONFETTI = 0x44, + EFFECT_SNOWFALL = 0x45, + EFFECT_46 = 0x46, + EFFECT_GATHER_MAGIC = 0x47, + EFFECT_ATTACK_RESULT_TEXT = 0x48, + EFFECT_SMALL_GOLD_SPARKLE = 0x49, + EFFECT_FLASHING_BOX_SHOCKWAVE = 0x4A, + EFFECT_BALLOON = 0x4B, + EFFECT_FLOATING_ROCK = 0x4C, + EFFECT_CHOMP_DROP = 0x4D, + EFFECT_QUIZMO_STAGE = 0x4E, + EFFECT_RADIATING_ENERGY_ORB = 0x4F, + EFFECT_QUIZMO_ANSWER = 0x50, // unused + EFFECT_MOTION_BLUR_FLAME = 0x51, // three orbs emanating from super block during upgrading animation + EFFECT_ENERGY_ORB_WAVE = 0x52, + EFFECT_MERLIN_HOUSE_STARS = 0x53, + EFFECT_QUIZMO_AUDIENCE = 0x54, // unused + EFFECT_BUTTERFLIES = 0x55, + EFFECT_STAT_CHANGE = 0x56, + EFFECT_SNAKING_STATIC = 0x57, + EFFECT_THUNDERBOLT_RING = 0x58, + EFFECT_SQUIRT = 0x59, + EFFECT_WATER_BLOCK = 0x5A, + EFFECT_WATERFALL = 0x5B, + EFFECT_WATER_FOUNTAIN = 0x5C, + EFFECT_UNDERWATER = 0x5D, + EFFECT_LIGHTNING_BOLT = 0x5E, + EFFECT_WATER_SPLASH = 0x5F, + EFFECT_SNOWMAN_DOLL = 0x60, + EFFECT_FRIGHT_JAR = 0x61, + EFFECT_STOP_WATCH = 0x62, + EFFECT_63 = 0x63, + EFFECT_THROW_SPINY = 0x64, + EFFECT_65 = 0x65, + EFFECT_TUBBA_HEART_ATTACK = 0x66, + EFFECT_WHIRLWIND = 0x67, + EFFECT_RED_IMPACT = 0x68, + EFFECT_FLOATING_CLOUD_PUFF = 0x69, + EFFECT_6A = 0x6A, // unused + EFFECT_ENERGY_IN_OUT = 0x6B, + EFFECT_TATTLE_WINDOW = 0x6C, + EFFECT_SHINY_FLARE = 0x6D, + EFFECT_HUFF_PUFF_BREATH = 0x6E, + EFFECT_COLD_BREATH = 0x6F, + EFFECT_EMBERS = 0x70, + EFFECT_HIEROGLYPHS = 0x71, + EFFECT_MISC_PARTICLES = 0x72, + EFFECT_STATIC_STATUS = 0x73, + EFFECT_MOVING_CLOUD = 0x74, + EFFECT_75 = 0x75, + EFFECT_76 = 0x76, // unused + EFFECT_FIREWORK_ROCKET = 0x77, + EFFECT_PEACH_STAR_BEAM = 0x78, + EFFECT_CHAPTER_CHANGE = 0x79, + EFFECT_ICE_SHARD = 0x7A, + EFFECT_SPIRIT_CARD = 0x7B, + EFFECT_LIL_OINK = 0x7C, + EFFECT_SOMETHING_ROTATING = 0x7D, + EFFECT_BREAKING_JUNK = 0x7E, + EFFECT_PARTNER_BUFF = 0x7F, + EFFECT_QUIZMO_ASSISTANT = 0x80, + EFFECT_ICE_PILLAR = 0x81, + EFFECT_SUN = 0x82, + EFFECT_STAR_SPIRITS_ENERGY = 0x83, + EFFECT_PINK_SPARKLES = 0x84, + EFFECT_STAR_OUTLINE = 0x85, + EFFECT_86 = 0x86, }; typedef struct Effect00FXData { diff --git a/include/enums.h b/include/enums.h index a5bb212bf2..6c3c1a6c49 100644 --- a/include/enums.h +++ b/include/enums.h @@ -3489,6 +3489,7 @@ enum AnyPartnerAnims { PARTNER_ANIM_RUN = 0x106, PARTNER_ANIM_TALK = 0x107, PARTNER_ANIM_HURT = 0x108, + PARTNER_ANIM_9 = 0x109, }; enum FirstStrikes { diff --git a/include/functions.h b/include/functions.h index 55c33ce7eb..af7d40d614 100644 --- a/include/functions.h +++ b/include/functions.h @@ -667,7 +667,7 @@ s32 find_item(s32); void enable_background_wave(void); -void func_80035DF0(s16); +void set_map_change_fade_rate(s16); // State funcs void state_init_startup(void); diff --git a/include/map.h b/include/map.h index 0b386e39e5..c160b4814a 100644 --- a/include/map.h +++ b/include/map.h @@ -14,6 +14,8 @@ #define EVS_BindExitTriggers EVS_BindExitTriggers #define EVS_EnterMap EVS_EnterMap +#define CLONED_MODEL(idx) (10000+(idx)) + // TODO: consider moving Npc here #define ENTRY_COUNT(entryList) (sizeof(entryList) / sizeof(Vec4f)) diff --git a/include/npc.h b/include/npc.h index 6787ff7324..9d1e31e599 100644 --- a/include/npc.h +++ b/include/npc.h @@ -5,13 +5,11 @@ #include "enums.h" #include "script_api/map.h" -#define GET_MACRO(_1,_2,_3,NAME,ARGS...) NAME -#define NPC_GROUP(ARGS...) GET_MACRO(ARGS, NPC_GROUP_3, NPC_GROUP_2, NPC_GROUP_1)(ARGS) - // battle and stage are optional in overloaded NPC_GROUP macros -#define NPC_GROUP_1(npcs) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, 0, 0 } -#define NPC_GROUP_2(npcs, battle) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle, 0 } -#define NPC_GROUP_3(npcs, battle, stage) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle, stage + 1 } +#define NPC_GROUP(args...) VFUNC(NPC_GROUP, args) +#define NPC_GROUP1(npcs) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, 0, 0 } +#define NPC_GROUP2(npcs, battle) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle, 0 } +#define NPC_GROUP3(npcs, battle, stage) { sizeof(npcs) / sizeof(StaticNpc), (StaticNpc*) &npcs, battle, stage + 1 } #define NO_DROPS { { F16(100), F16(0), 0, F16(0) }, } @@ -95,7 +93,7 @@ typedef struct MobileAISettings { typedef struct StationaryAISettings { /* 0x00 */ f32 unk_00; - /* 0x04 */ s32 unk_04; + /* 0x04 */ f32 unk_04; /* 0x08 */ s32 playerSearchInterval; // how often to search for player (frames) /* 0x0C */ f32 chaseSpeed; /* 0x10 */ s32 chaseTurnRate; // how many degrees this NPC can turn per frame while chasing diff --git a/include/script_api/common.h b/include/script_api/common.h index e516a750ee..92a382b8c0 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -285,7 +285,7 @@ ApiStatus func_802D2C14(Evt* script, s32 isInitialCall); ApiStatus func_802D7B10(Evt* script, s32 isInitialCall); ApiStatus ShowConsumableChoicePopup(Evt* script, s32 isInitialCall); ApiStatus func_800458CC(Evt* script, s32 isInitialCall); -ApiStatus func_80045900(Evt* script, s32 isInitialCall); +ApiStatus OnPlayerFled(Evt* script, s32 isInitialCall); ApiStatus ShowKeyChoicePopup(Evt* script, s32 isInitialCall); ApiStatus CloseChoicePopup(Evt* script, s32 isInitialCall); ApiStatus InterruptUsePartner(Evt* script, s32 isInitialCall); diff --git a/include/script_api/macros.h b/include/script_api/macros.h index bcd10fd7f1..c35f6617a2 100644 --- a/include/script_api/macros.h +++ b/include/script_api/macros.h @@ -571,6 +571,24 @@ /****** COMMON SCRIPTS ************************************************************************************************/ +#define EVT_SET_VEC2(baseVar, x, y, z) \ + EVT_SET(baseVar + 0, x) \ + EVT_SET(baseVar + 1, y) + +#define EVT_SETF_VEC2(baseVar, x, y, z) \ + EVT_SETF(baseVar + 0, x) \ + EVT_SETF(baseVar + 1, y) + +#define EVT_SET_VEC3(baseVar, x, y, z) \ + EVT_SET(baseVar + 0, x) \ + EVT_SET(baseVar + 1, y) \ + EVT_SET(baseVar + 2, z) + +#define EVT_SETF_VEC3(baseVar, x, y, z) \ + EVT_SETF(baseVar + 0, x) \ + EVT_SETF(baseVar + 1, y) \ + EVT_SETF(baseVar + 2, z) + #define EVT_EXIT_WALK(walkDistance, exitIdx, map, entryIdx) \ { \ EVT_SET_GROUP(EVT_GROUP_1B) \ @@ -595,7 +613,7 @@ EVT_END \ } -#define EVT_EXIT_DOUBLE_DOOR(exitIdx, colliderID, leftDoorModelID, rightDoorModelID, map, entryIdx) \ +#define EVT_EXIT_DOUBLE_DOOR(exitIdx, map, entryIdx, colliderID, leftDoorModelID, rightDoorModelID) \ { \ EVT_SET_GROUP(EVT_GROUP_1B) \ EVT_CALL(DisablePlayerInput, TRUE) \ @@ -633,4 +651,61 @@ EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) \ EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) +// allow macros with variable number of arguments +// see https://stackoverflow.com/questions/11761703/overloading-macro-on-number-of-arguments +// solution provided by R1tschY and edited by Gabriel Staples +#define __NARG__(args...) \ + __NARG_I_(args,__RSEQ_N()) +#define __NARG_I_(args...) \ + __ARG_N(args) +#define __ARG_N( \ + _1, _2, _3, _4, _5, _6, _7, _8, _9,_10, \ + _11,_12,_13,_14,_15,_16,_17,_18,_19,_20, \ + _21,_22,_23,_24,_25,_26,_27,_28,_29,_30, \ + _31,_32,_33,_34,_35,_36,_37,_38,_39,_40, \ + _41,_42,_43,_44,_45,_46,_47,_48,_49,_50, \ + _51,_52,_53,_54,_55,_56,_57,_58,_59,_60, \ + _61,_62,_63,N,...) N +#define __RSEQ_N() \ + 63,62,61,60, \ + 59,58,57,56,55,54,53,52,51,50, \ + 49,48,47,46,45,44,43,42,41,40, \ + 39,38,37,36,35,34,33,32,31,30, \ + 29,28,27,26,25,24,23,22,21,20, \ + 19,18,17,16,15,14,13,12,11,10, \ + 9,8,7,6,5,4,3,2,1,0 +#define _VFUNC_(name, n) name##n +#define _VFUNC(name, n) _VFUNC_(name, n) +#define VFUNC(func, args...) _VFUNC(func, __NARG__(args)) (args) + +#define EVT_PLAY_EFFECT(args...) VFUNC(EVT_PLAY_EFFECT, args) +#define EVT_PLAY_EFFECT1(effect) \ + EVT_CALL(PlayEffect, effect, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) +#define EVT_PLAY_EFFECT2(effect, subtype) \ + EVT_CALL(PlayEffect, effect, subtype, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) +#define EVT_PLAY_EFFECT3(effect, subtype, a) \ + EVT_CALL(PlayEffect, effect, subtype, a, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) +#define EVT_PLAY_EFFECT4(effect, subtype, a, b) \ + EVT_CALL(PlayEffect, effect, subtype, a, b, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) +#define EVT_PLAY_EFFECT5(effect, subtype, a, b, c) \ + EVT_CALL(PlayEffect, effect, subtype, a, b, c, 0, 0, 0, 0, 0, 0, 0, 0, 0) +#define EVT_PLAY_EFFECT6(effect, subtype, a, b, c, d) \ + EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, 0, 0, 0, 0, 0, 0, 0, 0) +#define EVT_PLAY_EFFECT7(effect, subtype, a, b, c, d, e) \ + EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, 0, 0, 0, 0, 0, 0, 0) +#define EVT_PLAY_EFFECT8(effect, subtype, a, b, c, d, e, f) \ + EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, f, 0, 0, 0, 0, 0, 0) +#define EVT_PLAY_EFFECT9(effect, subtype, a, b, c, d, e, f, g) \ + EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, f, g, 0, 0, 0, 0, 0) +#define EVT_PLAY_EFFECT10(effect, subtype, a, b, c, d, e, f, g, h) \ + EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, f, g, h, 0, 0, 0, 0) +#define EVT_PLAY_EFFECT11(effect, subtype, a, b, c, d, e, f, g, h, i) \ + EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, f, g, h, i, 0, 0, 0) +#define EVT_PLAY_EFFECT12(effect, subtype, a, b, c, d, e, f, g, h, i, j) \ + EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, f, g, h, i, j, 0, 0) +#define EVT_PLAY_EFFECT13(effect, subtype, a, b, c, d, e, f, g, h, i, j, k) \ + EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, f, g, h, i, j, k, 0) +#define EVT_PLAY_EFFECT14(effect, subtype, a, b, c, d, e, f, g, h, i, j, k, l) \ + EVT_CALL(PlayEffect, effect, subtype, a, b, c, d, e, f, g, h, i, j, k, l) + #endif diff --git a/include/variables.h b/include/variables.h index ce00726280..4731d1a7e8 100644 --- a/include/variables.h +++ b/include/variables.h @@ -94,9 +94,9 @@ extern s16 gMapTransitionAlpha; extern s8 D_800A0930; extern s8 D_800A0931; extern s16 D_800A0932[1]; -extern s16 D_800A0942; -extern s16 D_800A0944; -extern s16 D_800A0946; +extern s16 gMapTransitionFadeRate; +extern s16 gMapTransitionState; +extern s16 gMapTransitionStateTime; extern s16 D_800A0948; extern s16 D_800A0954; extern s16 D_800A0956; diff --git a/src/111f0_len_860.c b/src/111f0_len_860.c index f3ed94495c..9cc5ac61b4 100644 --- a/src/111f0_len_860.c +++ b/src/111f0_len_860.c @@ -2,9 +2,10 @@ #include "nu/nusys.h" void init_enter_world_shared(void); +s16 update_enter_map_screen_overlay(s16* progress); -void func_80035DF0(s16 arg0) { - D_800A0942 = arg0; +void set_map_change_fade_rate(s16 fadeRate) { + gMapTransitionFadeRate = fadeRate; } void state_init_enter_demo(void) { @@ -19,10 +20,10 @@ void state_init_enter_world(void) { } void init_enter_world_shared(void) { - D_800A0944 = 0; - D_800A0946 = 4; + gMapTransitionState = 0; + gMapTransitionStateTime = 4; gGameStatusPtr->exitTangent = 0.0f; - gMapTransitionAlpha = 0xFF; + gMapTransitionAlpha = 255; nuContRmbForceStopEnd(); update_exit_map_screen_overlay(&gMapTransitionAlpha); @@ -33,16 +34,16 @@ void init_enter_world_shared(void) { } void state_step_enter_world(void) { - switch (D_800A0944) { + switch (gMapTransitionState) { case 0: - if (D_800A0946 == 0) { + if (gMapTransitionStateTime == 0) { gGameStatusPtr->isBattle = FALSE; gGameStatusPtr->disableScripts = FALSE; if (D_800A0948 == 0) { - load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, 0); + load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, LOAD_FROM_MAP); } else { - load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, 1); + load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, LOAD_FROM_FILE_SELECT); } gGameStatusPtr->prevArea = gGameStatusPtr->areaID; @@ -51,10 +52,10 @@ void state_step_enter_world(void) { disable_player_input(); } update_cameras(); - D_800A0946 = 2; - D_800A0944++; + gMapTransitionStateTime = 2; + gMapTransitionState++; } else { - D_800A0946--; + gMapTransitionStateTime--; } break; case 1: @@ -63,11 +64,11 @@ void state_step_enter_world(void) { update_player(); update_cameras(); - if (D_800A0946 != 0) { - D_800A0946--; + if (gMapTransitionStateTime != 0) { + gMapTransitionStateTime--; } else if (!does_script_exist(gGameStatusPtr->mainScriptID)) { gOverrideFlags &= ~GLOBAL_OVERRIDES_8; - D_800A0944++; + gMapTransitionState++; } break; case 2: @@ -76,7 +77,7 @@ void state_step_enter_world(void) { update_effects(); update_cameras(); - if ((update_enter_map_screen_overlay(&gMapTransitionAlpha) << 0x10) != 0) { + if (update_enter_map_screen_overlay(&gMapTransitionAlpha) != 0) { if (gGameStatusPtr->demoState == 0) { enable_player_input(); } @@ -95,8 +96,8 @@ void state_drawUI_enter_world(void) { void state_init_change_map(void) { gMapTransitionAlpha = 0x00; - D_800A0942 = 0x14; - D_800A0944 = 0x00; + gMapTransitionFadeRate = 20; + gMapTransitionState = 0; if (gGameStatusPtr->prevArea != gGameStatusPtr->areaID) { gGameStatusPtr->didAreaChange = TRUE; @@ -107,7 +108,7 @@ void state_init_change_map(void) { } void state_step_change_map(void) { - switch (D_800A0944) { + switch (gMapTransitionState) { case 0: update_npcs(); update_player(); @@ -115,22 +116,22 @@ void state_step_change_map(void) { update_cameras(); if ((update_exit_map_screen_overlay(&gMapTransitionAlpha) << 0x10) != 0) { - D_800A0944++; + gMapTransitionState++; } break; case 1: gOverrideFlags |= GLOBAL_OVERRIDES_8; nuContRmbForceStop(); - D_800A0946 = 4; - D_800A0944++; + gMapTransitionStateTime = 4; + gMapTransitionState++; break; case 2: if (gGameStatusPtr->demoState != 0) { - set_game_mode(0x11); + set_game_mode(GAME_MODE_DEMO); } - if (D_800A0946 != 0) { - D_800A0946--; + if (gMapTransitionStateTime != 0) { + gMapTransitionStateTime--; } else { gGameStatusPtr->isBattle = FALSE; gGameStatusPtr->disableScripts = FALSE; @@ -141,8 +142,8 @@ void state_step_change_map(void) { disable_player_input(); } update_cameras(); - D_800A0946 = 2; - D_800A0944++; + gMapTransitionStateTime = 2; + gMapTransitionState++; } break; case 3: @@ -151,11 +152,11 @@ void state_step_change_map(void) { update_player(); update_cameras(); - if (D_800A0946 != 0) { - D_800A0946--; + if (gMapTransitionStateTime != 0) { + gMapTransitionStateTime--; } else if (!does_script_exist(gGameStatusPtr->mainScriptID)) { gOverrideFlags &= ~GLOBAL_OVERRIDES_8; - D_800A0944++; + gMapTransitionState++; } break; case 4: @@ -164,7 +165,7 @@ void state_step_change_map(void) { update_effects(); update_cameras(); - if ((update_enter_map_screen_overlay(&gMapTransitionAlpha) << 0x10) != 0) { + if (update_enter_map_screen_overlay(&gMapTransitionAlpha) != 0) { if (gGameStatusPtr->demoState == 0) { enable_player_input(); } @@ -176,35 +177,35 @@ void state_step_change_map(void) { } void state_drawUI_change_map(void) { - if (D_800A0944 == 4 || D_800A0944 == 0) { + if (gMapTransitionState == 4 || gMapTransitionState == 0) { draw_status_ui(); } } void func_80036430(void) { - gMapTransitionAlpha = 0xFF; - D_800A0942 = 0x14; - D_800A0944 = 0x01; + gMapTransitionAlpha = 255; + gMapTransitionFadeRate = 20; + gMapTransitionState = 0x01; gPlayerStatus.flags |= PS_FLAGS_1000; } void func_8003646C(void) { - switch (D_800A0944) { + switch (gMapTransitionState) { case 1: gOverrideFlags |= GLOBAL_OVERRIDES_8; nuContRmbForceStop(); - D_800A0946 = 4; - D_800A0944++; + gMapTransitionStateTime = 4; + gMapTransitionState++; break; case 2: - if (D_800A0946 != 0) { - D_800A0946--; + if (gMapTransitionStateTime != 0) { + gMapTransitionStateTime--; } else { gGameStatusPtr->isBattle = FALSE; gGameStatusPtr->disableScripts = FALSE; load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, 0); nuContRmbForceStopEnd(); - D_800A0944++; + gMapTransitionState++; } break; case 3: @@ -212,15 +213,15 @@ void func_8003646C(void) { update_npcs(); if (!does_script_exist(gGameStatusPtr->mainScriptID)) { gOverrideFlags &= ~GLOBAL_OVERRIDES_8; - D_800A0944++; + gMapTransitionState++; break; } return; case 4: - gMapTransitionAlpha -= D_800A0942; + gMapTransitionAlpha -= gMapTransitionFadeRate; if (gMapTransitionAlpha < 0) { gMapTransitionAlpha = 0; - D_800A0944++; + gMapTransitionState++; set_screen_overlay_params_front(255, -1.0f); set_game_mode(GAME_MODE_CHANGE_MAP); } diff --git a/src/1AF120.c b/src/1AF120.c index a7443449c0..a43c5eabf2 100644 --- a/src/1AF120.c +++ b/src/1AF120.c @@ -393,7 +393,7 @@ EvtScript D_80296014 = { EVT_WAIT(8) EVT_LABEL(10) EVT_CALL(GetActorPos, ACTOR_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 0, LVar0, LVar1, LVar2) EVT_RETURN EVT_END }; @@ -405,11 +405,11 @@ EvtScript D_8029621C = { EVT_ADD(LVar5, -5) EVT_ADD(LVar6, 18) EVT_ADD(LVar7, 5) - EVT_CALL(PlayEffect, EFFECT_RING_BLAST, 0, LVar5, LVar6, LVar7, EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, LVar5, LVar6, LVar7, EVT_FLOAT(1.5), 15) EVT_WAIT(2) EVT_ADD(LVar5, 10) EVT_ADD(LVar6, -14) - EVT_CALL(PlayEffect, EFFECT_RING_BLAST, 0, LVar5, LVar6, LVar7, EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, LVar5, LVar6, LVar7, EVT_FLOAT(1.5), 15) EVT_END_CHILD_THREAD EVT_CALL(GetDamageIntensity) EVT_SWITCH(LVar0) diff --git a/src/1a1f0_len_5390.c b/src/1a1f0_len_5390.c index bb316dfebb..703a8c0e48 100644 --- a/src/1a1f0_len_5390.c +++ b/src/1a1f0_len_5390.c @@ -21,7 +21,7 @@ void spawn_drops(Enemy* enemy); s32 D_80077C40 = 0; -extern EvtScript D_800936DC; +extern EvtScript EVS_NpcHitRecoil; EvtScript D_80077C44 = { EVT_WAIT(10) @@ -31,7 +31,7 @@ EvtScript D_80077C44 = { EVT_CALL(SetNpcFlagBits, NPC_BTL_MERLEE, NPC_FLAG_100, TRUE) EVT_CALL(SetNpcYaw, NPC_BTL_MERLEE, 0) EVT_CALL(GetCamLookAtObjVector) - EVT_CALL(SetNpcPos, NPC_BTL_MERLEE, LocalVar(0), LocalVar(1), LocalVar(2)) + EVT_CALL(SetNpcPos, NPC_BTL_MERLEE, LVar0, LocalVar(1), LocalVar(2)) EVT_THREAD EVT_CALL(MerleeUpdateFX) EVT_END_THREAD @@ -46,14 +46,14 @@ EvtScript D_80077C44 = { EVT_CALL(DeleteNpc, NPC_BTL_MERLEE) EVT_END_THREAD EVT_CALL(PlaySound, SOUND_2075) - EVT_CALL(GetPlayerPos, LocalVar(0), LocalVar(1), LocalVar(2)) - EVT_CALL(PlayMerleeGatherFX, LocalVar(0), LocalVar(1), LocalVar(2)) - EVT_CALL(PlayMerleeOrbFX, LocalVar(0), LocalVar(1), LocalVar(2)) + EVT_CALL(GetPlayerPos, LVar0, LocalVar(1), LocalVar(2)) + EVT_CALL(PlayMerleeGatherFX, LVar0, LocalVar(1), LocalVar(2)) + EVT_CALL(PlayMerleeOrbFX, LVar0, LocalVar(1), LocalVar(2)) EVT_WAIT(15) EVT_CALL(ShowMerleeCoinMessage) EVT_WAIT(15) EVT_CALL(HasMerleeCasts) - EVT_IF_EQ(LocalVar(0), 1) + EVT_IF_EQ(LVar0, 1) EVT_RETURN EVT_END_IF EVT_CALL(ShowMerleeRanOutMessage) @@ -63,8 +63,8 @@ EvtScript D_80077C44 = { }; EvtScript SCRIPT_NpcDefeat = { - EVT_CALL(GetBattleOutcome, LocalVar(0)) - EVT_SWITCH(LocalVar(0)) + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_CALL(OnDefeatEnemy) EVT_CASE_EQ(1) @@ -81,7 +81,7 @@ EvtScript D_80077E9C = { }; EnemyDrops D_80077EB8 = { - .dropFlags = 0x80, + .dropFlags = NPC_DROP_FLAGS_80, .itemDropChance = 10, .itemDrops = { { @@ -129,22 +129,22 @@ EnemyDrops D_80077EB8 = { }; EvtScript EnemyNpcHit = { - EVT_CALL(GetOwnerEncounterTrigger, LocalVar(0)) - EVT_SWITCH(LocalVar(0)) - EVT_CASE_EQ(1) - EVT_CASE_OR_EQ(2) - EVT_CASE_OR_EQ(4) - EVT_CASE_OR_EQ(6) - EVT_CALL(GetSelfAnimationFromTable, 7, LocalVar(0)) - EVT_EXEC_WAIT(D_800936DC) - EVT_CASE_EQ(3) + EVT_CALL(GetOwnerEncounterTrigger, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_NONE) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_JUMP) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_HAMMER) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_PARTNER) + EVT_CALL(GetSelfAnimationFromTable, ENEMY_ANIM_HIT, LVar0) + EVT_EXEC_WAIT(EVS_NpcHitRecoil) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_SPIN) EVT_THREAD - EVT_CALL(func_800458CC, LocalVar(0)) - EVT_IF_EQ(LocalVar(0), 0) - EVT_SET(LocalVar(10), 0) + EVT_CALL(func_800458CC, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_SET(LVarA, 0) EVT_LOOP(30) - EVT_ADD(LocalVar(10), 40) - EVT_CALL(SetNpcRotation, NPC_SELF, 0, LocalVar(10), 0) + EVT_ADD(LVarA, 40) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, LVarA, 0) EVT_WAIT(1) EVT_END_LOOP EVT_END_IF @@ -157,14 +157,14 @@ EvtScript EnemyNpcHit = { EvtScript EnemyNpcDefeat = { EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) - EVT_CALL(GetBattleOutcome, LocalVar(0)) - EVT_SWITCH(LocalVar(0)) - EVT_CASE_EQ(0) + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) EVT_CALL(DoNpcDefeat) - EVT_CASE_EQ(2) - EVT_CALL(func_80045900, 0) - EVT_CASE_EQ(3) - EVT_CALL(SetEnemyFlagBits, -1, 16, 1) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(OnPlayerFled, 0) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(SetEnemyFlagBits, -1, ENEMY_FLAGS_10, 1) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_SWITCH EVT_RETURN diff --git a/src/38F00.c b/src/38F00.c index efe03f0e5b..c1657166f6 100644 --- a/src/38F00.c +++ b/src/38F00.c @@ -10,7 +10,7 @@ EvtScript D_800936C0 = { EVT_END }; -EvtScript D_800936DC = { +EvtScript EVS_NpcHitRecoil = { EVT_CALL(SetNpcAnimation, NPC_SELF, LVar0) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar3, LVar2) EVT_SET(LVar1, LVar3) diff --git a/src/EDEA00.c b/src/EDEA00.c index 1e12e4929a..192fbd174c 100644 --- a/src/EDEA00.c +++ b/src/EDEA00.c @@ -5,7 +5,7 @@ #define NAMESPACE EDEA00 -#include "world/common/UnkFunc41.inc.c" +#include "world/common/util/ChangeNpcToPartner.inc.c" // must include this before LakituAI for the debug string to end up in the right position #include "world/common/enemy/FlyingAI.inc.c" diff --git a/src/battle/area_sbk/stage/sbk_02.c b/src/battle/area_sbk/stage/sbk_02.c index c669f2eb4c..489a87e40c 100644 --- a/src/battle/area_sbk/stage/sbk_02.c +++ b/src/battle/area_sbk/stage/sbk_02.c @@ -38,7 +38,7 @@ EvtScript N(beforeBattle_8021F800) = { EVT_SET(LVar0, 5) EVT_SET(LVar1, 240) EVT_EXEC(N(8021F720)) - EVT_CALL(PlayEffect, EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SUN) EVT_RETURN EVT_END }; diff --git a/src/cd180_len_38f0.c b/src/cd180_len_38f0.c index 93f4525786..a9f963f3a9 100644 --- a/src/cd180_len_38f0.c +++ b/src/cd180_len_38f0.c @@ -615,7 +615,7 @@ s32 update_exit_map_screen_overlay(s16* progress) { return 0; } -u8 update_enter_map_screen_overlay(s16* progress) { +s16 update_enter_map_screen_overlay(s16* progress) { u8 frontType = 0; s32 amt = 20; u8 ret = FALSE; diff --git a/src/encounter_api.c b/src/encounter_api.c index 6b9f44b059..9a469e58c7 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -801,14 +801,14 @@ ApiStatus func_800458CC(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_80045900(Evt* script, s32 isInitialCall) { +ApiStatus OnPlayerFled(Evt* script, s32 isInitialCall) { Enemy* enemy = script->owner1.enemy; Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var0 = evt_get_variable(script, *script->ptrReadPos); + s32 skipReaction = evt_get_variable(script, *script->ptrReadPos); enemy->aiFlags |= ENEMY_AI_FLAGS_4; - if (var0 == 0) { + if (!skipReaction) { s32 unk; if (!(enemy->aiFlags & ENEMY_AI_FLAGS_10)) { diff --git a/src/evt/map_api.c b/src/evt/map_api.c index 620234c09c..b4aaa9f1a8 100644 --- a/src/evt/map_api.c +++ b/src/evt/map_api.c @@ -420,12 +420,12 @@ ApiStatus RotateGroup(Evt* script, s32 isInitialCall) { ApiStatus ScaleGroup(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; - s32 var1 = evt_get_variable(script, *args); - s32 index = get_transform_group_index(var1); + s32 modelID = evt_get_variable(script, *args); + s32 transformIndex = get_transform_group_index(modelID); ModelTransformGroup* transformGroup; f32 x, y, z; - if (index == -1) { + if (transformIndex == -1) { apply_transform_to_children(ScaleModel, script); return ApiStatus_DONE2; } @@ -436,10 +436,10 @@ ApiStatus ScaleGroup(Evt* script, s32 isInitialCall) { y = evt_get_float_variable(script, *args++); z = evt_get_float_variable(script, *args++); - transformGroup = get_transform_group(index); + transformGroup = get_transform_group(transformIndex); - index = transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAGS_400; // TODO fix weird match - if (!(index)) { + transformIndex = transformGroup->flags & MODEL_TRANSFORM_GROUP_FLAGS_400; // TODO fix weird match + if (!(transformIndex)) { guScaleF(transformGroup->matrixB, x, y, z); transformGroup->flags |= (MODEL_TRANSFORM_GROUP_FLAGS_400 | MODEL_TRANSFORM_GROUP_FLAGS_1000); } else { diff --git a/src/hud_element.h b/src/hud_element.h index 5098b38137..06bfad8d0b 100644 --- a/src/hud_element.h +++ b/src/hud_element.h @@ -239,7 +239,7 @@ extern HudScript* wPartnerHudScripts[]; #define hs_RandomRestart(max, cutoff) HUD_ELEMENT_OP_RandomRestart, max, cutoff, #define hs_op_15(arg0) HUD_ELEMENT_OP_op_15, arg0, -#define hs_RandomBranch(...) HUD_ELEMENT_OP_RandomBranch, (sizeof((s32[]){__VA_ARGS__})/sizeof(s32)), __VA_ARGS__, +#define hs_RandomBranch(args...) HUD_ELEMENT_OP_RandomBranch, (sizeof((s32[]){args})/sizeof(s32)), args, #define hs_SetFlags(arg0) HUD_ELEMENT_OP_SetFlags, arg0, #define hs_ClearFlags(arg0) HUD_ELEMENT_OP_ClearFlags, arg0, #define hs_PlaySound(arg0) HUD_ELEMENT_OP_PlaySound, arg0, diff --git a/src/move_table.inc.c b/src/move_table.inc.c index c7f3869a19..822601d4e1 100644 --- a/src/move_table.inc.c +++ b/src/move_table.inc.c @@ -1119,7 +1119,7 @@ MoveData gMoveTable[] = { .costFP = 0, .costBP = 1 }, -{ // move 70: Unused_FinalBombomb +{ // move 70: Unused_FinalBobomb .nameMsg = "ファイナルボムヘイ", .fullDescMsg = 0, .shortDescMsg = 0, diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index 2141daf472..a92eda25e0 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -162,7 +162,7 @@ EvtScript N(80241AB0) = { EVT_CALL(RemoveNpc, NPC_SELF) EVT_CASE_EQ(2) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) - EVT_CALL(func_80045900, 1) + EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(3) EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(RemoveNpc, NPC_SELF) diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 1b66e061c6..9f53180736 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -400,7 +400,7 @@ EvtScript N(80243970) = { EVT_CALL(RemoveNpc, NPC_SELF) EVT_CASE_EQ(2) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) - EVT_CALL(func_80045900, 1) + EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(3) EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(RemoveNpc, NPC_SELF) diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index 7a160265a4..4e65292ff4 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -126,7 +126,7 @@ EvtScript N(802418C0) = { EVT_CALL(RemoveNpc, NPC_SELF) EVT_CASE_EQ(2) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) - EVT_CALL(func_80045900, 1) + EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(3) EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(RemoveNpc, NPC_SELF) diff --git a/src/world/area_dgb/dgb_06/C3D080.c b/src/world/area_dgb/dgb_06/C3D080.c index 902168dcc9..aad2e19b1e 100644 --- a/src/world/area_dgb/dgb_06/C3D080.c +++ b/src/world/area_dgb/dgb_06/C3D080.c @@ -88,7 +88,7 @@ EvtScript N(main) = { #define CHEST_ITEM 19 #define CHEST_FLAG 1048 -#include "world/common/atomic/Chest.inc.c" +#include "world/common/atomic/Chest.old.inc.c" EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, &Entity_Chest, -300, 50, -200, 0, 0, MAKE_ENTITY_END) diff --git a/src/world/area_dgb/dgb_07/C3DBF0.c b/src/world/area_dgb/dgb_07/C3DBF0.c index 1c77a210f0..0bc4daf48b 100644 --- a/src/world/area_dgb/dgb_07/C3DBF0.c +++ b/src/world/area_dgb/dgb_07/C3DBF0.c @@ -103,7 +103,7 @@ EvtScript N(802417F0) = { EVT_CALL(RemoveNpc, NPC_SELF) EVT_CASE_EQ(2) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) - EVT_CALL(func_80045900, 1) + EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(3) EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(RemoveNpc, NPC_SELF) diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 01f8a59882..84b06768d5 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -178,7 +178,7 @@ EvtScript N(802441D4) = { EVT_CALL(RemoveNpc, NPC_SELF) EVT_CASE_EQ(2) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) - EVT_CALL(func_80045900, 1) + EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(3) EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(RemoveNpc, NPC_SELF) diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 946db71019..056df894c0 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -196,7 +196,7 @@ EvtScript N(80244000) = { EVT_CALL(RemoveNpc, NPC_SELF) EVT_CASE_EQ(2) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) - EVT_CALL(func_80045900, 1) + EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(3) EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(RemoveNpc, NPC_SELF) diff --git a/src/world/area_dgb/dgb_12/C4DEF0.c b/src/world/area_dgb/dgb_12/C4DEF0.c index 526a718779..12ec5a2104 100644 --- a/src/world/area_dgb/dgb_12/C4DEF0.c +++ b/src/world/area_dgb/dgb_12/C4DEF0.c @@ -133,7 +133,7 @@ static s32 N(pad_868)[] = { #define CHEST_ITEM 19 #define CHEST_FLAG 1057 -#include "world/common/atomic/Chest.inc.c" +#include "world/common/atomic/Chest.old.inc.c" EvtScript N(makeEntities) = { EVT_CALL(MakeEntity, &Entity_Chest, -225, 0, -245, 0, 0, MAKE_ENTITY_END) diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 68d611dad5..689f1b0d6a 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -161,7 +161,7 @@ EvtScript N(80241EA0) = { EVT_CALL(RemoveNpc, NPC_SELF) EVT_CASE_EQ(2) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) - EVT_CALL(func_80045900, 1) + EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(3) EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(RemoveNpc, NPC_SELF) diff --git a/src/world/area_dgb/dgb_16/C52540.c b/src/world/area_dgb/dgb_16/C52540.c index 1244f09353..eeb38c98f9 100644 --- a/src/world/area_dgb/dgb_16/C52540.c +++ b/src/world/area_dgb/dgb_16/C52540.c @@ -118,7 +118,7 @@ EvtScript N(802417C0) = { EVT_CALL(RemoveNpc, NPC_SELF) EVT_CASE_EQ(2) EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) - EVT_CALL(func_80045900, 1) + EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(3) EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(RemoveNpc, NPC_SELF) diff --git a/src/world/area_dgb/dgb_18/C56EF0.c b/src/world/area_dgb/dgb_18/C56EF0.c index 955ed0d867..ccda9078d3 100644 --- a/src/world/area_dgb/dgb_18/C56EF0.c +++ b/src/world/area_dgb/dgb_18/C56EF0.c @@ -1,7 +1,7 @@ #include "dgb_18.h" // replace below with: -// #include "world/common/atomic/Chest.inc.c" +// #include "world/common/atomic/Chest.old.inc.c" // after data is done #include "world/common/StashVars.inc.c" @@ -10,4 +10,4 @@ #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_end/end_00/end_00_4_allies.c b/src/world/area_end/end_00/end_00_4_allies.c index 048ff39b65..adabda9696 100644 --- a/src/world/area_end/end_00/end_00_4_allies.c +++ b/src/world/area_end/end_00/end_00_4_allies.c @@ -39,13 +39,13 @@ EvtScript N(EVS_ParadePhase_Luigi) = { }; EvtScript N(EVS_ParadePhase_Partners) = { - EVT_CALL(PlayEffect, EFFECT_CONFETTI, 3, -2545, 200, 0, 1, 800, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_CONFETTI, 3, -2545, 200, 0, 1, 800) EVT_CALL(EnableNpcShadow, NPC_Goombario, FALSE) EVT_CALL(EnableNpcShadow, NPC_Bombette, FALSE) EVT_CHILD_THREAD EVT_LOOP(0) EVT_WAIT(25) - EVT_CALL(PlayEffect, EFFECT_CONFETTI, 4, -2530, 95, 5, 1, 20, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_CONFETTI, 4, -2530, 95, 5, 1, 20) EVT_WAIT(20) EVT_END_LOOP EVT_END_CHILD_THREAD @@ -109,7 +109,7 @@ EvtScript N(EVS_QuizCrew) = { EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_ChuckQuizmo, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 80) - EVT_CALL(PlayEffect, EFFECT_EXPLOSION, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_EXPLOSION, 0, LVar0, LVar1, LVar2) EVT_CALL(SetNpcAnimation, NPC_VannaT, ANIM_VannaT_Clap) EVT_WAIT(60) EVT_CALL(SetNpcAnimation, NPC_ChuckQuizmo, ANIM_ChuckQuizmo_CloseHat) diff --git a/src/world/area_end/end_00/end_00_5_koopas.c b/src/world/area_end/end_00/end_00_5_koopas.c index 33e041ff89..4aadd7801b 100644 --- a/src/world/area_end/end_00/end_00_5_koopas.c +++ b/src/world/area_end/end_00/end_00_5_koopas.c @@ -34,7 +34,7 @@ EvtScript N(EVS_KoopaBros_Red) = { EVT_CALL(GetNpcPos, NPC_KoopaBrosRed, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) EVT_WAIT(100) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosRed, ANIM_KoopaBros_Red_Anim20) EVT_WAIT(60) @@ -53,7 +53,7 @@ EvtScript N(EVS_KoopaBros_Black) = { EVT_CALL(GetNpcPos, NPC_KoopaBrosBlack, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -5) EVT_ADD(LVar1, 30) - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) EVT_WAIT(95) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosBlack, ANIM_KoopaBros_Black_Anim20) EVT_WAIT(60) @@ -72,7 +72,7 @@ EvtScript N(EVS_KoopaBros_Yellow) = { EVT_CALL(GetNpcPos, NPC_KoopaBrosYellow, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_ADD(LVar1, 30) - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) EVT_WAIT(90) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosYellow, ANIM_KoopaBros_Yellow_Anim20) EVT_WAIT(60) @@ -91,7 +91,7 @@ EvtScript N(EVS_KoopaBros_Green) = { EVT_CALL(GetNpcPos, NPC_KoopaBrosGreen, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -5) EVT_ADD(LVar1, 30) - EVT_CALL(PlayEffect, EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LENS_FLARE, 0, LVar0, LVar1, LVar2, 40) EVT_WAIT(85) EVT_CALL(SetNpcAnimation, NPC_KoopaBrosGreen, ANIM_KoopaBros_Green_Anim20) EVT_WAIT(60) @@ -114,7 +114,7 @@ EvtScript N(EVS_Bobomb1) = { EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_Bobomb1, ANIM_Bobomb_Anim16) EVT_CALL(GetNpcPos, NPC_Bobomb1, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2) EVT_CALL(EnableNpcShadow, NPC_Bobomb1, FALSE) EVT_CALL(NpcFlyTo, NPC_Bobomb1, LVar0, 200, LVar2, 10, 0, EASING_LINEAR) EVT_CALL(SetNpcPos, NPC_Bobomb1, -1870, 200, 40) @@ -136,7 +136,7 @@ EvtScript N(EVS_Bobomb2) = { EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_Bobomb2, ANIM_Bobomb_Anim16) EVT_CALL(GetNpcPos, NPC_Bobomb2, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2) EVT_CALL(EnableNpcShadow, NPC_Bobomb2, FALSE) EVT_CALL(NpcFlyTo, NPC_Bobomb2, LVar0, 200, LVar2, 10, 0, EASING_LINEAR) EVT_CALL(SetNpcPos, NPC_Bobomb2, -1860, 200, 13) @@ -158,7 +158,7 @@ EvtScript N(EVS_Bobomb3) = { EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_Bobomb3, ANIM_Bobomb_Anim16) EVT_CALL(GetNpcPos, NPC_Bobomb3, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2) EVT_CALL(EnableNpcShadow, NPC_Bobomb3, FALSE) EVT_CALL(NpcFlyTo, NPC_Bobomb3, LVar0, 200, LVar2, 10, 0, EASING_LINEAR) EVT_CALL(SetNpcPos, NPC_Bobomb3, -1840, 200, 13) @@ -180,7 +180,7 @@ EvtScript N(EVS_Bobomb4) = { EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_Bobomb4, ANIM_Bobomb_Anim16) EVT_CALL(GetNpcPos, NPC_Bobomb4, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar1, LVar2, 1, 20, 3, 2) EVT_CALL(EnableNpcShadow, NPC_Bobomb4, FALSE) EVT_CALL(NpcFlyTo, NPC_Bobomb4, LVar0, 200, LVar2, 10, 0, EASING_LINEAR) EVT_CALL(SetNpcPos, NPC_Bobomb4, -1830, 200, 40) diff --git a/src/world/area_end/end_00/end_00_7_boos.c b/src/world/area_end/end_00/end_00_7_boos.c index b63bc74bfd..449998502c 100644 --- a/src/world/area_end/end_00/end_00_7_boos.c +++ b/src/world/area_end/end_00/end_00_7_boos.c @@ -213,7 +213,7 @@ EvtScript N(EVS_ParadePhase_GoombaKing) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, LVar0, 0, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar0, 0, LVar2) EVT_CALL(SetNpcFlagBits, NPC_GoombaKing, NPC_FLAG_GRAVITY, FALSE) EVT_WAIT(60) EVT_THREAD diff --git a/src/world/area_end/end_00/end_00_9_huff_n_puff.c b/src/world/area_end/end_00/end_00_9_huff_n_puff.c index d8aec74702..d3cd0bcafb 100644 --- a/src/world/area_end/end_00/end_00_9_huff_n_puff.c +++ b/src/world/area_end/end_00/end_00_9_huff_n_puff.c @@ -226,11 +226,11 @@ EvtScript N(EVS_YoshiKids) = { EVT_EXEC(N(EVS_Puffs_Hurt)) EVT_THREAD EVT_CALL(GetNpcPos, NPC_HuffNPuffBody, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_TuffPuff1, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_TuffPuff2, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_RING, 0, LVar0, LVar1, LVar2) EVT_CALL(MakeLerp, 750, 375, 5, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) diff --git a/src/world/area_end/end_00/end_00_A_crystal_king.c b/src/world/area_end/end_00/end_00_A_crystal_king.c index b89a216052..9ed8bbd109 100644 --- a/src/world/area_end/end_00/end_00_A_crystal_king.c +++ b/src/world/area_end/end_00/end_00_A_crystal_king.c @@ -44,7 +44,7 @@ EvtScript N(EVS_ParadePhase_CrystalKing) = { EVT_WAIT(10) EVT_KILL_THREAD(LVarA) EVT_CALL(GetNpcPos, NPC_TrueCrystalKing, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1) EVT_CALL(SetNpcPos, NPC_TrueCrystalKing, 1800, 0, 0) EVT_CALL(SetNpcYaw, NPC_TrueCrystalKing, 270) EVT_CALL(SetNpcAnimation, NPC_TrueCrystalKing, ANIM_CrystalKing_Anim0E) @@ -91,7 +91,7 @@ EvtScript N(EVS_ParadePhase_CrystalKing) = { EVT_WAIT(10) EVT_KILL_THREAD(LVarB) EVT_CALL(GetNpcPos, NPC_FakeCrystalKing, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1) EVT_CALL(SetNpcPos, NPC_FakeCrystalKing, 0, -500, 0) EVT_CALL(SetNpcPos, NPC_Duplighost2, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_Duplighost2, EVT_FLOAT(0.5)) diff --git a/src/world/area_end/end_00/end_00_B_bowser.c b/src/world/area_end/end_00/end_00_B_bowser.c index f01c07b4c8..a99d694a41 100644 --- a/src/world/area_end/end_00/end_00_B_bowser.c +++ b/src/world/area_end/end_00/end_00_B_bowser.c @@ -29,9 +29,9 @@ EvtScript N(EVS_ParadePhase_Bowser) = { EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff) - EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 1930, 0, 0, 2160, 100, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 1930, 0, 0, 2160, 100, 0, 10) EVT_WAIT(30) - EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2160, 100, 0, 1930, 0, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2160, 100, 0, 1930, 0, 0, 10) EVT_EXEC(N(EVS_JrTroopa_SpinningDodge)) EVT_CALL(NpcJump1, NPC_JrTroopa, 1890, 0, 0, 20) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle) @@ -39,7 +39,7 @@ EvtScript N(EVS_ParadePhase_Bowser) = { EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) - EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2060, 60, 0, 1890, 0, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2060, 60, 0, 1890, 0, 0, 10) EVT_EXEC(N(EVS_JrTroopa_SpinningDodge)) EVT_CALL(NpcJump1, NPC_JrTroopa, 2040, 0, 0, 20) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle) @@ -51,7 +51,7 @@ EvtScript N(EVS_ParadePhase_Bowser) = { EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) - EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 1940, 60, 0, 2040, 0, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 1940, 60, 0, 2040, 0, 0, 10) EVT_EXEC(N(EVS_JrTroopa_SpinningDodge)) EVT_CALL(NpcJump1, NPC_JrTroopa, 2160, 0, 0, 20) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_Idle) @@ -59,19 +59,19 @@ EvtScript N(EVS_ParadePhase_Bowser) = { EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff) - EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2160, 0, 0, 1940, 60, 0, 20, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2160, 0, 0, 1940, 60, 0, 20) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim14) - EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 0, 1940, 60, 0, EVT_FLOAT(0.5), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, 1940, 60, 0, EVT_FLOAT(0.5), 10) EVT_WAIT(10) EVT_CALL(SetNpcPos, NPC_Kammy, 0, -500, 0) - EVT_CALL(PlayEffect, EFFECT_GATHER_ENERGY_PINK, 0, 2100, 60, 0, EVT_FLOAT(0.5), 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, 2100, 60, 0, EVT_FLOAT(0.5), 10) EVT_WAIT(10) EVT_CALL(SetNpcPos, NPC_Kammy, 2100, 60, 0) EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) - EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2100, 60, 0, 2160, 0, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2100, 60, 0, 2160, 0, 0, 10) EVT_EXEC(N(EVS_JrTroopa_SpinningDodge)) EVT_CALL(NpcJump1, NPC_JrTroopa, 2100, 0, 0, 20) EVT_THREAD @@ -91,7 +91,7 @@ EvtScript N(EVS_ParadePhase_Bowser) = { EVT_WAIT(150) EVT_THREAD EVT_WAIT(35) - EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2040, 60, -20, 2180, 0, 20, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2040, 60, -20, 2180, 0, 20, 10) EVT_WAIT(35) EVT_CALL(SetNpcPos, NPC_Kammy, 2390, 120, -20) EVT_CALL(NpcFlyTo, NPC_Kammy, 2440, 60, -20, 10, -10, EASING_LINEAR) @@ -105,7 +105,7 @@ EvtScript N(EVS_ParadePhase_Bowser) = { EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff) - EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2400, 0, 20, 2440, 60, -20, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2400, 0, 20, 2440, 60, -20, 10) EVT_THREAD EVT_CALL(NpcFlyTo, NPC_Kammy, 2300, 60, -20, 20, -10, EASING_LINEAR) EVT_CALL(InterpNpcYaw, NPC_Kammy, 90, 0) @@ -113,7 +113,7 @@ EvtScript N(EVS_ParadePhase_Bowser) = { EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) - EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2300, 60, -20, 2390, 40, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2300, 60, -20, 2390, 40, 0, 10) EVT_END_THREAD EVT_THREAD EVT_WAIT(10) @@ -125,10 +125,10 @@ EvtScript N(EVS_ParadePhase_Bowser) = { EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_RaiseStaff) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_MageJrTroopa_SwingStaff) - EVT_CALL(PlayEffect, EFFECT_SHAPE_SPELL, 0, 2480, 0, 20, 2390, 40, 0, 10, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SHAPE_SPELL, 0, 2480, 0, 20, 2390, 40, 0, 10) EVT_END_THREAD EVT_WAIT(60) - EVT_CALL(PlayEffect, EFFECT_RING_BLAST, 0, 2390, 40, 5, EVT_FLOAT(5.0), 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, 2390, 40, 5, EVT_FLOAT(5.0), 30) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_HammerBros1, ANIM_ParadeKoopas_Bowser_HammerBrosPanic) EVT_CALL(NpcMoveTo, NPC_HammerBros1, 2180, 0, 30) @@ -170,7 +170,7 @@ EvtScript N(EVS_ParadePhase_Bowser) = { EVT_CALL(NpcMoveTo, NPC_BurntBowserPropeller, 2270, 0, 60) EVT_END_THREAD EVT_CALL(NpcMoveTo, NPC_BurntBowser, 2270, 0, 60) - EVT_CALL(PlayEffect, EFFECT_FIRE_BREATH, 0, 2270, 40, -5, 2280, 40, -5, 5, 2, 30, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_FIRE_BREATH, 0, 2270, 40, -5, 2280, 40, -5, 5, 2, 30, 0, 0, 0) EVT_WAIT(20) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim07) diff --git a/src/world/area_end/end_01/end_01_4_opera_float.c b/src/world/area_end/end_01/end_01_4_opera_float.c index 830cf242fc..37dc26811d 100644 --- a/src/world/area_end/end_01/end_01_4_opera_float.c +++ b/src/world/area_end/end_01/end_01_4_opera_float.c @@ -122,7 +122,7 @@ EvtScript N(EVS_MakeSpiritAppear) = { EVT_SUB(LVar3, 120) EVT_SET(LVar5, LVar3) EVT_ADD(LVar5, 15) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar2, LVar5, LVar4, 30, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar2, LVar5, LVar4, 30) EVT_CALL(SetNpcPos, LVarA, LVar2, LVar3, LVar4) EVT_CALL(N(UpdateStarSpiritRotation)) EVT_RETURN diff --git a/src/world/area_end/end_01/end_01_5_flower_float.c b/src/world/area_end/end_01/end_01_5_flower_float.c index f24dec31a5..54965633d7 100644 --- a/src/world/area_end/end_01/end_01_5_flower_float.c +++ b/src/world/area_end/end_01/end_01_5_flower_float.c @@ -58,8 +58,8 @@ EvtScript N(EVS_Amayze_Dayzees) = { EVT_ADD(LVar4, 30) EVT_SUB(LVar5, 2) EVT_LOOP(0) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 30, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 30, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 30) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 30) EVT_WAIT(15) EVT_END_LOOP EVT_RETURN @@ -158,7 +158,7 @@ EvtScript N(EVS_ParadePhase_Wizards) = { EVT_CALL(SetNpcAnimation, NPC_Merlow, ANIM_ParadeWizard_Merle_MerlowRelease) EVT_CALL(SetNpcAnimation, NPC_Merlar, ANIM_ParadeWizard_Merle_MerlarRelease) EVT_CALL(GetNpcPos, NPC_Merlon, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_ENERGY_ORB_WAVE, 6, LVar0, LVar1, LVar2, 1, 20, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 6, LVar0, LVar1, LVar2, 1, 20, 0, 0, 0, 0, 0, 0, 0) EVT_WAIT(30) EVT_EXEC(N(EVS_Sun)) EVT_EXEC_GET_TID(N(EVS_TexPan_FlowerFloat_WisterwoodBody), LVarB) diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index accd55e0c5..39bb87b02b 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -300,7 +300,7 @@ EvtScript N(802442B0) = { EVT_CALL(SetSelfVar, 10, 100) EVT_CALL(DoNpcDefeat) EVT_CASE_EQ(2) - EVT_CALL(func_80045900, 0) + EVT_CALL(OnPlayerFled, 0) EVT_CASE_EQ(3) EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(RemoveNpc, NPC_SELF) @@ -733,7 +733,7 @@ EvtScript N(80245444) = { EVT_ADD(LVar0, 30) EVT_CALL(SetNpcSpeed, 0, EVT_FLOAT(3.5)) EVT_CALL(NpcMoveTo, 0, LVar0, 60, 0) - EVT_CALL(N(UnkFunc41), 0, 8) + EVT_CALL(N(ChangeNpcToPartner), 0, 8) EVT_CALL(N(LoadPartyImage)) EVT_EXEC(N(802438CC)) EVT_WAIT(15) @@ -1242,7 +1242,7 @@ NpcGroupList N(npcGroupList_80247984) = { {}, }; -#include "world/common/UnkFunc41.inc.c" +#include "world/common/util/ChangeNpcToPartner.inc.c" #define AI_LAKITU_FIRST_SPINY_ID 50 #define AI_LAKITU_LAST_SPINY_ID 55 diff --git a/src/world/area_flo/flo_13/flo_13.h b/src/world/area_flo/flo_13/flo_13.h index a35330932b..0319d845e2 100644 --- a/src/world/area_flo/flo_13/flo_13.h +++ b/src/world/area_flo/flo_13/flo_13.h @@ -9,7 +9,7 @@ #define NAMESPACE flo_13 ApiStatus N(func_80240000_CC3810)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc41)(Evt* script, s32 isInitialCall); +ApiStatus N(ChangeNpcToPartner)(Evt* script, s32 isInitialCall); ApiStatus N(LakituAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(SpinyAI_Main)(Evt* script, s32 isInitialCall); ApiStatus N(UnkFunc42)(Evt* script, s32 isInitialCall); diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index ffa26e6376..7c4f82034a 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -380,7 +380,7 @@ EvtScript N(80244590) = { EVT_CALL(SetSelfVar, 10, 100) EVT_CALL(DoNpcDefeat) EVT_CASE_EQ(2) - EVT_CALL(func_80045900, 0) + EVT_CALL(OnPlayerFled, 0) EVT_CASE_EQ(3) EVT_CALL(SetEnemyFlagBits, -1, 16, 1) EVT_CALL(RemoveNpc, NPC_SELF) diff --git a/src/world/area_hos/hos_06/A3B4B0.c b/src/world/area_hos/hos_06/A3B4B0.c index 1f5cedd261..214ee826c2 100644 --- a/src/world/area_hos/hos_06/A3B4B0.c +++ b/src/world/area_hos/hos_06/A3B4B0.c @@ -10,7 +10,7 @@ #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_8024228C_A3B76C); diff --git a/src/world/area_isk/isk_04/97BF60.c b/src/world/area_isk/isk_04/97BF60.c index 5a47494958..4dca5427dd 100644 --- a/src/world/area_isk/isk_04/97BF60.c +++ b/src/world/area_isk/isk_04/97BF60.c @@ -5,7 +5,7 @@ #include "world/partners.h" extern s32 D_80242288_97D8B8; -// duplicate of func_802400C0_9BD720 +// duplicate of SetupDemoScene from trd_09 ApiStatus func_8024095C_97BF8C(Evt* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/src/world/area_isk/isk_09/9864E0.c b/src/world/area_isk/isk_09/9864E0.c index 4a1ec78640..5a6bc60c31 100644 --- a/src/world/area_isk/isk_09/9864E0.c +++ b/src/world/area_isk/isk_09/9864E0.c @@ -10,7 +10,7 @@ static char* N(exit_str_1) = ""; #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" ApiStatus func_802402BC_98679C(Evt* script, s32 isInitialCall) { Entity* bigChest = get_entity_by_index(script->varTable[0]); diff --git a/src/world/area_iwa/iwa_03/918BB0.c b/src/world/area_iwa/iwa_03/918BB0.c index c9d5673a2f..ad8d0e37ff 100644 --- a/src/world/area_iwa/iwa_03/918BB0.c +++ b/src/world/area_iwa/iwa_03/918BB0.c @@ -9,7 +9,7 @@ static char* N(exit_str_1) = ""; #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" ApiStatus func_802402BC_918E6C(Evt* script, s32 isInitialCall) { s32 result = -1; diff --git a/src/world/area_iwa/iwa_10/91F5A0.c b/src/world/area_iwa/iwa_10/91F5A0.c index dca19c43ce..233b7bb198 100644 --- a/src/world/area_iwa/iwa_10/91F5A0.c +++ b/src/world/area_iwa/iwa_10/91F5A0.c @@ -1,6 +1,6 @@ #include "iwa_10.h" -#include "world/common/UnkFunc41.inc.c" +#include "world/common/util/ChangeNpcToPartner.inc.c" #include "world/common/GetNpcCollisionHeight.inc.c" diff --git a/src/world/area_jan/jan_04/B44AC0.c b/src/world/area_jan/jan_04/B44AC0.c index 0345ec1092..d37c976389 100644 --- a/src/world/area_jan/jan_04/B44AC0.c +++ b/src/world/area_jan/jan_04/B44AC0.c @@ -6,4 +6,4 @@ #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_jan/jan_04/B44D80.c b/src/world/area_jan/jan_04/B44D80.c index 9e42b232fc..fcc26f7be3 100644 --- a/src/world/area_jan/jan_04/B44D80.c +++ b/src/world/area_jan/jan_04/B44D80.c @@ -1,3 +1,3 @@ #include "jan_04.h" -#include "world/common/UnkFunc41.inc.c" +#include "world/common/util/ChangeNpcToPartner.inc.c" diff --git a/src/world/area_kkj/kkj_17/AF1C60.c b/src/world/area_kkj/kkj_17/AF1C60.c index 1bd1178ce6..4f67ce05a2 100644 --- a/src/world/area_kkj/kkj_17/AF1C60.c +++ b/src/world/area_kkj/kkj_17/AF1C60.c @@ -13,7 +13,7 @@ static char* N(exit_str_1) = ""; #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" ApiStatus func_802402BC_AF1F1C(Evt* script, s32 isInitialCall) { PopupMenu *menu; diff --git a/src/world/area_kkj/kkj_20/AFDB40.c b/src/world/area_kkj/kkj_20/AFDB40.c index b7bbf33915..6d305286e0 100644 --- a/src/world/area_kkj/kkj_20/AFDB40.c +++ b/src/world/area_kkj/kkj_20/AFDB40.c @@ -9,4 +9,4 @@ static char* N(exit_str_1) = ""; #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 2ac8d8a821..fa604058d8 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -28,7 +28,7 @@ static char* N(exit_str_4) = "nok_02"; static char* N(exit_str_5) = "kmr_03"; static char* N(exit_str_6) = "\0\0\0\0"; -#include "world/common/UnkFunc41.inc.c" +#include "world/common/util/ChangeNpcToPartner.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242014_8B2084); diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c index 168f880a5d..4a21523972 100644 --- a/src/world/area_kmr/kmr_03/8C7F90.c +++ b/src/world/area_kmr/kmr_03/8C7F90.c @@ -2,7 +2,7 @@ #include "message_ids.h" #include "../../partners.h" -#include "world/common/UnkFunc41.inc.c" +#include "world/common/util/ChangeNpcToPartner.inc.c" #include "world/common/CheckPartnerFlags1000.inc.c" diff --git a/src/world/area_kmr/kmr_03/8C8140.c b/src/world/area_kmr/kmr_03/8C8140.c index 7658b11b71..4a7940804e 100644 --- a/src/world/area_kmr/kmr_03/8C8140.c +++ b/src/world/area_kmr/kmr_03/8C8140.c @@ -135,7 +135,7 @@ EvtScript N(npcAI_80240B50) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, 0, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A8) - EVT_CALL(N(UnkFunc41), 0, 5) + EVT_CALL(N(ChangeNpcToPartner), 0, 5) EVT_SET(GB_StoryProgress, -121) EVT_CALL(UseSettingsFrom, 0, -220, 20, -72) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) diff --git a/src/world/area_kmr/kmr_03/kmr_03.h b/src/world/area_kmr/kmr_03/kmr_03.h index 00b4b8acf8..9b9f214dc0 100644 --- a/src/world/area_kmr/kmr_03/kmr_03.h +++ b/src/world/area_kmr/kmr_03/kmr_03.h @@ -10,7 +10,7 @@ #define NAMESPACE kmr_03 ApiStatus N(UnkPositionFunc)(Evt* script, s32 isInitialCall); -ApiStatus N(UnkFunc41)(Evt* script, s32 isInitialCall); +ApiStatus N(ChangeNpcToPartner)(Evt* script, s32 isInitialCall); ApiStatus N(func_802401B0_8C8140)(Evt* script, s32 isInitialCall); extern NpcGroupList N(npcGroupList_80241450); diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index ecf30c5fc1..6f40f27204 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -9,7 +9,7 @@ static char* N(exit_str_1) = "mac_00"; #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" #ifdef NON_EQUIVALENT // 0x1E4 is probably a linker constant. We need to learn more about animations, diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c index 6bbcdb7852..30945b97db 100644 --- a/src/world/area_kpa/kpa_14/A57830.c +++ b/src/world/area_kpa/kpa_14/A57830.c @@ -6,7 +6,7 @@ #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" #include "world/common/SetEntityFlags100000.inc.c" diff --git a/src/world/area_kpa/kpa_15/A596A0.c b/src/world/area_kpa/kpa_15/A596A0.c index 3600c2e85e..1035bbee14 100644 --- a/src/world/area_kpa/kpa_15/A596A0.c +++ b/src/world/area_kpa/kpa_15/A596A0.c @@ -6,4 +6,4 @@ #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c index 6e59a0f8ea..b3d70964ad 100644 --- a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c +++ b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c @@ -107,7 +107,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_THREAD EVT_LABEL(15) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 10) EVT_CALL(GetSelfVar, 0, LVar3) EVT_IF_EQ(LVar3, 1) EVT_WAIT(1) diff --git a/src/world/area_kzn/kzn_02/kzn_02_4_demo.c b/src/world/area_kzn/kzn_02/kzn_02_4_demo.c index 99dc648780..e638216bb4 100644 --- a/src/world/area_kzn/kzn_02/kzn_02_4_demo.c +++ b/src/world/area_kzn/kzn_02/kzn_02_4_demo.c @@ -51,7 +51,7 @@ EvtScript N(EVS_MonitorDemoState) = { s32 N(DemoSceneState) = 0; -API_CALLABLE(SetupDemoScene) { +API_CALLABLE(N(SetupDemoScene)) { PlayerStatus* playerStatus = &gPlayerStatus; switch (N(DemoSceneState)) { @@ -76,8 +76,9 @@ API_CALLABLE(SetupDemoScene) { return ApiStatus_BLOCK; } + EvtScript N(EVS_PlayDemoScene) = { - EVT_CALL(SetupDemoScene) + EVT_CALL(N(SetupDemoScene)) EVT_SET(GF_DemoSceneDone, FALSE) EVT_EXEC(N(EVS_MonitorDemoState)) EVT_EXEC(N(EVS_ProvideDemoInputs)) diff --git a/src/world/area_kzn/kzn_04/kzn_04_3_npc.c b/src/world/area_kzn/kzn_04/kzn_04_3_npc.c index 67ca221056..cceec3bdf7 100644 --- a/src/world/area_kzn/kzn_04/kzn_04_3_npc.c +++ b/src/world/area_kzn/kzn_04/kzn_04_3_npc.c @@ -37,7 +37,7 @@ EvtScript N(EVS_FireBar_Defeated) = { EVT_CALL(RandInt, 30, LVar5) EVT_ADD(LVar1, LVar4) EVT_ADD(LVar2, LVar5) - EVT_CALL(PlayEffect, EFFECT_00, LVar1, LVar2, LVar3, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_00, LVar1, LVar2, LVar3, 1, 20, 3, 2) EVT_END_LOOP EVT_IF_EQ(LVarA, NPC_FireBar_1A) EVT_IF_EQ(AF_KZN04_FireBar1_Coins, FALSE) diff --git a/src/world/area_kzn/kzn_08/kzn_08_2_entity.c b/src/world/area_kzn/kzn_08/kzn_08_2_entity.c index 6b91655ed2..f1833d06b3 100644 --- a/src/world/area_kzn/kzn_08/kzn_08_2_entity.c +++ b/src/world/area_kzn/kzn_08/kzn_08_2_entity.c @@ -9,7 +9,7 @@ s32** N(varStash) = NULL; #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" EvtScript N(D_80244BB4_C76034) = { EVT_SET_GROUP(EVT_GROUP_00) diff --git a/src/world/area_kzn/kzn_10/kzn_10_2_extra.c b/src/world/area_kzn/kzn_10/kzn_10_2_extra.c index a88eec64a5..d1723a2fbb 100644 --- a/src/world/area_kzn/kzn_10/kzn_10_2_extra.c +++ b/src/world/area_kzn/kzn_10/kzn_10_2_extra.c @@ -52,23 +52,23 @@ EvtScript N(EVS_SpinyTromp_ManageCamera) = { EvtScript N(D_80241224_C7F3A4) = { EVT_SET_GROUP(EVT_GROUP_0A) EVT_LOOP(5) - EVT_CALL(PlayEffect, EFFECT_DUST, 1, -430, 100, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_DUST, 1, -430, 100, 0, 30) EVT_WAIT(2) EVT_END_LOOP EVT_LABEL(0) EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 100) - EVT_CALL(PlayEffect, EFFECT_DUST, 1, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_DUST, 1, LVar0, LVar1, LVar2, 40) EVT_WAIT(20) EVT_SUB(LVar0, 100) EVT_ADD(LVar1, 50) - EVT_CALL(PlayEffect, EFFECT_DUST, 1, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_DUST, 1, LVar0, LVar1, LVar2, 40) EVT_WAIT(20) EVT_IF_EQ(AF_KZN_Tromp1_ShakingDone, FALSE) EVT_GOTO(0) EVT_END_IF EVT_LOOP(8) - EVT_CALL(PlayEffect, EFFECT_DUST, 1, 400, -80, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_DUST, 1, 400, -80, 0, 40) EVT_WAIT(5) EVT_END_LOOP EVT_RETURN @@ -124,7 +124,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_GOTO(10) EVT_END_IF EVT_SUB(LVar2, 55) - EVT_CALL(PlayEffect, EFFECT_LANDING_DUST, 4, UNK_FUNC_50_LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, UNK_FUNC_50_LVar1, LVar2, 0) EVT_EXEC(N(D_80241224_C7F3A4)) EVT_THREAD EVT_CALL(GetCurrentPartner, LVar0) @@ -206,7 +206,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_SET(LVar0, 418) EVT_SET(LVar2, 0) EVT_CALL(N(UnkFunc46)) - EVT_CALL(PlayEffect, EFFECT_00, LVar0, LVar2, 0, 1, 20, 3, 8, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_00, LVar0, LVar2, 0, 1, 20, 3, 8) EVT_END_THREAD EVT_SET(LVar0, LVar8) EVT_SET(LVar1, LVar9) diff --git a/src/world/area_kzn/kzn_11/kzn_11_3_npc.c b/src/world/area_kzn/kzn_11/kzn_11_3_npc.c index 73cca58c4e..0ba37d1883 100644 --- a/src/world/area_kzn/kzn_11/kzn_11_3_npc.c +++ b/src/world/area_kzn/kzn_11/kzn_11_3_npc.c @@ -38,7 +38,7 @@ EvtScript N(EVS_FireBar_Defeated) = { EVT_CALL(RandInt, 30, LVar5) EVT_ADD(LVar1, LVar4) EVT_ADD(LVar2, LVar5) - EVT_CALL(PlayEffect, EFFECT_00, LVar1, LVar2, LVar3, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_00, LVar1, LVar2, LVar3, 1, 20, 3, 2) EVT_END_LOOP EVT_IF_EQ(LVarA, NPC_FireBar_1A) EVT_IF_EQ(AF_KZN11_FireBar1_Coins, FALSE) diff --git a/src/world/area_kzn/kzn_17/kzn_17_4_extra.c b/src/world/area_kzn/kzn_17/kzn_17_4_extra.c index 2794b98157..16f029186a 100644 --- a/src/world/area_kzn/kzn_17/kzn_17_4_extra.c +++ b/src/world/area_kzn/kzn_17/kzn_17_4_extra.c @@ -118,7 +118,7 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_KILL_THREAD(MV_ScreenShakeTID) EVT_CALL(ModifyColliderFlags, 0, COLLIDER_gogo, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(PlaySoundAtCollider, COLLIDER_gogo, SOUND_1E4, 0) - EVT_CALL(PlayEffect, EFFECT_BOMBETTE_BREAKING, 2, 32, 32, 1, 10, 45, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 2, 32, 32, 1, 10, 45) EVT_CALL(EnableModel, MODEL_mae, FALSE) EVT_CALL(EnableModel, MODEL_ato, TRUE) EVT_THREAD diff --git a/src/world/area_kzn/kzn_20/kzn_20_1_main.c b/src/world/area_kzn/kzn_20/kzn_20_1_main.c index 2a4782fe22..e56bd6c45e 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_1_main.c +++ b/src/world/area_kzn/kzn_20/kzn_20_1_main.c @@ -187,7 +187,7 @@ BombTrigger N(WeakWallBombTrigger) = { }; EvtScript N(EVS_OnBreakWall) = { - EVT_CALL(PlayEffect, EFFECT_BOMBETTE_BREAKING, 0, 2, 2, 1, 10, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 2, 2, 1, 10, 30) EVT_CALL(EnableGroup, MODEL_bom_mae, FALSE) EVT_CALL(EnableGroup, MODEL_bom_ato, TRUE) EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_kzn/kzn_20/kzn_20_2_npc.c b/src/world/area_kzn/kzn_20/kzn_20_2_npc.c index 1b434d236a..038e298820 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_2_npc.c +++ b/src/world/area_kzn/kzn_20/kzn_20_2_npc.c @@ -74,10 +74,10 @@ EvtScript N(EVS_SpawnFallingDust) = { EVT_LOOP(0) EVT_CALL(RandInt, 100, LVar0) EVT_SUB(LVar0, 100) - EVT_CALL(PlayEffect, EFFECT_DUST, 1, LVar0, 350, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_DUST, 1, LVar0, 350, 0, 60) EVT_CALL(RandInt, 100, LVar0) EVT_WAIT(30) - EVT_CALL(PlayEffect, EFFECT_DUST, 1, LVar0, 350, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_DUST, 1, LVar0, 350, 0, 60) EVT_WAIT(30) EVT_END_LOOP EVT_RETURN @@ -309,7 +309,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_WAIT(1) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar2, -10) - EVT_CALL(PlayEffect, EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 10, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, 1, 10) EVT_IF_EQ(MV_SceneState, SCENE_STATE_KOLORADO_BURNED) EVT_BREAK_LOOP EVT_END_IF diff --git a/src/world/area_kzn/kzn_23/kzn_23_2_extra.c b/src/world/area_kzn/kzn_23/kzn_23_2_extra.c index 0069521a2b..b38f9cee17 100644 --- a/src/world/area_kzn/kzn_23/kzn_23_2_extra.c +++ b/src/world/area_kzn/kzn_23/kzn_23_2_extra.c @@ -182,19 +182,19 @@ EvtScript N(EVS_SpawnPyroclasts) = { EVT_EXEC(N(EVS_PlayPyroclastSounds)) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(PlayEffect, EFFECT_65, 2, 50, 2650, -20, 1, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_65, 2, 50, 2650, -20, 1) EVT_SET(LVarE, LVarF) EVT_CALL(LoadPath, 15, EVT_PTR(N(PyroclastPathA)), ARRAY_COUNT(N(PyroclastPathA)), EASING_QUADRATIC_OUT) EVT_CASE_EQ(1) - EVT_CALL(PlayEffect, EFFECT_65, 2, -20, 2650, -20, 1, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_65, 2, -20, 2650, -20, 1) EVT_SET(LVarE, LVarF) EVT_CALL(LoadPath, 10, EVT_PTR(N(PyroclastPathB)), ARRAY_COUNT(N(PyroclastPathB)), EASING_QUADRATIC_OUT) EVT_CASE_EQ(2) - EVT_CALL(PlayEffect, EFFECT_65, 2, 10, 2650, -20, 1, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_65, 2, 10, 2650, -20, 1) EVT_SET(LVarE, LVarF) EVT_CALL(LoadPath, 15, EVT_PTR(N(PyroclastPathC)), ARRAY_COUNT(N(PyroclastPathC)), EASING_QUADRATIC_OUT) EVT_CASE_EQ(3) - EVT_CALL(PlayEffect, EFFECT_65, 2, -50, 2650, -20, 1, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_65, 2, -50, 2650, -20, 1) EVT_SET(LVarE, LVarF) EVT_CALL(LoadPath, 20, EVT_PTR(N(PyroclastPathD)), ARRAY_COUNT(N(PyroclastPathD)), EASING_QUADRATIC_OUT) EVT_END_SWITCH diff --git a/src/world/area_mac/mac_06/mac_06_3.c b/src/world/area_mac/mac_06/mac_06_3.c index 3dbbb21195..319b3f92c6 100644 --- a/src/world/area_mac/mac_06/mac_06_3.c +++ b/src/world/area_mac/mac_06/mac_06_3.c @@ -2,8 +2,8 @@ #include "model.h" #include "effects.h" -#define CLONED_MODEL_GULL 11000 -#define CLONED_MODEL_UNUSED 10000 +#define CLONED_MODEL_GULL CLONED_MODEL(1000) +#define CLONED_MODEL_UNUSED CLONED_MODEL(0) NpcSettings N(NpcSettings_Whale) = { .height = 24, diff --git a/src/world/area_mgm/mgm_02/mgm_02.h b/src/world/area_mgm/mgm_02/mgm_02.h index 0f1cb19420..ccb72e243e 100644 --- a/src/world/area_mgm/mgm_02/mgm_02.h +++ b/src/world/area_mgm/mgm_02/mgm_02.h @@ -21,11 +21,11 @@ enum { NPC_Fuzzy_03 = 12, NPC_Fuzzy_04 = 13, NPC_Fuzzy_05 = 14, - NPC_Bombomb_01 = 30, - NPC_Bombomb_02 = 31, - NPC_Bombomb_03 = 32, - NPC_Bombomb_04 = 33, - NPC_Bombomb_05 = 34, + NPC_Bobomb_01 = 30, + NPC_Bobomb_02 = 31, + NPC_Bobomb_03 = 32, + NPC_Bobomb_04 = 33, + NPC_Bobomb_05 = 34, NPC_Luigi_01 = 100, NPC_Luigi_02 = 101, NPC_Luigi_03 = 102, diff --git a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c index 2ef806396a..2da2f5abcb 100644 --- a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c +++ b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c @@ -20,7 +20,7 @@ void partner_enable_input(void); #define SMASH_DATA_VAR_IDX 0 #define FUZZY_NPC_ID_BASE NPC_Fuzzy_01 -#define BOBOMB_NPC_ID_BASE NPC_Bombomb_01 +#define BOBOMB_NPC_ID_BASE NPC_Bobomb_01 #define LUIGI_NPC_ID_BASE NPC_Luigi_01 extern HudScript HES_BlueMeter; @@ -1030,7 +1030,7 @@ NpcSettings N(NpcSettings_Fuzzy) = { .onDefeat = &EnemyNpcDefeat, }; -NpcSettings N(NpcSettings_Bombomb) = { +NpcSettings N(NpcSettings_Bobomb) = { .height = 23, .radius = 20, .level = 6, @@ -1114,7 +1114,7 @@ EvtScript N(EVS_HideBoxWithSmoke) = { EVT_WAIT(1) EVT_CALL(GetColliderCenter, LVar1) EVT_SUB(LVar1, 5) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2) EVT_RETURN EVT_END }; @@ -1472,7 +1472,7 @@ EvtScript N(EVS_OnHitBox) = { EVT_SWITCH(LVarC) EVT_CASE_EQ(2) EVT_ADD(LVar1, 2) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 25, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 25) EVT_CASE_EQ(3) EVT_CALL(TranslateModel, LVarA, 0, -9, 0) EVT_WAIT(1) @@ -1484,11 +1484,11 @@ EvtScript N(EVS_OnHitBox) = { EVT_CALL(ModifyColliderFlags, 0, LVarB, COLLIDER_FLAGS_UPPER_MASK) EVT_WAIT(4) EVT_SUB(LVar1, 5) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2) EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(1) EVT_SUB(LVar1, 5) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableModel, LVarA, FALSE) @@ -1643,11 +1643,11 @@ EvtScript N(EVS_Toad_GovernGame) = { EVT_END_THREAD EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_100, TRUE) EVT_CALL(N(CreateSignpost)) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, 355, 45, -175, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, 355, 45, -175) EVT_THREAD EVT_CALL(SetNpcPos, NPC_Toad, 358, -20, 185) EVT_CALL(EnableNpcShadow, NPC_Toad, TRUE) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, 358, 5, 189, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, 358, 5, 189) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000, 0) EVT_END_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -1767,11 +1767,11 @@ EvtScript N(EVS_NpcInteract_Toad) = { EVT_WAIT(25) EVT_THREAD EVT_WAIT(12) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, 358, -10, 185, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, 358, -10, 185) EVT_CALL(SetNpcPos, NPC_Toad, 358, 500, 185) EVT_CALL(EnableNpcShadow, NPC_Toad, FALSE) EVT_CALL(N(DestroySignpost)) - EVT_CALL(PlayEffect, EFFECT_WALKING_DUST, 1, 355, 30, -180, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, 355, 30, -180) EVT_END_THREAD EVT_CALL(EndSpeech, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 5) EVT_CALL(PushSong, 133, 0) @@ -1855,7 +1855,7 @@ EvtScript N(EVS_NpcInit_Fuzzy) = { EVT_END }; -EvtScript N(EVS_NpcInit_Bombomb) = { +EvtScript N(EVS_NpcInit_Bobomb) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bobomb_Anim0B) EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_JUMPING, TRUE) @@ -2063,13 +2063,13 @@ StaticNpc N(NpcData_Fuzzy_05) = { .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; -StaticNpc N(NpcData_Bombomb_01) = { - .id = NPC_Bombomb_01, - .settings = &N(NpcSettings_Bombomb), +StaticNpc N(NpcData_Bobomb_01) = { + .id = NPC_Bobomb_01, + .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, - .init = &N(EVS_NpcInit_Bombomb), + .init = &N(EVS_NpcInit_Bobomb), .drops = { .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -2096,13 +2096,13 @@ StaticNpc N(NpcData_Bombomb_01) = { .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; -StaticNpc N(NpcData_Bombomb_02) = { - .id = NPC_Bombomb_02, - .settings = &N(NpcSettings_Bombomb), +StaticNpc N(NpcData_Bobomb_02) = { + .id = NPC_Bobomb_02, + .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, - .init = &N(EVS_NpcInit_Bombomb), + .init = &N(EVS_NpcInit_Bobomb), .drops = { .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -2129,13 +2129,13 @@ StaticNpc N(NpcData_Bombomb_02) = { .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; -StaticNpc N(NpcData_Bombomb_03) = { - .id = NPC_Bombomb_03, - .settings = &N(NpcSettings_Bombomb), +StaticNpc N(NpcData_Bobomb_03) = { + .id = NPC_Bobomb_03, + .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, - .init = &N(EVS_NpcInit_Bombomb), + .init = &N(EVS_NpcInit_Bobomb), .drops = { .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -2162,13 +2162,13 @@ StaticNpc N(NpcData_Bombomb_03) = { .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; -StaticNpc N(NpcData_Bombomb_04) = { - .id = NPC_Bombomb_04, - .settings = &N(NpcSettings_Bombomb), +StaticNpc N(NpcData_Bobomb_04) = { + .id = NPC_Bobomb_04, + .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, - .init = &N(EVS_NpcInit_Bombomb), + .init = &N(EVS_NpcInit_Bobomb), .drops = { .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -2195,13 +2195,13 @@ StaticNpc N(NpcData_Bombomb_04) = { .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; -StaticNpc N(NpcData_Bombomb_05) = { - .id = NPC_Bombomb_05, - .settings = &N(NpcSettings_Bombomb), +StaticNpc N(NpcData_Bobomb_05) = { + .id = NPC_Bobomb_05, + .settings = &N(NpcSettings_Bobomb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000 | NPC_FLAG_1000000 | NPC_FLAG_SIMPLIFIED_PHYSICS | NPC_FLAG_PARTICLE | NPC_FLAG_8000000 | NPC_FLAG_10000000 | NPC_FLAG_20000000, - .init = &N(EVS_NpcInit_Bombomb), + .init = &N(EVS_NpcInit_Bobomb), .drops = { .dropFlags = NPC_DROP_FLAGS_80, .heartDrops = NO_DROPS, @@ -2558,11 +2558,11 @@ NpcGroupList N(DefaultNPCs) = { NPC_GROUP(N(NpcData_Fuzzy_03)), NPC_GROUP(N(NpcData_Fuzzy_04)), NPC_GROUP(N(NpcData_Fuzzy_05)), - NPC_GROUP(N(NpcData_Bombomb_01)), - NPC_GROUP(N(NpcData_Bombomb_02)), - NPC_GROUP(N(NpcData_Bombomb_03)), - NPC_GROUP(N(NpcData_Bombomb_04)), - NPC_GROUP(N(NpcData_Bombomb_05)), + NPC_GROUP(N(NpcData_Bobomb_01)), + NPC_GROUP(N(NpcData_Bobomb_02)), + NPC_GROUP(N(NpcData_Bobomb_03)), + NPC_GROUP(N(NpcData_Bobomb_04)), + NPC_GROUP(N(NpcData_Bobomb_05)), NPC_GROUP(N(NpcData_Luigis)), {} }; diff --git a/src/world/area_nok/nok_04/9EDBF0.c b/src/world/area_nok/nok_04/9EDBF0.c index be1a455b0c..925403be93 100644 --- a/src/world/area_nok/nok_04/9EDBF0.c +++ b/src/world/area_nok/nok_04/9EDBF0.c @@ -59,7 +59,7 @@ trees in this room are labeled with a 0 through 5 system, meaning there are "6" static char* N(exit_str_0) = "nok_03"; static char* N(exit_str_1) = ""; -#include "world/common/UnkFunc41.inc.c" +#include "world/common/util/ChangeNpcToPartner.inc.c" #include "common/UnkFloatFunc.inc.c" diff --git a/src/world/area_obk/obk_07/BCEBF0.c b/src/world/area_obk/obk_07/BCEBF0.c index adf3f2b466..bf77c9a864 100644 --- a/src/world/area_obk/obk_07/BCEBF0.c +++ b/src/world/area_obk/obk_07/BCEBF0.c @@ -9,4 +9,4 @@ static char* N(exit_str_1) = ""; #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_obk/obk_09/BDA7B0.c b/src/world/area_obk/obk_09/BDA7B0.c index efb2d8ea94..6adabce574 100644 --- a/src/world/area_obk/obk_09/BDA7B0.c +++ b/src/world/area_obk/obk_09/BDA7B0.c @@ -1,3 +1,3 @@ #include "obk_09.h" -#include "world/common/UnkFunc41.inc.c" +#include "world/common/util/ChangeNpcToPartner.inc.c" diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 109e9212f7..2d4a7b2fca 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -9,7 +9,7 @@ static char* N(exit_str_1) = ""; #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" #include "world/common/UnsetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_omo/omo_06/DB8180.c b/src/world/area_omo/omo_06/DB8180.c index a5ae853bb7..63bc13b608 100644 --- a/src/world/area_omo/omo_06/DB8180.c +++ b/src/world/area_omo/omo_06/DB8180.c @@ -6,4 +6,4 @@ #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c index 269cb8f1cb..614ff5b42a 100644 --- a/src/world/area_omo/omo_07/DC01D0.c +++ b/src/world/area_omo/omo_07/DC01D0.c @@ -8,7 +8,7 @@ static char* N(exit_str_2) = "omo_07"; #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" #include "world/common/UnsetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_omo/omo_09/DCD3F0.c b/src/world/area_omo/omo_09/DCD3F0.c index 6a77241e57..9cd64a7bc4 100644 --- a/src/world/area_omo/omo_09/DCD3F0.c +++ b/src/world/area_omo/omo_09/DCD3F0.c @@ -6,4 +6,4 @@ #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_omo/omo_12/DDF310.c b/src/world/area_omo/omo_12/DDF310.c index 06ca45e678..e9dd4b351d 100644 --- a/src/world/area_omo/omo_12/DDF310.c +++ b/src/world/area_omo/omo_12/DDF310.c @@ -1,6 +1,6 @@ #include "omo_12.h" -#include "world/common/UnkFunc41.inc.c" +#include "world/common/util/ChangeNpcToPartner.inc.c" #include "world/common/atomic/DarkRoom.inc.c" diff --git a/src/world/area_omo/omo_13/DE36C0.c b/src/world/area_omo/omo_13/DE36C0.c index 01f5971e13..29551c6cc5 100644 --- a/src/world/area_omo/omo_13/DE36C0.c +++ b/src/world/area_omo/omo_13/DE36C0.c @@ -6,4 +6,4 @@ #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index bd7d56999c..fb6a689785 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -8,4 +8,4 @@ #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c index 88fe610e64..2334369dfa 100644 --- a/src/world/area_pra/pra_11/D61520.c +++ b/src/world/area_pra/pra_11/D61520.c @@ -8,4 +8,4 @@ #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c index 84130ff03e..22638625d7 100644 --- a/src/world/area_pra/pra_12/D62D10.c +++ b/src/world/area_pra/pra_12/D62D10.c @@ -10,4 +10,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240000_D62D10); #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c index 802fcd5325..24079e7486 100644 --- a/src/world/area_pra/pra_14/D67D20.c +++ b/src/world/area_pra/pra_14/D67D20.c @@ -8,4 +8,4 @@ #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c index de21bcf4fb..71999a423b 100644 --- a/src/world/area_pra/pra_27/D799F0.c +++ b/src/world/area_pra/pra_27/D799F0.c @@ -10,4 +10,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240000_D799F0); #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c index b0fd97467e..475efe787f 100644 --- a/src/world/area_pra/pra_28/D7B2A0.c +++ b/src/world/area_pra/pra_28/D7B2A0.c @@ -10,4 +10,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240000_D7B2A0); #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_pra/pra_35/D8FBA0.c b/src/world/area_pra/pra_35/D8FBA0.c index 4160f4f824..48a9fb879e 100644 --- a/src/world/area_pra/pra_35/D8FBA0.c +++ b/src/world/area_pra/pra_35/D8FBA0.c @@ -6,4 +6,4 @@ #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 50500c8603..e76fa831f9 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -28,7 +28,7 @@ extern s32 N(LetterDelivery_SavedNpcAnim); #include "common/GetItemEntityPosition.inc.c" -#include "world/common/UnkTrigFunc001.inc.c" +#include "world/common/GetLeftRightPoints.inc.c" #define NAMESPACE dup_sam_01 #include "world/common/StashVars.inc.c" @@ -40,4 +40,4 @@ extern s32 N(LetterDelivery_SavedNpcAnim); #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_sam/sam_10/D37800.c b/src/world/area_sam/sam_10/D37800.c index d2b017597f..61c7466d33 100644 --- a/src/world/area_sam/sam_10/D37800.c +++ b/src/world/area_sam/sam_10/D37800.c @@ -11,7 +11,7 @@ static char* N(exit_str_3) = ""; #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_10/D37800", func_802402BC_D37ABC); diff --git a/src/world/area_sbk/sbk_02/sbk_02_1_main.c b/src/world/area_sbk/sbk_02/sbk_02_1_main.c index 0ef15152ce..8a4d4e9868 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_1_main.c +++ b/src/world/area_sbk/sbk_02/sbk_02_1_main.c @@ -50,7 +50,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_IF_LT(GB_StoryProgress, STORY_CH2_UNCOVERED_DRY_DRY_RUINS) - EVT_CALL(PlayEffect, EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SUN) EVT_SET(MV_Unk_00, LVarF) EVT_END_IF EVT_IF_EQ(GB_StoryProgress, STORY_CH2_BEGAN_PEACH_MISSION) diff --git a/src/world/area_sbk/sbk_02/sbk_02_2_ruins.c b/src/world/area_sbk/sbk_02/sbk_02_2_ruins.c index 892d0e3104..f1d0969fbc 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_2_ruins.c +++ b/src/world/area_sbk/sbk_02/sbk_02_2_ruins.c @@ -60,8 +60,8 @@ s32 N(D_80241250_92B500)[] = { }; EvtScript N(D_80241258_92B508) = { - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, 0, 0, 0, 20, 10, 0, 60, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_DUST, 2, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, 0, 0, 0, 20, 10, 0, 60) + EVT_PLAY_EFFECT(EFFECT_DUST, 2, 0, 0, 0, 60) EVT_CALL(PlaySoundAtCollider, COLLIDER_iwa, SOUND_5F, 0) EVT_SET(LVar2, 0) EVT_CALL(MakeLerp, 0, -50, 50, EASING_LINEAR) @@ -298,8 +298,8 @@ EvtScript N(D_80241DE0_92C090) = { EVT_LOOP(30) EVT_CALL(RandInt, 290, LVar0) EVT_ADD(LVar0, -110) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -35, 20, 10, 0, 60, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_DUST, 2, LVar0, 0, -35, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -35, 20, 10, 0, 60) + EVT_PLAY_EFFECT(EFFECT_DUST, 2, LVar0, 0, -35, 60) EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD @@ -308,24 +308,24 @@ EvtScript N(D_80241DE0_92C090) = { EVT_LOOP(15) EVT_CALL(RandInt, 180, LVar0) EVT_ADD(LVar0, 170) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -300, 20, 10, 0, 60, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_DUST, 2, LVar0, 0, -300, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -300, 20, 10, 0, 60) + EVT_PLAY_EFFECT(EFFECT_DUST, 2, LVar0, 0, -300, 60) EVT_WAIT(20) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_WAIT(100) EVT_LOOP(5) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, -180, 0, 260, 20, 10, 0, 60, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_DUST, 2, -180, 0, 260, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, -180, 0, 260, 20, 10, 0, 60) + EVT_PLAY_EFFECT(EFFECT_DUST, 2, -180, 0, 260, 60) EVT_WAIT(40) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_WAIT(110) EVT_LOOP(4) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, 180, 0, 260, 20, 10, 0, 60, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_DUST, 2, 180, 0, 260, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, 180, 0, 260, 20, 10, 0, 60) + EVT_PLAY_EFFECT(EFFECT_DUST, 2, 180, 0, 260, 60) EVT_WAIT(50) EVT_END_LOOP EVT_END_THREAD @@ -365,8 +365,8 @@ EvtScript N(D_802422F0_92C5A0) = { EVT_LOOP(10) EVT_CALL(RandInt, 290, LVar0) EVT_ADD(LVar0, -110) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -35, 20, 10, 0, 60, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_DUST, 2, LVar0, 0, -35, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -35, 20, 10, 0, 60) + EVT_PLAY_EFFECT(EFFECT_DUST, 2, LVar0, 0, -35, 60) EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD @@ -375,23 +375,23 @@ EvtScript N(D_802422F0_92C5A0) = { EVT_LOOP(5) EVT_CALL(RandInt, 180, LVar0) EVT_ADD(LVar0, 170) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -300, 20, 10, 0, 60, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_DUST, 2, LVar0, 0, -300, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -300, 20, 10, 0, 60) + EVT_PLAY_EFFECT(EFFECT_DUST, 2, LVar0, 0, -300, 60) EVT_WAIT(20) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_LOOP(3) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, -180, 0, 260, 20, 10, 0, 60, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_DUST, 2, -180, 0, 260, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, -180, 0, 260, 20, 10, 0, 60) + EVT_PLAY_EFFECT(EFFECT_DUST, 2, -180, 0, 260, 60) EVT_WAIT(40) EVT_END_LOOP EVT_END_THREAD EVT_THREAD EVT_WAIT(10) EVT_LOOP(2) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, 180, 0, 260, 20, 10, 0, 60, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_DUST, 2, 180, 0, 260, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, 180, 0, 260, 20, 10, 0, 60) + EVT_PLAY_EFFECT(EFFECT_DUST, 2, 180, 0, 260, 60) EVT_WAIT(50) EVT_END_LOOP EVT_END_THREAD @@ -568,11 +568,11 @@ EvtScript N(D_80243310_92D5C0) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, 61, 2, -83, 20, 10, 0, 60, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_DUST, 2, 61, 2, -83, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, 61, 2, -83, 20, 10, 0, 60) + EVT_PLAY_EFFECT(EFFECT_DUST, 2, 61, 2, -83, 60) EVT_WAIT(3) - EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, -61, 2, -83, 20, 10, 0, 60, 0, 0, 0, 0, 0) - EVT_CALL(PlayEffect, EFFECT_DUST, 2, -61, 2, -83, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SMOKE_IMPACT, 0, -61, 2, -83, 20, 10, 0, 60) + EVT_PLAY_EFFECT(EFFECT_DUST, 2, -61, 2, -83, 60) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_RETURN EVT_END diff --git a/src/world/area_sbk/sbk_02/sbk_02_3_npc.c b/src/world/area_sbk/sbk_02/sbk_02_3_npc.c index d61a9ac5ef..3eeb56b27c 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_3_npc.c +++ b/src/world/area_sbk/sbk_02/sbk_02_3_npc.c @@ -226,16 +226,16 @@ EvtScript N(D_80244330_92E5E0) = { EVT_ADD(LVar2, 10) EVT_ADD(LVar3, 30) EVT_LOOP(5) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 20) EVT_WAIT(6) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 1, LVar0, LVar3, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar0, LVar3, LVar2, 20) EVT_WAIT(6) EVT_END_LOOP EVT_WAIT(20) EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(PlayEffect, EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) EVT_WAIT(30) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Idle) @@ -266,7 +266,7 @@ EvtScript N(D_80244330_92E5E0) = { EVT_THREAD EVT_LOOP(25) EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) EVT_WAIT(4) EVT_END_LOOP EVT_END_THREAD @@ -336,7 +336,7 @@ EvtScript N(EVS_NpcInteract_Toad) = { EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_SET(GF_TradingEvent2_Active, FALSE) EVT_RETURN @@ -365,7 +365,7 @@ EvtScript N(EVS_NpcInteract_Toad) = { EVT_WAIT(10) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0) - EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) EVT_SET(GF_TradingEvent2_Active, FALSE) EVT_ADD(GB_TradingEvent_Count, 1) diff --git a/src/world/area_sbk/sbk_20/sbk_20_2_entity.c b/src/world/area_sbk/sbk_20/sbk_20_2_entity.c index 6b27030d2b..188d300cf3 100644 --- a/src/world/area_sbk/sbk_20/sbk_20_2_entity.c +++ b/src/world/area_sbk/sbk_20/sbk_20_2_entity.c @@ -9,7 +9,7 @@ EvtScript N(EVS_OnHitInertBlock) = { EVT_IF_EQ(GF_SBK20_ItemBlock_Mushroom, FALSE) EVT_CALL(PlaySound, SOUND_B) EVT_CALL(PlaySoundAt, SOUND_2108, 0, -80, 60, -200) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, -80, 73, -200, 10, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -80, 73, -200, 10) EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -80, 60, -200, 0, ITEM_MUSHROOM, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_Mushroom) EVT_END_IF @@ -17,7 +17,7 @@ EvtScript N(EVS_OnHitInertBlock) = { EVT_IF_EQ(GF_SBK20_ItemBlock_SuperShroom, FALSE) EVT_CALL(PlaySound, SOUND_B) EVT_CALL(PlaySoundAt, SOUND_2108, 0, -180, 60, -200) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, -180, 73, -200, 10, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -180, 73, -200, 10) EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -180, 60, -200, 0, ITEM_SUPER_SHROOM, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_SuperShroom) EVT_END_IF @@ -25,7 +25,7 @@ EvtScript N(EVS_OnHitInertBlock) = { EVT_IF_EQ(GF_SBK20_ItemBlock_UltraShroom, FALSE) EVT_CALL(PlaySound, SOUND_B) EVT_CALL(PlaySoundAt, SOUND_2108, 0, -130, 60, -150) - EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, -130, 73, -150, 10, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -130, 73, -150, 10) EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -130, 60, -150, 0, ITEM_ULTRA_SHROOM, MAKE_ENTITY_END) EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_UltraShroom) EVT_END_IF diff --git a/src/world/area_tik/tik_02/86CA50.c b/src/world/area_tik/tik_02/86CA50.c index a4450b1fe9..1937ae2433 100644 --- a/src/world/area_tik/tik_02/86CA50.c +++ b/src/world/area_tik/tik_02/86CA50.c @@ -6,4 +6,4 @@ #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c index e779e07cad..755c157dea 100644 --- a/src/world/area_tik/tik_05/8750D0.c +++ b/src/world/area_tik/tik_05/8750D0.c @@ -11,7 +11,7 @@ #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" extern s16 Entity_ScriptSpring_AnimLaunch[]; diff --git a/src/world/area_tik/tik_09/882BF0.c b/src/world/area_tik/tik_09/882BF0.c index 448bed18e2..bb97193f61 100644 --- a/src/world/area_tik/tik_09/882BF0.c +++ b/src/world/area_tik/tik_09/882BF0.c @@ -2,4 +2,4 @@ #include "world/common/enemy/TackleAI.inc.c" -#include "world/common/GetDefeatedEnemyCount.inc.c" +#include "world/common/util/GetDefeatedEnemyCount.inc.c" diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index ca4eabdbd4..303e2b0fa6 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -8,6 +8,6 @@ #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" #include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/world/area_trd/trd.h b/src/world/area_trd/trd.h index 47c59c5e2d..c4fcb9cdc6 100644 --- a/src/world/area_trd/trd.h +++ b/src/world/area_trd/trd.h @@ -21,12 +21,28 @@ enum { }; enum { - AF_TRD_04 = AreaFlag(4), - AF_TRD08_FireBar1_Coins = AreaFlag(11), - AF_TRD08_FireBar2_Coins = AreaFlag(12), + AF_TRD01_RaiseStairs = AreaFlag(1), + AF_TRD02_LowerStairs = AreaFlag(2), + AF_TRD04_LowerStairs = AreaFlag(4), + AF_TRD_MetPrisoner1 = AreaFlag(6), + AF_TRD_MetPrisoner2 = AreaFlag(7), + AF_TRD_MetPrisoner3 = AreaFlag(8), + AF_TRD_MetPrisoner4 = AreaFlag(9), + AF_TRD08_FireBar1_Coins = AreaFlag(11), + AF_TRD08_FireBar2_Coins = AreaFlag(12), + AF_TRD_FakeBowserRevealed = AreaFlag(13), }; +extern MapSettings trd_00_settings; +extern MapSettings trd_01_settings; +extern MapSettings trd_02_settings; +extern MapSettings trd_03_settings; extern MapSettings trd_04_settings; +extern MapSettings trd_05_settings; +extern MapSettings trd_06_settings; +extern MapSettings trd_07_settings; extern MapSettings trd_08_settings; +extern MapSettings trd_09_settings; +extern MapSettings trd_10_settings; #endif diff --git a/src/world/area_trd/trd_00/999C70.c b/src/world/area_trd/trd_00/999C70.c deleted file mode 100644 index ed2f2aa321..0000000000 --- a/src/world/area_trd/trd_00/999C70.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "trd_00.h" - -static char* N(exit_str_0) = "nok_15"; -static char* N(exit_str_1) = "trd_01"; -static char* N(exit_str_2) = "trd_05"; -static char* N(exit_str_3) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_trd/trd_00/999F80.c b/src/world/area_trd/trd_00/999F80.c deleted file mode 100644 index 6d4cd5dcca..0000000000 --- a/src/world/area_trd/trd_00/999F80.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "trd_00.h" - -#include "world/common/StashVars.inc.c" - -#include "world/common/GetItemName.inc.c" - -#include "world/common/SomeItemEntityFunc.inc.c" - -#include "world/common/CheckItemFlags40.inc.c" diff --git a/src/world/area_trd/trd_00/99A240.c b/src/world/area_trd/trd_00/99A240.c deleted file mode 100644 index 2c2ae2730f..0000000000 --- a/src/world/area_trd/trd_00/99A240.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "trd_00.h" - -ApiStatus PostChapter1StatUpdate(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - - set_max_SP(1); - playerData->curHP = playerData->curMaxHP; - playerData->curFP = playerData->curMaxFP; - sync_status_menu(); - return ApiStatus_DONE2; -} - -#include "world/common/SyncStatusMenu.inc.c" diff --git a/src/world/area_trd/trd_00/trd_00.h b/src/world/area_trd/trd_00/trd_00.h index 4bcf7070f9..5e29cfb828 100644 --- a/src/world/area_trd/trd_00/trd_00.h +++ b/src/world/area_trd/trd_00/trd_00.h @@ -2,8 +2,19 @@ /// @brief Koopa Bros Fortress - Fortress Exterior #include "common.h" -#include "../trd.h" #include "message_ids.h" #include "map.h" +#include "../trd.h" +#include "mapfs/trd_00_shape.h" +#include "mapfs/trd_00_hit.h" + +#include "sprite/npc/KoopaBros.h" +#include "sprite/npc/WorldEldstar.h" + +enum { + NPC_KoopaBros = 0, + NPC_Eldstar = 1, +}; + #define NAMESPACE trd_00 diff --git a/src/world/area_trd/trd_00/trd_00_0_header.c b/src/world/area_trd/trd_00/trd_00_0_header.c new file mode 100644 index 0000000000..31fdfcd51c --- /dev/null +++ b/src/world/area_trd/trd_00/trd_00_0_header.c @@ -0,0 +1,36 @@ +#include "trd_00.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [trd_00_ENTRY_0] { -973.0, 0.0, 204.0, 90.0 }, + [trd_00_ENTRY_1] { -525.0, 0.0, 130.0, 240.0 }, + [trd_00_ENTRY_2] { 400.0, 0.0, 185.0, 180.0 }, + [trd_00_ENTRY_3] { 587.0, 0.0, 6.0, 90.0 }, + [trd_00_ENTRY_4] { -955.0, 200.0, -101.0, 90.0 }, + [trd_00_ENTRY_5] { -518.0, 0.0, 212.0, 240.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_trd_00 }, +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH1_ARRIVED_AT_KOOPA_FORTRESS) + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_FORTRESS, 1, 8) + EVT_CALL(PlaySound, SOUND_8000005C) + EVT_CASE_EQ(STORY_CH1_BEGAN_PEACH_MISSION) + EVT_CALL(SetMusicTrack, 0, SONG_STAR_SPIRIT_THEME, 1, 8) + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_PLEASANT_PATH, 0, 8) + EVT_CALL(PlaySound, SOUND_8000005C) + EVT_END_SWITCH + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_00/trd_00_1_main.c b/src/world/area_trd/trd_00/trd_00_1_main.c new file mode 100644 index 0000000000..371ade01e6 --- /dev/null +++ b/src/world/area_trd/trd_00/trd_00_1_main.c @@ -0,0 +1,160 @@ +#include "trd_00.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_nok_15_1) = EVT_EXIT_WALK(60, trd_00_ENTRY_0, "nok_15", nok_15_ENTRY_1); +EvtScript N(EVS_ExitDoors_trd_01_0) = EVT_EXIT_DOUBLE_DOOR(trd_00_ENTRY_1, "trd_01", trd_01_ENTRY_0, COLLIDER_tt2, MODEL_o62, MODEL_doa); +EvtScript N(EVS_ExitDoors_trd_05_1) = EVT_EXIT_DOUBLE_DOOR(trd_00_ENTRY_2, "trd_05", trd_05_ENTRY_1, COLLIDER_tt3, MODEL_o70, MODEL_o69); +EvtScript N(EVS_ExitWalk_trd_05_2) = EVT_EXIT_WALK(60, trd_00_ENTRY_3, "trd_05", trd_05_ENTRY_2); +EvtScript N(EVS_ExitWalk_nok_15_2) = EVT_EXIT_WALK(60, trd_00_ENTRY_4, "nok_15", nok_15_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_nok_15_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_01_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tt2, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_05_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tt3, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_trd_05_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili5, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_nok_15_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilit, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240B34_99A7A4) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerPos,NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION) + EVT_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -730, 0, 400) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 20, 0, 400) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -1000) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 18, EVT_FLOAT(-20.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -480, 0, 400) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -1300) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 18, EVT_FLOAT(-11.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.8)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(5) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_END_THREAD + EVT_WAIT(82) + EVT_CALL(SetPlayerPos, -1041, 0, 204) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetNpcPos, NPC_PARTNER, -1041, 0, 204) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(PlayerMoveTo, -900, 200, 30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(1) + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, 1) + EVT_EXEC(EnterSavePoint) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(trd_00_ENTRY_0) + EVT_IF_LT(GB_StoryProgress, STORY_CH1_ARRIVED_AT_KOOPA_FORTRESS) + EVT_SET(GB_StoryProgress, STORY_CH1_ARRIVED_AT_KOOPA_FORTRESS) + EVT_EXEC_WAIT(N(D_80240B34_99A7A4)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_ELSE + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_IF + EVT_CASE_EQ(trd_00_ENTRY_1) + EVT_SET(LVar2, MODEL_o62) + EVT_SET(LVar3, MODEL_doa) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_00_ENTRY_2) + EVT_SET(LVar2, MODEL_o70) + EVT_SET(LVar3, MODEL_o69) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_00_ENTRY_3) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(trd_00_ENTRY_4) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(trd_00_ENTRY_5) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RESUME_GROUP(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_WaterEdge) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTexPanner, MODEL_ue, 1) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_LABEL(10) + EVT_CALL(SetTexPanOffset, 1, 0, LVar0, 0) + EVT_CALL(SetTexPanOffset, 1, 1, LVar1, 0) + EVT_ADD(LVar0, 100) + EVT_SUB(LVar1, 100) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_KOOPA_BROS_FORTRESS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_SET(GF_MAP_KoopaBrosFortress, TRUE) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(trd_00_ENTRY_0) + EVT_CASE_OR_EQ(trd_00_ENTRY_1) + EVT_CASE_OR_EQ(trd_00_ENTRY_4) + EVT_END_SWITCH + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_TexPan_WaterEdge)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_WAIT(1) + EVT_IF_EQ(GF_TRD05_BombedWall, FALSE) + EVT_CALL(SetGroupEnabled, MODEL_g21, 0) + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt5, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetGroupEnabled, MODEL_ana, 0) + EVT_END_IF + EVT_EXEC(N(EVS_EnterMap)) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, trd_00_ENTRY_5) + EVT_WAIT(65) + EVT_ELSE + EVT_WAIT(1) + EVT_END_IF + EVT_CALL(EnableTexPanning, MODEL_o125, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 0, 90, -60, -70) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_00/trd_00_2_entity.c b/src/world/area_trd/trd_00/trd_00_2_entity.c new file mode 100644 index 0000000000..3577ec8bbb --- /dev/null +++ b/src/world/area_trd/trd_00/trd_00_2_entity.c @@ -0,0 +1,20 @@ +#include "trd_00.h" +#include "entity.h" + +#include "world/common/atomic/Chest.inc.c" + +EvtScript N(EVS_OpenChest_Refund) = EVT_OPEN_CHEST_BADGE(ITEM_REFUND, GF_TRD00_Chest_Refund); +EvtScript N(EVS_OpenChest_FPPlus) = EVT_OPEN_CHEST_BADGE(ITEM_FP_PLUS_B, GF_TRD00_Chest_FPPlusB); + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 810, 0, -50, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignChestFlag, GF_TRD00_Chest_Refund) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest_Refund))) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), -750, 200, -125, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignChestFlag, GF_TRD00_Chest_FPPlusB) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest_FPPlus))) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -920, 60, 80, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 325, 60, 220, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_00/trd_00_3_npc.c b/src/world/area_trd/trd_00/trd_00_3_npc.c new file mode 100644 index 0000000000..6bb6671047 --- /dev/null +++ b/src/world/area_trd/trd_00/trd_00_3_npc.c @@ -0,0 +1,405 @@ +#include "trd_00.h" +#include "effects.h" + +extern EvtScript N(EVS_SetupMusic); + +API_CALLABLE(N(UpgradeStarPower)) { + PlayerData* playerData = &gPlayerData; + + set_max_SP(1); + playerData->curHP = playerData->curMaxHP; + playerData->curFP = playerData->curMaxFP; + sync_status_menu(); + return ApiStatus_DONE2; +} + +#include "world/common/SyncStatusMenu.inc.c" + +NpcSettings N(NpcSettings_KoopaBros) = { + .height = 34, + .radius = 24, + .level = 99, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +NpcSettings N(NpcSettings_Eldstar) = { + .height = 26, + .radius = 24, + .level = 99, +}; + +NpcSettings N(NpcSettings_Unused1) = { + .height = 20, + .radius = 20, + .level = 99, +}; + +NpcSettings N(NpcSettings_Unused2) = { + .height = 22, + .radius = 24, + .level = 99, +}; + +EvtScript N(EVS_NpcIdle_KoopaBros) = { + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(AwaitPlayerApproach, -580, 276, 50) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_THREAD + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt2, SOUND_METAL_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 100, 10, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o62, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_doa, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_NE(LVar1, 0) + EVT_GOTO(0) + EVT_END_IF + EVT_END_THREAD + EVT_CALL(DisablePlayerInput, TRUE) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -570, 0, 173) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim03) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.5)) + EVT_CALL(NpcMoveTo, NPC_SELF, -556, 180, 0) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(func_802CFD30, -1, 5, 4, 2, 1, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim1E) + EVT_WAIT(12) + EVT_CALL(func_802CFD30, -1, 0, 0, 0, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim04) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Black_Anim14, ANIM_KoopaBros_Black_Anim04, 0, MSG_CH1_00D2) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim02) + EVT_CALL(InterpNpcYaw, NPC_SELF, 45, 2) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_173, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim03) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 8) + EVT_WAIT(8) + EVT_WAIT(12) + EVT_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_174, 0) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, -496, 101, 0) + EVT_END_THREAD + EVT_WAIT(10) + EVT_THREAD + EVT_WAIT(8) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_CALL(MakeLerp, 100, 0, 10, EASING_COS_IN_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o62, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_doa, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_NE(LVar1, 0) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt2, SOUND_METAL_DOOR_CLOSE, 0) + EVT_WAIT(10) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.5)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_SET(GB_StoryProgress, STORY_CH1_SPOTTED_BY_KOOPA_BROS) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_KoopaBros) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_KoopaBros))) + EVT_IF_GE(GB_StoryProgress, STORY_CH1_SPOTTED_BY_KOOPA_BROS) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Eldstar) = { + EVT_LOOP(0) + EVT_LOOP(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_SUB(LVar1, 1) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 1) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Eldstar) = { + EVT_CALL(SetSelfVar, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80241DA4_99BA14) = { + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(func_802CF56C, 2) + EVT_CALL(SetNpcPos, NPC_Eldstar, -567, 26, 236) + EVT_CALL(PlayerFaceNpc, NPC_Eldstar, FALSE) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Eldstar, 0) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -527, 0, 216) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -527, 0, 216) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(475.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(WaitForPlayerInputEnabled) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(40) + EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH1_010D) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.0), EVT_FLOAT(-9.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_Eldstar, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(EnableNpcAI, NPC_Eldstar, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Leap) + EVT_WAIT(20) + EVT_CALL(PlaySoundAtPlayer, SOUND_139, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SET(LVar3, LVar1) + EVT_ADD(LVar0, 5) + EVT_ADD(LVar1, 50) + EVT_ADD(LVar2, 10) + EVT_ADD(LVar3, 30) + EVT_LOOP(6) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 20) + EVT_WAIT(6) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar0, LVar3, LVar2, 20) + EVT_WAIT(6) + EVT_END_LOOP + EVT_WAIT(20) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 20) + EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) + EVT_WAIT(40) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Idle) + EVT_CALL(EnableNpcAI, NPC_Eldstar, TRUE) + EVT_CALL(N(UpgradeStarPower)) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0191, 160, 40) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH1_010E) + EVT_CALL(ShowChoice, MSG_Choice_0013) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH1_010F) + EVT_CALL(ShowChoice, MSG_Choice_0013) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH1_0110) + EVT_GOTO(10) + EVT_END_IF + EVT_END_IF + EVT_CALL(ContinueSpeech, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH1_0111) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(StartBattle) + EVT_LOOP(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(FullyRestoreSP) + EVT_CALL(N(SyncStatusMenu)) + EVT_LABEL(10) + EVT_WAIT(30) + EVT_CALL(GetNpcPos, NPC_Eldstar, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH1_0112) + EVT_WAIT(10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -527, 0, 216) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.0), EVT_FLOAT(-9.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH1_0113) + EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_40000, TRUE) + EVT_THREAD + EVT_LOOP(25) + EVT_CALL(GetNpcPos, NPC_Eldstar, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 20) + EVT_WAIT(4) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_SET(LVar2, 0) + EVT_SET(LVar3, 0x00000708) + EVT_CALL(MakeLerp, LVar2, LVar3, 100, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_Eldstar, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Eldstar, LVar2, LVar3, LVar4) + EVT_SET(LVar5, LVar3) + EVT_ADD(LVar5, 180) + EVT_CALL(MakeLerp, LVar3, LVar5, 100, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcPos, NPC_Eldstar, LVar2, LVar0, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcPos, NPC_Eldstar, NPC_DISPOSE_LOCATION) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(PlaySoundAtNpc, NPC_Eldstar, SOUND_2045, 0) + EVT_END_THREAD + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_WAIT(90) + EVT_CALL(ResetCam, CAM_DEFAULT, 3) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_SET(GB_StoryProgress, STORY_CH1_STAR_SPRIT_DEPARTED) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Eldstar) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, trd_00_ENTRY_5) + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_ELSE + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Eldstar))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Eldstar))) + EVT_EXEC(N(D_80241DA4_99BA14)) + EVT_END_IF + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_KoopaBros) = { + .id = NPC_KoopaBros, + .settings = &N(NpcSettings_KoopaBros), + .pos = { -469.0f, 0.0f, 101.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_KoopaBros), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_KoopaBros_Green_Anim04, + .walk = ANIM_KoopaBros_Green_Anim02, + .run = ANIM_KoopaBros_Green_Anim03, + .chase = ANIM_KoopaBros_Green_Anim03, + .anim_4 = ANIM_KoopaBros_Green_Anim04, + .anim_5 = ANIM_KoopaBros_Green_Anim04, + .death = ANIM_KoopaBros_Green_Anim0A, + .hit = ANIM_KoopaBros_Green_Anim0A, + .anim_8 = ANIM_KoopaBros_Green_Anim03, + .anim_9 = ANIM_KoopaBros_Green_Anim03, + .anim_A = ANIM_KoopaBros_Green_Anim03, + .anim_B = ANIM_KoopaBros_Green_Anim03, + .anim_C = ANIM_KoopaBros_Green_Anim03, + .anim_D = ANIM_KoopaBros_Green_Anim03, + .anim_E = ANIM_KoopaBros_Green_Anim03, + .anim_F = ANIM_KoopaBros_Green_Anim03, + }, +}; + +StaticNpc N(NpcData_Eldstar) = { + .id = NPC_Eldstar, + .settings = &N(NpcSettings_Eldstar), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_Eldstar), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { NPC_DISPOSE_LOCATION }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { NPC_DISPOSE_LOCATION }, + .detectSize = { 500 }, + } + }, + .animations = { + .idle = ANIM_WorldEldstar_Idle, + .walk = ANIM_WorldEldstar_Idle, + .run = ANIM_WorldEldstar_Idle, + .chase = ANIM_WorldEldstar_Idle, + .anim_4 = ANIM_WorldEldstar_Idle, + .anim_5 = ANIM_WorldEldstar_Idle, + .death = ANIM_WorldEldstar_Idle, + .hit = ANIM_WorldEldstar_Idle, + .anim_8 = ANIM_WorldEldstar_Still, + .anim_9 = ANIM_WorldEldstar_Idle, + .anim_A = ANIM_WorldEldstar_Idle, + .anim_B = ANIM_WorldEldstar_Idle, + .anim_C = ANIM_WorldEldstar_Idle, + .anim_D = ANIM_WorldEldstar_Idle, + .anim_E = ANIM_WorldEldstar_Idle, + .anim_F = ANIM_WorldEldstar_Idle, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_KoopaBros)), + NPC_GROUP(N(NpcData_Eldstar), BTL_TRD_PART_3_FORMATION_00), + {} +}; diff --git a/src/world/area_trd/trd_01/99C990.c b/src/world/area_trd/trd_01/99C990.c deleted file mode 100644 index 7cd5efda1b..0000000000 --- a/src/world/area_trd/trd_01/99C990.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "trd_01.h" - -static char* N(exit_str_0) = "trd_00"; -static char* N(exit_str_1) = "trd_02"; -static char* N(exit_str_2) = "trd_09"; -static char* N(exit_str_3) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_trd/trd_01/99CCA0.c b/src/world/area_trd/trd_01/99CCA0.c deleted file mode 100644 index 8cd1fdfd39..0000000000 --- a/src/world/area_trd/trd_01/99CCA0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "trd_01.h" - -#include "world/common/SetEntityFlags100000.inc.c" - -#include "world/common/GetEntityPosition.inc.c" - diff --git a/src/world/area_trd/trd_01/99CD80.c b/src/world/area_trd/trd_01/99CD80.c deleted file mode 100644 index 41faa135fd..0000000000 --- a/src/world/area_trd/trd_01/99CD80.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "trd_01.h" - -#include "world/common/enemy/TackleAI.inc.c" - -#include "world/common/enemy/StationaryAI.inc.c" - -ApiStatus func_80241630_99DFC0(Evt* script, s32 isInitialCall) { - Enemy* owner1 = script->owner1.enemy; - Npc* npc = get_npc_safe(script->owner2.npcID); - - owner1->territory->wander.centerPos.x = npc->pos.x; - owner1->territory->wander.centerPos.y = npc->pos.y; - owner1->territory->wander.centerPos.z = npc->pos.z; - owner1->territory->wander.detectPos.x = npc->pos.x; - owner1->territory->wander.detectPos.y = npc->pos.y; - owner1->territory->wander.detectPos.z = npc->pos.z; - return ApiStatus_DONE2; -} diff --git a/src/world/area_trd/trd_01/trd_01.h b/src/world/area_trd/trd_01/trd_01.h index 718ea1d7eb..40053ebe72 100644 --- a/src/world/area_trd/trd_01/trd_01.h +++ b/src/world/area_trd/trd_01/trd_01.h @@ -2,8 +2,30 @@ /// @brief Koopa Bros Fortress - Left Tower #include "common.h" -#include "../trd.h" #include "message_ids.h" #include "map.h" +#include "../trd.h" +#include "mapfs/trd_01_shape.h" +#include "mapfs/trd_01_hit.h" + +#include "sprite/npc/KoopaTroopa.h" +#include "sprite/npc/Bobomb.h" + +enum { + NPC_KoopaTroopa_01 = 0, + NPC_KoopaTroopa_02 = 1, + NPC_KoopaTroopa_03 = 2, + NPC_Bobomb = 3, +}; + +enum { + MV_Padlock_EntityIndex = MapVar(0), +}; + +enum { + NPC_KoopaTroopa_02_DonePanic = MapFlag(10), + NPC_KoopaTroopa_03_DonePanic = MapFlag(11), +}; + #define NAMESPACE trd_01 diff --git a/src/world/area_trd/trd_01/trd_01_0_header.c b/src/world/area_trd/trd_01/trd_01_0_header.c new file mode 100644 index 0000000000..a410169551 --- /dev/null +++ b/src/world/area_trd/trd_01/trd_01_0_header.c @@ -0,0 +1,24 @@ +#include "trd_01.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [trd_01_ENTRY_0] { -310.0, 0.0, 0.0, 90.0 }, + [trd_01_ENTRY_1] { 310.0, 0.0, 0.0, 270.0 }, + [trd_01_ENTRY_2] { 310.0, 220.0, 0.0, 270.0 }, + [trd_01_ENTRY_3] { 310.0, 520.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_trd_01 }, +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_FORTRESS, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_01/trd_01_1_main.c b/src/world/area_trd/trd_01/trd_01_1_main.c new file mode 100644 index 0000000000..9561ad00d2 --- /dev/null +++ b/src/world/area_trd/trd_01/trd_01_1_main.c @@ -0,0 +1,346 @@ +#include "trd_01.h" +#include "entity.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_UnlockDoors); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_EnterMap) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(EVT_GROUP_01) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(trd_01_ENTRY_0) + EVT_SET(LVar2, MODEL_ew_doa) + EVT_SET(LVar3, MODEL_ew_doa2) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(trd_01_ENTRY_1) + EVT_SET(LVar2, MODEL_e2_doa) + EVT_SET(LVar3, MODEL_e2_doa2) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(trd_01_ENTRY_2) + EVT_SET(LVar2, MODEL_e3_doa) + EVT_SET(LVar3, MODEL_e3_doa2) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(trd_01_ENTRY_3) + EVT_SET(LVar2, MODEL_e4_doa) + EVT_SET(LVar3, MODEL_e4_doa2) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_END_SWITCH + EVT_RESUME_GROUP(EVT_GROUP_01) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoors_trd_00_1) = EVT_EXIT_DOUBLE_DOOR(trd_01_ENTRY_0, "trd_00", trd_00_ENTRY_1, COLLIDER_ttw, MODEL_ew_doa, MODEL_ew_doa2); +EvtScript N(EVS_ExitDoors_trd_02_0) = EVT_EXIT_DOUBLE_DOOR(trd_01_ENTRY_1, "trd_02", trd_02_ENTRY_0, COLLIDER_tte, MODEL_e2_doa, MODEL_e2_doa2); +EvtScript N(EVS_ExitDoors_trd_02_2) = EVT_EXIT_DOUBLE_DOOR(trd_01_ENTRY_2, "trd_02", trd_02_ENTRY_2, COLLIDER_tte2, MODEL_e3_doa, MODEL_e3_doa2); +EvtScript N(EVS_ExitDoors_trd_09_0) = EVT_EXIT_DOUBLE_DOOR(trd_01_ENTRY_3, "trd_09", trd_09_ENTRY_0, COLLIDER_tte3, MODEL_e4_doa, MODEL_e4_doa2); + +EvtScript N(EVS_Scene_RaiseStairs) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(GB_StoryProgress, STORY_CH1_RAISED_SUBMERGED_STAIRS) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_WAIT(1) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_WAIT(20) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 220) + EVT_SET(LVar2, 255) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 18, 12) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.4)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_o162, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetGroupEnabled, MODEL_move_saku, 0) + EVT_CALL(PlaySound, SOUND_80000006) + EVT_CHILD_THREAD + EVT_SET_GROUP(EVT_GROUP_00) + EVT_WAIT(4) + EVT_CALL(EnableModel, MODEL_sui1, TRUE) + EVT_CALL(EnableModel, MODEL_sui2, TRUE) + EVT_CALL(EnableTexPanning, MODEL_sui1, TRUE) + EVT_CALL(EnableTexPanning, MODEL_sui2, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o145, TRUE) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 0) + EVT_SET(LVar3, 0) + EVT_SET(LVar4, 0) + EVT_SET(LVar5, 0) + EVT_SET(LVar6, 0) + EVT_SET(LVar7, 0) + EVT_LOOP(0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_AUX, LVar2, LVar3) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, LVar4, LVar5) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_AUX, LVar6, LVar7) + EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_MAIN, LVar8, LVar9) + EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_AUX, LVarA, LVarB) + EVT_ADD(LVar0, -600) + EVT_ADD(LVar1, -600) + EVT_ADD(LVar2, -300) + EVT_ADD(LVar3, -300) + EVT_ADD(LVar4, 140) + EVT_ADD(LVar5, -600) + EVT_ADD(LVar6, -30) + EVT_ADD(LVar7, -600) + EVT_ADD(LVar8, 100) + EVT_ADD(LVar9, -600) + EVT_ADD(LVarA, -100) + EVT_ADD(LVarB, -300) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_THREAD + EVT_CALL(PlaySound, SOUND_80000007) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(4.0)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 250, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.2)) + EVT_CALL(StopSound, SOUND_80000007) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(50) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 500, LVar2) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_KoopaTroopa_02, LVar4, LVar5, LVar6) + EVT_CALL(SetNpcPos, NPC_KoopaTroopa_02, LVar4, -27, LVar6) + EVT_WAIT(100) + EVT_CALL(MakeLerp, -27, 300, 210, EASING_QUADRATIC_OUT) + EVT_LOOP(210) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcPos, NPC_KoopaTroopa_02, LVar4, LVar0, LVar6) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_263, 0) + EVT_CALL(ShowEmote, NPC_KoopaTroopa_02, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_WAIT(120) + EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_02, ANIM_KoopaTroopa_Anim08) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_02, ANIM_KoopaTroopa_Anim17) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_KoopaTroopa_02, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) + EVT_LOOP(4) + EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_02, 270, 0) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_02, 90, 0) + EVT_WAIT(15) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(210) + EVT_SET(NPC_KoopaTroopa_02_DonePanic, TRUE) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_KoopaTroopa_03, LVar4, LVar5, LVar6) + EVT_CALL(SetNpcPos, NPC_KoopaTroopa_03, LVar4, -27, LVar6) + EVT_WAIT(85) + EVT_CALL(MakeLerp, -27, 350, 215, EASING_QUADRATIC_OUT) + EVT_LOOP(215) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcPos, NPC_KoopaTroopa_03, LVar4, LVar0, LVar6) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(25) + EVT_CALL(ShowEmote, NPC_KoopaTroopa_03, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_WAIT(120) + EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_03, ANIM_KoopaTroopa_Anim08) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_03, ANIM_KoopaTroopa_Anim17) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_03, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_KoopaTroopa_03, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) + EVT_LOOP(4) + EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_03, 270, 0) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_03, 90, 0) + EVT_WAIT(15) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(180) + EVT_SET(NPC_KoopaTroopa_03_DonePanic, TRUE) + EVT_END_THREAD + EVT_CALL(MakeLerp, -450, 0, 300, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_dan, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_k_soku, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_k_kusari, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o158) + EVT_SET(LVar2, LVar0) + EVT_ADD(LVar2, 400) + EVT_IF_GE(LVar2, -20) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_SET(LocalFlag(0), TRUE) + EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(EnableModel, MODEL_o145, TRUE) + EVT_END_IF + EVT_END_IF + EVT_SET(LVar2, LVar0) + EVT_ADD(LVar2, 375) + EVT_IF_GE(LVar2, -20) + EVT_IF_EQ(LocalFlag(1), FALSE) + EVT_SET(LocalFlag(1), TRUE) + EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(TranslateModel, MODEL_o145, 50, 0, 0) + EVT_END_IF + EVT_END_IF + EVT_SET(LVar2, LVar0) + EVT_ADD(LVar2, 350) + EVT_IF_GE(LVar2, -20) + EVT_IF_EQ(LocalFlag(2), FALSE) + EVT_SET(LocalFlag(2), TRUE) + EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(TranslateModel, MODEL_o145, 100, 0, 0) + EVT_END_IF + EVT_END_IF + EVT_SET(LVar2, LVar0) + EVT_ADD(LVar2, 325) + EVT_IF_GE(LVar2, -20) + EVT_IF_EQ(LocalFlag(3), FALSE) + EVT_SET(LocalFlag(3), TRUE) + EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(TranslateModel, MODEL_o145, 150, 0, 0) + EVT_END_IF + EVT_END_IF + EVT_SET(LVar2, LVar0) + EVT_ADD(LVar2, 299) + EVT_IF_GE(LVar2, -20) + EVT_IF_EQ(LocalFlag(4), FALSE) + EVT_SET(LocalFlag(4), TRUE) + EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(TranslateModel, MODEL_o145, 200, 0, 0) + EVT_END_IF + EVT_END_IF + EVT_SET(LVar2, LVar0) + EVT_ADD(LVar2, 273) + EVT_IF_GE(LVar2, -20) + EVT_IF_EQ(LocalFlag(5), FALSE) + EVT_SET(LocalFlag(5), TRUE) + EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(TranslateModel, MODEL_o145, 250, 0, 0) + EVT_END_IF + EVT_END_IF + EVT_SET(LVar2, LVar0) + EVT_ADD(LVar2, 245) + EVT_IF_GE(LVar2, -20) + EVT_IF_EQ(LocalFlag(6), FALSE) + EVT_SET(LocalFlag(6), TRUE) + EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(TranslateModel, MODEL_o145, 300, 0, 0) + EVT_END_IF + EVT_END_IF + EVT_SET(LVar2, LVar0) + EVT_ADD(LVar2, 220) + EVT_IF_GE(LVar2, -20) + EVT_IF_EQ(LocalFlag(7), FALSE) + EVT_SET(LocalFlag(7), TRUE) + EVT_CALL(PlaySound, SOUND_23) + EVT_CALL(EnableModel, MODEL_o145, FALSE) + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(30) + EVT_THREAD + EVT_WAIT(28) + EVT_CALL(EnableModel, MODEL_sui1, FALSE) + EVT_CALL(EnableModel, MODEL_sui2, FALSE) + EVT_END_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 220, 255) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_CALL(StopSound, SOUND_80000006) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Water) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTexPanner, MODEL_suimenn, TEX_PANNER_1) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_LABEL(10) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_AUX, LVar1, 0) + EVT_ADD(LVar0, 100) + EVT_SUB(LVar1, 100) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +s32 N(KeyList)[] = { + ITEM_KOOPA_FORTRESS_KEY, + ITEM_NONE +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_KOOPA_BROS_FORTRESS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_TexPan_Water)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_00_1)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_IF_EQ(GF_TRD01_UnlockedDoor, FALSE) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockDoors)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(KeyList)), 0, 1) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_02_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_END_IF + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_02_2)), TRIGGER_WALL_PRESS_A, COLLIDER_tte2, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_09_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte3, 1, 0) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_SET(AF_TRD01_RaiseStairs, FALSE) + EVT_CALL(ParentColliderToModel, COLLIDER_o158, MODEL_dan) + EVT_IF_LT(GB_StoryProgress, STORY_CH1_RAISED_SUBMERGED_STAIRS) + EVT_SET(LVar0, -450) + EVT_CALL(TranslateModel, MODEL_dan, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_k_soku, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_k_kusari, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o158) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Scene_RaiseStairs)), TRIGGER_AREA_FLAG_SET, AF_TRD01_RaiseStairs, 0, 0) + EVT_ELSE + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_o162, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetGroupEnabled, MODEL_move_saku, 0) + EVT_END_IF + EVT_CALL(EnableModel, MODEL_sui1, FALSE) + EVT_CALL(EnableModel, MODEL_sui2, FALSE) + EVT_CALL(EnableModel, MODEL_o145, FALSE) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_CALL(EnableTexPanning, MODEL_suimenn, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 0, 90, -60, -70) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_01/trd_01_2_entity.c b/src/world/area_trd/trd_01/trd_01_2_entity.c new file mode 100644 index 0000000000..2d9fe9ee7d --- /dev/null +++ b/src/world/area_trd/trd_01/trd_01_2_entity.c @@ -0,0 +1,83 @@ +#include "trd_01.h" +#include "entity.h" + +extern EvtScript N(EVS_ExitDoors_trd_02_0); + +#include "world/common/SetEntityFlags100000.inc.c" +#include "world/common/GetEntityPosition.inc.c" + +EvtScript N(EVS_FocusCamOnLock) = { + EVT_LABEL(0) + EVT_IF_EQ(GF_TRD01_Item_FortressKey, TRUE) + EVT_CALL(AwaitPlayerApproach, 320, 0, 40) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 220, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 300, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(350.0)) + EVT_CALL(GetCamPosA, CAM_DEFAULT, LVar0, LVar1) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-64.0), LVar1) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(AwaitPlayerLeave, 320, 0, 60) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_END_IF + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UnlockDoors) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(1) + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RESUME_GROUP(1) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RESUME_GROUP(1) + EVT_RETURN + EVT_END_IF + EVT_CALL(FindKeyItem, ITEM_KOOPA_FORTRESS_KEY, LVar0) + EVT_CALL(RemoveKeyItemAt, LVar0) + EVT_CALL(CloseChoicePopup) + EVT_SET(GF_TRD01_UnlockedDoor, TRUE) + EVT_CALL(N(GetEntityPosition), MV_Padlock_EntityIndex, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) + EVT_SET(LVar0, MV_Padlock_EntityIndex) + EVT_CALL(N(SetEntityFlags100000)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_RESUME_GROUP(1) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindLockTrigger) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_02_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_TRD01_UnlockedDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 315, 8, 0, -80, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_BindLockTrigger))) + EVT_SET(MV_Padlock_EntityIndex, LVar0) + EVT_END_IF + EVT_IF_LT(GB_StoryProgress, STORY_CH1_RAISED_SUBMERGED_STAIRS) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), 0, 220, 255, 0, MAKE_ENTITY_END) + EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_TRD01_RaiseStairs)) + EVT_END_IF + EVT_CALL(MakeItemEntity, ITEM_SMASH_CHARGE, -268, 656, -40, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_TRD01_Item_SmashCharge) + EVT_IF_EQ(GF_TRD01_Defeated_KoopaGuard, TRUE) + EVT_IF_EQ(GF_TRD01_Item_FortressKey, FALSE) + EVT_CALL(MakeItemEntity, ITEM_KOOPA_FORTRESS_KEY, 254, 0, 30, ITEM_SPAWN_MODE_KEY, GF_TRD01_Item_FortressKey) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_01/trd_01_3_npc.c b/src/world/area_trd/trd_01/trd_01_3_npc.c new file mode 100644 index 0000000000..af62db5c8e --- /dev/null +++ b/src/world/area_trd/trd_01/trd_01_3_npc.c @@ -0,0 +1,353 @@ +#include "trd_01.h" + +MAP_RODATA_PAD(1, pad); + +extern EvtScript N(EVS_FocusCamOnLock); + +#include "world/common/enemy/complete/KoopaTroopa_Wander.inc.c" +#include "world/common/enemy/complete/Bobomb_Stationary.inc.c" + +API_CALLABLE(N(SetNewWanderCenterPos)) { + Enemy* owner1 = script->owner1.enemy; + Npc* npc = get_npc_safe(script->owner2.npcID); + + owner1->territory->wander.centerPos.x = npc->pos.x; + owner1->territory->wander.centerPos.y = npc->pos.y; + owner1->territory->wander.centerPos.z = npc->pos.z; + owner1->territory->wander.detectPos.x = npc->pos.x; + owner1->territory->wander.detectPos.y = npc->pos.y; + owner1->territory->wander.detectPos.z = npc->pos.z; + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcIdle_KoopaTroopa_02) = { + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(SetNpcPos, NPC_SELF, 45, -30, 20) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, -70, -30, -20) + EVT_END_IF + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(GetNpcPos, NPC_SELF, LVar2, LVar3, LVar4) + EVT_LABEL(0) + EVT_CALL(MakeLerp, EVT_FLOAT(-2.0), EVT_FLOAT(2.0), 30, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_IF_EQ(GB_StoryProgress, STORY_CH1_RAISED_SUBMERGED_STAIRS) + EVT_GOTO(100) + EVT_END_IF + EVT_CALL(UpdateLerp) + EVT_SET(LVar5, LVar3) + EVT_ADD(LVar5, LVar0) + EVT_CALL(SetNpcPos, NPC_SELF, LVar2, LVar5, LVar4) + EVT_WAIT(1) + EVT_IF_NE(LVar1, 0) + EVT_GOTO(10) + EVT_END_IF + EVT_WAIT(5) + EVT_CALL(MakeLerp, EVT_FLOAT(2.0), EVT_FLOAT(-2.0), 30, EASING_COS_IN_OUT) + EVT_LABEL(20) + EVT_IF_EQ(GB_StoryProgress, STORY_CH1_RAISED_SUBMERGED_STAIRS) + EVT_GOTO(100) + EVT_END_IF + EVT_CALL(UpdateLerp) + EVT_SET(LVar5, LVar3) + EVT_ADD(LVar5, LVar0) + EVT_CALL(SetNpcPos, NPC_SELF, LVar2, LVar5, LVar4) + EVT_WAIT(1) + EVT_IF_NE(LVar1, 0) + EVT_GOTO(20) + EVT_END_IF + EVT_WAIT(5) + EVT_GOTO(0) + EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) + EVT_LABEL(100) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_IF_EQ(NPC_KoopaTroopa_02_DonePanic, FALSE) + EVT_WAIT(1) + EVT_GOTO(100) + EVT_END_IF + EVT_ELSE + EVT_IF_EQ(NPC_KoopaTroopa_03_DonePanic, FALSE) + EVT_WAIT(1) + EVT_GOTO(100) + EVT_END_IF + EVT_END_IF + EVT_WAIT(10) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT, FALSE) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 190, 20, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, 245, 75, 0) + EVT_ELSE + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.6)) + EVT_CALL(NpcMoveTo, NPC_SELF, 210, -20, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, 260, 25, 0) + EVT_END_IF + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(1.5)) + EVT_CALL(N(SetNewWanderCenterPos)) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_KoopaTroopa_Wander))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_KoopaTroopa_02) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH1_RAISED_SUBMERGED_STAIRS) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_KoopaTroopa_02))) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaTroopa_Anim0E) + EVT_ELSE + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(SetNpcPos, NPC_SELF, 240, 220, 130) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, 80, 220, 265) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_KoopaTroopa_01) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_SET(GF_TRD01_Defeated_KoopaGuard, TRUE) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(MakeItemEntity, ITEM_KOOPA_FORTRESS_KEY, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, GF_TRD01_Item_FortressKey) + EVT_EXEC(N(EVS_FocusCamOnLock)) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_KoopaTroopa_01) = { + EVT_IF_EQ(GF_TRD01_Defeated_KoopaGuard, TRUE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_KoopaTroopa_01))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_KoopaTroopa_01) = { + .id = NPC_KoopaTroopa_01, + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .pos = { 260.0f, 0.0f, 30.0f }, + .yaw = 0, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_NO_DROPS, + .init = &N(EVS_NpcInit_KoopaTroopa_01), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 260, 0, 40 }, + .wanderSize = { 30, 25 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 260, 0, 40 }, + .detectSize = { 200 }, + } + }, + .animations = { + .idle = ANIM_KoopaTroopa_Anim01, + .walk = ANIM_KoopaTroopa_Anim03, + .run = ANIM_KoopaTroopa_Anim04, + .chase = ANIM_KoopaTroopa_Anim04, + .anim_4 = ANIM_KoopaTroopa_Anim01, + .anim_5 = ANIM_KoopaTroopa_Anim01, + .death = ANIM_KoopaTroopa_Anim0B, + .hit = ANIM_KoopaTroopa_Anim0B, + .anim_8 = ANIM_KoopaTroopa_Anim07, + .anim_9 = ANIM_KoopaTroopa_Anim06, + .anim_A = ANIM_KoopaTroopa_Anim08, + .anim_B = ANIM_KoopaTroopa_Anim04, + .anim_C = ANIM_KoopaTroopa_Anim04, + .anim_D = ANIM_KoopaTroopa_Anim04, + .anim_E = ANIM_KoopaTroopa_Anim04, + .anim_F = ANIM_KoopaTroopa_Anim04, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_KoopaTroopa_02) = { + .id = NPC_KoopaTroopa_02, + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_KoopaTroopa_02), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 5, 0 }, + { ITEM_P_O_W_BLOCK, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 240, 220, 130 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 240, 220, 130 }, + .detectSize = { 200 }, + } + }, + .animations = { + .idle = ANIM_KoopaTroopa_Anim01, + .walk = ANIM_KoopaTroopa_Anim03, + .run = ANIM_KoopaTroopa_Anim04, + .chase = ANIM_KoopaTroopa_Anim04, + .anim_4 = ANIM_KoopaTroopa_Anim01, + .anim_5 = ANIM_KoopaTroopa_Anim01, + .death = ANIM_KoopaTroopa_Anim0B, + .hit = ANIM_KoopaTroopa_Anim0B, + .anim_8 = ANIM_KoopaTroopa_Anim07, + .anim_9 = ANIM_KoopaTroopa_Anim06, + .anim_A = ANIM_KoopaTroopa_Anim08, + .anim_B = ANIM_KoopaTroopa_Anim04, + .anim_C = ANIM_KoopaTroopa_Anim04, + .anim_D = ANIM_KoopaTroopa_Anim04, + .anim_E = ANIM_KoopaTroopa_Anim04, + .anim_F = ANIM_KoopaTroopa_Anim04, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_KoopaTroopa_03) = { + .id = NPC_KoopaTroopa_03, + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_KoopaTroopa_02), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 5, 0 }, + { ITEM_P_O_W_BLOCK, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 80, 220, 265 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 80, 220, 265 }, + .detectSize = { 200 }, + } + }, + .animations = { + .idle = ANIM_KoopaTroopa_Anim01, + .walk = ANIM_KoopaTroopa_Anim03, + .run = ANIM_KoopaTroopa_Anim04, + .chase = ANIM_KoopaTroopa_Anim04, + .anim_4 = ANIM_KoopaTroopa_Anim01, + .anim_5 = ANIM_KoopaTroopa_Anim01, + .death = ANIM_KoopaTroopa_Anim0B, + .hit = ANIM_KoopaTroopa_Anim0B, + .anim_8 = ANIM_KoopaTroopa_Anim07, + .anim_9 = ANIM_KoopaTroopa_Anim06, + .anim_A = ANIM_KoopaTroopa_Anim08, + .anim_B = ANIM_KoopaTroopa_Anim04, + .anim_C = ANIM_KoopaTroopa_Anim04, + .anim_D = ANIM_KoopaTroopa_Anim04, + .anim_E = ANIM_KoopaTroopa_Anim04, + .anim_F = ANIM_KoopaTroopa_Anim04, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bobomb) = { + .id = NPC_Bobomb, + .settings = &N(NpcSettings_Bobomb_Stationary), + .pos = { -255.0f, 640.0f, 35.0f }, + .yaw = 180, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 5, 0 }, + { ITEM_FIRE_FLOWER, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -255, 640, 35 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -255, 640, 35 }, + .detectSize = { 100 }, + } + }, + .animations = { + .idle = ANIM_Bobomb_Anim02, + .walk = ANIM_Bobomb_Anim04, + .run = ANIM_Bobomb_Anim06, + .chase = ANIM_Bobomb_Anim06, + .anim_4 = ANIM_Bobomb_Anim02, + .anim_5 = ANIM_Bobomb_Anim02, + .death = ANIM_Bobomb_Anim0E, + .hit = ANIM_Bobomb_Anim0E, + .anim_8 = ANIM_Bobomb_Anim06, + .anim_9 = ANIM_Bobomb_Anim06, + .anim_A = ANIM_Bobomb_Anim06, + .anim_B = ANIM_Bobomb_Anim06, + .anim_C = ANIM_Bobomb_Anim06, + .anim_D = ANIM_Bobomb_Anim06, + .anim_E = ANIM_Bobomb_Anim06, + .anim_F = ANIM_Bobomb_Anim06, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_KoopaTroopa_01), BTL_TRD_PART_1_FORMATION_03, BTL_TRD_PART_1_STAGE_02), + NPC_GROUP(N(NpcData_KoopaTroopa_02), BTL_TRD_PART_1_FORMATION_01, BTL_TRD_PART_1_STAGE_07), + NPC_GROUP(N(NpcData_KoopaTroopa_03), BTL_TRD_PART_1_FORMATION_00, BTL_TRD_PART_1_STAGE_07), + NPC_GROUP(N(NpcData_Bobomb), BTL_TRD_PART_1_FORMATION_10, BTL_TRD_PART_1_STAGE_07), + {} +}; diff --git a/src/world/area_trd/trd_02/9A0FE0.c b/src/world/area_trd/trd_02/9A0FE0.c deleted file mode 100644 index c9ee219814..0000000000 --- a/src/world/area_trd/trd_02/9A0FE0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "trd_02.h" - -static char* N(exit_str_0) = "trd_01"; -static char* N(exit_str_1) = "trd_03"; - -#include "world/common/SetEntityFlags100000.inc.c" - -#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c deleted file mode 100644 index 021275e679..0000000000 --- a/src/world/area_trd/trd_02/9A10C0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "trd_02.h" - -#include "world/common/enemy/TackleAI.inc.c" - -#include "world/common/enemy/KoopaPatrolAI.inc.c" diff --git a/src/world/area_trd/trd_02/trd_02.h b/src/world/area_trd/trd_02/trd_02.h index 7e8a6eea2a..b33ab6fc58 100644 --- a/src/world/area_trd/trd_02/trd_02.h +++ b/src/world/area_trd/trd_02/trd_02.h @@ -2,8 +2,24 @@ /// @brief Koopa Bros Fortress - Left Stairway #include "common.h" -#include "../trd.h" #include "message_ids.h" #include "map.h" +#include "../trd.h" +#include "mapfs/trd_02_shape.h" +#include "mapfs/trd_02_hit.h" + +#include "sprite/npc/Bobomb.h" +#include "sprite/npc/KoopaTroopa.h" + +enum { + NPC_Bobomb_01 = 0, + NPC_Bobomb_02 = 1, + NPC_KoopaTroopa = 2, +}; + +enum { + MV_Padlock_EntityIndex = MapVar(0), +}; + #define NAMESPACE trd_02 diff --git a/src/world/area_trd/trd_02/trd_02_0_header.c b/src/world/area_trd/trd_02/trd_02_0_header.c new file mode 100644 index 0000000000..798cb16036 --- /dev/null +++ b/src/world/area_trd/trd_02/trd_02_0_header.c @@ -0,0 +1,25 @@ +#include "trd_02.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [trd_02_ENTRY_0] { -257.0, 0.0, 80.0, 90.0 }, + [trd_02_ENTRY_1] { 257.0, 0.0, 80.0, 270.0 }, + [trd_02_ENTRY_2] { -257.0, 187.0, -55.0, 90.0 }, + [trd_02_ENTRY_3] { 257.0, 187.0, -55.0, 270.0 }, + [trd_02_ENTRY_4] { 235.0, 50.0, -70.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_trd_02 }, +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_FORTRESS, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_02/trd_02_1_main.c b/src/world/area_trd/trd_02/trd_02_1_main.c new file mode 100644 index 0000000000..2a5009193e --- /dev/null +++ b/src/world/area_trd/trd_02/trd_02_1_main.c @@ -0,0 +1,194 @@ +#include "trd_02.h" +#include "effects.h" + +extern EvtScript N(D_80242890_9A3870); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); + +EvtScript N(EVS_ExitDoors_trd_01_1) = EVT_EXIT_DOUBLE_DOOR(trd_02_ENTRY_0, "trd_01", trd_01_ENTRY_1, COLLIDER_ttw, MODEL_o6, MODEL_o7); +EvtScript N(EVS_ExitDoors_trd_03_0) = EVT_EXIT_DOUBLE_DOOR(trd_02_ENTRY_1, "trd_03", trd_03_ENTRY_0, COLLIDER_tte, MODEL_o9, MODEL_o8); +EvtScript N(EVS_ExitDoors_trd_01_2) = EVT_EXIT_DOUBLE_DOOR(trd_02_ENTRY_2, "trd_01", trd_01_ENTRY_2, COLLIDER_ttw2, MODEL_o13, MODEL_o12); +EvtScript N(EVS_ExitDoors_trd_03_2) = EVT_EXIT_DOUBLE_DOOR(trd_02_ENTRY_3, "trd_03", trd_03_ENTRY_2, COLLIDER_tte2, MODEL_o10, MODEL_o11); +EvtScript N(EVS_ExitWalk_trd_03_4) = EVT_EXIT_WALK(40, trd_02_ENTRY_4, "trd_03", trd_03_ENTRY_4); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_trd_03_4)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilia, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(1) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(trd_02_ENTRY_0) + EVT_SET(LVar2, MODEL_o6) + EVT_SET(LVar3, MODEL_o7) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_02_ENTRY_1) + EVT_SET(LVar2, MODEL_o9) + EVT_SET(LVar3, MODEL_o8) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_02_ENTRY_2) + EVT_SET(LVar2, MODEL_o13) + EVT_SET(LVar3, MODEL_o12) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_02_ENTRY_3) + EVT_SET(LVar2, MODEL_o10) + EVT_SET(LVar3, MODEL_o11) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_02_ENTRY_4) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_RESUME_GROUP(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_LowerStairs) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, 0) + EVT_SUSPEND_GROUP(1) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(30) + EVT_CALL(SetGroupEnabled, MODEL_move_saku, 0) + EVT_CALL(PlaySound, SOUND_80000004) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 320, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.4)) + EVT_END_THREAD + EVT_WAIT(20) + EVT_THREAD + EVT_LOOP(5) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 150) + EVT_PLAY_EFFECT(EFFECT_DUST, 0, LVar0, LVar1, LVar2, 40) + EVT_CALL(RandInt, 20, LVar0) + EVT_ADD(LVar0, 20) + EVT_WAIT(LVar0) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(7) + EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) + EVT_CALL(RandInt, 200, LVar4) + EVT_SUB(LVar4, 100) + EVT_CALL(RandInt, 200, LVar5) + EVT_SUB(LVar5, 100) + EVT_ADD(LVar1, LVar4) + EVT_ADD(LVar2, 200) + EVT_ADD(LVar3, LVar5) + EVT_PLAY_EFFECT(EFFECT_SHATTERING_STONES, 0, LVar1, LVar2, LVar3, 187) + EVT_CALL(RandInt, 30, LVar0) + EVT_ADD(LVar0, 30) + EVT_WAIT(LVar0) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(20) + EVT_CALL(MakeLerp, 187, 0, 300, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_dan, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_k_soku, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_kusari, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(UpdateColliderTransform, COLLIDER_o54) + EVT_CALL(UpdateColliderTransform, COLLIDER_o55) + EVT_CALL(UpdateColliderTransform, COLLIDER_o65) + EVT_CALL(StopSound, SOUND_80000004) + EVT_CALL(PlaySound, SOUND_25) + EVT_SET(GB_StoryProgress, STORY_CH1_LOWERED_SECOND_STAIRS) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, 0) + EVT_RESUME_GROUP(1) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +BombTrigger N(D_8024240C_9A33EC) = { + .pos = { 255.0f, 50.0f, -80.0f }, + .radius = 0.0f +}; + +EvtScript N(D_8024241C_9A33FC) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(1) + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 17, 11, 1, 10, 30) + EVT_CALL(EnableModel, MODEL_anaaki, TRUE) + EVT_LOOP(10) + EVT_CALL(SetGroupEnabled, MODEL_g14, 1) + EVT_WAIT(1) + EVT_CALL(SetGroupEnabled, MODEL_g14, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tta, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_TRD02_BombedWall, TRUE) + EVT_RESUME_GROUP(1) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +s32 N(D_8024252C_9A350C)[] = { + ITEM_KOOPA_FORTRESS_KEY, + ITEM_NONE +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_KOOPA_BROS_FORTRESS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_01_1)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_03_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_IF_EQ(GF_TRD02_UnlockedDoor, FALSE) + EVT_BIND_PADLOCK(EVT_PTR(N(D_80242890_9A3870)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(D_8024252C_9A350C)), 0, 1) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_01_2)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw2, 1, 0) + EVT_END_IF + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_03_2)), TRIGGER_WALL_PRESS_A, COLLIDER_tte2, 1, 0) + EVT_IF_EQ(GF_TRD02_BombedWall, FALSE) + EVT_CALL(EnableModel, MODEL_anaaki, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(D_8024241C_9A33FC)), TRIGGER_POINT_BOMB, EVT_PTR(N(D_8024240C_9A33EC)), 1, 0) + EVT_ELSE + EVT_CALL(SetGroupEnabled, MODEL_g14, 0) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tta, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_EXEC(N(EVS_SetupMusic)) + EVT_SET(AF_TRD02_LowerStairs, FALSE) + EVT_CALL(ParentColliderToModel, COLLIDER_o55, MODEL_dan) + EVT_CALL(ParentColliderToModel, COLLIDER_o54, MODEL_k_soku) + EVT_CALL(ParentColliderToModel, COLLIDER_o65, MODEL_kusari) + EVT_IF_LT(GB_StoryProgress, STORY_CH1_LOWERED_SECOND_STAIRS) + EVT_CALL(TranslateModel, MODEL_dan, 0, 187, 0) + EVT_CALL(TranslateModel, MODEL_k_soku, 0, 187, 0) + EVT_CALL(TranslateModel, MODEL_kusari, 0, 187, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o55) + EVT_CALL(UpdateColliderTransform, COLLIDER_o54) + EVT_CALL(UpdateColliderTransform, COLLIDER_o65) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Scene_LowerStairs)), TRIGGER_AREA_FLAG_SET, AF_TRD02_LowerStairs, 1, 0) + EVT_ELSE + EVT_CALL(UpdateColliderTransform, COLLIDER_o55) + EVT_CALL(UpdateColliderTransform, COLLIDER_o54) + EVT_CALL(UpdateColliderTransform, COLLIDER_o65) + EVT_CALL(SetGroupEnabled, MODEL_move_saku, 0) + EVT_END_IF + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_02/trd_02_2_entity.c b/src/world/area_trd/trd_02/trd_02_2_entity.c new file mode 100644 index 0000000000..bf9a209cba --- /dev/null +++ b/src/world/area_trd/trd_02/trd_02_2_entity.c @@ -0,0 +1,55 @@ +#include "trd_02.h" +#include "entity.h" + +extern EvtScript N(EVS_ExitDoors_trd_01_2); + +#include "world/common/SetEntityFlags100000.inc.c" +#include "world/common/GetEntityPosition.inc.c" + +EvtScript N(D_80242890_9A3870) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(1) + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RESUME_GROUP(1) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RESUME_GROUP(1) + EVT_RETURN + EVT_END_IF + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_CALL(CloseChoicePopup) + EVT_SET(GF_TRD02_UnlockedDoor, TRUE) + EVT_CALL(N(GetEntityPosition), MV_Padlock_EntityIndex, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) + EVT_SET(LVar0, MV_Padlock_EntityIndex) + EVT_CALL(N(SetEntityFlags100000)) + EVT_RESUME_GROUP(1) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindLockTrigger) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_01_2)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_TRD02_UnlockedDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), -265, 195, -55, 80, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_BindLockTrigger))) + EVT_SET(MV_Padlock_EntityIndex, LVar0) + EVT_END_IF + EVT_IF_LT(GB_StoryProgress, STORY_CH1_LOWERED_SECOND_STAIRS) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), 10, 187, 100, 0, MAKE_ENTITY_END) + EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_TRD02_LowerStairs)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_02/trd_02_3_npc.c b/src/world/area_trd/trd_02/trd_02_3_npc.c new file mode 100644 index 0000000000..a6759d13aa --- /dev/null +++ b/src/world/area_trd/trd_02/trd_02_3_npc.c @@ -0,0 +1,167 @@ +#include "trd_02.h" + +#include "world/common/enemy/complete/Bobomb_Wander.inc.c" +#include "world/common/enemy/complete/KoopaTroopa_Wander.inc.c" +#include "world/common/enemy/complete/KoopaTroopa_Patrol.inc.c" + +StaticNpc N(NpcData_Bobomb_01) = { + .id = NPC_Bobomb_01, + .settings = &N(NpcSettings_Bobomb_Wander), + .pos = { -70.0f, 0.0f, 80.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 5, 0 }, + { ITEM_FIRE_FLOWER, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -70, 0, 80 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 35 }, + .detectSize = { 250, 175 }, + } + }, + .animations = { + .idle = ANIM_Bobomb_Anim02, + .walk = ANIM_Bobomb_Anim04, + .run = ANIM_Bobomb_Anim06, + .chase = ANIM_Bobomb_Anim06, + .anim_4 = ANIM_Bobomb_Anim02, + .anim_5 = ANIM_Bobomb_Anim02, + .death = ANIM_Bobomb_Anim0E, + .hit = ANIM_Bobomb_Anim0E, + .anim_8 = ANIM_Bobomb_Anim06, + .anim_9 = ANIM_Bobomb_Anim06, + .anim_A = ANIM_Bobomb_Anim06, + .anim_B = ANIM_Bobomb_Anim06, + .anim_C = ANIM_Bobomb_Anim06, + .anim_D = ANIM_Bobomb_Anim06, + .anim_E = ANIM_Bobomb_Anim06, + .anim_F = ANIM_Bobomb_Anim06, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bobomb_02) = { + .id = NPC_Bobomb_02, + .settings = &N(NpcSettings_Bobomb_Wander), + .pos = { 140.0f, 0.0f, 80.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 5, 0 }, + { ITEM_FIRE_FLOWER, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 140, 0, 80 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_RECT, + .detectPos = { 0, 0, 35 }, + .detectSize = { 250, 175 }, + } + }, + .animations = { + .idle = ANIM_Bobomb_Anim02, + .walk = ANIM_Bobomb_Anim04, + .run = ANIM_Bobomb_Anim06, + .chase = ANIM_Bobomb_Anim06, + .anim_4 = ANIM_Bobomb_Anim02, + .anim_5 = ANIM_Bobomb_Anim02, + .death = ANIM_Bobomb_Anim0E, + .hit = ANIM_Bobomb_Anim0E, + .anim_8 = ANIM_Bobomb_Anim06, + .anim_9 = ANIM_Bobomb_Anim06, + .anim_A = ANIM_Bobomb_Anim06, + .anim_B = ANIM_Bobomb_Anim06, + .anim_C = ANIM_Bobomb_Anim06, + .anim_D = ANIM_Bobomb_Anim06, + .anim_E = ANIM_Bobomb_Anim06, + .anim_F = ANIM_Bobomb_Anim06, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_KoopaTroopa) = { + .id = NPC_KoopaTroopa, + .settings = &N(NpcSettings_KoopaTroopa_Patrol), + .pos = { 50.0f, 187.0f, 183.0f }, + .yaw = 0, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 5, 0 }, + { ITEM_P_O_W_BLOCK, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .patrol = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .numPoints = 2, + .points = { + { 70, 187, 183 }, + { -20, 187, 183 }, + }, + .detectShape = SHAPE_RECT, + .detectPos = { 20, 187, 207 }, + .detectSize = { 150, 80 }, + } + }, + .animations = { + .idle = ANIM_KoopaTroopa_Anim01, + .walk = ANIM_KoopaTroopa_Anim03, + .run = ANIM_KoopaTroopa_Anim04, + .chase = ANIM_KoopaTroopa_Anim04, + .anim_4 = ANIM_KoopaTroopa_Anim01, + .anim_5 = ANIM_KoopaTroopa_Anim01, + .death = ANIM_KoopaTroopa_Anim0B, + .hit = ANIM_KoopaTroopa_Anim0B, + .anim_8 = ANIM_KoopaTroopa_Anim07, + .anim_9 = ANIM_KoopaTroopa_Anim06, + .anim_A = ANIM_KoopaTroopa_Anim08, + .anim_B = ANIM_KoopaTroopa_Anim04, + .anim_C = ANIM_KoopaTroopa_Anim04, + .anim_D = ANIM_KoopaTroopa_Anim04, + .anim_E = ANIM_KoopaTroopa_Anim04, + .anim_F = ANIM_KoopaTroopa_Anim04, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Bobomb_01), BTL_TRD_PART_1_FORMATION_10, BTL_TRD_PART_1_STAGE_09), + NPC_GROUP(N(NpcData_Bobomb_02), BTL_TRD_PART_1_FORMATION_10, BTL_TRD_PART_1_STAGE_09), + NPC_GROUP(N(NpcData_KoopaTroopa), BTL_TRD_PART_1_FORMATION_07, BTL_TRD_PART_1_STAGE_0C), + {} +}; diff --git a/src/world/area_trd/trd_03/9A4650.c b/src/world/area_trd/trd_03/9A4650.c deleted file mode 100644 index 0bb8b1f645..0000000000 --- a/src/world/area_trd/trd_03/9A4650.c +++ /dev/null @@ -1,25 +0,0 @@ -#include "trd_03.h" - -static char* N(exit_str_0) = "trd_02"; -static char* N(exit_str_1) = "trd_04"; - -ApiStatus func_80240000_9A4650(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - u32 stickX; - - stickX = 0; - if (gCollisionStatus.pushingAgainstWall == COLLIDER_o84) { - stickX = gGameStatusPtr->stickX[0] < 0; - } - if ((gCollisionStatus.pushingAgainstWall == COLLIDER_o85) && (gGameStatusPtr->stickX[0] > 0)) { - stickX = 2; - } - - evt_set_variable(script, *args, stickX); - return ApiStatus_DONE2; -} - -ApiStatus GetFrameCounter(Evt* script, s32 isInitialCall) { - evt_set_variable(script, *script->ptrReadPos, gGameStatusPtr->frameCounter); - return ApiStatus_DONE2; -} diff --git a/src/world/area_trd/trd_03/9A46F0.c b/src/world/area_trd/trd_03/9A46F0.c deleted file mode 100644 index 593bdf6048..0000000000 --- a/src/world/area_trd/trd_03/9A46F0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "trd_03.h" - -#include "world/common/enemy/TackleAI.inc.c" diff --git a/src/world/area_trd/trd_03/9A4ED0.c b/src/world/area_trd/trd_03/9A4ED0.c deleted file mode 100644 index 9e74d000e0..0000000000 --- a/src/world/area_trd/trd_03/9A4ED0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "trd_03.h" - -#include "world/common/UnkTrigFunc001.inc.c" diff --git a/src/world/area_trd/trd_03/trd_03.h b/src/world/area_trd/trd_03/trd_03.h index 1a4872f16d..0b017ec7d6 100644 --- a/src/world/area_trd/trd_03/trd_03.h +++ b/src/world/area_trd/trd_03/trd_03.h @@ -2,11 +2,25 @@ /// @brief Koopa Bros Fortress - Central Hall #include "common.h" -#include "../trd.h" #include "message_ids.h" #include "map.h" -#define NAMESPACE trd_03 +#include "../trd.h" +#include "mapfs/trd_03_shape.h" +#include "mapfs/trd_03_hit.h" -#define COLLIDER_o84 35 -#define COLLIDER_o85 37 +#include "sprite/npc/KoopaBros.h" +#include "sprite/npc/KoopaTroopa.h" + +enum { + NPC_KoopaBros = 0, + NPC_KoopaTroopa_01 = 10, + NPC_KoopaTroopa_02 = 11, + NPC_KoopaTroopa_03 = 12, +}; + +enum { + MV_PlatformsExtended = MapVar(0), +}; + +#define NAMESPACE trd_03 diff --git a/src/world/area_trd/trd_03/trd_03_0_header.c b/src/world/area_trd/trd_03/trd_03_0_header.c new file mode 100644 index 0000000000..54523b0907 --- /dev/null +++ b/src/world/area_trd/trd_03/trd_03_0_header.c @@ -0,0 +1,39 @@ +#include "trd_03.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [trd_03_ENTRY_0] { -647.0, 0.0, 80.0, 90.0 }, + [trd_03_ENTRY_1] { 537.0, 0.0, 80.0, 270.0 }, + [trd_03_ENTRY_2] { -647.0, 180.0, -100.0, 90.0 }, + [trd_03_ENTRY_3] { 537.0, 180.0, -100.0, 270.0 }, + [trd_03_ENTRY_4] { -645.0, 45.0, -100.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_trd_03 }, +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_FORTRESS, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_StartKoopaBrosTheme) = { + EVT_CALL(FadeInMusic, 1, SONG_KOOPA_BROS_INTERLUDE, 0, 3000, 0, 127) + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EndKoopaBrosTheme) = { + EVT_CALL(FadeInMusic, 0, SONG_KOOPA_FORTRESS, 0, 3000, 0, 127) + EVT_CALL(FadeOutMusic, 1, 3000) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_03/trd_03_1_main.c b/src/world/area_trd/trd_03/trd_03_1_main.c new file mode 100644 index 0000000000..9c1a572dbd --- /dev/null +++ b/src/world/area_trd/trd_03/trd_03_1_main.c @@ -0,0 +1,241 @@ +#include "trd_03.h" +#include "effects.h" + +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_Scene_GreenKoopaBros); +extern EvtScript N(EVS_InitializePlatforms); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); + +API_CALLABLE(N(GetHiddenDoorPushDirection)) { + Bytecode* args = script->ptrReadPos; + s32 pushDir = 0; + + if ((gCollisionStatus.pushingAgainstWall == COLLIDER_o84) && (gGameStatusPtr->stickX[0] < 0)) { + pushDir = 1; + } + if ((gCollisionStatus.pushingAgainstWall == COLLIDER_o85) && (gGameStatusPtr->stickX[0] > 0)) { + pushDir = 2; + } + + evt_set_variable(script, *args, pushDir); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetFrameCounter)) { + evt_set_variable(script, *script->ptrReadPos, gGameStatusPtr->frameCounter); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ExitDoors_trd_02_1) = EVT_EXIT_DOUBLE_DOOR(trd_03_ENTRY_0, "trd_02", trd_02_ENTRY_1, COLLIDER_ttw, MODEL_d1, MODEL_d2); +EvtScript N(EVS_ExitDoors_trd_04_0) = EVT_EXIT_DOUBLE_DOOR(trd_03_ENTRY_1, "trd_04", trd_04_ENTRY_0, COLLIDER_tte, MODEL_d3, MODEL_d4); +EvtScript N(EVS_ExitDoors_trd_02_3) = EVT_EXIT_DOUBLE_DOOR(trd_03_ENTRY_2, "trd_02", trd_02_ENTRY_3, COLLIDER_ttwo, MODEL_o33, MODEL_o34); +EvtScript N(EVS_ExitDoors_trd_04_2) = EVT_EXIT_DOUBLE_DOOR(trd_03_ENTRY_3, "trd_04", trd_04_ENTRY_2, COLLIDER_tteo, MODEL_o31, MODEL_o32); +EvtScript N(EVS_ExitDoors_trd_02_4) = EVT_EXIT_WALK(40, trd_03_ENTRY_4, "trd_02", trd_02_ENTRY_4); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_02_1)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_04_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_02_3)), TRIGGER_WALL_PRESS_A, COLLIDER_ttwo, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_04_2)), TRIGGER_WALL_PRESS_A, COLLIDER_tteo, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_02_4)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(trd_03_ENTRY_0) + EVT_SET(LVar2, MODEL_d1) + EVT_SET(LVar3, MODEL_d2) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_03_ENTRY_1) + EVT_SET(LVar2, MODEL_d3) + EVT_SET(LVar3, MODEL_d4) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_03_ENTRY_2) + EVT_SET(LVar2, MODEL_o33) + EVT_SET(LVar3, MODEL_o34) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_03_ENTRY_3) + EVT_SET(LVar2, MODEL_o31) + EVT_SET(LVar3, MODEL_o32) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_03_ENTRY_4) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +BombTrigger N(BombPos_MiddleCell) = { + .pos = { -160.0f, 0.0f, -10.0f }, + .radius = 0.0f +}; + +BombTrigger N(BombPos_RightCell) = { + .pos = { 360.0f, 0.0f, -10.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_BombWall_MiddleCell) = { + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 40, 10, 1, 10, 30) + EVT_CALL(EnableModel, MODEL_nk2, TRUE) + EVT_LOOP(10) + EVT_CALL(SetGroupEnabled, MODEL_ana2, 1) + EVT_WAIT(1) + EVT_CALL(SetGroupEnabled, MODEL_ana2, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilit2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tt2, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_TRD03_BombedCenterCell, TRUE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BombWall_RightCell) = { + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 43, 10, 1, 10, 30) + EVT_CALL(EnableModel, MODEL_nk3, TRUE) + EVT_LOOP(10) + EVT_CALL(SetGroupEnabled, MODEL_ana3, 1) + EVT_WAIT(1) + EVT_CALL(SetGroupEnabled, MODEL_ana3, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilit3, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tt3, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_TRD03_BombedRightCell, TRUE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HiddenDoor) = { + EVT_SET(LVarB, 0) + EVT_SETF(LVarC, EVT_FLOAT(0.0)) + EVT_SET(LVarD, 0) + EVT_SET(LVarE, 0) + EVT_CALL(CloneModel, MODEL_rou2, CLONED_MODEL(0)) + EVT_CALL(EnableModel, CLONED_MODEL(0), FALSE) + EVT_CALL(ParentColliderToModel, COLLIDER_o84, CLONED_MODEL(0)) + EVT_CALL(CloneModel, MODEL_rou2, CLONED_MODEL(1)) + EVT_CALL(EnableModel, CLONED_MODEL(1), FALSE) + EVT_CALL(ParentColliderToModel, COLLIDER_o85, CLONED_MODEL(1)) + EVT_LABEL(0) + EVT_IF_EQ(LVarD, 0) + EVT_CALL(N(GetHiddenDoorPushDirection), LVar0) + EVT_SWITCH(LVar0) + // pushing left on COLLIDER_o84 + EVT_CASE_EQ(1) + EVT_CALL(N(GetFrameCounter), LVar1) + EVT_SUB(LVar1, LVarA) + EVT_IF_EQ(LVar1, 1) + EVT_ADD(LVarB, 1) + EVT_SUBF(LVarC, EVT_FLOAT(0.1)) + EVT_ELSE + EVT_SET(LVarB, 0) + EVT_END_IF + EVT_IF_GT(LVarB, 15) + EVT_SET(LVarB, 0) + EVT_SET(LVarD, 8) + EVT_END_IF + EVT_IF_LT(LVarC, -3) + EVT_SET(LVarD, 8) + EVT_END_IF + // pushing right on COLLIDER_o85 + EVT_CASE_EQ(2) + EVT_SET(LVarD, -8) + // not pushing + EVT_CASE_DEFAULT + EVT_SET(LVarB, 0) + EVT_IF_LT(LVarC, 0) + EVT_ADDF(LVarC, EVT_FLOAT(0.2)) + EVT_IF_GT(LVarC, 0) + EVT_SETF(LVarC, EVT_FLOAT(0.0)) + EVT_END_IF + EVT_ELSE + EVT_SUBF(LVarC, EVT_FLOAT(0.2)) + EVT_IF_LT(LVarC, 0) + EVT_SETF(LVarC, EVT_FLOAT(0.0)) + EVT_END_IF + EVT_END_IF + EVT_END_SWITCH + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o84, 0x7FFFFFFF) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o85, 0x7FFFFFFF) + EVT_CALL(TranslateModel, CLONED_MODEL(0), LVarC, 0, 0) + EVT_CALL(TranslateModel, CLONED_MODEL(1), LVarC, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o84) + EVT_CALL(UpdateColliderTransform, COLLIDER_o85) + EVT_ELSE + EVT_SETF(LVarC, EVT_FLOAT(0.0)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o84, 0x7FFFFFFF) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o85, 0x7FFFFFFF) + EVT_IF_GT(LVarD, 0) + EVT_SUB(LVarD, 1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SETF(LVar3, LVarD) + EVT_MULF(LVar3, EVT_FLOAT(1.8)) + EVT_SUBF(LVar0, LVar3) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_ELSE + EVT_ADD(LVarD, 1) + EVT_END_IF + EVT_END_IF + EVT_CALL(N(GetFrameCounter), LVarA) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_KOOPA_BROS_FORTRESS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_IF_LT(GB_StoryProgress, STORY_CH1_KOOPA_BROS_HID_KEY) + EVT_EXEC(N(EVS_Scene_GreenKoopaBros)) + EVT_ELSE + EVT_EXEC(N(EVS_EnterMap)) + EVT_END_IF + EVT_IF_EQ(GF_TRD02_BombedWall, FALSE) + EVT_CALL(EnableModel, MODEL_nk1, FALSE) + EVT_ELSE + EVT_CALL(SetGroupEnabled, MODEL_ana1, 0) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilit1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_IF_EQ(GF_TRD03_BombedCenterCell, FALSE) + EVT_CALL(EnableModel, MODEL_nk2, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BombWall_MiddleCell)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_MiddleCell)), 1, 0) + EVT_ELSE + EVT_CALL(SetGroupEnabled, MODEL_ana2, 0) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilit2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tt2, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_IF_EQ(GF_TRD03_BombedRightCell, FALSE) + EVT_CALL(EnableModel, MODEL_nk3, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BombWall_RightCell)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_RightCell)), 1, 0) + EVT_ELSE + EVT_CALL(SetGroupEnabled, MODEL_ana3, 0) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilit3, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tt3, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_EXEC(N(EVS_SetupMusic)) + EVT_IF_LT(GB_StoryProgress, STORY_CH1_KOOPA_BROS_HID_KEY) + EVT_CALL(TranslateModel, MODEL_0ri, 0, 100, -1) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_InitializePlatforms)) + EVT_EXEC(N(EVS_HiddenDoor)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_03/trd_03_2_entity.c b/src/world/area_trd/trd_03/trd_03_2_entity.c new file mode 100644 index 0000000000..4cfb055491 --- /dev/null +++ b/src/world/area_trd/trd_03/trd_03_2_entity.c @@ -0,0 +1,18 @@ +#include "trd_03.h" +#include "entity.h" + +extern EvtScript N(EVS_TogglePlatforms_LeftSwitch); +extern EvtScript N(EVS_TogglePlatforms_RightSwitch); + +EvtScript N(EVS_MakeEntities) = { + EVT_SET(MV_PlatformsExtended, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_RedSwitch), -315, 120, -100, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_TogglePlatforms_LeftSwitch))) + EVT_CALL(MakeEntity, EVT_PTR(Entity_RedSwitch), 210, 120, -100, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_TogglePlatforms_RightSwitch))) + EVT_CALL(MakeItemEntity, ITEM_KOOPA_FORTRESS_KEY, -580, 0, -60, ITEM_SPAWN_MODE_KEY, GF_TRD03_Item_FortressKeyA) + EVT_CALL(MakeItemEntity, ITEM_KOOPA_FORTRESS_KEY, 470, 0, -60, ITEM_SPAWN_MODE_KEY, GF_TRD03_Item_FortressKeyB) + EVT_CALL(MakeItemEntity, ITEM_POWER_BOUNCE, -50, 0, -60, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_TRD03_Item_PowerBounce) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_03/trd_03_3_npc.c b/src/world/area_trd/trd_03/trd_03_3_npc.c new file mode 100644 index 0000000000..36e5106328 --- /dev/null +++ b/src/world/area_trd/trd_03/trd_03_3_npc.c @@ -0,0 +1,376 @@ +#include "trd_03.h" + +extern EvtScript N(EVS_StartKoopaBrosTheme); +extern EvtScript N(EVS_EndKoopaBrosTheme); +extern EvtScript N(EVS_EnterMap); + +#include "world/common/enemy/complete/KoopaTroopa_Wander.inc.c" + +NpcSettings N(NpcSettings_KoopaBros) = { + .height = 34, + .radius = 24, + .level = 99, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +#include "world/common/enemy/complete/Bobomb_Wander.inc.c" + +EvtScript N(EVS_Scene_GreenKoopaBros) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC(N(EVS_StartKoopaBrosTheme)) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, -720, 0, 75) + EVT_CALL(SetPlayerPos, -700, 0, 80) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim05) + EVT_CALL(SetNpcPos, NPC_KoopaBros, -570, 0, -57) + EVT_CALL(InterpNpcYaw, NPC_KoopaBros, 270, 0) + EVT_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -607, 0, 80) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 320) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -607, 0, 80) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) + EVT_WAIT(15) + EVT_CALL(InterpNpcYaw, NPC_KoopaBros, 90, 0) + EVT_WAIT(3) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim03) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros, EVT_FLOAT(2.6)) + EVT_CALL(NpcMoveTo, NPC_KoopaBros, -555, 20, 0) + EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_01, 270, 0) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) + EVT_WAIT(2) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim14) + EVT_WAIT(25) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) + EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_01, ANIM_KoopaTroopa_Anim09) + EVT_WAIT(25) + EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_01, ANIM_KoopaTroopa_Anim01) + EVT_THREAD + EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_26B, 0) + EVT_CALL(MakeLerp, 100, 0, 40, EASING_QUADRATIC_IN) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_0ri, 0, LVar0, -1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_26C, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_END_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim03) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_KoopaBros, -550, 70, 0) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) + EVT_WAIT(15) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim14, ANIM_KoopaBros_Green_Anim04, 5, MSG_CH1_00D3) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_WAIT(10) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_METAL_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_d1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_d2, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(EnablePartnerAI) + EVT_CALL(SetPlayerPos, -647, 0, 80) + EVT_EXEC_WAIT(N(EVS_EnterMap)) + EVT_CALL(InterpNpcYaw, NPC_KoopaBros, 270, 5) + EVT_CALL(func_802CFD30, 0, 5, 4, 2, 1, 0) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim1E) + EVT_WAIT(12) + EVT_CALL(func_802CFD30, 0, 0, 0, 0, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim04) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim14, ANIM_KoopaBros_Green_Anim04, 0, MSG_CH1_00D4) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim02) + EVT_CALL(InterpNpcYaw, NPC_KoopaBros, 45, 2) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_173, 0) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros, ANIM_KoopaBros_Green_Anim03) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBros, EVT_FLOAT(0.8)) + EVT_CALL(GetNpcPos, NPC_KoopaBros, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_KoopaBros, LVar0, LVar1, LVar2, 8) + EVT_WAIT(8) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros, SOUND_174, 0) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros, EVT_FLOAT(8.0)) + EVT_CALL(NpcMoveTo, NPC_KoopaBros, -300, 70, 0) + EVT_SET(GB_StoryProgress, STORY_CH1_KOOPA_BROS_HID_KEY) + EVT_CALL(RemoveNpc, NPC_KoopaBros) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_EXEC(N(EVS_EndKoopaBrosTheme)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_KoopaBros) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH1_KOOPA_BROS_HID_KEY) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_KoopaTroopa_01) = { + EVT_LABEL(0) + EVT_WAIT(1) + EVT_IF_LT(GB_StoryProgress, STORY_CH1_KOOPA_BROS_HID_KEY) + EVT_GOTO(0) + EVT_END_IF + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaTroopa_Anim03) + EVT_WAIT(10) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_KoopaTroopa_Wander))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_KoopaTroopa_01) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_KoopaTroopa_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_KoopaTroopa_02) = { + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_IF_LT(LVar0, -150) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaTroopa_Anim09) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaTroopa_Anim03) + EVT_LABEL(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_IF_LT(LVar0, -100) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaTroopa_Anim04) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(7.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 35, -130, 0) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) + EVT_CALL(NpcMoveTo, NPC_SELF, 90, -130, 0) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, FALSE) + EVT_CALL(NpcMoveTo, NPC_SELF, 105, 10, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaTroopa_Anim03) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_KoopaTroopa_Wander))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_KoopaTroopa_02) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_KoopaTroopa_02))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_KoopaBros) = { + .id = NPC_KoopaBros, + .settings = &N(NpcSettings_KoopaBros), + .pos = { -569.0f, 0.0f, -57.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_KoopaBros), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_KoopaBros_Green_Anim04, + .walk = ANIM_KoopaBros_Green_Anim02, + .run = ANIM_KoopaBros_Green_Anim03, + .chase = ANIM_KoopaBros_Green_Anim03, + .anim_4 = ANIM_KoopaBros_Green_Anim04, + .anim_5 = ANIM_KoopaBros_Green_Anim04, + .death = ANIM_KoopaBros_Green_Anim0A, + .hit = ANIM_KoopaBros_Green_Anim0A, + .anim_8 = ANIM_KoopaBros_Green_Anim03, + .anim_9 = ANIM_KoopaBros_Green_Anim03, + .anim_A = ANIM_KoopaBros_Green_Anim03, + .anim_B = ANIM_KoopaBros_Green_Anim03, + .anim_C = ANIM_KoopaBros_Green_Anim03, + .anim_D = ANIM_KoopaBros_Green_Anim03, + .anim_E = ANIM_KoopaBros_Green_Anim03, + .anim_F = ANIM_KoopaBros_Green_Anim03, + }, +}; + +StaticNpc N(NpcData_KoopaTroopa_01) = { + .id = NPC_KoopaTroopa_01, + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .pos = { -520.0f, 0.0f, 15.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_KoopaTroopa_01), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 5, 0 }, + { ITEM_P_O_W_BLOCK, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -520, 0, 15 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -520, 0, 15 }, + .detectSize = { 350 }, + } + }, + .animations = { + .idle = ANIM_KoopaTroopa_Anim01, + .walk = ANIM_KoopaTroopa_Anim03, + .run = ANIM_KoopaTroopa_Anim04, + .chase = ANIM_KoopaTroopa_Anim04, + .anim_4 = ANIM_KoopaTroopa_Anim01, + .anim_5 = ANIM_KoopaTroopa_Anim01, + .death = ANIM_KoopaTroopa_Anim0B, + .hit = ANIM_KoopaTroopa_Anim0B, + .anim_8 = ANIM_KoopaTroopa_Anim07, + .anim_9 = ANIM_KoopaTroopa_Anim06, + .anim_A = ANIM_KoopaTroopa_Anim08, + .anim_B = ANIM_KoopaTroopa_Anim04, + .anim_C = ANIM_KoopaTroopa_Anim04, + .anim_D = ANIM_KoopaTroopa_Anim04, + .anim_E = ANIM_KoopaTroopa_Anim04, + .anim_F = ANIM_KoopaTroopa_Anim04, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_KoopaTroopa_02) = { + .id = NPC_KoopaTroopa_02, + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .pos = { -52.0f, 0.0f, -21.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_KoopaTroopa_02), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 5, 0 }, + { ITEM_P_O_W_BLOCK, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -52, 0, -21 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -52, 0, -21 }, + .detectSize = { 350 }, + } + }, + .animations = { + .idle = ANIM_KoopaTroopa_Anim01, + .walk = ANIM_KoopaTroopa_Anim03, + .run = ANIM_KoopaTroopa_Anim04, + .chase = ANIM_KoopaTroopa_Anim04, + .anim_4 = ANIM_KoopaTroopa_Anim01, + .anim_5 = ANIM_KoopaTroopa_Anim01, + .death = ANIM_KoopaTroopa_Anim0B, + .hit = ANIM_KoopaTroopa_Anim0B, + .anim_8 = ANIM_KoopaTroopa_Anim07, + .anim_9 = ANIM_KoopaTroopa_Anim06, + .anim_A = ANIM_KoopaTroopa_Anim08, + .anim_B = ANIM_KoopaTroopa_Anim04, + .anim_C = ANIM_KoopaTroopa_Anim04, + .anim_D = ANIM_KoopaTroopa_Anim04, + .anim_E = ANIM_KoopaTroopa_Anim04, + .anim_F = ANIM_KoopaTroopa_Anim04, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_KoopaTroopa_03) = { + .id = NPC_KoopaTroopa_03, + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .pos = { 375.0f, 0.0f, 15.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 5, 0 }, + { ITEM_P_O_W_BLOCK, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 375, 0, 15 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 375, 0, 15 }, + .detectSize = { 350 }, + } + }, + .animations = { + .idle = ANIM_KoopaTroopa_Anim01, + .walk = ANIM_KoopaTroopa_Anim03, + .run = ANIM_KoopaTroopa_Anim04, + .chase = ANIM_KoopaTroopa_Anim04, + .anim_4 = ANIM_KoopaTroopa_Anim01, + .anim_5 = ANIM_KoopaTroopa_Anim01, + .death = ANIM_KoopaTroopa_Anim0B, + .hit = ANIM_KoopaTroopa_Anim0B, + .anim_8 = ANIM_KoopaTroopa_Anim07, + .anim_9 = ANIM_KoopaTroopa_Anim06, + .anim_A = ANIM_KoopaTroopa_Anim08, + .anim_B = ANIM_KoopaTroopa_Anim04, + .anim_C = ANIM_KoopaTroopa_Anim04, + .anim_D = ANIM_KoopaTroopa_Anim04, + .anim_E = ANIM_KoopaTroopa_Anim04, + .anim_F = ANIM_KoopaTroopa_Anim04, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_KoopaBros), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_01), + NPC_GROUP(N(NpcData_KoopaTroopa_01), BTL_TRD_PART_1_FORMATION_03, BTL_TRD_PART_1_STAGE_01), + NPC_GROUP(N(NpcData_KoopaTroopa_02), BTL_TRD_PART_1_FORMATION_04, BTL_TRD_PART_1_STAGE_01), + NPC_GROUP(N(NpcData_KoopaTroopa_03), BTL_TRD_PART_1_FORMATION_03, BTL_TRD_PART_1_STAGE_01), + {} +}; diff --git a/src/world/area_trd/trd_03/trd_03_4_puzzle.c b/src/world/area_trd/trd_03/trd_03_4_puzzle.c new file mode 100644 index 0000000000..45ffa28920 --- /dev/null +++ b/src/world/area_trd/trd_03/trd_03_4_puzzle.c @@ -0,0 +1,273 @@ +#include "trd_03.h" + +#define FLOOR_RETRACT_LENGTH -95 +#define WALL_RETRACT_LENGTH -145 + +API_CALLABLE(N(GetLeftRightPoints)) { + Bytecode* args = script->ptrReadPos; + s32 switchPosX = evt_get_variable(script, *args++); + s32 switchPosZ = evt_get_variable(script, *args++); + f32 dist = evt_get_variable(script, *args++); + + script->varTable[0] = switchPosX + (sin_deg(gCameras[CAM_DEFAULT].currentYaw + 270.0f + dist) * 100.0f); + script->varTable[1] = switchPosZ - (cos_deg(gCameras[CAM_DEFAULT].currentYaw + 270.0f + dist) * 100.0f); + script->varTable[2] = switchPosX + (sin_deg(gCameras[CAM_DEFAULT].currentYaw + 90.0f + dist) * 100.0f); + script->varTable[3] = switchPosZ - (cos_deg(gCameras[CAM_DEFAULT].currentYaw + 90.0f + dist) * 100.0f); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_InitializePlatforms) = { + EVT_CALL(TranslateModel, MODEL_1, 0, 0, FLOOR_RETRACT_LENGTH) + EVT_CALL(TranslateModel, MODEL_2, 0, 0, FLOOR_RETRACT_LENGTH) + EVT_CALL(TranslateModel, MODEL_3, 0, 0, FLOOR_RETRACT_LENGTH) + EVT_CALL(TranslateModel, MODEL_4, 0, 0, FLOOR_RETRACT_LENGTH) + EVT_CALL(TranslateModel, MODEL_5, 0, 0, WALL_RETRACT_LENGTH) + EVT_CALL(TranslateModel, MODEL_6, 0, 0, WALL_RETRACT_LENGTH) + EVT_CALL(TranslateModel, MODEL_7, 0, 0, WALL_RETRACT_LENGTH) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_3, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_4, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o75, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o74, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o73, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(MV_PlatformsExtended, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RetractPlatform) = { + EVT_CALL(MakeLerp, 0, LVar8, 7, EASING_CUBIC_IN) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, LVar9, 0, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, 0, LVar7, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySound, SOUND_26) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(0.3)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExtendPlatform) = { + EVT_CALL(MakeLerp, LVar8, 0, 7, EASING_CUBIC_IN) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, LVar9, 0, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, LVar7, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySound, SOUND_26) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(0.3)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TogglePlatforms_LeftSwitch) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_LABEL(123) + EVT_CALL(GetPlayerActionState, LVar0) + EVT_WAIT(1) + EVT_IF_NE(LVar0, ACTION_STATE_IDLE) + EVT_GOTO(123) + EVT_END_IF + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -315, 120, -50) + EVT_CALL(N(GetLeftRightPoints), -315, -100, 60) + EVT_CALL(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) + EVT_CALL(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(15) + EVT_IF_EQ(MV_PlatformsExtended, FALSE) + EVT_SET(LVar7, COLLIDER_o73) + EVT_SET(LVar8, WALL_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_7) + EVT_EXEC(N(EVS_ExtendPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_4) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_4) + EVT_EXEC(N(EVS_ExtendPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_3) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_3) + EVT_EXEC(N(EVS_ExtendPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_o74) + EVT_SET(LVar8, WALL_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_6) + EVT_EXEC(N(EVS_ExtendPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_2) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_2) + EVT_EXEC(N(EVS_ExtendPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_1) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_1) + EVT_EXEC(N(EVS_ExtendPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_o75) + EVT_SET(LVar8, WALL_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_5) + EVT_EXEC(N(EVS_ExtendPlatform)) + EVT_WAIT(9) + EVT_SET(MV_PlatformsExtended, TRUE) + EVT_ELSE + EVT_SET(LVar7, COLLIDER_o75) + EVT_SET(LVar8, WALL_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_5) + EVT_EXEC(N(EVS_RetractPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_1) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_1) + EVT_EXEC(N(EVS_RetractPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_2) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_2) + EVT_EXEC(N(EVS_RetractPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_o74) + EVT_SET(LVar8, WALL_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_6) + EVT_EXEC(N(EVS_RetractPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_3) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_3) + EVT_EXEC(N(EVS_RetractPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_4) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_4) + EVT_EXEC(N(EVS_RetractPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_o73) + EVT_SET(LVar8, WALL_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_7) + EVT_EXEC(N(EVS_RetractPlatform)) + EVT_WAIT(9) + EVT_SET(MV_PlatformsExtended, FALSE) + EVT_END_IF + EVT_WAIT(10) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TogglePlatforms_RightSwitch) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_LABEL(123) + EVT_CALL(GetPlayerActionState, LVar0) + EVT_WAIT(1) + EVT_IF_NE(LVar0, ACTION_STATE_IDLE) + EVT_GOTO(123) + EVT_END_IF + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 210, 120, -50) + EVT_CALL(N(GetLeftRightPoints), 210, -100, -60) + EVT_CALL(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) + EVT_CALL(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(15) + EVT_IF_EQ(MV_PlatformsExtended, FALSE) + EVT_SET(LVar7, COLLIDER_o75) + EVT_SET(LVar8, WALL_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_5) + EVT_EXEC(N(EVS_ExtendPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_1) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_1) + EVT_EXEC(N(EVS_ExtendPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_2) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_2) + EVT_EXEC(N(EVS_ExtendPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_o74) + EVT_SET(LVar8, WALL_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_6) + EVT_EXEC(N(EVS_ExtendPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_3) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_3) + EVT_EXEC(N(EVS_ExtendPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_4) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_4) + EVT_EXEC(N(EVS_ExtendPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_o73) + EVT_SET(LVar8, WALL_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_7) + EVT_EXEC(N(EVS_ExtendPlatform)) + EVT_WAIT(9) + EVT_SET(MV_PlatformsExtended, TRUE) + EVT_ELSE + EVT_SET(LVar7, COLLIDER_o73) + EVT_SET(LVar8, WALL_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_7) + EVT_EXEC(N(EVS_RetractPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_4) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_4) + EVT_EXEC(N(EVS_RetractPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_3) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_3) + EVT_EXEC(N(EVS_RetractPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_o74) + EVT_SET(LVar8, WALL_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_6) + EVT_EXEC(N(EVS_RetractPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_2) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_2) + EVT_EXEC(N(EVS_RetractPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_1) + EVT_SET(LVar8, FLOOR_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_1) + EVT_EXEC(N(EVS_RetractPlatform)) + EVT_WAIT(9) + EVT_SET(LVar7, COLLIDER_o75) + EVT_SET(LVar8, WALL_RETRACT_LENGTH) + EVT_SET(LVar9, MODEL_5) + EVT_EXEC(N(EVS_RetractPlatform)) + EVT_WAIT(9) + EVT_SET(MV_PlatformsExtended, FALSE) + EVT_END_IF + EVT_WAIT(10) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_04/trd_04_1_main.c b/src/world/area_trd/trd_04/trd_04_1_main.c index ed354eb01b..aea70c5069 100644 --- a/src/world/area_trd/trd_04/trd_04_1_main.c +++ b/src/world/area_trd/trd_04/trd_04_1_main.c @@ -12,22 +12,22 @@ extern NpcGroupList N(NpcGroupAfter); #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" -EvtScript N(EVS_ExitDoors_trd_03_1) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_0, - COLLIDER_ttw2, MODEL_o6, MODEL_o7, "trd_03", trd_03_ENTRY_1); +EvtScript N(EVS_ExitDoors_trd_03_1) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_0, "trd_03", trd_03_ENTRY_1, + COLLIDER_ttw2, MODEL_o6, MODEL_o7); -EvtScript N(EVS_ExitDoors_trd_05_0) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_1, - COLLIDER_tte2, MODEL_o9, MODEL_o8, "trd_05", trd_05_ENTRY_0); +EvtScript N(EVS_ExitDoors_trd_05_0) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_1, "trd_05", trd_05_ENTRY_0, + COLLIDER_tte2, MODEL_o9, MODEL_o8); -EvtScript N(EVS_ExitDoors_trd_03_3) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_2, - COLLIDER_ttw3, MODEL_o13, MODEL_o12, "trd_03", trd_03_ENTRY_3); +EvtScript N(EVS_ExitDoors_trd_03_3) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_2, "trd_03", trd_03_ENTRY_3, + COLLIDER_ttw3, MODEL_o13, MODEL_o12); -EvtScript N(EVS_ExitDoors_trd_05_3) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_3, - COLLIDER_tte3, MODEL_o10, MODEL_o11, "trd_05", trd_05_ENTRY_3); +EvtScript N(EVS_ExitDoors_trd_05_3) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_3, "trd_05", trd_05_ENTRY_3, + COLLIDER_tte3, MODEL_o10, MODEL_o11); EvtScript N(EVS_ExitWalk_trd_07_0) = EVT_EXIT_WALK(60, trd_04_ENTRY_4, "trd_07", trd_07_ENTRY_0); -EvtScript N(EVS_ExitDoors_trd_06_1) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_5, - COLLIDER_tte, MODEL_o29, MODEL_o28, "trd_06", trd_06_ENTRY_1); +EvtScript N(EVS_ExitDoors_trd_06_1) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_5, "trd_06", trd_06_ENTRY_1, + COLLIDER_tte, MODEL_o29, MODEL_o28); s32 N(KeyList)[] = { ITEM_KOOPA_FORTRESS_KEY, @@ -245,7 +245,7 @@ EvtScript N(EVS_Main) = { EVT_END_IF EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) - EVT_SET(AF_TRD_04, FALSE) + EVT_SET(AF_TRD04_LowerStairs, FALSE) EVT_CALL(ParentColliderToModel, COLLIDER_o86, MODEL_k_dan) EVT_CALL(ParentColliderToModel, COLLIDER_o87, MODEL_k_dan) EVT_IF_LT(GB_StoryProgress, STORY_CH1_LOWERED_FIRST_STAIRS) @@ -254,7 +254,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(TranslateModel, MODEL_k_kusari, 0, 187, 0) EVT_CALL(UpdateColliderTransform, COLLIDER_o86) EVT_CALL(UpdateColliderTransform, COLLIDER_o87) - EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Scene_LowerStairs)), TRIGGER_AREA_FLAG_SET, AF_TRD_04, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Scene_LowerStairs)), TRIGGER_AREA_FLAG_SET, AF_TRD04_LowerStairs, 1, 0) EVT_END_IF EVT_EXEC(N(EVS_TexPan_Water)) EVT_CALL(ModifyColliderFlags, 0, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) diff --git a/src/world/area_trd/trd_04/trd_04_2_entity.c b/src/world/area_trd/trd_04/trd_04_2_entity.c index 5ec70e4526..37eb19da34 100644 --- a/src/world/area_trd/trd_04/trd_04_2_entity.c +++ b/src/world/area_trd/trd_04/trd_04_2_entity.c @@ -149,7 +149,7 @@ EvtScript N(EVS_MakeEntities) = { EVT_END_IF EVT_IF_LE(GB_StoryProgress, STORY_CH1_DEFEATED_BASEMENT_GUARD) EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), NPC_DISPOSE_LOCATION, 0, MAKE_ENTITY_END) - EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_TRD_04)) + EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_TRD04_LowerStairs)) EVT_SET(MV_Unk_02, LVar0) EVT_IF_EQ(GB_StoryProgress, STORY_CH1_DEFEATED_BASEMENT_GUARD) EVT_CALL(N(SetEntityPosition), MV_Unk_02, -180, 0, -35) diff --git a/src/world/area_trd/trd_05/9AE700.c b/src/world/area_trd/trd_05/9AE700.c deleted file mode 100644 index e795e28d8e..0000000000 --- a/src/world/area_trd/trd_05/9AE700.c +++ /dev/null @@ -1,141 +0,0 @@ -#include "trd_05.h" -#include "sprite.h" - -static char* N(exit_str_0) = "trd_04"; -static char* N(exit_str_1) = "trd_00"; - -typedef struct UnkTrdStruct { - /* 0x00 */ s32 foldStateID; - /* 0x04 */ s32 entityID; - /* 0x08 */ s32 playerSpriteID; - /* 0x0C */ s32 rasterID; - /* 0x10 */ Vec3f pos; - /* 0x1C */ Vec3f rot; - /* 0x28 */ Vec3f scale; -} UnkTrdStruct; // size = 0x34 - -BSS UnkTrdStruct N(D_80243090); - -ApiStatus func_80240000_9AE700(Evt* script, s32 isInitialCall) { - func_80035DF0(5); - return ApiStatus_DONE2; -} - -void func_80240020_9AE720(void) { - FoldImageRecPart recPart; - SpriteRasterInfo sp30; - Matrix4f sp40; - Matrix4f sp80; - UnkTrdStruct* unkTrd = &N(D_80243090); - s32 frameMod4; - - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | - G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); - gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - - guTranslateF(sp40, unkTrd->pos.x, unkTrd->pos.y, unkTrd->pos.z); - guRotateF(sp80, unkTrd->rot.x, 1.0f, 0.0f, 0.0f); - guMtxCatF(sp80, sp40, sp40); - guRotateF(sp80, unkTrd->rot.y, 0.0f, 1.0f, 0.0f); - guMtxCatF(sp80, sp40, sp40); - guRotateF(sp80, unkTrd->rot.z, 0.0f, 0.0f, 1.0f); - guMtxCatF(sp80, sp40, sp40); - guScaleF(sp80, unkTrd->scale.x, unkTrd->scale.y, unkTrd->scale.z); - guMtxCatF(sp80, sp40, sp40); - guMtxF2L(sp40, &gDisplayContext->matrixStack[gMatrixListPos]); - - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), - G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - unkTrd->playerSpriteID = 8; - - frameMod4 = gGameStatusPtr->frameCounter % 4; - if (frameMod4 == 0) { - unkTrd->rasterID = 0x25; - } else if (frameMod4 >= 2U) { - if (frameMod4 >= 3U) { - unkTrd->rasterID = 0x24; - } else { - unkTrd->rasterID = 0x27; - } - } else { - unkTrd->rasterID = 0x26; - } - - spr_get_player_raster_info(&sp30, unkTrd->playerSpriteID, unkTrd->rasterID); - recPart.raster = sp30.raster; - recPart.palette = sp30.defaultPal; - recPart.width = sp30.width; - recPart.height = sp30.height; - recPart.xOffset = -(sp30.width / 2); - recPart.yOffset = (sp30.height / 2); - recPart.opacity = 255; - fold_appendGfx_component(unkTrd->foldStateID, &recPart, 0, sp40); - - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); -} - -ApiStatus func_80240404_9AEB04(Evt* script, s32 isInitialCall) { - N(D_80243090).pos.x = gPlayerStatus.position.x; - N(D_80243090).pos.y = gPlayerStatus.position.y + (gPlayerStatus.colliderHeight * SPRITE_WORLD_SCALE_D * 0.5); - N(D_80243090).pos.z = gPlayerStatus.position.z; - N(D_80243090).rot.x = 0.0f; - N(D_80243090).rot.y = 0.0f; - N(D_80243090).rot.z = 0.0f; - N(D_80243090).scale.x = SPRITE_WORLD_SCALE_F; - N(D_80243090).scale.y = SPRITE_WORLD_SCALE_F; - N(D_80243090).scale.z = SPRITE_WORLD_SCALE_F; - N(D_80243090).foldStateID = func_8013A704(1); - N(D_80243090).entityID = create_generic_entity_world(0, func_80240020_9AE720); - return ApiStatus_DONE2; -} - -ApiStatus func_802404D0_9AEBD0(Evt* script, s32 isInitialCall) { - func_8013A854(N(D_80243090).foldStateID); - free_generic_entity(N(D_80243090).entityID); - return ApiStatus_DONE2; -} - -ApiStatus func_80240508_9AEC08(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 x = evt_get_float_variable(script, *args++); - s32 y = evt_get_float_variable(script, *args++); - s32 z = evt_get_float_variable(script, *args++); - - N(D_80243090).pos.x = x; - N(D_80243090).pos.y = y + (gPlayerStatus.colliderHeight * SPRITE_WORLD_SCALE_D * 0.5); - N(D_80243090).pos.z = z; - return ApiStatus_DONE2; -} - -static const char* N(exit_str_2) = "trd_06"; - -ApiStatus func_802405FC_9AECFC(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 add = evt_get_variable(script, *args++); - s32 x = evt_get_float_variable(script, *args++); - s32 y = evt_get_float_variable(script, *args++); - s32 z = evt_get_float_variable(script, *args++); - UnkTrdStruct* unkTrd = &N(D_80243090); - - if (!add) { - unkTrd->rot.x = x; - unkTrd->rot.y = y; - unkTrd->rot.z = z; - } else { - unkTrd->rot.x += x; - unkTrd->rot.y += y; - unkTrd->rot.z += z; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_trd/trd_05/9AEE20.c b/src/world/area_trd/trd_05/9AEE20.c deleted file mode 100644 index a076975a43..0000000000 --- a/src/world/area_trd/trd_05/9AEE20.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "trd_05.h" -#include "effects.h" - -ApiStatus func_80240720_9AEE20(Evt* script, s32 isInitialCall) { - fx_walking_dust(2, script->varTable[0], script->varTable[1], script->varTable[2], 0, 0); - return ApiStatus_DONE2; -} diff --git a/src/world/area_trd/trd_05/trd_05.h b/src/world/area_trd/trd_05/trd_05.h index 5f58eb632f..5896ea6e3e 100644 --- a/src/world/area_trd/trd_05/trd_05.h +++ b/src/world/area_trd/trd_05/trd_05.h @@ -2,8 +2,18 @@ /// @brief Koopa Bros Fortress - Right Tower #include "common.h" -#include "../trd.h" #include "message_ids.h" #include "map.h" +#include "../trd.h" +#include "mapfs/trd_05_shape.h" +#include "mapfs/trd_05_hit.h" + +#include "sprite/npc/KoopaBros.h" + +enum { + NPC_KoopaBros_01 = 0, + NPC_KoopaBros_02 = 1, +}; + #define NAMESPACE trd_05 diff --git a/src/world/area_trd/trd_05/trd_05_0_header.c b/src/world/area_trd/trd_05/trd_05_0_header.c new file mode 100644 index 0000000000..a85a34150d --- /dev/null +++ b/src/world/area_trd/trd_05/trd_05_0_header.c @@ -0,0 +1,38 @@ +#include "trd_05.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [trd_05_ENTRY_0] { -310.0, 0.0, 0.0, 90.0 }, + [trd_05_ENTRY_1] { 0.0, 0.0, 310.0, 0.0 }, + [trd_05_ENTRY_2] { 290.0, 0.0, 30.0, 270.0 }, + [trd_05_ENTRY_3] { -310.0, 240.0, 0.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_trd_05 }, +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_FORTRESS, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_StartKoopaBrosTheme) = { + EVT_CALL(FadeInMusic, 1, SONG_KOOPA_BROS_INTERLUDE, 0, 3000, 0, 127) + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EndKoopaBrosTheme) = { + EVT_CALL(FadeInMusic, 0, SONG_KOOPA_FORTRESS, 0, 3000, 0, 127) + EVT_CALL(FadeOutMusic, 1, 3000) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_05/trd_05_1_main.c b/src/world/area_trd/trd_05/trd_05_1_main.c new file mode 100644 index 0000000000..20d5a3e2b8 --- /dev/null +++ b/src/world/area_trd/trd_05/trd_05_1_main.c @@ -0,0 +1,126 @@ +#include "trd_05.h" +#include "effects.h" + +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_KoopaBros_SetTrap); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); + +API_CALLABLE(N(SetMapChangeFadeRate)) { + set_map_change_fade_rate(5); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ExitDoors_trd_04_1) = EVT_EXIT_DOUBLE_DOOR(trd_05_ENTRY_0, "trd_04", trd_04_ENTRY_1, COLLIDER_ttw, MODEL_doa2, MODEL_doa1); +EvtScript N(EVS_ExitDoors_trd_00_2) = EVT_EXIT_DOUBLE_DOOR(trd_05_ENTRY_1, "trd_00", trd_00_ENTRY_2, COLLIDER_ttse, MODEL_doa4, MODEL_doa6); +EvtScript N(EVS_ExitWalk_trd_00_3) = EVT_EXIT_WALK(60, trd_05_ENTRY_2, "trd_00", trd_00_ENTRY_3); +EvtScript N(EVS_ExitDoors_trd_04_3) = EVT_EXIT_DOUBLE_DOOR(trd_05_ENTRY_3, "trd_04", trd_04_ENTRY_3, COLLIDER_ttw2, MODEL_doa7, MODEL_doa8); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_04_1)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_trd_00_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_00_2)), TRIGGER_WALL_PRESS_A, COLLIDER_ttse, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_04_3)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(EVT_GROUP_01) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(trd_05_ENTRY_0) + EVT_SET(LVar2, MODEL_doa2) + EVT_SET(LVar3, MODEL_doa1) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_05_ENTRY_1) + EVT_SET(LVar2, MODEL_doa4) + EVT_SET(LVar3, MODEL_doa6) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_05_ENTRY_2) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(trd_05_ENTRY_3) + EVT_SET(LVar2, MODEL_doa7) + EVT_SET(LVar3, MODEL_doa8) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RESUME_GROUP(EVT_GROUP_01) + EVT_RETURN + EVT_END +}; + +BombTrigger N(BombPos_Wall) = { + .pos = { 300.0f, 0.0f, 0.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_BombWall) = { + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 29, 0, 1, 10, 30) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(EVT_GROUP_01) + EVT_CALL(SetGroupEnabled, MODEL_ana2, 1) + EVT_LOOP(10) + EVT_CALL(SetGroupEnabled, MODEL_ana3, 1) + EVT_WAIT(1) + EVT_CALL(SetGroupEnabled, MODEL_ana3, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_TRD05_BombedWall, TRUE) + EVT_RESUME_GROUP(EVT_GROUP_01) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Water) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTexPanner, MODEL_suimen, 1) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_LABEL(10) + EVT_CALL(SetTexPanOffset, 1, 0, LVar0, 0) + EVT_CALL(SetTexPanOffset, 1, 1, LVar1, 0) + EVT_ADD(LVar0, 100) + EVT_SUB(LVar1, 100) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_KOOPA_BROS_FORTRESS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_IF_EQ(GF_TRD05_BombedWall, FALSE) + EVT_CALL(SetGroupEnabled, MODEL_ana2, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BombWall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Wall)), 1, 0) + EVT_ELSE + EVT_CALL(SetGroupEnabled, MODEL_ana3, 0) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_TexPan_Water)) + EVT_CALL(EnableModel, MODEL_o95, FALSE) + EVT_CALL(EnableModel, MODEL_o96, FALSE) + EVT_CALL(SetGroupEnabled, MODEL_kesu, 0) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_o103, COLLIDER_FLAGS_UPPER_MASK) + EVT_IF_LT(GB_StoryProgress, STORY_CH1_KOOPA_BROS_SET_TRAP) + EVT_WAIT(10) + EVT_CALL(N(SetMapChangeFadeRate)) + EVT_EXEC(N(EVS_KoopaBros_SetTrap)) + EVT_ELSE + EVT_EXEC(N(EVS_EnterMap)) + EVT_END_IF + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_05/trd_05_2_entity.c b/src/world/area_trd/trd_05/trd_05_2_entity.c new file mode 100644 index 0000000000..0e2846f54f --- /dev/null +++ b/src/world/area_trd/trd_05/trd_05_2_entity.c @@ -0,0 +1,13 @@ +#include "trd_05.h" +#include "entity.h" + +extern EvtScript N(EVS_OnHitTrapTrigger); + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH1_MARIO_ACTIVATED_TRAP) + EVT_CALL(MakeEntity, EVT_PTR(Entity_TriggerBlock), -70, 300, -15, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnHitTrapTrigger))) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_05/trd_05_3_trap.c b/src/world/area_trd/trd_05/trd_05_3_trap.c new file mode 100644 index 0000000000..180658eaf3 --- /dev/null +++ b/src/world/area_trd/trd_05/trd_05_3_trap.c @@ -0,0 +1,369 @@ +#include "trd_05.h" +#include "sprite.h" + +typedef struct FallingSprite { + /* 0x00 */ s32 foldStateID; + /* 0x04 */ s32 workerID; + /* 0x08 */ s32 playerSpriteID; + /* 0x0C */ s32 rasterID; + /* 0x10 */ Vec3f pos; + /* 0x1C */ Vec3f rot; + /* 0x28 */ Vec3f scale; +} FallingSprite; // size = 0x34 + +BSS FallingSprite N(Falling); + +void N(appendGfx_FallingSprite)(void) { + FallingSprite* falling = &N(Falling); + FoldImageRecPart recPart; + SpriteRasterInfo info; + Matrix4f transformMtx; + Matrix4f tempMtx; + u32 animFrame; + + gDPPipeSync(gMasterGfxPos++); + gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); + gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | + G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); + gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); + gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); + gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); + gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); + gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); + gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); + + guTranslateF(transformMtx, falling->pos.x, falling->pos.y, falling->pos.z); + guRotateF(tempMtx, falling->rot.x, 1.0f, 0.0f, 0.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guRotateF(tempMtx, falling->rot.y, 0.0f, 1.0f, 0.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guRotateF(tempMtx, falling->rot.z, 0.0f, 0.0f, 1.0f); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guScaleF(tempMtx, falling->scale.x, falling->scale.y, falling->scale.z); + guMtxCatF(tempMtx, transformMtx, transformMtx); + guMtxF2L(transformMtx, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + //TODO use SPR_RASTER_Mario8_XYZ here once they are defined + falling->playerSpriteID = SPR_Mario_8; + animFrame = gGameStatusPtr->frameCounter % 4; + if (animFrame == 0) { + falling->rasterID = 37; + } else if (animFrame <= 1) { + falling->rasterID = 38; + } else if (animFrame <= 2) { + falling->rasterID = 39; + } else { + falling->rasterID = 36; + } + + spr_get_player_raster_info(&info, falling->playerSpriteID, falling->rasterID); + recPart.raster = info.raster; + recPart.palette = info.defaultPal; + recPart.width = info.width; + recPart.height = info.height; + recPart.xOffset = -(info.width / 2); + recPart.yOffset = (info.height / 2); + recPart.opacity = 255; + fold_appendGfx_component(falling->foldStateID, &recPart, 0, transformMtx); + + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +API_CALLABLE(N(InitializeFallingSprite)) { + FallingSprite* falling = &N(Falling); + falling->pos.x = gPlayerStatus.position.x; + falling->pos.y = gPlayerStatus.position.y + (gPlayerStatus.colliderHeight * SPRITE_WORLD_SCALE_D * 0.5); + falling->pos.z = gPlayerStatus.position.z; + falling->rot.x = 0.0f; + falling->rot.y = 0.0f; + falling->rot.z = 0.0f; + falling->scale.x = SPRITE_WORLD_SCALE_F; + falling->scale.y = SPRITE_WORLD_SCALE_F; + falling->scale.z = SPRITE_WORLD_SCALE_F; + falling->foldStateID = func_8013A704(1); + falling->workerID = create_generic_entity_world(0, &N(appendGfx_FallingSprite)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DeleteFallingSprite)) { + func_8013A854(N(Falling).foldStateID); + free_generic_entity(N(Falling).workerID); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetFallingSpritePos)) { + Bytecode* args = script->ptrReadPos; + s32 x = evt_get_float_variable(script, *args++); + s32 y = evt_get_float_variable(script, *args++); + s32 z = evt_get_float_variable(script, *args++); + FallingSprite* falling = &N(Falling); + + falling->pos.x = x; + falling->pos.y = y + (gPlayerStatus.colliderHeight * SPRITE_WORLD_SCALE_D * 0.5); + falling->pos.z = z; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetFallingSpriteRot)) { + Bytecode* args = script->ptrReadPos; + s32 add = evt_get_variable(script, *args++); + s32 x = evt_get_float_variable(script, *args++); + s32 y = evt_get_float_variable(script, *args++); + s32 z = evt_get_float_variable(script, *args++); + FallingSprite* falling = &N(Falling); + + if (!add) { + falling->rot.x = x; + falling->rot.y = y; + falling->rot.z = z; + } else { + falling->rot.x += x; + falling->rot.y += y; + falling->rot.z += z; + } + return ApiStatus_DONE2; +} + +Vec3f N(FallPath)[] = { + { 0.0, 0.0, 0.0 }, + { 20.0, -150.0, 0.0 }, + { 50.0, -170.0, 0.0 }, + { 80.0, -160.0, 0.0 }, +}; + +Vec3f N(UnusedPath)[] = { + { 0.0, 0.0, 0.0 }, + { 25.0, -80.0, 0.0 }, + { 50.0, -100.0, 0.0 }, + { 70.0, -100.0, 0.0 }, +}; + +EvtScript N(EVS_PlayerFalling) = { + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(PlaySound, SOUND_175) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, 0, 150, 45, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetFallingSpriteRot), 0, EVT_FLOAT(0.0), EVT_FLOAT(0.0), LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar4, LVar5, LVar6) + EVT_CALL(SetPlayerPos, NPC_DISPOSE_LOCATION) + EVT_CALL(LoadPath, 45, EVT_PTR(N(FallPath)), ARRAY_COUNT(N(FallPath)), EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(GetNextPathPos) + EVT_ADDF(LVar1, LVar4) + EVT_ADDF(LVar2, LVar5) + EVT_ADDF(LVar3, LVar6) + EVT_CALL(N(SetFallingSpritePos), LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_SETF(LVar4, LVar1) + EVT_SETF(LVar5, LVar2) + EVT_SETF(LVar6, LVar3) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(PlaySound, SOUND_175) + EVT_END_THREAD + EVT_CALL(MakeLerp, 0, 100, 30, EASING_QUADRATIC_IN) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar7, EVT_FLOAT(-1.0)) + EVT_SETF(LVar8, EVT_FLOAT(-1.7315)) + EVT_SETF(LVar9, EVT_FLOAT(0.0)) + EVT_MULF(LVar7, LVar0) + EVT_MULF(LVar8, LVar0) + EVT_MULF(LVar9, LVar0) + EVT_ADDF(LVar7, LVar4) + EVT_ADDF(LVar8, LVar5) + EVT_ADDF(LVar9, LVar6) + EVT_CALL(N(SetFallingSpritePos), LVar7, LVar8, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(SetPlayerPos, LVar7, LVar8, LVar9) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PartnerFalling) = { + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(PlaySound, SOUND_176) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, 0, -135, 45, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_PARTNER, EVT_FLOAT(0.0), EVT_FLOAT(0.0), LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(1) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar4, LVar5, LVar6) + EVT_CALL(LoadPath, 45, EVT_PTR(N(FallPath)), 4, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(GetNextPathPos) + EVT_MULF(LVar1, EVT_FLOAT(-1.0)) + EVT_ADDF(LVar1, LVar4) + EVT_ADDF(LVar2, LVar5) + EVT_ADDF(LVar3, LVar6) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(PlaySound, SOUND_176) + EVT_END_THREAD + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar4, LVar5, LVar6) + EVT_CALL(MakeLerp, 0, 100, 30, EASING_QUADRATIC_IN) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar7, EVT_FLOAT(1.0)) + EVT_SETF(LVar8, EVT_FLOAT(-2.0)) + EVT_SETF(LVar9, EVT_FLOAT(0.0)) + EVT_MULF(LVar7, LVar0) + EVT_MULF(LVar8, LVar0) + EVT_MULF(LVar9, LVar0) + EVT_ADDF(LVar7, LVar4) + EVT_ADDF(LVar8, LVar5) + EVT_ADDF(LVar9, LVar6) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar7, LVar8, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar7, LVar8, LVar9) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnHitTrapTrigger) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_LABEL(10) + EVT_CALL(GetPlayerActionState, LVar0) + EVT_WAIT(1) + EVT_IF_NE(LVar0, ACTION_STATE_IDLE) + EVT_GOTO(10) + EVT_END_IF + EVT_LOOP(0) + EVT_CALL(GetCurrentPartner, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(10) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -10) + EVT_ADD(LVar2, -5) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_END_THREAD + EVT_WAIT(10) + EVT_CALL(EnableModel, MODEL_o101, FALSE) + EVT_CALL(EnableModel, MODEL_o95, TRUE) + EVT_CALL(EnableModel, MODEL_o96, TRUE) + EVT_CALL(SetGroupEnabled, MODEL_kesu, 1) + EVT_CALL(PlaySound, SOUND_2091) + EVT_CALL(MakeLerp, 0, 90, 30, EASING_COS_SLOW_OVERSHOOT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o95, LVar0, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o96, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(InterpPlayerYaw, 270, 1) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 90, 1) + EVT_WAIT(15) + EVT_CALL(InterpPlayerYaw, 270, 1) + EVT_WAIT(3) + EVT_CALL(InterpPlayerYaw, 90, 1) + EVT_WAIT(3) + EVT_CALL(InterpPlayerYaw, 270, 1) + EVT_WAIT(3) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80017) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_9) + EVT_WAIT(15) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_WAIT(5) + EVT_THREAD + EVT_CALL(N(InitializeFallingSprite)) + EVT_EXEC_WAIT(N(EVS_PlayerFalling)) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_PartnerFalling)) + EVT_END_THREAD + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_o82, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar2, LVar3, LVar4) + EVT_SET(LVar5, LVar3) + EVT_SUB(LVar5, 200) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar2, LVar5, LVar4) + EVT_CALL(PanToTarget, CAM_DEFAULT, EVT_FLOAT(0.5), 1) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_IF_LT(GB_StoryProgress, STORY_CH1_MARIO_ACTIVATED_TRAP) + EVT_WAIT(60) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(N(DeleteFallingSprite)) + EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -250, 240, -25) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim02) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -150, -25, 0) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim1A) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_WAIT(5) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim14, ANIM_KoopaBros_Yellow_Anim04, 5, MSG_CH1_00D7) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(2.5)) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim02) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -200, -25, 0) + EVT_END_THREAD + EVT_WAIT(20) + EVT_SET(GB_StoryProgress, STORY_CH1_MARIO_ACTIVATED_TRAP) + EVT_ELSE + EVT_WAIT(20) + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("trd_06"), trd_06_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_05/trd_05_4_npc.c b/src/world/area_trd/trd_05/trd_05_4_npc.c new file mode 100644 index 0000000000..0c14ad3a10 --- /dev/null +++ b/src/world/area_trd/trd_05/trd_05_4_npc.c @@ -0,0 +1,272 @@ +#include "trd_05.h" +#include "effects.h" + +extern EvtScript N(EVS_StartKoopaBrosTheme); +extern EvtScript N(EVS_EndKoopaBrosTheme); +extern EvtScript N(EVS_EnterMap); + +API_CALLABLE(N(MakeHammerDust)) { + fx_walking_dust(2, script->varTable[0], script->varTable[1], script->varTable[2], 0, 0); + return ApiStatus_DONE2; +} + +NpcSettings N(NpcSettings_KoopaBros) = { + .height = 34, + .radius = 24, + .level = 99, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +EvtScript N(EVS_KoopaBros_SetTrap) = { + EVT_EXEC(N(EVS_StartKoopaBrosTheme)) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetPlayerPos, -350, 0, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, -350, 0, 0) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -70, 240, -10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -70, 240, -10) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_THREAD + EVT_LOOP(8) + EVT_CALL(func_802CFD30, 0, 7, 0, 0, 0, 0) + EVT_CALL(func_802CFD30, 1, 7, 255, 0, 0, 0) + EVT_WAIT(6) + EVT_CALL(func_802CFD30, 0, 7, 255, 0, 0, 0) + EVT_CALL(func_802CFD30, 1, 7, 0, 0, 0, 0) + EVT_WAIT(6) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(8) + EVT_WAIT(5) + EVT_CALL(GetNpcPos, NPC_KoopaBros_02, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 8) + EVT_CALL(N(MakeHammerDust)) + EVT_WAIT(5) + EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 8) + EVT_CALL(N(MakeHammerDust)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(PlaySound, SOUND_29) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) + EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -100, 240, 30) + EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 90) + EVT_WAIT(15) + EVT_CALL(PlaySound, SOUND_2A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) + EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -35, 240, -75) + EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 270) + EVT_WAIT(15) + EVT_CALL(PlaySound, SOUND_29) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) + EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -40, 240, 10) + EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 270) + EVT_WAIT(15) + EVT_CALL(PlaySound, SOUND_2A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) + EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -110, 240, -20) + EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 90) + EVT_WAIT(15) + EVT_CALL(PlaySound, SOUND_29) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) + EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -90, 240, 30) + EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 90) + EVT_WAIT(15) + EVT_CALL(PlaySound, SOUND_2A) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Yellow_Anim1D) + EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -30, 240, -50) + EVT_CALL(SetNpcYaw, NPC_KoopaBros_02, 270) + EVT_WAIT(15) + EVT_CALL(SetNpcPos, NPC_KoopaBros_02, 0, -500, 0) + EVT_END_THREAD + EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -45, 240, -30) + EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 270) + EVT_WAIT(1) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(1.6)) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, -45, 240, -30, 6) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, -45, 240, -30, 6) + EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -120, 240, 20) + EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 90) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim1B) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -110, 240, -70) + EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 90) + EVT_WAIT(1) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(1.6)) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, -110, 240, -70, 6) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, -110, 240, -70, 6) + EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -35, 240, -51) + EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 270) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim1B) + EVT_WAIT(14) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -45, 240, -25) + EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 270) + EVT_WAIT(1) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(1.6)) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, -45, 240, -25, 6) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, -45, 240, -25, 6) + EVT_WAIT(1) + EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -120, 240, 20) + EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 90) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim1B) + EVT_WAIT(20) + EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -120, 240, 20) + EVT_CALL(SetNpcYaw, NPC_KoopaBros_01, 90) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim1A) + EVT_WAIT(26) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim02) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -25, -15, 0) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 270, 4) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim05) + EVT_WAIT(25) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim02) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -122, -15, 0) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_WAIT(3) + EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 90, 5) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim14, ANIM_KoopaBros_Yellow_Anim04, 5, MSG_CH1_00D5) + EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_KoopaBros_01, EMOTE_EXCLAMATION, 0, 25, 2, LVar0, LVar1, LVar2, 40) + EVT_WAIT(25) + EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 270, 2) + EVT_WAIT(7) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim05) + EVT_WAIT(25) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim04) + EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(3.0)) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, LVar0, LVar1, LVar2, 5) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim14, ANIM_KoopaBros_Yellow_Anim04, 0, MSG_CH1_00D6) + EVT_CALL(PlaySound, SOUND_173) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim03) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(0.8)) + EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_KoopaBros_01, LVar0, LVar1, LVar2, 8) + EVT_WAIT(8) + EVT_CALL(PlaySound, SOUND_174) + EVT_CALL(SetNpcSpeed, NPC_KoopaBros_01, EVT_FLOAT(8.0)) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -400, -10, 0) + EVT_EXEC(N(EVS_EndKoopaBrosTheme)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -270, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -270, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcPos, NPC_KoopaBros_01, NPC_DISPOSE_LOCATION) + EVT_CALL(PlaySound, SOUND_METAL_DOOR_OPEN) + EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_doa2, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_doa1, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(SetPlayerPos, -310, 0, 0) + EVT_EXEC_WAIT(N(EVS_EnterMap)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_SET(GB_StoryProgress, STORY_CH1_KOOPA_BROS_SET_TRAP) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_KoopaBros) = { + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_IF_GE(GB_StoryProgress, STORY_CH1_MARIO_ACTIVATED_TRAP) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_KoopaBros)[] = { + { + .id = NPC_KoopaBros_01, + .settings = &N(NpcSettings_KoopaBros), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_KoopaBros), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_KoopaBros_Yellow_Anim04, + .walk = ANIM_KoopaBros_Yellow_Anim02, + .run = ANIM_KoopaBros_Yellow_Anim03, + .chase = ANIM_KoopaBros_Yellow_Anim03, + .anim_4 = ANIM_KoopaBros_Yellow_Anim04, + .anim_5 = ANIM_KoopaBros_Yellow_Anim04, + .death = ANIM_KoopaBros_Yellow_Anim0A, + .hit = ANIM_KoopaBros_Yellow_Anim0A, + .anim_8 = ANIM_KoopaBros_Yellow_Anim03, + .anim_9 = ANIM_KoopaBros_Yellow_Anim03, + .anim_A = ANIM_KoopaBros_Yellow_Anim03, + .anim_B = ANIM_KoopaBros_Yellow_Anim03, + .anim_C = ANIM_KoopaBros_Yellow_Anim03, + .anim_D = ANIM_KoopaBros_Yellow_Anim03, + .anim_E = ANIM_KoopaBros_Yellow_Anim03, + .anim_F = ANIM_KoopaBros_Yellow_Anim03, + }, + }, + { + .id = NPC_KoopaBros_02, + .settings = &N(NpcSettings_KoopaBros), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_KoopaBros), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_KoopaBros_Yellow_Anim04, + .walk = ANIM_KoopaBros_Yellow_Anim02, + .run = ANIM_KoopaBros_Yellow_Anim03, + .chase = ANIM_KoopaBros_Yellow_Anim03, + .anim_4 = ANIM_KoopaBros_Yellow_Anim04, + .anim_5 = ANIM_KoopaBros_Yellow_Anim04, + .death = ANIM_KoopaBros_Yellow_Anim0A, + .hit = ANIM_KoopaBros_Yellow_Anim0A, + .anim_8 = ANIM_KoopaBros_Yellow_Anim03, + .anim_9 = ANIM_KoopaBros_Yellow_Anim03, + .anim_A = ANIM_KoopaBros_Yellow_Anim03, + .anim_B = ANIM_KoopaBros_Yellow_Anim03, + .anim_C = ANIM_KoopaBros_Yellow_Anim03, + .anim_D = ANIM_KoopaBros_Yellow_Anim03, + .anim_E = ANIM_KoopaBros_Yellow_Anim03, + .anim_F = ANIM_KoopaBros_Yellow_Anim03, + }, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_KoopaBros)), + {} +}; diff --git a/src/world/area_trd/trd_06/9B1790.c b/src/world/area_trd/trd_06/9B1790.c deleted file mode 100644 index b01bf7aa0f..0000000000 --- a/src/world/area_trd/trd_06/9B1790.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "trd_06.h" - -static char* N(exit_str_0) = "trd_04"; -static char* N(exit_str_1) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_trd/trd_06/9B1AA0.c b/src/world/area_trd/trd_06/9B1AA0.c deleted file mode 100644 index 86deb931f1..0000000000 --- a/src/world/area_trd/trd_06/9B1AA0.c +++ /dev/null @@ -1,103 +0,0 @@ -#include "trd_06.h" -#include "sprite.h" - -typedef struct Struct_trd_06_802451F0 { - /* 0x00 */ s32 unk_00; - /* 0x04 */ s32 unk_04; - /* 0x08 */ s32 unk_08; - /* 0x0C */ s32 unk_0C; - /* 0x10 */ s32 unk_10; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 unk_18; - /* 0x1C */ f32 unk_1C; - /* 0x20 */ f32 unk_20; - /* 0x24 */ f32 unk_24; - /* 0x28 */ f32 unk_28; - /* 0x2C */ f32 unk_2C; - /* 0x30 */ f32 unk_30; - /* 0x34 */ f32 unk_34; - /* 0x38 */ f32 unk_38; - /* 0x3C */ f32 unk_3C; -} Struct_trd_06_802451F0; // size unknown - -// BSS -extern Struct_trd_06_802451F0 trd_06_802451F0; - -void func_80240310_9B1AA0(void) { - FoldImageRecPart foldImage; - SpriteRasterInfo rasterInfo; - Matrix4f mtx1; - Matrix4f mtx2; - Struct_trd_06_802451F0* unkStruct = &trd_06_802451F0; - - gDPPipeSync(gMasterGfxPos++); - gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); - gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); - gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); - gSPTexture(gMasterGfxPos++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); - gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); - gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); - gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); - gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); - gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); - gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); - gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); - gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); - guTranslateF(mtx1, unkStruct->unk_14, unkStruct->unk_18, unkStruct->unk_1C); - guRotateF(mtx2, unkStruct->unk_24, 0.0f, 1.0f, 0.0f); - guMtxCatF(mtx2, mtx1, mtx1); - guRotateF(mtx2, unkStruct->unk_28, 0.0f, 0.0f, 1.0f); - guMtxCatF(mtx2, mtx1, mtx1); - guRotateF(mtx2, unkStruct->unk_20, 1.0f, 0.0f, 0.0f); - guMtxCatF(mtx2, mtx1, mtx1); - guScaleF(mtx2, unkStruct->unk_2C, unkStruct->unk_30, unkStruct->unk_34); - guMtxCatF(mtx2, mtx1, mtx1); - guMtxF2L(mtx1, &gDisplayContext->matrixStack[gMatrixListPos]); - gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - if (unkStruct->unk_00 == 0) { - u32 v1; - unkStruct->unk_0C = 8; - v1 = gGameStatusPtr->frameCounter % 4; - if (v1 == 0) { - unkStruct->unk_10 = 37; - } else if (v1 <= 1) { - unkStruct->unk_10 = 38; - } else if (v1 <= 2) { - unkStruct->unk_10 = 39; - } else { - unkStruct->unk_10 = 36; - } - } - spr_get_player_raster_info(&rasterInfo, unkStruct->unk_0C, unkStruct->unk_10); - foldImage.raster = rasterInfo.raster; - foldImage.palette = rasterInfo.defaultPal; - unkStruct->unk_38 = foldImage.width = rasterInfo.width; - unkStruct->unk_3C = foldImage.height = rasterInfo.height; - foldImage.xOffset = -(rasterInfo.width / 2); - foldImage.yOffset = rasterInfo.height / 2; - foldImage.opacity = 255; - fold_appendGfx_component(unkStruct->unk_04, &foldImage, 0, mtx1); - gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); -} - -INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_80240724_9B1EB4); - -INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_8024081C_9B1FAC); - -INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_80240854_9B1FE4); - -INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_8024093C_9B20CC); - -ApiStatus func_80240A5C_9B21EC(void) { - trd_06_802451F0.unk_00 = 1; - return ApiStatus_DONE2; -} - -ApiStatus func_80240A70_9B2200(Evt* script, s32 isInitialCall) { - f32 partnerCollisionHeight = get_npc_unsafe(NPC_PARTNER)->collisionHeight; - - script->varTable[0] = ((partnerCollisionHeight * 2) / 3.0f) + 145.0f; - return ApiStatus_DONE2; -} - -INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_80240AD0_9B2260); diff --git a/src/world/area_trd/trd_06/9B2280.c b/src/world/area_trd/trd_06/9B2280.c deleted file mode 100644 index 354f47acaa..0000000000 --- a/src/world/area_trd/trd_06/9B2280.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "trd_06.h" - -#include "world/common/UnkFunc41.inc.c" diff --git a/src/world/area_trd/trd_06/9B2410.c b/src/world/area_trd/trd_06/9B2410.c deleted file mode 100644 index 34ec34fdad..0000000000 --- a/src/world/area_trd/trd_06/9B2410.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "trd_06.h" - -// TODO(data) -//#define PARTY_IMAGE "party_pinki" -//#include "world/common/LoadPartyImage.inc.c" -INCLUDE_ASM(s32, "world/area_trd/trd_06/9B2410", func_80240C80_9B2410); diff --git a/src/world/area_trd/trd_06/trd_06.h b/src/world/area_trd/trd_06/trd_06.h index f9b5edbf32..9ef501cead 100644 --- a/src/world/area_trd/trd_06/trd_06.h +++ b/src/world/area_trd/trd_06/trd_06.h @@ -2,8 +2,32 @@ /// @brief Koopa Bros Fortress - Jail #include "common.h" -#include "../trd.h" #include "message_ids.h" #include "map.h" +#include "../trd.h" +#include "mapfs/trd_06_shape.h" +#include "mapfs/trd_06_hit.h" + +#include "sprite/npc/WorldBombette.h" +#include "sprite/npc/KoopaTroopa.h" +#include "sprite/npc/Bobomb.h" +#include "sprite/npc/WorldBobomb.h" +#include "sprite/npc/KoopaBros.h" + +enum { + NPC_Bombette = 1, + NPC_Bobomb_01 = 2, + NPC_Bobomb_02 = 3, + NPC_Bobomb_03 = 4, + NPC_Bobomb_04 = 5, + NPC_Jailer_KoopaTroopa = 10, + NPC_Jailer_Bobomb_01 = 11, + NPC_Jailer_Bobomb_02 = 12, + NPC_KoopaBros_Black = 15, + NPC_KoopaBros_Red = 16, + NPC_KoopaBros_Yellow = 17, + NPC_KoopaBros_Green = 18, +}; + #define NAMESPACE trd_06 diff --git a/src/world/area_trd/trd_06/trd_06_0_header.c b/src/world/area_trd/trd_06/trd_06_0_header.c new file mode 100644 index 0000000000..1d5d22acd1 --- /dev/null +++ b/src/world/area_trd/trd_06/trd_06_0_header.c @@ -0,0 +1,43 @@ +#include "trd_06.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [trd_06_ENTRY_0] { 0.0, 0.0, 0.0, 0.0 }, + [trd_06_ENTRY_1] { -310.0, 0.0, 0.0, 90.0 }, + [trd_06_ENTRY_2] { 0.0, 0.0, 0.0, 0.0 }, + [trd_06_ENTRY_3] { 0.0, 0.0, 0.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_trd_06 }, +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_GE(trd_06_ENTRY_2) + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_FORTRESS, 0, 8) + EVT_END_SWITCH + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PushSong) = { + EVT_CALL(PushSong, 130, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PopSong) = { + EVT_CALL(FadeOutMusic, 0, 500) + EVT_WAIT(15) + EVT_CALL(PopSong) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_06/trd_06_1_main.c b/src/world/area_trd/trd_06/trd_06_1_main.c new file mode 100644 index 0000000000..717cd58bc0 --- /dev/null +++ b/src/world/area_trd/trd_06/trd_06_1_main.c @@ -0,0 +1,182 @@ +#include "trd_06.h" +#include "effects.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(NpcGroup_Prisoners); +extern NpcGroupList N(NpcGroup_KoopaBros); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_Scene_FallIntoCell); +extern EvtScript N(EVS_Scene_ImprisonedKoopaBros); + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitDoors_trd_04_5) = EVT_EXIT_DOUBLE_DOOR(trd_06_ENTRY_1, "trd_04", trd_04_ENTRY_5, + COLLIDER_ttw, MODEL_o93, MODEL_o94); + +MAP_RODATA_PAD(1,pad); //TODO remove + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(trd_06_ENTRY_0) + EVT_EXEC(N(EVS_Scene_FallIntoCell)) + EVT_CASE_EQ(trd_06_ENTRY_1) + EVT_SET(LVar2, MODEL_o93) + EVT_SET(LVar3, MODEL_o94) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_LE(trd_06_ENTRY_3) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetPlayerPos, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_4, TRUE) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) + EVT_EXEC(N(EVS_Scene_ImprisonedKoopaBros)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +BombTrigger N(BombPos_CellWall) = { + .pos = { 160.0f, 0.0f, 160.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_BombWall_Cell) = { + EVT_CALL(SetPlayerFlagBits, PS_FLAGS_40 | PS_FLAGS_80, TRUE) + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 19, 19, 1, 10, 30) + EVT_CALL(SetGroupEnabled, MODEL_ana, 1) + EVT_LOOP(10) + EVT_CALL(SetGroupEnabled, MODEL_ana2, 1) + EVT_WAIT(1) + EVT_CALL(SetGroupEnabled, MODEL_ana2, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilitse, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_ttse, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(WaitForPlayerInputEnabled) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(GF_TRD06_BombedWall, TRUE) + EVT_WAIT(60) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 110) + EVT_IF_LT(LVar2, 140) + EVT_WAIT(25) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_03, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_04, NPC_FLAG_100, TRUE) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, 110, 140, 0) + EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_01, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_02, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_03, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Bobomb_04, NPC_FLAG_100, FALSE) + EVT_END_IF + EVT_END_IF + EVT_END_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldBombette_Walk) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.5)) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 156, 156, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldBombette_Idle) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00E2) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00E3) + EVT_CALL(SetPlayerFlagBits, PS_FLAGS_40 | PS_FLAGS_80, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_THREAD + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_IF_LT(LVar2, 200) + EVT_GOTO(0) + EVT_END_IF + EVT_IF_GT(LVar0, -120) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetNpcVar, NPC_Jailer_KoopaTroopa, 0, 1) + EVT_END_THREAD + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Water) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTexPanner, MODEL_suimen, TEX_PANNER_1) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_LABEL(10) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_AUX, LVar1, 0) + EVT_ADD(LVar0, 100) + EVT_SUB(LVar1, 100) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_KOOPA_BROS_FORTRESS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH1_DEFEATED_KOOPA_BROS) + EVT_CALL(EnableModel, MODEL_o97, FALSE) + EVT_CALL(EnableModel, MODEL_o98, FALSE) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_o109, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_SWITCH + EVT_IF_GE(GB_StoryProgress, STORY_CH1_DEFEATED_DUNGEON_GUARDS) + EVT_SET(GF_TRD06_BombedWall, TRUE) + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH1_DEFEATED_KOOPA_BROS) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(NpcGroup_Prisoners))) + EVT_CALL(SetGroupEnabled, MODEL_g27, 0) + EVT_CASE_LT(STORY_CH1_DEFEATED_JR_TROOPA) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(NpcGroup_KoopaBros))) + EVT_END_SWITCH + EVT_WAIT(2) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_04_5)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) //@bug unterminated switch + EVT_IF_LE(LVar0, trd_06_ENTRY_1) + EVT_IF_EQ(GF_TRD06_BombedWall, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BombWall_Cell)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_CellWall)), 1, 0) + EVT_CALL(SetGroupEnabled, MODEL_ana, 0) + EVT_ELSE + EVT_CALL(SetGroupEnabled, MODEL_ana2, 0) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilitse, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_ttse, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_ELSE + EVT_CALL(SetGroupEnabled, MODEL_ana, 0) + EVT_END_IF + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_TexPan_Water)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_CALL(EnableTexPanning, MODEL_suimen, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 0, 90, -60, -70) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_06/trd_06_2_falling.c b/src/world/area_trd/trd_06/trd_06_2_falling.c new file mode 100644 index 0000000000..47b5d5e81c --- /dev/null +++ b/src/world/area_trd/trd_06/trd_06_2_falling.c @@ -0,0 +1,358 @@ +#include "trd_06.h" +#include "sprite.h" + +typedef struct FallingSprite { + /* 0x00 */ s32 animationEnabled; + /* 0x04 */ s32 foldStateID; + /* 0x08 */ s32 workerID; + /* 0x0C */ s32 playerSpriteID; + /* 0x10 */ s32 rasterID; + /* 0x14 */ Vec3f pos; + /* 0x20 */ Vec3f rot; + /* 0x2C */ Vec3f scale; + /* 0x38 */ f32 width; + /* 0x3C */ f32 height; +} FallingSprite; // size = 0x40 + +BSS FallingSprite N(Falling); + +void N(appendGfx_FallingSprite)(void) { + FoldImageRecPart foldImage; + SpriteRasterInfo rasterInfo; + Matrix4f mtxTransform; + Matrix4f mtxTemp; + u32 animFrame; + FallingSprite* falling = &N(Falling); + + gDPPipeSync(gMasterGfxPos++); + gDPSetCycleType(gMasterGfxPos++, G_CYC_1CYCLE); + gSPClearGeometryMode(gMasterGfxPos++, G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH); + gSPSetGeometryMode(gMasterGfxPos++, G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH); + gSPTexture(gMasterGfxPos++, -1, -1, 0, G_TX_RENDERTILE, G_ON); + gDPSetTextureLOD(gMasterGfxPos++, G_TL_TILE); + gDPSetTexturePersp(gMasterGfxPos++, G_TP_PERSP); + gDPSetTextureFilter(gMasterGfxPos++, G_TF_BILERP); + gDPSetColorDither(gMasterGfxPos++, G_CD_DISABLE); + gDPSetTextureDetail(gMasterGfxPos++, G_TD_CLAMP); + gDPSetTextureConvert(gMasterGfxPos++, G_TC_FILT); + gDPSetCombineKey(gMasterGfxPos++, G_CK_NONE); + gDPSetAlphaCompare(gMasterGfxPos++, G_AC_NONE); + guTranslateF(mtxTransform, falling->pos.x, falling->pos.y, falling->pos.z); + guRotateF(mtxTemp, falling->rot.y, 0.0f, 1.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guRotateF(mtxTemp, falling->rot.z, 0.0f, 0.0f, 1.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guRotateF(mtxTemp, falling->rot.x, 1.0f, 0.0f, 0.0f); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guScaleF(mtxTemp, falling->scale.x, falling->scale.y, falling->scale.z); + guMtxCatF(mtxTemp, mtxTransform, mtxTransform); + guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); + gSPMatrix(gMasterGfxPos++, VIRTUAL_TO_PHYSICAL(&gDisplayContext->matrixStack[gMatrixListPos++]), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + //TODO use SPR_RASTER_Mario8_XYZ here once they are defined + if (!falling->animationEnabled) { + falling->playerSpriteID = SPR_Mario_8; + animFrame = gGameStatusPtr->frameCounter % 4; + if (animFrame == 0) { + falling->rasterID = 37; + } else if (animFrame <= 1) { + falling->rasterID = 38; + } else if (animFrame <= 2) { + falling->rasterID = 39; + } else { + falling->rasterID = 36; + } + } + + spr_get_player_raster_info(&rasterInfo, falling->playerSpriteID, falling->rasterID); + foldImage.raster = rasterInfo.raster; + foldImage.palette = rasterInfo.defaultPal; + falling->width = foldImage.width = rasterInfo.width; + falling->height = foldImage.height = rasterInfo.height; + foldImage.xOffset = -(rasterInfo.width / 2); + foldImage.yOffset = rasterInfo.height / 2; + foldImage.opacity = 255; + fold_appendGfx_component(falling->foldStateID, &foldImage, 0, mtxTransform); + gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); +} + +API_CALLABLE(N(InitializeFallingSprite)) { + FallingSprite* falling = &N(Falling); + falling->animationEnabled = FALSE; + falling->rasterID = 0; + falling->playerSpriteID = 1; + falling->width = gPlayerStatus.colliderHeight; + falling->height = gPlayerStatus.colliderDiameter; + falling->pos.x = gPlayerStatus.position.x; + falling->pos.y = gPlayerStatus.position.y + (falling->height * SPRITE_WORLD_SCALE_D * 0.5); + falling->pos.z = gPlayerStatus.position.z; + falling->rot.x = 0.0f; + falling->rot.y = 0.0f; + falling->rot.z = 0.0f; + falling->scale.x = SPRITE_WORLD_SCALE_F; + falling->scale.y = SPRITE_WORLD_SCALE_F; + falling->scale.z = SPRITE_WORLD_SCALE_F; + + falling->foldStateID = func_8013A704(1); + falling->workerID = create_generic_entity_world(0, &N(appendGfx_FallingSprite)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DeleteFallingSprite)) { + func_8013A854(N(Falling).foldStateID); + free_generic_entity(N(Falling).workerID); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetFallingSpritePos)) { + Bytecode* args = script->ptrReadPos; + s32 x = evt_get_float_variable(script, *args++); + s32 y = evt_get_float_variable(script, *args++); + s32 z = evt_get_float_variable(script, *args++); + FallingSprite* falling = &N(Falling); + + falling->pos.x = x; + falling->pos.y = y + (falling->height * SPRITE_WORLD_SCALE_D * 0.5); + falling->pos.z = z; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetFallingSpriteRot)) { + Bytecode* args = script->ptrReadPos; + s32 add = evt_get_variable(script, *args++); + s32 x = evt_get_float_variable(script, *args++); + s32 y = evt_get_float_variable(script, *args++); + s32 z = evt_get_float_variable(script, *args++); + FallingSprite* falling = &N(Falling); + + if (!add) { + falling->rot.x = x; + falling->rot.y = y; + falling->rot.z = z; + } else { + falling->rot.x += x; + falling->rot.y += y; + falling->rot.z += z; + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(EnableFallingAnimation)) { + N(Falling).animationEnabled = TRUE; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(InitializeFallingPartner)) { + f32 partnerCollisionHeight = get_npc_unsafe(NPC_PARTNER)->collisionHeight; + + script->varTable[0] = ((partnerCollisionHeight * 2) / 3.0f) + 145.0f; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(InitializeGetUp)) { + FallingSprite* falling = &N(Falling); + + falling->playerSpriteID = SPR_Mario_1; + falling->rasterID = 0; + return ApiStatus_DONE2; +} + +Vec3f N(FallPath)[] = { + { 0.0, 0.0, 0.0 }, + { 8.600760, -48.39987, -1.993566 }, + { 24.998905, -96.99983, -1.994021 }, + { 51.399390, -143.39980, 1.006466 }, +}; + +EvtScript N(EVS_PlayerFalling) = { + EVT_CALL(SetPlayerPos, 0, 130, 0) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(PlaySound, SOUND_175) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, 180, 210, 25, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetFallingSpriteRot), 0, EVT_FLOAT(0.0), EVT_FLOAT(0.0), LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar4, LVar5, LVar6) + EVT_CALL(LoadPath, 30, EVT_PTR(N(FallPath)), ARRAY_COUNT(N(FallPath)), EASING_QUADRATIC_IN) + EVT_LABEL(0) + EVT_CALL(GetNextPathPos) + EVT_ADDF(LVar1, LVar4) + EVT_ADDF(LVar2, LVar5) + EVT_ADDF(LVar3, LVar6) + EVT_CALL(N(SetFallingSpritePos), LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_108) + EVT_ADD(LVar2, -1000) + EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PartnerFalling) = { + EVT_CALL(N(InitializeFallingPartner)) + EVT_CALL(SetNpcPos, NPC_PARTNER, 0, LVar0, 0) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(PlaySound, SOUND_176) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, 180, 150, 25, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_PARTNER, 0, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(1) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar4, LVar5, LVar6) + EVT_CALL(LoadPath, 30, EVT_PTR(N(FallPath)), ARRAY_COUNT(N(FallPath)), EASING_QUADRATIC_IN) + EVT_LABEL(0) + EVT_CALL(GetNextPathPos) + EVT_ADDF(LVar1, LVar4) + EVT_ADDF(LVar2, LVar5) + EVT_ADDF(LVar3, LVar6) + EVT_MULF(LVar1, EVT_FLOAT(-1.0)) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_108) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar1, LVar2, LVar3) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Unused_GetUp) = { + EVT_CALL(N(InitializeGetUp)) + EVT_THREAD + EVT_LOOP(11) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 1000) + EVT_CALL(N(SetFallingSpritePos), LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, 210, 360, 10, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetFallingSpriteRot), 0, EVT_FLOAT(0.0), EVT_FLOAT(0.0), LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(1) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(PlayerJump, LVar0, -1000, LVar2, 10) + EVT_THREAD + EVT_CALL(MakeLerp, 150, 0, 10, EASING_COS_IN_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_PARTNER, 0, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(1) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, 0, LVar2, 10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_FallIntoCell) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 300, -500) + EVT_CALL(SetCamPosB, CAM_DEFAULT, -100, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 360) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(InterpPlayerYaw, 270, 1) + EVT_CALL(SetPlayerPos, 0, 300, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, 0, 300, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_4, TRUE) + EVT_WAIT(30) + EVT_CALL(N(InitializeFallingSprite)) + EVT_EXEC_WAIT(N(EVS_PlayerFalling)) + EVT_CALL(InterpNpcYaw, NPC_Bombette, 90, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_4 | NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100, TRUE) + EVT_EXEC_WAIT(N(EVS_PartnerFalling)) + EVT_CALL(InterpNpcYaw, NPC_Bombette, 270, 0) + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_Bombette, 90, 0) + EVT_CALL(SpeakToPlayer, NPC_Bombette, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00D8) + EVT_CALL(N(EnableFallingAnimation)) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100, FALSE) + EVT_CALL(N(DeleteFallingSprite)) + EVT_THREAD + EVT_CALL(SetNpcRotation, NPC_PARTNER, 0, 0, 0) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, 0, LVar2, 10) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 1000) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump, LVar0, 0, LVar2, 10) + EVT_WAIT(15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_IF_LT(GB_StoryProgress, STORY_CH1_BOMBETTE_JOINED_PARTY) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 27, 0, 30) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(NpcMoveTo, NPC_PARTNER, -21, 47, 10) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 50, 35, 15) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 73, 22, 10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(GetAngleToNPC, NPC_Bombette, LVar0) + EVT_CALL(InterpPlayerYaw, LVar0, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVar0, 0) + EVT_WAIT(1) + EVT_CALL(SpeakToPlayer, NPC_Bombette, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00D9) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_END_THREAD + EVT_CALL(EndSpeech, NPC_Bombette, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcVar, NPC_Bombette, 0, 1) + EVT_END_IF + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c new file mode 100644 index 0000000000..99c7a2a6e2 --- /dev/null +++ b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c @@ -0,0 +1,639 @@ +#include "trd_06.h" +#include "sprite.h" + +extern EvtScript N(EVS_PushSong); +extern EvtScript N(EVS_PopSong); +API_CALLABLE(N(LoadPartyImage)); + +#include "world/common/util/ChangeNpcToPartner.inc.c" + +NpcSettings N(NpcSettings_Bobomb) = { + .height = 23, + .radius = 20, + .level = 6, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +NpcSettings N(NpcSettings_KoopaTroopa) = { + .height = 34, + .radius = 24, + .level = 99, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +EvtScript N(EVS_Bombette_DemonstrateAbility) = { + EVT_CALL(SetPanTarget, CAM_DEFAULT, 96, 0, 129) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.6)) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldBombette_Walk) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 124, 129, 0) + EVT_CALL(GetAngleToPlayer, NPC_PARTNER, LVar0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVar0, 5) + EVT_END_THREAD + EVT_WAIT(30) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, 96, 129, 0) + EVT_CALL(GetAngleToNPC, NPC_PARTNER, LVar0) + EVT_CALL(InterpPlayerYaw, LVar0, 5) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00E1) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Bombette) = { + EVT_THREAD + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 0, EVT_FLOAT(300.0), EVT_FLOAT(18.0), EVT_FLOAT(-7.0)) + EVT_END_THREAD + EVT_CALL(GetAngleToPlayer, NPC_SELF, LVar0) + EVT_IF_LT(LVar0, 180) + EVT_SET(LVar1, 27) + EVT_ELSE + EVT_SET(LVar1, -27) + EVT_END_IF + EVT_CALL(GetNpcPos, NPC_SELF, LVar2, LVar3, LVar4) + EVT_CALL(GetPlayerPos, LVarA, LVarB, LVarC) + EVT_SUB(LVarA, LVar2) + EVT_IF_LT(LVarA, 0) + EVT_MUL(LVarA, -1) + EVT_END_IF + EVT_IF_LT(LVarA, 20) + EVT_ADD(LVar2, LVar1) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, LVar2, LVar4, 0) + EVT_CALL(PlayerFaceNpc, NPC_Bombette, 3) + EVT_END_IF + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_IF_EQ(GF_TRD06_Met_Bombette, FALSE) + EVT_SET(GF_TRD06_Met_Bombette, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00DA) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(EndSpeech, NPC_SELF, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(ShowChoice, MSG_Choice_000D) + EVT_IF_NE(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00DB) + EVT_END_IF + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00DC) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(ShowChoice, MSG_Choice_000D) + EVT_IF_NE(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00DD) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 15) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00DE) + EVT_CALL(N(ChangeNpcToPartner), NPC_Bombette, PARTNER_BOMBETTE) + EVT_SET(GB_StoryProgress, STORY_CH1_BOMBETTE_JOINED_PARTY) + EVT_CALL(N(LoadPartyImage)) + EVT_EXEC(N(EVS_PushSong)) + EVT_WAIT(15) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_018B, 160, 40) + EVT_EXEC(N(EVS_PopSong)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00DF) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_WAIT(15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(25) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, -45, 30, TRUE, 0, 0, 0, 0) + EVT_WAIT(40) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00E0) + EVT_EXEC_WAIT(N(EVS_Bombette_DemonstrateAbility)) + EVT_END_IF + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bombette) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH1_BOMBETTE_JOINED_PARTY) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_ELSE + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Bombette))) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_KoopaTroopa) = { + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_METAL_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 90, 15, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o93, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o94, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(SetNpcPos, NPC_Jailer_KoopaTroopa, -350, 0, 0) + EVT_CALL(SetNpcPos, NPC_Jailer_Bobomb_01, -370, 0, 0) + EVT_CALL(SetNpcPos, NPC_Jailer_Bobomb_02, -390, 0, 0) + EVT_CALL(SetNpcSpeed, NPC_Jailer_KoopaTroopa, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_Jailer_Bobomb_01, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcSpeed, NPC_Jailer_Bobomb_02, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcAnimation, NPC_Jailer_KoopaTroopa, ANIM_KoopaTroopa_Anim04) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Anim06) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Anim06) + EVT_CALL(SetNpcFlagBits, NPC_Jailer_KoopaTroopa, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Jailer_Bobomb_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Jailer_Bobomb_02, NPC_FLAG_100, TRUE) + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_Jailer_KoopaTroopa, -237, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(NpcMoveTo, NPC_Jailer_Bobomb_01, -274, 25, 0) + EVT_END_THREAD + EVT_WAIT(15) + EVT_CALL(NpcMoveTo, NPC_Jailer_Bobomb_02, -266, -15, 0) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -260, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -260, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Anim02) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Anim02) + EVT_CALL(SpeakToPlayer, NPC_Jailer_KoopaTroopa, ANIM_KoopaTroopa_Anim04, ANIM_KoopaTroopa_Anim01, 0, MSG_CH1_00F0) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Anim06) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Anim06) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_THREAD + EVT_WAIT(60) + EVT_CALL(MakeLerp, 90, 0, 15, EASING_COS_IN_OUT) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o93, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o94, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_ttw, SOUND_METAL_DOOR_CLOSE, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_Jailer_KoopaTroopa, -233, 147, 0) + EVT_CALL(NpcMoveTo, NPC_Jailer_KoopaTroopa, -167, 218, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_Jailer_Bobomb_01, -254, 144, 0) + EVT_CALL(NpcMoveTo, NPC_Jailer_Bobomb_01, -203, 222, 0) + EVT_END_THREAD + EVT_WAIT(15) + EVT_CALL(NpcMoveTo, NPC_Jailer_Bobomb_02, -265, 0, 0) + EVT_CALL(NpcMoveTo, NPC_Jailer_Bobomb_02, -186, 175, 0) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcJumpscale, NPC_Jailer_KoopaTroopa, EVT_FLOAT(1.0)) + EVT_CALL(GetNpcPos, NPC_Jailer_KoopaTroopa, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Jailer_KoopaTroopa, LVar0, LVar1, LVar2, 10) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Anim02) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Anim02) + EVT_CALL(SpeakToPlayer, NPC_Jailer_KoopaTroopa, ANIM_KoopaTroopa_Anim04, ANIM_KoopaTroopa_Anim01, 0, MSG_CH1_00F1) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_01, ANIM_Bobomb_Anim06) + EVT_CALL(SetNpcAnimation, NPC_Jailer_Bobomb_02, ANIM_Bobomb_Anim06) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_KoopaTroopa) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_SET(GB_StoryProgress, STORY_CH1_DEFEATED_DUNGEON_GUARDS) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_KoopaTroopa) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_KoopaTroopa))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_KoopaTroopa))) + EVT_IF_GE(GB_StoryProgress, STORY_CH1_DEFEATED_DUNGEON_GUARDS) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bobomb_Jailer) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH1_DEFEATED_DUNGEON_GUARDS) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Bobomb_01) = { + EVT_IF_EQ(GF_TRD06_BombedWall, FALSE) + EVT_IF_EQ(AF_TRD_MetPrisoner1, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBobomb_Red_Talk, ANIM_WorldBobomb_Red_Idle, 0, MSG_CH1_00E4) + EVT_SET(AF_TRD_MetPrisoner1, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBobomb_Red_Talk, ANIM_WorldBobomb_Red_Idle, 0, MSG_CH1_00E5) + EVT_SET(AF_TRD_MetPrisoner1, FALSE) + EVT_END_IF + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBobomb_Red_Talk, ANIM_WorldBobomb_Red_Idle, 0, MSG_CH1_00E6) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Bobomb_02) = { + EVT_IF_EQ(GF_TRD06_BombedWall, FALSE) + EVT_IF_EQ(AF_TRD_MetPrisoner2, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBobomb_Blue_Talk, ANIM_WorldBobomb_Blue_Idle, 0, MSG_CH1_00E7) + EVT_SET(AF_TRD_MetPrisoner2, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBobomb_Blue_Talk, ANIM_WorldBobomb_Blue_Idle, 0, MSG_CH1_00E8) + EVT_SET(AF_TRD_MetPrisoner2, FALSE) + EVT_END_IF + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBobomb_Blue_Talk, ANIM_WorldBobomb_Blue_Idle, 0, MSG_CH1_00E9) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Bobomb_03) = { + EVT_IF_EQ(GF_TRD06_BombedWall, FALSE) + EVT_IF_EQ(AF_TRD_MetPrisoner3, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBobomb_Green_Talk, ANIM_WorldBobomb_Green_Idle, 0, MSG_CH1_00EA) + EVT_SET(AF_TRD_MetPrisoner3, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBobomb_Green_Talk, ANIM_WorldBobomb_Green_Idle, 0, MSG_CH1_00EB) + EVT_SET(AF_TRD_MetPrisoner3, FALSE) + EVT_END_IF + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBobomb_Green_Talk, ANIM_WorldBobomb_Green_Idle, 0, MSG_CH1_00EC) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Bobomb_04) = { + EVT_IF_EQ(GF_TRD06_BombedWall, FALSE) + EVT_IF_EQ(AF_TRD_MetPrisoner4, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBobomb_Green_Talk, ANIM_WorldBobomb_Green_Idle, 0, MSG_CH1_00ED) + EVT_SET(AF_TRD_MetPrisoner4, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBobomb_Green_Talk, ANIM_WorldBobomb_Green_Idle, 0, MSG_CH1_00EE) + EVT_SET(AF_TRD_MetPrisoner4, FALSE) + EVT_END_IF + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBobomb_Green_Talk, ANIM_WorldBobomb_Green_Idle, 0, MSG_CH1_00EF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bobomb_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Bobomb_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bobomb_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Bobomb_02))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bobomb_03) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Bobomb_03))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bobomb_04) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Bobomb_04))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Bombette) = { + .id = NPC_Bombette, + .settings = &N(NpcSettings_Bobomb), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_Bombette), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_WorldBombette_Idle, + .walk = ANIM_WorldBombette_Walk, + .run = ANIM_WorldBombette_Walk, + .chase = ANIM_WorldBombette_Walk, + .anim_4 = ANIM_WorldBombette_Walk, + .anim_5 = ANIM_WorldBombette_Walk, + .death = ANIM_WorldBombette_Still, + .hit = ANIM_WorldBombette_Still, + .anim_8 = ANIM_WorldBombette_Still, + .anim_9 = ANIM_WorldBombette_Still, + .anim_A = ANIM_WorldBombette_Still, + .anim_B = ANIM_WorldBombette_Still, + .anim_C = ANIM_WorldBombette_Still, + .anim_D = ANIM_WorldBombette_Still, + .anim_E = ANIM_WorldBombette_Still, + .anim_F = ANIM_WorldBombette_Still, + }, + .tattle = MSG_NpcTattle_TRD_Bombette, +}; + +StaticNpc N(NpcData_Jailers)[] = { + { + .id = NPC_Jailer_KoopaTroopa, + .settings = &N(NpcSettings_KoopaTroopa), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING | NPC_FLAG_40000, + .init = &N(EVS_NpcInit_KoopaTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 5, 0 }, + { ITEM_HONEY_SYRUP, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .animations = { + .idle = ANIM_KoopaTroopa_Anim01, + .walk = ANIM_KoopaTroopa_Anim03, + .run = ANIM_KoopaTroopa_Anim04, + .chase = ANIM_KoopaTroopa_Anim04, + .anim_4 = ANIM_KoopaTroopa_Anim01, + .anim_5 = ANIM_KoopaTroopa_Anim01, + .death = ANIM_KoopaTroopa_Anim0B, + .hit = ANIM_KoopaTroopa_Anim0B, + .anim_8 = ANIM_KoopaTroopa_Anim07, + .anim_9 = ANIM_KoopaTroopa_Anim06, + .anim_A = ANIM_KoopaTroopa_Anim08, + .anim_B = ANIM_KoopaTroopa_Anim04, + .anim_C = ANIM_KoopaTroopa_Anim04, + .anim_D = ANIM_KoopaTroopa_Anim04, + .anim_E = ANIM_KoopaTroopa_Anim04, + .anim_F = ANIM_KoopaTroopa_Anim04, + }, + }, + { + .id = NPC_Jailer_Bobomb_01, + .settings = &N(NpcSettings_Bobomb), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING | NPC_FLAG_40000, + .init = &N(EVS_NpcInit_Bobomb_Jailer), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Bobomb_Anim02, + .walk = ANIM_Bobomb_Anim04, + .run = ANIM_Bobomb_Anim06, + .chase = ANIM_Bobomb_Anim06, + .anim_4 = ANIM_Bobomb_Anim02, + .anim_5 = ANIM_Bobomb_Anim02, + .death = ANIM_Bobomb_Anim0E, + .hit = ANIM_Bobomb_Anim0E, + .anim_8 = ANIM_Bobomb_Anim06, + .anim_9 = ANIM_Bobomb_Anim06, + .anim_A = ANIM_Bobomb_Anim06, + .anim_B = ANIM_Bobomb_Anim06, + .anim_C = ANIM_Bobomb_Anim06, + .anim_D = ANIM_Bobomb_Anim06, + .anim_E = ANIM_Bobomb_Anim06, + .anim_F = ANIM_Bobomb_Anim06, + }, + }, + { + .id = NPC_Jailer_Bobomb_02, + .settings = &N(NpcSettings_Bobomb), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING | NPC_FLAG_40000, + .init = &N(EVS_NpcInit_Bobomb_Jailer), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Bobomb_Anim02, + .walk = ANIM_Bobomb_Anim04, + .run = ANIM_Bobomb_Anim06, + .chase = ANIM_Bobomb_Anim06, + .anim_4 = ANIM_Bobomb_Anim02, + .anim_5 = ANIM_Bobomb_Anim02, + .death = ANIM_Bobomb_Anim0E, + .hit = ANIM_Bobomb_Anim0E, + .anim_8 = ANIM_Bobomb_Anim06, + .anim_9 = ANIM_Bobomb_Anim06, + .anim_A = ANIM_Bobomb_Anim06, + .anim_B = ANIM_Bobomb_Anim06, + .anim_C = ANIM_Bobomb_Anim06, + .anim_D = ANIM_Bobomb_Anim06, + .anim_E = ANIM_Bobomb_Anim06, + .anim_F = ANIM_Bobomb_Anim06, + }, + }, +}; + +StaticNpc N(NpcData_Inmates)[] = { + { + .id = NPC_Bobomb_01, + .settings = &N(NpcSettings_Bobomb), + .pos = { 25.0f, 0.0f, 127.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_Bobomb_01), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 5, 0 }, + { ITEM_FIRE_FLOWER, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .animations = { + .idle = ANIM_WorldBobomb_Red_Idle, + .walk = ANIM_WorldBobomb_Red_Walk, + .run = ANIM_WorldBobomb_Red_Run, + .chase = ANIM_WorldBobomb_Red_Run, + .anim_4 = ANIM_WorldBobomb_Red_Idle, + .anim_5 = ANIM_WorldBobomb_Red_Idle, + .death = ANIM_WorldBobomb_Red_Still, + .hit = ANIM_WorldBobomb_Red_Still, + .anim_8 = ANIM_WorldBobomb_Red_Still, + .anim_9 = ANIM_WorldBobomb_Red_Still, + .anim_A = ANIM_WorldBobomb_Red_Still, + .anim_B = ANIM_WorldBobomb_Red_Still, + .anim_C = ANIM_WorldBobomb_Red_Still, + .anim_D = ANIM_WorldBobomb_Red_Still, + .anim_E = ANIM_WorldBobomb_Red_Still, + .anim_F = ANIM_WorldBobomb_Red_Still, + }, + .tattle = MSG_NpcTattle_TRD_BobombA, + }, + { + .id = NPC_Bobomb_02, + .settings = &N(NpcSettings_Bobomb), + .pos = { -30.0f, 0.0f, 130.0f }, + .yaw = 90, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_Bobomb_02), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 5, 0 }, + { ITEM_FIRE_FLOWER, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .animations = { + .idle = ANIM_WorldBobomb_Blue_Idle, + .walk = ANIM_WorldBobomb_Blue_Walk, + .run = ANIM_WorldBobomb_Blue_Run, + .chase = ANIM_WorldBobomb_Blue_Run, + .anim_4 = ANIM_WorldBobomb_Blue_Idle, + .anim_5 = ANIM_WorldBobomb_Blue_Idle, + .death = ANIM_WorldBobomb_Blue_Still, + .hit = ANIM_WorldBobomb_Blue_Still, + .anim_8 = ANIM_WorldBobomb_Blue_Still, + .anim_9 = ANIM_WorldBobomb_Blue_Still, + .anim_A = ANIM_WorldBobomb_Blue_Still, + .anim_B = ANIM_WorldBobomb_Blue_Still, + .anim_C = ANIM_WorldBobomb_Blue_Still, + .anim_D = ANIM_WorldBobomb_Blue_Still, + .anim_E = ANIM_WorldBobomb_Blue_Still, + .anim_F = ANIM_WorldBobomb_Blue_Still, + }, + .tattle = MSG_NpcTattle_TRD_BobombB, + }, + { + .id = NPC_Bobomb_03, + .settings = &N(NpcSettings_Bobomb), + .pos = { -140.0f, 0.0f, -90.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_Bobomb_03), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 5, 0 }, + { ITEM_FIRE_FLOWER, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .animations = { + .idle = ANIM_WorldBobomb_Green_Idle, + .walk = ANIM_WorldBobomb_Green_Walk, + .run = ANIM_WorldBobomb_Green_Run, + .chase = ANIM_WorldBobomb_Green_Run, + .anim_4 = ANIM_WorldBobomb_Green_Idle, + .anim_5 = ANIM_WorldBobomb_Green_Idle, + .death = ANIM_WorldBobomb_Green_Still, + .hit = ANIM_WorldBobomb_Green_Still, + .anim_8 = ANIM_WorldBobomb_Green_Still, + .anim_9 = ANIM_WorldBobomb_Green_Still, + .anim_A = ANIM_WorldBobomb_Green_Still, + .anim_B = ANIM_WorldBobomb_Green_Still, + .anim_C = ANIM_WorldBobomb_Green_Still, + .anim_D = ANIM_WorldBobomb_Green_Still, + .anim_E = ANIM_WorldBobomb_Green_Still, + .anim_F = ANIM_WorldBobomb_Green_Still, + }, + .tattle = MSG_NpcTattle_TRD_BobombC, + }, + { + .id = NPC_Bobomb_04, + .settings = &N(NpcSettings_Bobomb), + .pos = { -75.0f, 0.0f, -80.0f }, + .yaw = 90, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_Bobomb_04), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 5, 0 }, + { ITEM_FIRE_FLOWER, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .animations = { + .idle = ANIM_WorldBobomb_Green_Idle, + .walk = ANIM_WorldBobomb_Green_Walk, + .run = ANIM_WorldBobomb_Green_Run, + .chase = ANIM_WorldBobomb_Green_Run, + .anim_4 = ANIM_WorldBobomb_Green_Idle, + .anim_5 = ANIM_WorldBobomb_Green_Idle, + .death = ANIM_WorldBobomb_Green_Still, + .hit = ANIM_WorldBobomb_Green_Still, + .anim_8 = ANIM_WorldBobomb_Green_Still, + .anim_9 = ANIM_WorldBobomb_Green_Still, + .anim_A = ANIM_WorldBobomb_Green_Still, + .anim_B = ANIM_WorldBobomb_Green_Still, + .anim_C = ANIM_WorldBobomb_Green_Still, + .anim_D = ANIM_WorldBobomb_Green_Still, + .anim_E = ANIM_WorldBobomb_Green_Still, + .anim_F = ANIM_WorldBobomb_Green_Still, + }, + .tattle = MSG_NpcTattle_TRD_BobombD, + }, +}; + +NpcGroupList N(NpcGroup_Prisoners) = { + NPC_GROUP(N(NpcData_Bombette)), + NPC_GROUP(N(NpcData_Inmates)), + NPC_GROUP(N(NpcData_Jailers), BTL_TRD_PART_1_FORMATION_04, BTL_TRD_PART_1_STAGE_0B), + {} +}; diff --git a/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c b/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c new file mode 100644 index 0000000000..008fd38972 --- /dev/null +++ b/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c @@ -0,0 +1,221 @@ +#include "trd_06.h" + +MobileAISettings N(AISettings_KoopaBros) = { + .moveSpeed = 1.5f, + .moveTime = 60, + .waitTime = 30, + .playerSearchInterval = -1, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_KoopaBros) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_KoopaBros))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_KoopaBros) = { + .height = 35, + .radius = 24, + .level = 99, + .ai = &N(EVS_NpcAI_KoopaBros), + .actionFlags = AI_ACTION_LOOK_AROUND_DURING_LOITER, +}; + +NpcSettings N(NpcSettings_Unused) = { + .height = 42, + .radius = 24, + .level = 99, + .ai = &N(EVS_NpcAI_KoopaBros), +}; + +EvtScript N(EVS_Scene_ImprisonedKoopaBros) = { + EVT_WAIT(60) + EVT_CALL(EnableNpcAI, NPC_KoopaBros_Red, FALSE) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_Red, ANIM_KoopaBros_Red_Anim18, ANIM_KoopaBros_Red_Anim18, 0, MSG_CH1_010C) + EVT_CALL(EnableNpcAI, NPC_KoopaBros_Red, TRUE) + EVT_WAIT(30) + EVT_CALL(FadeOutMusic, 0, 2000) + EVT_WAIT(30) + EVT_CALL(GetEntryID, LVar0) + EVT_CALL(GotoMap, EVT_PTR("trd_10"), trd_10_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_KoopaBros)[] = { + { + .id = NPC_KoopaBros_Red, + .settings = &N(NpcSettings_KoopaBros), + .pos = { 60.0f, 0.0f, -60.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 60, 0, -60 }, + .wanderSize = { 20 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 60, 0, -60 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_KoopaBros_Red_Anim04, + .walk = ANIM_KoopaBros_Red_Anim02, + .run = ANIM_KoopaBros_Red_Anim03, + .chase = ANIM_KoopaBros_Red_Anim03, + .anim_4 = ANIM_KoopaBros_Red_Anim04, + .anim_5 = ANIM_KoopaBros_Red_Anim04, + .death = ANIM_KoopaBros_Red_Anim0A, + .hit = ANIM_KoopaBros_Red_Anim0A, + .anim_8 = ANIM_KoopaBros_Red_Anim03, + .anim_9 = ANIM_KoopaBros_Red_Anim03, + .anim_A = ANIM_KoopaBros_Red_Anim03, + .anim_B = ANIM_KoopaBros_Red_Anim03, + .anim_C = ANIM_KoopaBros_Red_Anim03, + .anim_D = ANIM_KoopaBros_Red_Anim03, + .anim_E = ANIM_KoopaBros_Red_Anim03, + .anim_F = ANIM_KoopaBros_Red_Anim03, + }, + }, + { + .id = NPC_KoopaBros_Black, + .settings = &N(NpcSettings_KoopaBros), + .pos = { 60.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 60, 0, 0 }, + .wanderSize = { 20 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 60, 0, 60 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_KoopaBros_Black_Anim04, + .walk = ANIM_KoopaBros_Black_Anim02, + .run = ANIM_KoopaBros_Black_Anim03, + .chase = ANIM_KoopaBros_Black_Anim03, + .anim_4 = ANIM_KoopaBros_Black_Anim04, + .anim_5 = ANIM_KoopaBros_Black_Anim04, + .death = ANIM_KoopaBros_Black_Anim0A, + .hit = ANIM_KoopaBros_Black_Anim0A, + .anim_8 = ANIM_KoopaBros_Black_Anim03, + .anim_9 = ANIM_KoopaBros_Black_Anim03, + .anim_A = ANIM_KoopaBros_Black_Anim03, + .anim_B = ANIM_KoopaBros_Black_Anim03, + .anim_C = ANIM_KoopaBros_Black_Anim03, + .anim_D = ANIM_KoopaBros_Black_Anim03, + .anim_E = ANIM_KoopaBros_Black_Anim03, + .anim_F = ANIM_KoopaBros_Black_Anim03, + }, + }, + { + .id = NPC_KoopaBros_Yellow, + .settings = &N(NpcSettings_KoopaBros), + .pos = { -10.0f, 0.0f, -60.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -10, 0, -60 }, + .wanderSize = { 20 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -10, 0, -60 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_KoopaBros_Yellow_Anim04, + .walk = ANIM_KoopaBros_Yellow_Anim02, + .run = ANIM_KoopaBros_Yellow_Anim03, + .chase = ANIM_KoopaBros_Yellow_Anim03, + .anim_4 = ANIM_KoopaBros_Yellow_Anim04, + .anim_5 = ANIM_KoopaBros_Yellow_Anim04, + .death = ANIM_KoopaBros_Yellow_Anim0A, + .hit = ANIM_KoopaBros_Yellow_Anim0A, + .anim_8 = ANIM_KoopaBros_Yellow_Anim03, + .anim_9 = ANIM_KoopaBros_Yellow_Anim03, + .anim_A = ANIM_KoopaBros_Yellow_Anim03, + .anim_B = ANIM_KoopaBros_Yellow_Anim03, + .anim_C = ANIM_KoopaBros_Yellow_Anim03, + .anim_D = ANIM_KoopaBros_Yellow_Anim03, + .anim_E = ANIM_KoopaBros_Yellow_Anim03, + .anim_F = ANIM_KoopaBros_Yellow_Anim03, + }, + }, + { + .id = NPC_KoopaBros_Green, + .settings = &N(NpcSettings_KoopaBros), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 20 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -10, 0, 60 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_KoopaBros_Green_Anim04, + .walk = ANIM_KoopaBros_Green_Anim02, + .run = ANIM_KoopaBros_Green_Anim03, + .chase = ANIM_KoopaBros_Green_Anim03, + .anim_4 = ANIM_KoopaBros_Green_Anim04, + .anim_5 = ANIM_KoopaBros_Green_Anim04, + .death = ANIM_KoopaBros_Green_Anim0A, + .hit = ANIM_KoopaBros_Green_Anim0A, + .anim_8 = ANIM_KoopaBros_Green_Anim03, + .anim_9 = ANIM_KoopaBros_Green_Anim03, + .anim_A = ANIM_KoopaBros_Green_Anim03, + .anim_B = ANIM_KoopaBros_Green_Anim03, + .anim_C = ANIM_KoopaBros_Green_Anim03, + .anim_D = ANIM_KoopaBros_Green_Anim03, + .anim_E = ANIM_KoopaBros_Green_Anim03, + .anim_F = ANIM_KoopaBros_Green_Anim03, + }, + }, +}; + +NpcGroupList N(NpcGroup_KoopaBros) = { + NPC_GROUP(N(NpcData_KoopaBros)), + {} +}; diff --git a/src/world/area_trd/trd_06/trd_06_5_entity.c b/src/world/area_trd/trd_06/trd_06_5_entity.c new file mode 100644 index 0000000000..b6b86a31a7 --- /dev/null +++ b/src/world/area_trd/trd_06/trd_06_5_entity.c @@ -0,0 +1,8 @@ +#include "trd_06.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), -150, 60, 100, 0, 6, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_06/trd_06_6_party_image.c b/src/world/area_trd/trd_06/trd_06_6_party_image.c new file mode 100644 index 0000000000..c38da7336b --- /dev/null +++ b/src/world/area_trd/trd_06/trd_06_6_party_image.c @@ -0,0 +1,4 @@ +#include "trd_06.h" + +#define PARTY_IMAGE "party_pinki" +#include "world/common/LoadPartyImage.inc.c" diff --git a/src/world/area_trd/trd_07/9B6980.c b/src/world/area_trd/trd_07/9B6980.c deleted file mode 100644 index 8d700384e9..0000000000 --- a/src/world/area_trd/trd_07/9B6980.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "trd_07.h" - -static char* N(exit_str_0) = "trd_08"; -static char* N(exit_str_1) = "trd_04"; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c deleted file mode 100644 index b92855e4a5..0000000000 --- a/src/world/area_trd/trd_07/9B6C90.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "trd_07.h" - -#include "world/common/enemy/TackleAI.inc.c" - -#include "world/common/enemy/ParatroopaAI.inc.c" - -#include "world/common/GetDefeatedEnemyCount.inc.c" - -ApiStatus func_80242600_9B8F80(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - f32 posX = evt_get_float_variable(script, *args++); - f32 posZ = evt_get_float_variable(script, *args++); - f32 angle = evt_get_float_variable(script, *args++); - - script->varTable[0] = ((posX + (sin_deg(clamp_angle(gCameras[CAM_DEFAULT].currentYaw + angle + 270.0f)) * 1000.0f)) * 1024.0f) + -2.3e8f; - script->varTable[1] = ((posZ - (cos_deg(clamp_angle(gCameras[CAM_DEFAULT].currentYaw + angle + 270.0f)) * 1000.0f)) * 1024.0f) + -2.3e8f; - script->varTable[2] = ((posX + (sin_deg(clamp_angle(gCameras[CAM_DEFAULT].currentYaw + angle + 90.0f)) * 1000.0f)) * 1024.0f) + -2.3e8f; - script->varTable[3] = ((posZ - (cos_deg(clamp_angle(gCameras[CAM_DEFAULT].currentYaw + angle + 90.0f)) * 1000.0f)) * 1024.0f) + -2.3e8f; - return ApiStatus_DONE2; -} - -ApiStatus func_802427FC_9B917C(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 posX = evt_get_variable(script, *args++); - s32 posY = evt_get_variable(script, *args++); - s32 posZ = evt_get_variable(script, *args++); - f32 yaw = evt_get_variable(script, *args++); - - fx_walking_dust(1, posX, posY + 10, posZ, sin_deg(yaw), -cos_deg(yaw)); - return ApiStatus_DONE2; -} diff --git a/src/world/area_trd/trd_07/trd_07.h b/src/world/area_trd/trd_07/trd_07.h index 79f00102a5..98471e889e 100644 --- a/src/world/area_trd/trd_07/trd_07.h +++ b/src/world/area_trd/trd_07/trd_07.h @@ -2,8 +2,26 @@ /// @brief Koopa Bros Fortress - Dungeon Trap #include "common.h" -#include "../trd.h" #include "message_ids.h" #include "map.h" +#include "../trd.h" +#include "mapfs/trd_07_shape.h" +#include "mapfs/trd_07_hit.h" + +#include "sprite/npc/KoopaTroopa.h" +#include "sprite/npc/ParaTroopa.h" + +enum { + NPC_KoopaTroopa = 0, + NPC_ParaTroopa_01 = 1, + NPC_ParaTroopa_02 = 2, +}; + +enum { + MV_EnterWalkScriptID = MapVar(0), + MV_DoorScaleZ = MapVar(0), // reusing + MV_DoorScaleY = MapVar(1), +}; + #define NAMESPACE trd_07 diff --git a/src/world/area_trd/trd_07/trd_07_0_header.c b/src/world/area_trd/trd_07/trd_07_0_header.c new file mode 100644 index 0000000000..9f398b250c --- /dev/null +++ b/src/world/area_trd/trd_07/trd_07_0_header.c @@ -0,0 +1,22 @@ +#include "trd_07.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [trd_07_ENTRY_0] { 220.0, 0.0, 0.0, 270.0 }, + [trd_07_ENTRY_1] { -200.0, 0.0, 0.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_trd_07 }, +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_FORTRESS, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_07/trd_07_1_main.c b/src/world/area_trd/trd_07/trd_07_1_main.c new file mode 100644 index 0000000000..88aabb25cf --- /dev/null +++ b/src/world/area_trd/trd_07/trd_07_1_main.c @@ -0,0 +1,56 @@ +#include "trd_07.h" + +extern EvtScript N(EVS_SetupMagicDoors); +extern EvtScript N(EVS_SetupMusic); +extern NpcGroupList N(DefaultNPCs); + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_trd_08_0) = EVT_EXIT_WALK(60, trd_07_ENTRY_1, "trd_08", trd_08_ENTRY_0); +EvtScript N(EVS_ExitWalk_trd_04_4) = EVT_EXIT_WALK(60, trd_07_ENTRY_0, "trd_04", trd_04_ENTRY_4); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_trd_08_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_trd_04_4)), TRIGGER_FLOOR_ABOVE, COLLIDER_tte, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_1) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_LABEL(10) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_AUX, LVar1, 0) + EVT_ADD(LVar0, 100) + EVT_SUB(LVar1, 100) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_KOOPA_BROS_FORTRESS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_TexPan_1)) + EVT_EXEC_WAIT(N(EVS_SetupMagicDoors)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC_GET_TID(EnterWalk, MV_EnterWalkScriptID) + EVT_WAIT(1) + EVT_CALL(EnableTexPanning, MODEL_suimen2, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 0, 90, -60, -70) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_07/trd_07_2_npc.c b/src/world/area_trd/trd_07/trd_07_2_npc.c new file mode 100644 index 0000000000..72c2632ed1 --- /dev/null +++ b/src/world/area_trd/trd_07/trd_07_2_npc.c @@ -0,0 +1,196 @@ +#include "trd_07.h" + +extern EvtScript N(EVS_RestoreMagicDoors); + +#include "world/common/enemy/complete/KoopaTroopa_Wander.inc.c" +#include "world/common/enemy/complete/Paratroopa.inc.c" + +#include "world/common/util/GetDefeatedEnemyCount.inc.c" + +EvtScript N(EVS_NpcDefeat_KoopaTroopa) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(N(GetDefeatedEnemyCount), LVar0) + EVT_IF_EQ(LVar0, 1) // ??? + EVT_SET(GF_TRD07_Defeated_DungeonAmbush, TRUE) + EVT_EXEC(N(EVS_RestoreMagicDoors)) + EVT_END_IF + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(OnPlayerFled, 0) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_10, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_KoopaTroopa) = { + EVT_CALL(SetSelfEnemyFlags, ENEMY_FLAGS_800000) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_KoopaTroopa))) + EVT_IF_EQ(GF_TRD07_Defeated_DungeonAmbush, TRUE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_KoopaTroopa) = { + .id = NPC_KoopaTroopa, + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .pos = { -75.0f, 0.0f, -30.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000, + .init = &N(EVS_NpcInit_KoopaTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 5, 0 }, + { ITEM_P_O_W_BLOCK, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -75, 0, -30 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_KoopaTroopa_Anim01, + .walk = ANIM_KoopaTroopa_Anim03, + .run = ANIM_KoopaTroopa_Anim04, + .chase = ANIM_KoopaTroopa_Anim04, + .anim_4 = ANIM_KoopaTroopa_Anim01, + .anim_5 = ANIM_KoopaTroopa_Anim01, + .death = ANIM_KoopaTroopa_Anim0B, + .hit = ANIM_KoopaTroopa_Anim0B, + .anim_8 = ANIM_KoopaTroopa_Anim07, + .anim_9 = ANIM_KoopaTroopa_Anim06, + .anim_A = ANIM_KoopaTroopa_Anim08, + .anim_B = ANIM_KoopaTroopa_Anim04, + .anim_C = ANIM_KoopaTroopa_Anim04, + .anim_D = ANIM_KoopaTroopa_Anim04, + .anim_E = ANIM_KoopaTroopa_Anim04, + .anim_F = ANIM_KoopaTroopa_Anim04, + }, +}; + +StaticNpc N(NpcData_ParaTroopa_01) = { + .id = NPC_ParaTroopa_01, + .settings = &N(NpcSettings_ParaTroopa), + .pos = { 0.0f, 50.0f, 30.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000, + .init = &N(EVS_NpcInit_KoopaTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_P_O_W_BLOCK, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 50, 30 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 50, 30 }, + .detectSize = { 200 }, + } + }, + .animations = { + .idle = ANIM_ParaTroopa_Anim01, + .walk = ANIM_ParaTroopa_Anim02, + .run = ANIM_ParaTroopa_Anim03, + .chase = ANIM_ParaTroopa_Anim03, + .anim_4 = ANIM_ParaTroopa_Anim01, + .anim_5 = ANIM_ParaTroopa_Anim01, + .death = ANIM_ParaTroopa_Anim06, + .hit = ANIM_ParaTroopa_Anim06, + .anim_8 = ANIM_ParaTroopa_Anim04, + .anim_9 = ANIM_ParaTroopa_Anim0C, + .anim_A = ANIM_ParaTroopa_Anim0A, + .anim_B = ANIM_ParaTroopa_Anim0E, + .anim_C = ANIM_ParaTroopa_Anim03, + .anim_D = ANIM_ParaTroopa_Anim03, + .anim_E = ANIM_ParaTroopa_Anim03, + .anim_F = ANIM_ParaTroopa_Anim03, + }, +}; + +StaticNpc N(NpcData_ParaTroopa_02) = { + .id = NPC_ParaTroopa_02, + .settings = &N(NpcSettings_ParaTroopa), + .pos = { 75.0f, 50.0f, -30.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000, + .init = &N(EVS_NpcInit_KoopaTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_P_O_W_BLOCK, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 75, 50, -30 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 75, 50, -30 }, + .detectSize = { 200 }, + } + }, + .animations = { + .idle = ANIM_ParaTroopa_Anim01, + .walk = ANIM_ParaTroopa_Anim02, + .run = ANIM_ParaTroopa_Anim03, + .chase = ANIM_ParaTroopa_Anim03, + .anim_4 = ANIM_ParaTroopa_Anim01, + .anim_5 = ANIM_ParaTroopa_Anim01, + .death = ANIM_ParaTroopa_Anim06, + .hit = ANIM_ParaTroopa_Anim06, + .anim_8 = ANIM_ParaTroopa_Anim04, + .anim_9 = ANIM_ParaTroopa_Anim0C, + .anim_A = ANIM_ParaTroopa_Anim0A, + .anim_B = ANIM_ParaTroopa_Anim0E, + .anim_C = ANIM_ParaTroopa_Anim03, + .anim_D = ANIM_ParaTroopa_Anim03, + .anim_E = ANIM_ParaTroopa_Anim03, + .anim_F = ANIM_ParaTroopa_Anim03, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_KoopaTroopa), BTL_TRD_PART_1_FORMATION_01, BTL_TRD_PART_1_STAGE_03), + NPC_GROUP(N(NpcData_ParaTroopa_01), BTL_TRD_PART_1_FORMATION_08, BTL_TRD_PART_1_STAGE_03), + NPC_GROUP(N(NpcData_ParaTroopa_02), BTL_TRD_PART_1_FORMATION_0A, BTL_TRD_PART_1_STAGE_03), + {} +}; diff --git a/src/world/area_trd/trd_07/trd_07_3_magic_doors.c b/src/world/area_trd/trd_07/trd_07_3_magic_doors.c new file mode 100644 index 0000000000..fea27c5ad2 --- /dev/null +++ b/src/world/area_trd/trd_07/trd_07_3_magic_doors.c @@ -0,0 +1,310 @@ +#include "trd_07.h" +#include "effects.h" + +API_CALLABLE(N(GetPointsWithCamRelativeOffset)) { + Bytecode* args = script->ptrReadPos; + f32 posX = evt_get_float_variable(script, *args++); + f32 posZ = evt_get_float_variable(script, *args++); + f32 angle = evt_get_float_variable(script, *args++); + + script->varTable[0] = EVT_FLOAT_TO_FIXED(posX + (sin_deg(clamp_angle(gCameras[CAM_DEFAULT].currentYaw + angle + 270.0f)) * 1000.0f)); + script->varTable[1] = EVT_FLOAT_TO_FIXED(posZ - (cos_deg(clamp_angle(gCameras[CAM_DEFAULT].currentYaw + angle + 270.0f)) * 1000.0f)); + script->varTable[2] = EVT_FLOAT_TO_FIXED(posX + (sin_deg(clamp_angle(gCameras[CAM_DEFAULT].currentYaw + angle + 90.0f)) * 1000.0f)); + script->varTable[3] = EVT_FLOAT_TO_FIXED(posZ - (cos_deg(clamp_angle(gCameras[CAM_DEFAULT].currentYaw + angle + 90.0f)) * 1000.0f)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SpawnMovingDoorDust)) { + Bytecode* args = script->ptrReadPos; + s32 posX = evt_get_variable(script, *args++); + s32 posY = evt_get_variable(script, *args++); + s32 posZ = evt_get_variable(script, *args++); + f32 yaw = evt_get_variable(script, *args++); + + fx_walking_dust(1, posX, posY + 10, posZ, sin_deg(yaw), -cos_deg(yaw)); + return ApiStatus_DONE2; +} + +// LVar0 = modelID +EvtScript N(EVS_AnimateDoorRaising) = { + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(PlaySound, SOUND_2B) + EVT_END_THREAD + EVT_THREAD + // input LVar0 ignored in this thread + EVT_CALL(MakeLerp, 100, 120, 20, EASING_QUADRATIC_IN) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, EVT_FLOAT(100.0)) + EVT_SETF(MV_DoorScaleZ, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(MakeLerp, 120, 80, 20, EASING_QUADRATIC_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, EVT_FLOAT(100.0)) + EVT_SETF(MV_DoorScaleZ, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(MakeLerp, 80, 100, 20, EASING_QUADRATIC_IN) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, EVT_FLOAT(100.0)) + EVT_SETF(MV_DoorScaleZ, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_END_THREAD + EVT_THREAD + // input LVar0 ignored in this thread + EVT_CALL(MakeLerp, 100, 80, 20, EASING_QUADRATIC_IN) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, EVT_FLOAT(100.0)) + EVT_SETF(MV_DoorScaleY, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(MakeLerp, 80, 120, 20, EASING_QUADRATIC_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, EVT_FLOAT(100.0)) + EVT_SETF(MV_DoorScaleY, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(MakeLerp, 120, 100, 20, EASING_QUADRATIC_IN) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_DIVF(LVar0, EVT_FLOAT(100.0)) + EVT_SETF(MV_DoorScaleY, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_END_THREAD + EVT_SETF(MV_DoorScaleZ, EVT_FLOAT(1.0)) + EVT_SETF(MV_DoorScaleY, EVT_FLOAT(1.0)) + EVT_THREAD + // input LVar0 used in this thread! + EVT_SET(LVar9, LVar0) + EVT_LOOP(20) + EVT_CALL(ScaleGroup, LVar9, EVT_FLOAT(1.0), MV_DoorScaleY, MV_DoorScaleZ) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(MakeLerp, 0, 80, 30, EASING_QUADRATIC_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, LVar9, 0, LVar0, 0) + EVT_CALL(ScaleGroup, LVar9, EVT_FLOAT(1.0), MV_DoorScaleY, MV_DoorScaleZ) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(MakeLerp, 80, 70, 10, EASING_QUADRATIC_IN) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, LVar9, 0, LVar0, 0) + EVT_CALL(ScaleGroup, LVar9, EVT_FLOAT(1.0), MV_DoorScaleY, MV_DoorScaleZ) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(61) + EVT_RETURN + EVT_END +}; + +// LVar0 = modelID +EvtScript N(EVS_AnimateDoorLowering) = { + EVT_SET(LVar9, LVar0) + EVT_CALL(MakeLerp, 70, 0, 20, EASING_CUBIC_IN) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, LVar9, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_2C) + EVT_IF_EQ(LVar9, MODEL_migi) + EVT_CALL(N(SpawnMovingDoorDust), 270, 0, 40, 270) + EVT_CALL(N(SpawnMovingDoorDust), 270, 0, -40, 270) + EVT_ELSE + EVT_CALL(N(SpawnMovingDoorDust), -255, 0, 40, 90) + EVT_CALL(N(SpawnMovingDoorDust), -255, 0, -40, 90) + EVT_END_IF + EVT_CALL(MakeLerp, 0, 20, 10, EASING_QUADRATIC_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, LVar9, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(MakeLerp, 20, 0, 10, EASING_QUADRATIC_IN) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, LVar9, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_2C) + EVT_IF_EQ(LVar9, MODEL_migi) + EVT_CALL(N(SpawnMovingDoorDust), 270, 0, 40, 270) + EVT_CALL(N(SpawnMovingDoorDust), 270, 0, -40, 270) + EVT_ELSE + EVT_CALL(N(SpawnMovingDoorDust), -255, 0, 40, 90) + EVT_CALL(N(SpawnMovingDoorDust), -255, 0, -40, 90) + EVT_END_IF + EVT_CALL(MakeLerp, 0, 10, 5, EASING_QUADRATIC_OUT) + EVT_LABEL(3) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, LVar9, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(3) + EVT_END_IF + EVT_CALL(MakeLerp, 10, 0, 5, EASING_QUADRATIC_IN) + EVT_LABEL(4) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, LVar9, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(4) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_2C) + EVT_IF_EQ(LVar9, MODEL_migi) + EVT_CALL(N(SpawnMovingDoorDust), 270, 0, 40, 270) + EVT_CALL(N(SpawnMovingDoorDust), 270, 0, -40, 270) + EVT_CALL(EnableModel, MODEL_o44, FALSE) + EVT_ELSE + EVT_CALL(N(SpawnMovingDoorDust), -255, 0, 40, 90) + EVT_CALL(N(SpawnMovingDoorDust), -255, 0, -40, 90) + EVT_CALL(EnableModel, MODEL_o43, FALSE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RaiseMagicDoors) = { + // for for enter walk scrip to complete + EVT_LABEL(10) + EVT_IS_THREAD_RUNNING(MV_EnterWalkScriptID, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(EVT_GROUP_01) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(PlaySound, SOUND_A) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(N(GetPointsWithCamRelativeOffset), LVar0, LVar2, EVT_FLOAT(30.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) + EVT_CALL(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(EnableModel, MODEL_o44, TRUE) + EVT_SET(LVar0, MODEL_migi) + EVT_EXEC_WAIT(N(EVS_AnimateDoorRaising)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 400) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(N(GetPointsWithCamRelativeOffset), LVar0, LVar2, EVT_FLOAT(-60.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) + EVT_CALL(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(EnableModel, MODEL_o43, TRUE) + EVT_SET(LVar0, MODEL_hidari) + EVT_EXEC_WAIT(N(EVS_AnimateDoorRaising)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RESUME_GROUP(EVT_GROUP_01) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LowerMagicDoors) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(15) + EVT_CALL(PlaySound, SOUND_B) + EVT_WAIT(15) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_SET_VEC3(LVar0, 220, 0, 0) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(N(GetPointsWithCamRelativeOffset), LVar0, LVar2, EVT_FLOAT(30.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) + EVT_CALL(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_SET(LVar0, MODEL_migi) + EVT_EXEC_WAIT(N(EVS_AnimateDoorLowering)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_WAIT(1) + EVT_SET_VEC3(LVar0, 220, 0, 0) + EVT_SUB(LVar0, 400) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(N(GetPointsWithCamRelativeOffset), LVar0, LVar2, EVT_FLOAT(-60.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, LVar0, LVar1) + EVT_CALL(SetCamPosB, CAM_DEFAULT, LVar2, LVar3) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_SET(LVar0, MODEL_hidari) + EVT_EXEC_WAIT(N(EVS_AnimateDoorLowering)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RestoreMagicDoors) = { + EVT_EXEC(N(EVS_LowerMagicDoors)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupMagicDoors) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o44, FALSE) + EVT_CALL(EnableModel, MODEL_o43, FALSE) + EVT_IF_EQ(GF_TRD07_Defeated_DungeonAmbush, FALSE) + EVT_EXEC(N(EVS_RaiseMagicDoors)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_08/trd_08_3_npc.c b/src/world/area_trd/trd_08/trd_08_3_npc.c index 3d6da66326..b985acf0af 100644 --- a/src/world/area_trd/trd_08/trd_08_3_npc.c +++ b/src/world/area_trd/trd_08/trd_08_3_npc.c @@ -37,7 +37,7 @@ EvtScript N(EVS_FireBar_Defeated) = { EVT_CALL(RandInt, 30, LVar5) EVT_ADD(LVar1, LVar4) EVT_ADD(LVar2, LVar5) - EVT_CALL(PlayEffect, EFFECT_00, LVar1, LVar2, LVar3, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_00, LVar1, LVar2, LVar3, 1, 20, 3, 2) EVT_END_LOOP EVT_IF_EQ(LVarA, NPC_FireBar_1A) EVT_IF_EQ(AF_TRD08_FireBar1_Coins, FALSE) diff --git a/src/world/area_trd/trd_09/9BD660.c b/src/world/area_trd/trd_09/9BD660.c deleted file mode 100644 index 7610f6f4b6..0000000000 --- a/src/world/area_trd/trd_09/9BD660.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "trd_09.h" - -static char* N(exit_str_0) = "trd_01"; -static char* N(exit_str_1) = "trd_10"; -static char* N(exit_str_2) = "trd_09"; -static char* N(exit_str_3) = ""; - -ApiStatus func_80240000_9BD660(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Enemy* npc = script->owner1.enemy; - s32 npcID = evt_get_variable(script, *args++); - s32 varIdx = evt_get_variable(script, *args++); - s32 var3 = *args++; - - if (npcID == NPC_SELF) { - npcID = npc->npcID; - } - - npc = get_enemy(npcID); - if (npc != NULL) { - evt_set_variable(script, var3, npc->varTable[varIdx]); - } else { - evt_set_variable(script, var3, -1); - } - - return ApiStatus_DONE2; -} diff --git a/src/world/area_trd/trd_09/9BD720.c b/src/world/area_trd/trd_09/9BD720.c deleted file mode 100644 index db5284a3f3..0000000000 --- a/src/world/area_trd/trd_09/9BD720.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "trd_09.h" - -#include "world/partners.h" -extern s32 D_80245234_9C2894; - -// duplicate of func_8024095C_97BF8C -ApiStatus func_802400C0_9BD720(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - - switch (D_80245234_9C2894) { - case 0: - D_80245234_9C2894 = 1; - return ApiStatus_BLOCK; - case 1: - case 2: - D_80245234_9C2894++; - return ApiStatus_BLOCK; - case 3: - wPartnerNpc->pos.x = playerStatus->position.x - 30.0f; - wPartnerNpc->pos.z = playerStatus->position.z + 30.0f; - partner_clear_player_tracking(wPartnerNpc); - partner_set_goal_pos(playerStatus->position.x, playerStatus->position.z); - func_800EF3D4(0); - set_npc_yaw(wPartnerNpc, 90.0f); - playerStatus->targetYaw = 90.0f; - playerStatus->currentYaw = 90.0f; - playerStatus->spriteFacingAngle = 0.0f; - return ApiStatus_DONE2; - } - return ApiStatus_BLOCK; -} diff --git a/src/world/area_trd/trd_09/trd_09.h b/src/world/area_trd/trd_09/trd_09.h index fe5bafe44e..1cd69a51b2 100644 --- a/src/world/area_trd/trd_09/trd_09.h +++ b/src/world/area_trd/trd_09/trd_09.h @@ -2,8 +2,40 @@ /// @brief Koopa Bros Fortress - Battlement #include "common.h" -#include "../trd.h" #include "message_ids.h" #include "map.h" +#include "../trd.h" +#include "mapfs/trd_09_shape.h" +#include "mapfs/trd_09_hit.h" + +#include "sprite/npc/KoopaBros.h" +#include "sprite/npc/BillBlaster.h" +#include "sprite/npc/BulletBill.h" + +enum { + NPC_BillBlaster_01 = 10, + NPC_BillBlaster_02 = 11, + NPC_BillBlaster_03 = 12, + NPC_BulletBill_01 = 20, + NPC_BulletBill_02 = 21, + NPC_BulletBill_03 = 22, + NPC_BulletBill_04 = 23, + NPC_BulletBill_05 = 24, + NPC_BulletBill_06 = 25, + NPC_BulletBill_07 = 26, + NPC_BulletBill_08 = 27, + NPC_BulletBill_09 = 28, + NPC_BulletBill_10 = 29, + NPC_BulletBill_Demo1 = 40, + NPC_BulletBill_Demo2 = 41, + NPC_BulletBill_Demo3 = 42, + NPC_BulletBill_Demo4 = 43, + NPC_BulletBill_Demo5 = 44, + NPC_KoopaBros_Red = 70, + NPC_KoopaBros_Green = 71, + NPC_KoopaBros_Yellow = 72, + NPC_KoopaBros_Black = 73, +}; + #define NAMESPACE trd_09 diff --git a/src/world/area_trd/trd_09/trd_09_0_header.c b/src/world/area_trd/trd_09/trd_09_0_header.c new file mode 100644 index 0000000000..b1eaa6e37b --- /dev/null +++ b/src/world/area_trd/trd_09/trd_09_0_header.c @@ -0,0 +1,32 @@ +#include "trd_09.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [trd_09_ENTRY_0] { -565.0, 60.0, 10.0, 90.0 }, + [trd_09_ENTRY_1] { 1515.0, 60.0, 0.0, 270.0 }, + [trd_09_ENTRY_2] { -340.0, 0.0, 50.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_trd_09 }, +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH1_KOOPA_BROS_FIRING_BLASTERS) + EVT_IF_EQ(GF_TRD09_Defeated_BillBlasters, FALSE) + EVT_CALL(SetMusicTrack, 0, SONG_BULLET_BILL_ASSAULT, 0, 8) + EVT_ELSE + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_FORTRESS, 0, 8) + EVT_END_IF + EVT_ELSE + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_FORTRESS, 0, 8) + EVT_END_IF + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_09/trd_09_1_main.c b/src/world/area_trd/trd_09/trd_09_1_main.c new file mode 100644 index 0000000000..ef0bb70ff4 --- /dev/null +++ b/src/world/area_trd/trd_09/trd_09_1_main.c @@ -0,0 +1,70 @@ +#include "trd_09.h" + +extern EvtScript N(EVS_PlayDemoScene); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DemoNPCs); +extern NpcGroupList N(DefaultNPCs); + +EvtScript N(EVS_ExitDoors_trd_01_3) = EVT_EXIT_DOUBLE_DOOR(trd_09_ENTRY_0, "trd_01", trd_01_ENTRY_3, + COLLIDER_tt5, MODEL_o67, MODEL_o63); +EvtScript N(EVS_ExitDoors_trd_10_0) = EVT_EXIT_DOUBLE_DOOR(trd_09_ENTRY_1, "trd_10", trd_10_ENTRY_0, + COLLIDER_tt4, MODEL_o60, MODEL_o65); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_01_3)), TRIGGER_WALL_PRESS_A, COLLIDER_tt5, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_10_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tt4, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_EXEC(EnterSavePoint) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END_IF + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(EVT_GROUP_01) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(trd_09_ENTRY_0) + EVT_SET(LVar2, MODEL_o67) + EVT_SET(LVar3, MODEL_o63) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(trd_09_ENTRY_1) + EVT_SET(LVar2, MODEL_o60) + EVT_SET(LVar3, MODEL_o65) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_END_SWITCH + EVT_RESUME_GROUP(EVT_GROUP_01) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_KOOPA_BROS_FORTRESS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(GetDemoState, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DemoNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC_WAIT(N(EVS_PlayDemoScene)) + EVT_RETURN + EVT_END_IF + EVT_IF_LE(GB_StoryProgress, STORY_CH1_DEFEATED_KOOPA_BROS) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_END_IF + EVT_IF_EQ(GF_TRD09_Defeated_BillBlasters, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o85, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_09/trd_09_2_entity.c b/src/world/area_trd/trd_09/trd_09_2_entity.c new file mode 100644 index 0000000000..7ffc9a7778 --- /dev/null +++ b/src/world/area_trd/trd_09/trd_09_2_entity.c @@ -0,0 +1,21 @@ +#include "trd_09.h" +#include "entity.h" + +EvtScript N(EVS_BombRock) = { + EVT_SET(GF_TRD09_BombedRock, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_TRD09_BombedRock, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BombableRock2), -470, -75, 139, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_BombRock))) + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), 1400, -15, 135, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 1490, -15, 135, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -540, -15, 135, 0, ITEM_MAPLE_SYRUP, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TRD09_ItemBlock_MapleSyrup) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_09/trd_09_3_npcs.c b/src/world/area_trd/trd_09/trd_09_3_npcs.c new file mode 100644 index 0000000000..b600383973 --- /dev/null +++ b/src/world/area_trd/trd_09/trd_09_3_npcs.c @@ -0,0 +1,1479 @@ +#include "trd_09.h" +#include "effects.h" + +extern EvtScript D_800936C0; +extern EvtScript EVS_NpcHitRecoil; + +API_CALLABLE(N(func_80240000_9BD660)) { + Bytecode* args = script->ptrReadPos; + Enemy* npc = script->owner1.enemy; + s32 npcID = evt_get_variable(script, *args++); + s32 varIdx = evt_get_variable(script, *args++); + s32 var3 = *args++; + + if (npcID == NPC_SELF) { + npcID = npc->npcID; + } + + npc = get_enemy(npcID); + if (npc != NULL) { + evt_set_variable(script, var3, npc->varTable[varIdx]); + } else { + evt_set_variable(script, var3, -1); + } + + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcAuxAI_BillBlaster) = { + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_200000, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240844_9BDEA4) = { + EVT_LABEL(0) + EVT_SETF(LVar0, EVT_FLOAT(400.0)) + EVT_SET(LVar1, 1) + EVT_CALL(GetNpcYaw, NPC_SELF, LVar2) + EVT_SET(LVar3, 10) + EVT_SET(LVarA, ANIM_BillBlaster_Anim01) + EVT_SET(LVarB, ANIM_BillBlaster_Anim01) + EVT_EXEC_WAIT(D_800936C0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BillBlaster_Anim02) + EVT_WAIT(15) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcYaw, NPC_SELF, LVar3) + EVT_CALL(AddVectorPolar, LVar0, LVar2, EVT_FLOAT(20.0), LVar3) + EVT_ADD(LVar1, 12) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BillBlaster_Anim01) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_ADD(LVar0, 1) + EVT_CALL(SetNpcVar, LVar0, 0, 1) + EVT_LABEL(1) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_ADD(LVar0, 1) + EVT_CALL(GetNpcVar, LVar0, 0, LVar1) + EVT_IF_EQ(LVar1, 0) + EVT_WAIT(1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(RandInt, 30, LVar0) + EVT_ADD(LVar0, 30) + EVT_WAIT(LVar0) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_BillBlaster) = { + EVT_CALL(SetBattleMusic, SONG_SPECIAL_BATTLE) + EVT_CALL(GetOwnerEncounterTrigger, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_NONE) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_JUMP) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_HAMMER) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_PARTNER) + EVT_SET(LVar0, ANIM_BillBlaster_Anim03) + EVT_EXEC_WAIT(EVS_NpcHitRecoil) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_SPIN) + EVT_THREAD + EVT_CALL(func_800458CC, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_SET(LVarA, 0) + EVT_LOOP(30) + EVT_ADD(LVarA, 40) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, LVarA, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_IF + EVT_END_THREAD + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240B80_9BE1E0) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_10, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAuxAI_BulletBill) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240C1C_9BE27C) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240C2C_9BE28C) = { + EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(DoNpcDefeat) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +s32 N(missing_80240CE4_CE4)[] = { + 0x002E0001, 0x001A0020, 0x80240820, 0x00000000, 0x80240844, 0x80240A48, 0x00000000, 0x80240B80, + 0x00000000, 0x00000000, 0x000A0000, 0x002D0001, 0x000E001F, 0x80240C0C, 0x00000000, 0x80240C1C, + 0x80077F70, 0x00000000, 0x80240C2C, 0x00000000, 0x00000000, 0x00050000, +}; + +EvtScript N(EVS_NpcAuxAI_KoopaBros_Red) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH1_KOOPA_BROS_FIRING_BLASTERS) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_KoopaBros_Red) = { + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_IF_LT(LVar0, -370) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(20) + EVT_CALL(FadeOutMusic, 0, 2000) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 1300, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 1490, 0, 0) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 1466, EVT_FLOAT(41.6)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(20) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 1466, EVT_FLOAT(41.6)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 1490, 60, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 25, -9) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(20) + EVT_CALL(PlaySound, SOUND_METAL_DOOR_OPEN) + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_BROS_THEME, 0, 8) + EVT_CALL(MakeLerp, 0, 110, 10, EASING_COS_IN_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o60, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o65, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_CALL(SetNpcVar, NPC_KoopaBros_Green, 0, 1) + EVT_CALL(SetNpcVar, NPC_KoopaBros_Yellow, 0, 1) + EVT_CALL(SetNpcVar, NPC_KoopaBros_Black, 0, 1) + EVT_WAIT(60) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Anim03) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) + EVT_CALL(NpcMoveTo, NPC_SELF, 1490, 0, 0) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Red_Anim1B, ANIM_KoopaBros_Red_Anim1B, 0, MSG_CH1_00F2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 1300, 0, 0) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 1466, EVT_FLOAT(41.6)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 1250, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Anim12) + EVT_CALL(NpcJump0, NPC_SELF, 1440, 30, 0, 20) + EVT_CALL(NpcJump0, NPC_SELF, 1380, 0, 0, 20) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Anim03) + EVT_CALL(NpcMoveTo, NPC_SELF, 1360, 0, 0) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Red_Anim04) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_KoopaBros_Red_Anim1B, ANIM_KoopaBros_Red_Anim1B, 0, MSG_CH1_00F3) + EVT_CALL(SetNpcVar, NPC_KoopaBros_Green, 0, 2) + EVT_CALL(SetNpcVar, NPC_KoopaBros_Yellow, 0, 2) + EVT_CALL(SetNpcVar, NPC_KoopaBros_Black, 0, 2) + EVT_CALL(SetSelfVar, 0, 1) + EVT_CALL(SetMusicTrack, 0, SONG_BULLET_BILL_ASSAULT, 0, 8) + EVT_WAIT(60) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 1300, 0, 0) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_SET(GB_StoryProgress, STORY_CH1_KOOPA_BROS_FIRING_BLASTERS) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(RotateModel, MODEL_o60, 0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o65, 0, 0, 1, 0) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAuxAI_KoopaBros_Black) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH1_KOOPA_BROS_FIRING_BLASTERS) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAuxAI_KoopaBros_Yellow) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH1_KOOPA_BROS_FIRING_BLASTERS) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAuxAI_KoopaBros_Green) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH1_KOOPA_BROS_FIRING_BLASTERS) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_KoopaBros_Black) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_LABEL(10) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim03) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) + EVT_CALL(NpcMoveTo, NPC_SELF, 1520, 20, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim12) + EVT_CALL(NpcJump0, NPC_SELF, 1470, 30, 30, 20) + EVT_CALL(NpcJump0, NPC_SELF, 1410, 0, 40, 20) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim03) + EVT_CALL(NpcMoveTo, NPC_SELF, 1330, 50, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim01) + EVT_LABEL(20) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_WAIT(1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Black_Anim1B) + EVT_WAIT(100) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_KoopaBros_Yellow) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_LABEL(10) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Anim03) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) + EVT_CALL(NpcMoveTo, NPC_SELF, 1505, 5, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Anim12) + EVT_CALL(NpcJump0, NPC_SELF, 1455, 30, 5, 20) + EVT_CALL(NpcJump0, NPC_SELF, 1395, 0, 5, 20) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Anim03) + EVT_CALL(NpcMoveTo, NPC_SELF, 1315, 5, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Anim01) + EVT_LABEL(20) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_WAIT(1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Yellow_Anim1B) + EVT_WAIT(100) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_KoopaBros_Green) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_LABEL(10) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Anim03) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.8)) + EVT_CALL(NpcMoveTo, NPC_SELF, 1490, -10, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Anim12) + EVT_CALL(NpcJump0, NPC_SELF, 1440, 30, -20, 20) + EVT_CALL(NpcJump0, NPC_SELF, 1380, 0, -30, 20) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Anim03) + EVT_CALL(NpcMoveTo, NPC_SELF, 1300, -40, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Anim01) + EVT_LABEL(20) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_WAIT(1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaBros_Green_Anim1B) + EVT_WAIT(100) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_BillBlaster) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH1_KOOPA_BROS_FIRING_BLASTERS) + EVT_LABEL(100) + EVT_CALL(GetNpcVar, NPC_KoopaBros_Red, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_WAIT(1) + EVT_GOTO(100) + EVT_END_IF + EVT_END_IF + EVT_LABEL(0) + EVT_SET(LVarA, 20) + EVT_LOOP(10) + EVT_CALL(N(func_80240000_9BD660), LVarA, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_CALL(SetNpcVar, LVarA, 0, LVar0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BillBlaster_Anim02) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BillBlaster_Anim01) + EVT_CALL(RandInt, 100, LVar0) + EVT_ADD(LVar0, 60) + EVT_WAIT(LVar0) + EVT_END_IF + EVT_ADD(LVarA, 1) + EVT_END_LOOP + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_BulletBill) = { + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_200000, 1) + EVT_LABEL(1) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SelfEnemyOverrideSyncPos, 0) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_LABEL(2) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_WAIT(1) + EVT_GOTO(2) + EVT_END_IF + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BulletBill_Anim04) + EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(SelfEnemyOverrideSyncPos, 1) + EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) + EVT_CALL(GetNpcYaw, LVar0, LVar4) + EVT_CALL(AddVectorPolar, LVar1, LVar3, EVT_FLOAT(14.0), LVar4) + EVT_ADD(LVar2, 11) + EVT_CALL(SetNpcPos, NPC_SELF, LVar1, LVar2, LVar3) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar4, 0) + EVT_CALL(func_80045838, -1, 808, 0x00200000) + EVT_SET(LVarA, LVar1) + EVT_SUB(LVarA, 10) + EVT_SET(LVarB, LVar2) + EVT_ADD(LVarB, 5) + EVT_SET(LVarC, LVar3) + EVT_ADD(LVarC, 3) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVarA, LVarB, LVarC, 0, 0) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(6.0)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(10) + EVT_CALL(NpcMoveTo, NPC_SELF, -437, LVar3, 0) + EVT_CASE_EQ(11) + EVT_CALL(NpcMoveTo, NPC_SELF, -460, LVar3, 0) + EVT_CASE_EQ(12) + EVT_CALL(NpcMoveTo, NPC_SELF, -450, LVar3, 0) + EVT_END_SWITCH + EVT_CALL(func_80045838, -1, 0xB0000018, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BulletBill_Anim05) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 5) + EVT_ADD(LVar2, 1) + EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(0.05), 20) + EVT_ADD(LVar2, 1) + EVT_PLAY_EFFECT(EFFECT_RING_BLAST, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.2), 25) + EVT_WAIT(3) + EVT_GOTO(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_BulletBill) = { + EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_BulletBill))) + EVT_END_THREAD + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(OnPlayerFled, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_KoopaBros_Red) = { + .defaultAnim = ANIM_KoopaBros_Red_Anim02, + .height = 34, + .radius = 24, + .level = 99, + .otherAI = &N(EVS_NpcAuxAI_KoopaBros_Red), + .ai = &N(EVS_NpcAI_KoopaBros_Red), + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400, +}; + +NpcSettings N(NpcSettings_KoopaBros_Black) = { + .defaultAnim = ANIM_KoopaBros_Black_Anim02, + .height = 34, + .radius = 24, + .level = 99, + .otherAI = &N(EVS_NpcAuxAI_KoopaBros_Black), + .ai = &N(EVS_NpcAI_KoopaBros_Black), + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400, +}; + +NpcSettings N(NpcSettings_KoopaBros_Yellow) = { + .defaultAnim = ANIM_KoopaBros_Yellow_Anim02, + .height = 34, + .radius = 24, + .level = 99, + .otherAI = &N(EVS_NpcAuxAI_KoopaBros_Yellow), + .ai = &N(EVS_NpcAI_KoopaBros_Yellow), + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400, +}; + +NpcSettings N(NpcSettings_KoopaBros_Green) = { + .defaultAnim = ANIM_KoopaBros_Green_Anim02, + .height = 34, + .radius = 24, + .level = 99, + .otherAI = &N(EVS_NpcAuxAI_KoopaBros_Green), + .ai = &N(EVS_NpcAI_KoopaBros_Green), + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400, +}; + +NpcSettings N(NpcSettings_BillBlaster) = { + .defaultAnim = ANIM_BillBlaster_Anim01, + .height = 26, + .radius = 32, + .level = 10, + .otherAI = &N(EVS_NpcAuxAI_BillBlaster), + .ai = &N(EVS_NpcAI_BillBlaster), + .onHit = &N(EVS_NpcHit_BillBlaster), +}; + +NpcSettings N(NpcSettings_BulletBill) = { + .defaultAnim = ANIM_BulletBill_Anim01, + .height = 14, + .radius = 31, + .level = 5, + .otherAI = &N(EVS_NpcAuxAI_BulletBill), + .ai = &N(EVS_NpcAI_BulletBill), + .onHit = &EnemyNpcHit, + .onDefeat = &N(EVS_NpcDefeat_BulletBill), +}; + +EvtScript N(EVS_NpcDefeat_BillBlaster) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o85, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_TRD09_Defeated_BillBlasters, TRUE) + EVT_CALL(DoNpcDefeat) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_BillBlaster) = { + EVT_IF_EQ(GF_TRD09_Defeated_BillBlasters, FALSE) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_BillBlaster))) + EVT_ELSE + EVT_CALL(RemoveEncounter, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_BillBlasters)[] = { + { + .id = NPC_BillBlaster_01, + .settings = &N(NpcSettings_BillBlaster), + .pos = { 1260.0f, 0.0f, -40.0f }, + .yaw = 270, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_40000 | NPC_FLAG_200000, + .init = &N(EVS_NpcInit_BillBlaster), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BillBlaster_Anim01, + .walk = ANIM_BillBlaster_Anim01, + .run = ANIM_BillBlaster_Anim01, + .chase = ANIM_BillBlaster_Anim01, + .anim_4 = ANIM_BillBlaster_Anim01, + .anim_5 = ANIM_BillBlaster_Anim01, + .death = ANIM_BillBlaster_Anim03, + .hit = ANIM_BillBlaster_Anim03, + .anim_8 = ANIM_BillBlaster_Anim01, + .anim_9 = ANIM_BillBlaster_Anim01, + .anim_A = ANIM_BillBlaster_Anim01, + .anim_B = ANIM_BillBlaster_Anim01, + .anim_C = ANIM_BillBlaster_Anim01, + .anim_D = ANIM_BillBlaster_Anim01, + .anim_E = ANIM_BillBlaster_Anim01, + .anim_F = ANIM_BillBlaster_Anim01, + }, + }, + { + .id = NPC_BillBlaster_03, + .settings = &N(NpcSettings_BillBlaster), + .pos = { 1275.0f, 0.0f, 5.0f }, + .yaw = 270, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_40000 | NPC_FLAG_200000, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BillBlaster_Anim01, + .walk = ANIM_BillBlaster_Anim01, + .run = ANIM_BillBlaster_Anim01, + .chase = ANIM_BillBlaster_Anim01, + .anim_4 = ANIM_BillBlaster_Anim01, + .anim_5 = ANIM_BillBlaster_Anim01, + .death = ANIM_BillBlaster_Anim03, + .hit = ANIM_BillBlaster_Anim03, + .anim_8 = ANIM_BillBlaster_Anim01, + .anim_9 = ANIM_BillBlaster_Anim01, + .anim_A = ANIM_BillBlaster_Anim01, + .anim_B = ANIM_BillBlaster_Anim01, + .anim_C = ANIM_BillBlaster_Anim01, + .anim_D = ANIM_BillBlaster_Anim01, + .anim_E = ANIM_BillBlaster_Anim01, + .anim_F = ANIM_BillBlaster_Anim01, + }, + }, + { + .id = NPC_BillBlaster_02, + .settings = &N(NpcSettings_BillBlaster), + .pos = { 1290.0f, 0.0f, 50.0f }, + .yaw = 270, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_40000 | NPC_FLAG_200000, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BillBlaster_Anim01, + .walk = ANIM_BillBlaster_Anim01, + .run = ANIM_BillBlaster_Anim01, + .chase = ANIM_BillBlaster_Anim01, + .anim_4 = ANIM_BillBlaster_Anim01, + .anim_5 = ANIM_BillBlaster_Anim01, + .death = ANIM_BillBlaster_Anim03, + .hit = ANIM_BillBlaster_Anim03, + .anim_8 = ANIM_BillBlaster_Anim01, + .anim_9 = ANIM_BillBlaster_Anim01, + .anim_A = ANIM_BillBlaster_Anim01, + .anim_B = ANIM_BillBlaster_Anim01, + .anim_C = ANIM_BillBlaster_Anim01, + .anim_D = ANIM_BillBlaster_Anim01, + .anim_E = ANIM_BillBlaster_Anim01, + .anim_F = ANIM_BillBlaster_Anim01, + }, + }, +}; + +StaticNpc N(NpcData_BulletBill_01) = { + .id = NPC_BulletBill_01, + .settings = &N(NpcSettings_BulletBill), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_REFLECT_FLOOR, + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BulletBill_Anim01, + .walk = ANIM_BulletBill_Anim02, + .run = ANIM_BulletBill_Anim03, + .chase = ANIM_BulletBill_Anim03, + .anim_4 = ANIM_BulletBill_Anim01, + .anim_5 = ANIM_BulletBill_Anim04, + .death = ANIM_BulletBill_Anim05, + .hit = ANIM_BulletBill_Anim05, + .anim_8 = ANIM_BulletBill_Anim01, + .anim_9 = ANIM_BulletBill_Anim01, + .anim_A = ANIM_BulletBill_Anim01, + .anim_B = ANIM_BulletBill_Anim01, + .anim_C = ANIM_BulletBill_Anim01, + .anim_D = ANIM_BulletBill_Anim01, + .anim_E = ANIM_BulletBill_Anim01, + .anim_F = ANIM_BulletBill_Anim01, + }, +}; + +StaticNpc N(NpcData_BulletBill_02) = { + .id = NPC_BulletBill_02, + .settings = &N(NpcSettings_BulletBill), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_REFLECT_FLOOR, + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BulletBill_Anim01, + .walk = ANIM_BulletBill_Anim02, + .run = ANIM_BulletBill_Anim03, + .chase = ANIM_BulletBill_Anim03, + .anim_4 = ANIM_BulletBill_Anim01, + .anim_5 = ANIM_BulletBill_Anim04, + .death = ANIM_BulletBill_Anim05, + .hit = ANIM_BulletBill_Anim05, + .anim_8 = ANIM_BulletBill_Anim01, + .anim_9 = ANIM_BulletBill_Anim01, + .anim_A = ANIM_BulletBill_Anim01, + .anim_B = ANIM_BulletBill_Anim01, + .anim_C = ANIM_BulletBill_Anim01, + .anim_D = ANIM_BulletBill_Anim01, + .anim_E = ANIM_BulletBill_Anim01, + .anim_F = ANIM_BulletBill_Anim01, + }, +}; + +StaticNpc N(NpcData_BulletBill_03) = { + .id = NPC_BulletBill_03, + .settings = &N(NpcSettings_BulletBill), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_REFLECT_FLOOR, + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BulletBill_Anim01, + .walk = ANIM_BulletBill_Anim02, + .run = ANIM_BulletBill_Anim03, + .chase = ANIM_BulletBill_Anim03, + .anim_4 = ANIM_BulletBill_Anim01, + .anim_5 = ANIM_BulletBill_Anim04, + .death = ANIM_BulletBill_Anim05, + .hit = ANIM_BulletBill_Anim05, + .anim_8 = ANIM_BulletBill_Anim01, + .anim_9 = ANIM_BulletBill_Anim01, + .anim_A = ANIM_BulletBill_Anim01, + .anim_B = ANIM_BulletBill_Anim01, + .anim_C = ANIM_BulletBill_Anim01, + .anim_D = ANIM_BulletBill_Anim01, + .anim_E = ANIM_BulletBill_Anim01, + .anim_F = ANIM_BulletBill_Anim01, + }, +}; + +StaticNpc N(NpcData_BulletBill_04) = { + .id = NPC_BulletBill_04, + .settings = &N(NpcSettings_BulletBill), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_REFLECT_FLOOR, + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BulletBill_Anim01, + .walk = ANIM_BulletBill_Anim02, + .run = ANIM_BulletBill_Anim03, + .chase = ANIM_BulletBill_Anim03, + .anim_4 = ANIM_BulletBill_Anim01, + .anim_5 = ANIM_BulletBill_Anim04, + .death = ANIM_BulletBill_Anim05, + .hit = ANIM_BulletBill_Anim05, + .anim_8 = ANIM_BulletBill_Anim01, + .anim_9 = ANIM_BulletBill_Anim01, + .anim_A = ANIM_BulletBill_Anim01, + .anim_B = ANIM_BulletBill_Anim01, + .anim_C = ANIM_BulletBill_Anim01, + .anim_D = ANIM_BulletBill_Anim01, + .anim_E = ANIM_BulletBill_Anim01, + .anim_F = ANIM_BulletBill_Anim01, + }, +}; + +StaticNpc N(NpcData_BulletBill_05) = { + .id = NPC_BulletBill_05, + .settings = &N(NpcSettings_BulletBill), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_REFLECT_FLOOR, + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BulletBill_Anim01, + .walk = ANIM_BulletBill_Anim02, + .run = ANIM_BulletBill_Anim03, + .chase = ANIM_BulletBill_Anim03, + .anim_4 = ANIM_BulletBill_Anim01, + .anim_5 = ANIM_BulletBill_Anim04, + .death = ANIM_BulletBill_Anim05, + .hit = ANIM_BulletBill_Anim05, + .anim_8 = ANIM_BulletBill_Anim01, + .anim_9 = ANIM_BulletBill_Anim01, + .anim_A = ANIM_BulletBill_Anim01, + .anim_B = ANIM_BulletBill_Anim01, + .anim_C = ANIM_BulletBill_Anim01, + .anim_D = ANIM_BulletBill_Anim01, + .anim_E = ANIM_BulletBill_Anim01, + .anim_F = ANIM_BulletBill_Anim01, + }, +}; + +StaticNpc N(NpcData_BulletBill_06) = { + .id = NPC_BulletBill_06, + .settings = &N(NpcSettings_BulletBill), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_REFLECT_FLOOR, + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BulletBill_Anim01, + .walk = ANIM_BulletBill_Anim02, + .run = ANIM_BulletBill_Anim03, + .chase = ANIM_BulletBill_Anim03, + .anim_4 = ANIM_BulletBill_Anim01, + .anim_5 = ANIM_BulletBill_Anim04, + .death = ANIM_BulletBill_Anim05, + .hit = ANIM_BulletBill_Anim05, + .anim_8 = ANIM_BulletBill_Anim01, + .anim_9 = ANIM_BulletBill_Anim01, + .anim_A = ANIM_BulletBill_Anim01, + .anim_B = ANIM_BulletBill_Anim01, + .anim_C = ANIM_BulletBill_Anim01, + .anim_D = ANIM_BulletBill_Anim01, + .anim_E = ANIM_BulletBill_Anim01, + .anim_F = ANIM_BulletBill_Anim01, + }, +}; + +StaticNpc N(NpcData_BulletBill_07) = { + .id = NPC_BulletBill_07, + .settings = &N(NpcSettings_BulletBill), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_REFLECT_FLOOR, + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BulletBill_Anim01, + .walk = ANIM_BulletBill_Anim02, + .run = ANIM_BulletBill_Anim03, + .chase = ANIM_BulletBill_Anim03, + .anim_4 = ANIM_BulletBill_Anim01, + .anim_5 = ANIM_BulletBill_Anim04, + .death = ANIM_BulletBill_Anim05, + .hit = ANIM_BulletBill_Anim05, + .anim_8 = ANIM_BulletBill_Anim01, + .anim_9 = ANIM_BulletBill_Anim01, + .anim_A = ANIM_BulletBill_Anim01, + .anim_B = ANIM_BulletBill_Anim01, + .anim_C = ANIM_BulletBill_Anim01, + .anim_D = ANIM_BulletBill_Anim01, + .anim_E = ANIM_BulletBill_Anim01, + .anim_F = ANIM_BulletBill_Anim01, + }, +}; + +StaticNpc N(NpcData_BulletBill_08) = { + .id = NPC_BulletBill_08, + .settings = &N(NpcSettings_BulletBill), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_REFLECT_FLOOR, + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BulletBill_Anim01, + .walk = ANIM_BulletBill_Anim02, + .run = ANIM_BulletBill_Anim03, + .chase = ANIM_BulletBill_Anim03, + .anim_4 = ANIM_BulletBill_Anim01, + .anim_5 = ANIM_BulletBill_Anim04, + .death = ANIM_BulletBill_Anim05, + .hit = ANIM_BulletBill_Anim05, + .anim_8 = ANIM_BulletBill_Anim01, + .anim_9 = ANIM_BulletBill_Anim01, + .anim_A = ANIM_BulletBill_Anim01, + .anim_B = ANIM_BulletBill_Anim01, + .anim_C = ANIM_BulletBill_Anim01, + .anim_D = ANIM_BulletBill_Anim01, + .anim_E = ANIM_BulletBill_Anim01, + .anim_F = ANIM_BulletBill_Anim01, + }, +}; + +StaticNpc N(NpcData_BulletBill_09) = { + .id = NPC_BulletBill_09, + .settings = &N(NpcSettings_BulletBill), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_REFLECT_FLOOR, + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BulletBill_Anim01, + .walk = ANIM_BulletBill_Anim02, + .run = ANIM_BulletBill_Anim03, + .chase = ANIM_BulletBill_Anim03, + .anim_4 = ANIM_BulletBill_Anim01, + .anim_5 = ANIM_BulletBill_Anim04, + .death = ANIM_BulletBill_Anim05, + .hit = ANIM_BulletBill_Anim05, + .anim_8 = ANIM_BulletBill_Anim01, + .anim_9 = ANIM_BulletBill_Anim01, + .anim_A = ANIM_BulletBill_Anim01, + .anim_B = ANIM_BulletBill_Anim01, + .anim_C = ANIM_BulletBill_Anim01, + .anim_D = ANIM_BulletBill_Anim01, + .anim_E = ANIM_BulletBill_Anim01, + .anim_F = ANIM_BulletBill_Anim01, + }, +}; + +StaticNpc N(NpcData_BulletBill_10) = { + .id = NPC_BulletBill_10, + .settings = &N(NpcSettings_BulletBill), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_REFLECT_FLOOR, + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BulletBill_Anim01, + .walk = ANIM_BulletBill_Anim02, + .run = ANIM_BulletBill_Anim03, + .chase = ANIM_BulletBill_Anim03, + .anim_4 = ANIM_BulletBill_Anim01, + .anim_5 = ANIM_BulletBill_Anim04, + .death = ANIM_BulletBill_Anim05, + .hit = ANIM_BulletBill_Anim05, + .anim_8 = ANIM_BulletBill_Anim01, + .anim_9 = ANIM_BulletBill_Anim01, + .anim_A = ANIM_BulletBill_Anim01, + .anim_B = ANIM_BulletBill_Anim01, + .anim_C = ANIM_BulletBill_Anim01, + .anim_D = ANIM_BulletBill_Anim01, + .anim_E = ANIM_BulletBill_Anim01, + .anim_F = ANIM_BulletBill_Anim01, + }, +}; + +StaticNpc N(NpcData_KoopaBros)[] = { + { + .id = NPC_KoopaBros_Red, + .settings = &N(NpcSettings_KoopaBros_Red), + .pos = { 1590.0f, 60.0f, 0.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE, + .initVarCount = 1, + .initVar = { .value = 0 }, + }, + { + .id = NPC_KoopaBros_Green, + .settings = &N(NpcSettings_KoopaBros_Green), + .pos = { 1590.0f, 60.0f, -10.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE, + .initVarCount = 1, + .initVar = { .value = 0 }, + }, + { + .id = NPC_KoopaBros_Yellow, + .settings = &N(NpcSettings_KoopaBros_Yellow), + .pos = { 1605.0f, 60.0f, 5.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE, + .initVarCount = 1, + .initVar = { .value = 0 }, + }, + { + .id = NPC_KoopaBros_Black, + .settings = &N(NpcSettings_KoopaBros_Black), + .pos = { 1620.0f, 60.0f, 20.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE, + .initVarCount = 1, + .initVar = { .value = 0 }, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_BillBlasters), BTL_TRD_PART_1_FORMATION_17, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_01), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_02), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_03), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_04), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_05), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_06), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_07), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_08), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_09), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_10), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_KoopaBros)), + {} +}; + +EvtScript N(EVS_NpcIdle_BulletBill_Demo) = { + EVT_CALL(GetNpcPos, NPC_SELF, LVar1, LVar2, LVar3) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(6.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, -460, LVar3, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_BulletBill_Demo) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_BulletBill_Demo))) + EVT_CALL(SelfEnemyOverrideSyncPos, 1) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_BulletBill_Demo1) = { + .id = NPC_BulletBill_Demo1, + .settings = &N(NpcSettings_BulletBill), + .pos = { -100.0f, 11.0f, 50.0f }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_REFLECT_FLOOR, + .init = &N(EVS_NpcInit_BulletBill_Demo), + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BulletBill_Anim01, + .walk = ANIM_BulletBill_Anim02, + .run = ANIM_BulletBill_Anim03, + .chase = ANIM_BulletBill_Anim03, + .anim_4 = ANIM_BulletBill_Anim01, + .anim_5 = ANIM_BulletBill_Anim04, + .death = ANIM_BulletBill_Anim05, + .hit = ANIM_BulletBill_Anim05, + .anim_8 = ANIM_BulletBill_Anim01, + .anim_9 = ANIM_BulletBill_Anim01, + .anim_A = ANIM_BulletBill_Anim01, + .anim_B = ANIM_BulletBill_Anim01, + .anim_C = ANIM_BulletBill_Anim01, + .anim_D = ANIM_BulletBill_Anim01, + .anim_E = ANIM_BulletBill_Anim01, + .anim_F = ANIM_BulletBill_Anim01, + }, +}; + +StaticNpc N(NpcData_BulletBill_Demo2) = { + .id = NPC_BulletBill_Demo2, + .settings = &N(NpcSettings_BulletBill), + .pos = { -150.0f, 11.0f, 5.0f }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_REFLECT_FLOOR, + .init = &N(EVS_NpcInit_BulletBill_Demo), + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BulletBill_Anim01, + .walk = ANIM_BulletBill_Anim02, + .run = ANIM_BulletBill_Anim03, + .chase = ANIM_BulletBill_Anim03, + .anim_4 = ANIM_BulletBill_Anim01, + .anim_5 = ANIM_BulletBill_Anim04, + .death = ANIM_BulletBill_Anim05, + .hit = ANIM_BulletBill_Anim05, + .anim_8 = ANIM_BulletBill_Anim01, + .anim_9 = ANIM_BulletBill_Anim01, + .anim_A = ANIM_BulletBill_Anim01, + .anim_B = ANIM_BulletBill_Anim01, + .anim_C = ANIM_BulletBill_Anim01, + .anim_D = ANIM_BulletBill_Anim01, + .anim_E = ANIM_BulletBill_Anim01, + .anim_F = ANIM_BulletBill_Anim01, + }, +}; + +StaticNpc N(NpcData_BulletBill_Demo3) = { + .id = NPC_BulletBill_Demo3, + .settings = &N(NpcSettings_BulletBill), + .pos = { 120.0f, 11.0f, 50.0f }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_REFLECT_FLOOR, + .init = &N(EVS_NpcInit_BulletBill_Demo), + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BulletBill_Anim01, + .walk = ANIM_BulletBill_Anim02, + .run = ANIM_BulletBill_Anim03, + .chase = ANIM_BulletBill_Anim03, + .anim_4 = ANIM_BulletBill_Anim01, + .anim_5 = ANIM_BulletBill_Anim04, + .death = ANIM_BulletBill_Anim05, + .hit = ANIM_BulletBill_Anim05, + .anim_8 = ANIM_BulletBill_Anim01, + .anim_9 = ANIM_BulletBill_Anim01, + .anim_A = ANIM_BulletBill_Anim01, + .anim_B = ANIM_BulletBill_Anim01, + .anim_C = ANIM_BulletBill_Anim01, + .anim_D = ANIM_BulletBill_Anim01, + .anim_E = ANIM_BulletBill_Anim01, + .anim_F = ANIM_BulletBill_Anim01, + }, +}; + +StaticNpc N(NpcData_BulletBill_Demo4) = { + .id = NPC_BulletBill_Demo4, + .settings = &N(NpcSettings_BulletBill), + .pos = { 330.0f, 11.0f, 5.0f }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_REFLECT_FLOOR, + .init = &N(EVS_NpcInit_BulletBill_Demo), + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BulletBill_Anim01, + .walk = ANIM_BulletBill_Anim02, + .run = ANIM_BulletBill_Anim03, + .chase = ANIM_BulletBill_Anim03, + .anim_4 = ANIM_BulletBill_Anim01, + .anim_5 = ANIM_BulletBill_Anim04, + .death = ANIM_BulletBill_Anim05, + .hit = ANIM_BulletBill_Anim05, + .anim_8 = ANIM_BulletBill_Anim01, + .anim_9 = ANIM_BulletBill_Anim01, + .anim_A = ANIM_BulletBill_Anim01, + .anim_B = ANIM_BulletBill_Anim01, + .anim_C = ANIM_BulletBill_Anim01, + .anim_D = ANIM_BulletBill_Anim01, + .anim_E = ANIM_BulletBill_Anim01, + .anim_F = ANIM_BulletBill_Anim01, + }, +}; + +StaticNpc N(NpcData_BulletBill_Demo5) = { + .id = NPC_BulletBill_Demo5, + .settings = &N(NpcSettings_BulletBill), + .pos = { 380.0f, 11.0f, -40.0f }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_REFLECT_FLOOR, + .init = &N(EVS_NpcInit_BulletBill_Demo), + .initVarCount = 1, + .initVar = { .value = 0 }, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 3, + .itemDrops = { + { ITEM_MUSHROOM, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = { + .idle = ANIM_BulletBill_Anim01, + .walk = ANIM_BulletBill_Anim02, + .run = ANIM_BulletBill_Anim03, + .chase = ANIM_BulletBill_Anim03, + .anim_4 = ANIM_BulletBill_Anim01, + .anim_5 = ANIM_BulletBill_Anim04, + .death = ANIM_BulletBill_Anim05, + .hit = ANIM_BulletBill_Anim05, + .anim_8 = ANIM_BulletBill_Anim01, + .anim_9 = ANIM_BulletBill_Anim01, + .anim_A = ANIM_BulletBill_Anim01, + .anim_B = ANIM_BulletBill_Anim01, + .anim_C = ANIM_BulletBill_Anim01, + .anim_D = ANIM_BulletBill_Anim01, + .anim_E = ANIM_BulletBill_Anim01, + .anim_F = ANIM_BulletBill_Anim01, + }, +}; + +NpcGroupList N(DemoNPCs) = { + NPC_GROUP(N(NpcData_BulletBill_Demo1), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_Demo2), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_Demo3), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_Demo4), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + NPC_GROUP(N(NpcData_BulletBill_Demo5), BTL_TRD_PART_1_FORMATION_1A, BTL_TRD_PART_1_STAGE_06), + {} +}; diff --git a/src/world/area_trd/trd_09/trd_09_4_demo.c b/src/world/area_trd/trd_09/trd_09_4_demo.c new file mode 100644 index 0000000000..54cf846cea --- /dev/null +++ b/src/world/area_trd/trd_09/trd_09_4_demo.c @@ -0,0 +1,115 @@ +#include "trd_09.h" +#include "world/partners.h" + +EvtScript N(EVS_ProvideDemoInputs) = { + EVT_WAIT(5) + EVT_CALL(DemoJoystickXY, 78, 0) + EVT_WAIT(11) + EVT_CALL(DemoJoystickXY, 79, 1) + EVT_CALL(DemoSetButtons, BUTTON_A) + EVT_WAIT(7) + EVT_CALL(DemoSetButtons, 0) + EVT_WAIT(34) + EVT_CALL(DemoSetButtons, BUTTON_A) + EVT_WAIT(4) + EVT_CALL(DemoSetButtons, 0) + EVT_WAIT(9) + EVT_CALL(DemoJoystickXY, 78, 1) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 76, 6) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 71, 31) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 66, 51) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 63, 60) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 63, 61) + EVT_WAIT(7) + EVT_CALL(DemoJoystickXY, 64, 61) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 65, 59) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 65, 56) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 67, 45) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 71, 28) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 75, 14) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 77, 6) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 78, 2) + EVT_WAIT(13) + EVT_CALL(DemoJoystickXY, 78, 3) + EVT_CALL(DemoSetButtons, BUTTON_A) + EVT_WAIT(9) + EVT_CALL(DemoSetButtons, 0) + EVT_IF_EQ(GF_DemoSceneDone, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_DemoSceneDone, TRUE) + EVT_CALL(GotoMapSpecial, EVT_PTR("trd_09"), trd_09_ENTRY_2, TRANSITION_2) + EVT_WAIT(123) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MonitorDemoState) = { + EVT_WAIT(10) + EVT_LOOP(0) + EVT_CALL(GetDemoState, LVar0) + EVT_IF_EQ(LVar0, DEMO_STATE_CHANGE_MAP) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_IF_EQ(GF_DemoSceneDone, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_DemoSceneDone, TRUE) + EVT_CALL(GotoMapSpecial, EVT_PTR("trd_09"), trd_09_ENTRY_2, TRANSITION_3) + EVT_WAIT(113) + EVT_RETURN + EVT_END +}; + +s32 N(DemoSceneState) = 0; + +// duplicate of func_8024095C_97BF8C +API_CALLABLE(N(SetupDemoScene)) { + PlayerStatus* playerStatus = &gPlayerStatus; + + switch (N(DemoSceneState)) { + case 0: + N(DemoSceneState) = 1; + break; + case 1: + case 2: + N(DemoSceneState)++; + break; + case 3: + wPartnerNpc->pos.x = playerStatus->position.x - 30.0f; + wPartnerNpc->pos.z = playerStatus->position.z + 30.0f; + partner_clear_player_tracking(wPartnerNpc); + partner_set_goal_pos(playerStatus->position.x, playerStatus->position.z); + func_800EF3D4(0); + set_npc_yaw(wPartnerNpc, 90.0f); + playerStatus->targetYaw = 90.0f; + playerStatus->currentYaw = 90.0f; + playerStatus->spriteFacingAngle = 0.0f; + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_PlayDemoScene) = { + EVT_CALL(N(SetupDemoScene)) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) + EVT_SET(GF_DemoSceneDone, FALSE) + EVT_EXEC(N(EVS_MonitorDemoState)) + EVT_EXEC(N(EVS_ProvideDemoInputs)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_10/9C2910.c b/src/world/area_trd/trd_10/9C2910.c deleted file mode 100644 index 964b480299..0000000000 --- a/src/world/area_trd/trd_10/9C2910.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "trd_10.h" - -#include "world/common/StarSpiritEffectFunc.inc.c" - -static char* N(exit_str_0) = "kmr_23"; -static char* N(exit_str_1) = "trd_06"; -static char* N(exit_str_2) = "trd_09"; - -ApiStatus func_802407F4_9C3104(Evt* script, s32 isInitialCall) { - func_80035DF0(10); - return ApiStatus_DONE2; -} diff --git a/src/world/area_trd/trd_10/9C3130.c b/src/world/area_trd/trd_10/9C3130.c deleted file mode 100644 index caaa2e1cd4..0000000000 --- a/src/world/area_trd/trd_10/9C3130.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "trd_10.h" - -ApiStatus N(IsPartnerBombette)(Evt* script, s32 isInitialCall) { - if (gPlayerData.currentPartner == PARTNER_BOMBETTE) { - script->varTable[0] = TRUE; - } else { - script->varTable[0] = FALSE; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_trd/trd_10/trd_10.h b/src/world/area_trd/trd_10/trd_10.h index 84757626bb..09a71979fe 100644 --- a/src/world/area_trd/trd_10/trd_10.h +++ b/src/world/area_trd/trd_10/trd_10.h @@ -2,8 +2,20 @@ /// @brief Koopa Bros Fortress - Boss Battle Room #include "common.h" -#include "../trd.h" #include "message_ids.h" #include "map.h" +#include "../trd.h" +#include "mapfs/trd_10_shape.h" +#include "mapfs/trd_10_hit.h" + +#include "sprite/npc/KoopaBros.h" + +enum { + NPC_KoopaBros_01 = 0, + NPC_KoopaBros_02 = 1, + NPC_KoopaBros_03 = 2, + NPC_KoopaBros_04 = 3, +}; + #define NAMESPACE trd_10 diff --git a/src/world/area_trd/trd_10/trd_10_0_header.c b/src/world/area_trd/trd_10/trd_10_0_header.c new file mode 100644 index 0000000000..bbc1cf27c0 --- /dev/null +++ b/src/world/area_trd/trd_10/trd_10_0_header.c @@ -0,0 +1,29 @@ +#include "trd_10.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [trd_10_ENTRY_0] { -310.0, 0.0, 0.0, 90.0 }, + [trd_10_ENTRY_1] { -225.0, 0.0, 0.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_trd_10 }, +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH1_DEFEATED_KOOPA_BROS) + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_BROS_THEME, 1, 8) + EVT_CASE_EQ(STORY_CH1_DEFEATED_KOOPA_BROS) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_FORTRESS, 0, 8) + EVT_END_SWITCH + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_10/trd_10_1_main.c b/src/world/area_trd/trd_10/trd_10_1_main.c new file mode 100644 index 0000000000..3639e366e8 --- /dev/null +++ b/src/world/area_trd/trd_10/trd_10_1_main.c @@ -0,0 +1,156 @@ +#include "trd_10.h" + +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_InitFakeBowser); +extern EvtScript N(EVS_SetupFakeBowser); +extern NpcGroupList N(DefaultNPCs); + +#include "world/common/StarSpiritEffectFunc.inc.c" + +API_CALLABLE(N(SetMapChangeFadeRate)) { + set_map_change_fade_rate(10); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_BossDefeated) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH1_KOOPA_BROS_FIRING_BLASTERS) + EVT_SET(GB_StoryProgress, STORY_CH1_DEFEATED_KOOPA_BROS) + EVT_CALL(GotoMap, EVT_PTR("trd_06"), trd_06_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_CASE_EQ(STORY_CH1_DEFEATED_KOOPA_BROS) + EVT_SET(LVar0, 1) + EVT_CALL(GetEntryID, LVar1) + EVT_IF_EQ(LVar1, trd_10_ENTRY_1) + EVT_SET(LVar0, 0) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_RETURN + EVT_END_SWITCH + EVT_IF_EQ(LVar0, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -135, 85, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.6)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -135, 30, 0) + EVT_CALL(GetCamDistance, CAM_DEFAULT, LVar1) + EVT_SUB(LVar1, 100) + EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar1) + EVT_IF_NE(10000, 10000) + EVT_CALL(GetCamPitch, CAM_DEFAULT, LVar2, LVar3) + EVT_CALL(SetCamPitch, CAM_DEFAULT, LVar2, 10000) + EVT_END_IF + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(N(StarSpiritEffectFunc2), 0, 180, -135, 10, 0, -135, 85, 0, 30, 0) + EVT_THREAD + EVT_CALL(N(StarSpiritEffectFunc3)) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(1) + EVT_CALL(PlaySound, SOUND_80000067) + EVT_CALL(N(StarSpiritEffectFunc1)) + EVT_CALL(StopSound, SOUND_80000067) + EVT_CALL(PlaySoundAt, SOUND_B2, 0, -135, 85, 0) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(45) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(180) + EVT_WAIT(115) + EVT_CALL(PlaySoundAt, SOUND_137, 0, -135, 85, 0) + EVT_END_THREAD + EVT_CALL(N(StarSpiritEffectFunc4), 1) + EVT_THREAD + EVT_WAIT(80) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_END_THREAD + EVT_ADD(LVar1, 100) + EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar1) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -135, 0, 0) + EVT_CALL(N(StarSpiritEffectFunc4), 2) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar2, LVar3, LVar4) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar2, LVar3, LVar4) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ELSE + EVT_CALL(N(StarSpiritEffectFunc5), 0, -135, 30, 0, 0) + EVT_THREAD + EVT_CALL(N(StarSpiritEffectFunc6)) + EVT_END_THREAD + EVT_WAIT(1) + EVT_END_IF + EVT_CALL(N(StarSpiritEffectFunc4), 3) + EVT_CALL(PlaySoundAtPlayer, SOUND_138, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(GB_StoryProgress, STORY_CH1_STAR_SPIRIT_RESCUED) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_23"), kmr_23_ENTRY_0, TRANSITION_14) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(trd_10_ENTRY_0) + EVT_SET(LVar2, MODEL_o192) + EVT_SET(LVar3, MODEL_o191) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_CASE_EQ(trd_10_ENTRY_1) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, -253, 0, 0) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) + EVT_WAIT(3) + EVT_CALL(EnablePartnerAI) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoors_trd_09_1) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, trd_10_ENTRY_0) + EVT_SET(LVar1, COLLIDER_ttw) + EVT_SET(LVar2, MODEL_o192) + EVT_SET(LVar3, MODEL_o191) + EVT_EXEC(ExitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("trd_09"), trd_09_ENTRY_1) + EVT_END_IF //@bug unmatched endif + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_09_1)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_KOOPA_BROS_FORTRESS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(N(SetMapChangeFadeRate)) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_InitFakeBowser)) + EVT_EXEC(N(EVS_SetupFakeBowser)) + EVT_IF_EQ(GB_StoryProgress, STORY_CH1_DEFEATED_KOOPA_BROS) + EVT_EXEC(N(EVS_BossDefeated)) + EVT_END_IF + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_IF_GE(GB_StoryProgress, STORY_CH1_DEFEATED_KOOPA_BROS) + EVT_EXEC(N(EVS_EnterMap)) + EVT_END_IF + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_10/trd_10_2_npc.c b/src/world/area_trd/trd_10/trd_10_2_npc.c new file mode 100644 index 0000000000..18794cdcd0 --- /dev/null +++ b/src/world/area_trd/trd_10/trd_10_2_npc.c @@ -0,0 +1,464 @@ +#include "trd_10.h" + +extern EvtScript N(EVS_BossDefeated); + +API_CALLABLE(N(IsPartnerBombette)) { + if (gPlayerData.currentPartner == PARTNER_BOMBETTE) { + script->varTable[0] = TRUE; + } else { + script->varTable[0] = FALSE; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcAuxAI_KoopaBros_01) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH1_DEFEATED_KOOPA_BROS) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAux_KoopaBros_01) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_KoopaBros_01) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetPlayerPos, -333, 0, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, -363, 0, 0) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -240, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -240, -170, 0) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 18, -3) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -240, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -240, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2)) + EVT_CALL(PanToTarget, CAM_DEFAULT, EVT_FLOAT(0.5), 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(PlaySound, SOUND_METAL_DOOR_OPEN) + EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o192, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_o191, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -220, 0, 0) + EVT_CALL(MakeLerp, -80, 0, 10, EASING_LINEAR) + EVT_LABEL(11) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o192, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o191, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(11) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_METAL_DOOR_CLOSE) + EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -32, 0, 0) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, -88, 0, 15) + EVT_WAIT(10) + EVT_CALL(func_802CFD30, 0, 5, 4, 2, 1, 0) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim1E) + EVT_WAIT(12) + EVT_CALL(func_802CFD30, 0, 0, 0, 0, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim04) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim02, ANIM_KoopaBros_Black_Anim04, 0, MSG_CH1_00F4) + EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -32, 0, 0) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, -64, 0, 10) + EVT_CALL(SpeakToPlayer, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim02, ANIM_KoopaBros_Red_Anim04, 0, MSG_CH1_00F5) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_02, 0, 0, 10) + EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, -10, 4) + EVT_CALL(NpcMoveTo, NPC_KoopaBros_01, 0, 0, 10) + EVT_WAIT(30) + EVT_CALL(SetNpcPos, NPC_KoopaBros_01, 0, -1000, 0) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_HAS_SHADOW, FALSE) + EVT_CALL(SetNpcPos, NPC_KoopaBros_02, 0, -1000, 0) + EVT_CALL(SetNpcPos, NPC_KoopaBros_03, 0, -1000, 0) + EVT_CALL(SetNpcPos, NPC_KoopaBros_04, 0, -1000, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_00F6, 300, 100) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_00F7, 300, 100) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_00F8, 300, 100) + EVT_CALL(PlaySoundAt, SOUND_1E2, 0, 0, 0, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(1.0)) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_00F9, 300, 100) + EVT_WAIT(30) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_00FA, 300, 100) + EVT_WAIT(30) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_00FB, 300, 100) + EVT_WAIT(10) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_00FC, 300, 100) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -160, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -160, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_SET(AF_TRD_FakeBowserRevealed, TRUE) + EVT_WAIT(60) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -155, 0, 0) + EVT_CALL(StartBossBattle, SONG_FAKE_BOWSER_BATTLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_KoopaBros_01) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_KoopaBros_01) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_KoopaBros_01) = { + EVT_CALL(SetEncounterStatusFlags, 2, TRUE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcPos, NPC_KoopaBros_01, 0, -1000, 0) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_2, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_KoopaBros_01, NPC_FLAG_HAS_SHADOW, TRUE) + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_BROS_INTERLUDE, 0, 8) + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(EnableGroup, MODEL_nise_koppa, FALSE) + EVT_CALL(SetNpcPos, NPC_KoopaBros_01, -170, 30, -55) + EVT_CALL(SetNpcPos, NPC_KoopaBros_02, -150, 30, 55) + EVT_CALL(SetNpcPos, NPC_KoopaBros_03, -130, 30, -55) + EVT_CALL(SetNpcPos, NPC_KoopaBros_04, -110, 30, 55) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_01, ANIM_KoopaBros_Black_Anim1C) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim1C) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_03, ANIM_KoopaBros_Yellow_Anim1C) + EVT_CALL(SetNpcAnimation, NPC_KoopaBros_04, ANIM_KoopaBros_Green_Anim1C) + EVT_WAIT(1) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH1_010B, 160, 40) + EVT_END_THREAD + EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_01, EVT_FLOAT(0.3)) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_02, EVT_FLOAT(0.3)) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_03, EVT_FLOAT(0.3)) + EVT_CALL(SetNpcJumpscale, NPC_KoopaBros_04, EVT_FLOAT(0.3)) + EVT_THREAD + EVT_CALL(NpcJump0, NPC_KoopaBros_01, -170, -400, -200, 75) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(NpcJump0, NPC_KoopaBros_02, -150, -400, 200, 75) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(NpcJump0, NPC_KoopaBros_03, -130, -400, -200, 75) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(NpcJump0, NPC_KoopaBros_04, -110, -400, 200, 75) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(165) + EVT_EXEC(N(EVS_BossDefeated)) + EVT_WAIT(1) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_THREAD + EVT_WAIT(120) + EVT_CALL(PlaySoundAt, SOUND_1E2, 0, 0, 0, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(0.5)) + EVT_WAIT(15) + EVT_SET(GF_TRD10_Defeated_KoopaBros, TRUE) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAuxAI_KoopaBros_02) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH1_DEFEATED_KOOPA_BROS) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAux_KoopaBros_02) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_KoopaBros_02) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_KoopaBros_02) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_KoopaBros_02) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_KoopaBros_02) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAuxAI_KoopaBros_03) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH1_DEFEATED_KOOPA_BROS) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAux_KoopaBros_03) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_KoopaBros_03) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_KoopaBros_03) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_KoopaBros_03) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_KoopaBros_03) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAuxAI_KoopaBros_04) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH1_DEFEATED_KOOPA_BROS) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAux_KoopaBros_04) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_KoopaBros_04) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_KoopaBros_04) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_KoopaBros_04) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_KoopaBros_04) = { + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_KoopaBros_01) = { + .defaultAnim = ANIM_KoopaBros_Black_Anim02, + .height = 34, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_KoopaBros_01), + .onInteract = &N(EVS_NpcInteract_KoopaBros_01), + .ai = &N(EVS_NpcAI_KoopaBros_01), + .onHit = &N(EVS_NpcHit_KoopaBros_01), + .aux = &N(EVS_NpcAux_KoopaBros_01), + .onDefeat = &N(EVS_NpcDefeat_KoopaBros_01), + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, +}; + +NpcSettings N(NpcSettings_KoopaBros_02) = { + .defaultAnim = ANIM_KoopaBros_Red_Anim02, + .height = 34, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_KoopaBros_02), + .onInteract = &N(EVS_NpcInteract_KoopaBros_02), + .ai = &N(EVS_NpcAI_KoopaBros_02), + .onHit = &N(EVS_NpcHit_KoopaBros_02), + .aux = &N(EVS_NpcAux_KoopaBros_02), + .onDefeat = &N(EVS_NpcDefeat_KoopaBros_02), + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, +}; + +NpcSettings N(NpcSettings_KoopaBros_03) = { + .defaultAnim = ANIM_KoopaBros_Yellow_Anim02, + .height = 34, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_KoopaBros_03), + .onInteract = &N(EVS_NpcInteract_KoopaBros_03), + .ai = &N(EVS_NpcAI_KoopaBros_03), + .onHit = &N(EVS_NpcHit_KoopaBros_03), + .aux = &N(EVS_NpcAux_KoopaBros_03), + .onDefeat = &N(EVS_NpcDefeat_KoopaBros_03), + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, +}; + +NpcSettings N(NpcSettings_KoopaBros_04) = { + .defaultAnim = ANIM_KoopaBros_Green_Anim02, + .height = 34, + .radius = 24, + .otherAI = &N(EVS_NpcAuxAI_KoopaBros_04), + .onInteract = &N(EVS_NpcInteract_KoopaBros_04), + .ai = &N(EVS_NpcAI_KoopaBros_04), + .onHit = &N(EVS_NpcHit_KoopaBros_04), + .aux = &N(EVS_NpcAux_KoopaBros_04), + .onDefeat = &N(EVS_NpcDefeat_KoopaBros_04), + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, +}; + +StaticNpc N(NpcData_KoopaBros_01)[] = { + { + .id = NPC_KoopaBros_01, + .settings = &N(NpcSettings_KoopaBros_01), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_NO_DROPS, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_KoopaBros_Black_Anim04, + .walk = ANIM_KoopaBros_Black_Anim02, + .run = ANIM_KoopaBros_Black_Anim03, + .chase = ANIM_KoopaBros_Black_Anim03, + .anim_4 = ANIM_KoopaBros_Black_Anim04, + .anim_5 = ANIM_KoopaBros_Black_Anim04, + .death = ANIM_KoopaBros_Black_Anim0A, + .hit = ANIM_KoopaBros_Black_Anim0A, + .anim_8 = ANIM_KoopaBros_Black_Anim03, + .anim_9 = ANIM_KoopaBros_Black_Anim03, + .anim_A = ANIM_KoopaBros_Black_Anim03, + .anim_B = ANIM_KoopaBros_Black_Anim03, + .anim_C = ANIM_KoopaBros_Black_Anim03, + .anim_D = ANIM_KoopaBros_Black_Anim03, + .anim_E = ANIM_KoopaBros_Black_Anim03, + .anim_F = ANIM_KoopaBros_Black_Anim03, + }, + }, + { + .id = NPC_KoopaBros_02, + .settings = &N(NpcSettings_KoopaBros_02), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_NO_DROPS, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_KoopaBros_Red_Anim04, + .walk = ANIM_KoopaBros_Red_Anim02, + .run = ANIM_KoopaBros_Red_Anim03, + .chase = ANIM_KoopaBros_Red_Anim03, + .anim_4 = ANIM_KoopaBros_Red_Anim04, + .anim_5 = ANIM_KoopaBros_Red_Anim04, + .death = ANIM_KoopaBros_Red_Anim0A, + .hit = ANIM_KoopaBros_Red_Anim0A, + .anim_8 = ANIM_KoopaBros_Red_Anim03, + .anim_9 = ANIM_KoopaBros_Red_Anim03, + .anim_A = ANIM_KoopaBros_Red_Anim03, + .anim_B = ANIM_KoopaBros_Red_Anim03, + .anim_C = ANIM_KoopaBros_Red_Anim03, + .anim_D = ANIM_KoopaBros_Red_Anim03, + .anim_E = ANIM_KoopaBros_Red_Anim03, + .anim_F = ANIM_KoopaBros_Red_Anim03, + }, + }, + { + .id = NPC_KoopaBros_03, + .settings = &N(NpcSettings_KoopaBros_03), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_NO_DROPS, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_KoopaBros_Yellow_Anim04, + .walk = ANIM_KoopaBros_Yellow_Anim02, + .run = ANIM_KoopaBros_Yellow_Anim03, + .chase = ANIM_KoopaBros_Yellow_Anim03, + .anim_4 = ANIM_KoopaBros_Yellow_Anim04, + .anim_5 = ANIM_KoopaBros_Yellow_Anim04, + .death = ANIM_KoopaBros_Yellow_Anim0A, + .hit = ANIM_KoopaBros_Yellow_Anim0A, + .anim_8 = ANIM_KoopaBros_Yellow_Anim03, + .anim_9 = ANIM_KoopaBros_Yellow_Anim03, + .anim_A = ANIM_KoopaBros_Yellow_Anim03, + .anim_B = ANIM_KoopaBros_Yellow_Anim03, + .anim_C = ANIM_KoopaBros_Yellow_Anim03, + .anim_D = ANIM_KoopaBros_Yellow_Anim03, + .anim_E = ANIM_KoopaBros_Yellow_Anim03, + .anim_F = ANIM_KoopaBros_Yellow_Anim03, + }, + }, + { + .id = NPC_KoopaBros_04, + .settings = &N(NpcSettings_KoopaBros_04), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_NO_DROPS, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_KoopaBros_Green_Anim04, + .walk = ANIM_KoopaBros_Green_Anim02, + .run = ANIM_KoopaBros_Green_Anim03, + .chase = ANIM_KoopaBros_Green_Anim03, + .anim_4 = ANIM_KoopaBros_Green_Anim04, + .anim_5 = ANIM_KoopaBros_Green_Anim04, + .death = ANIM_KoopaBros_Green_Anim0A, + .hit = ANIM_KoopaBros_Green_Anim0A, + .anim_8 = ANIM_KoopaBros_Green_Anim03, + .anim_9 = ANIM_KoopaBros_Green_Anim03, + .anim_A = ANIM_KoopaBros_Green_Anim03, + .anim_B = ANIM_KoopaBros_Green_Anim03, + .anim_C = ANIM_KoopaBros_Green_Anim03, + .anim_D = ANIM_KoopaBros_Green_Anim03, + .anim_E = ANIM_KoopaBros_Green_Anim03, + .anim_F = ANIM_KoopaBros_Green_Anim03, + }, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_KoopaBros_01), BTL_TRD_PART_2_FORMATION_00), + {} +}; diff --git a/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c b/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c new file mode 100644 index 0000000000..121e741d82 --- /dev/null +++ b/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c @@ -0,0 +1,73 @@ +#include "trd_10.h" + +EvtScript N(EVS_InitFakeBowser) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HideFakeBowser) = { + EVT_CALL(EnableGroup, MODEL_atama, FALSE) + EVT_CALL(EnableGroup, MODEL_left_arm, FALSE) + EVT_CALL(EnableGroup, MODEL_shippo, FALSE) + EVT_CALL(EnableGroup, MODEL_dou, FALSE) + EVT_CALL(EnableGroup, MODEL_koura, FALSE) + EVT_CALL(EnableGroup, MODEL_koma1, FALSE) + EVT_CALL(EnableGroup, MODEL_koma2, FALSE) + EVT_CALL(EnableModel, MODEL_o171, FALSE) + EVT_CALL(EnableModel, MODEL_o172, FALSE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_CALL(EnableModel, MODEL_o118, FALSE) + EVT_CALL(EnableModel, MODEL_o120, FALSE) + EVT_CALL(EnableModel, MODEL_o165, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetModelsPos) = { + EVT_CALL(TranslateGroup, MODEL_atama, LVar0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_left_arm, LVar0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_shippo, LVar0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_dou, LVar0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_koura, LVar0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_koma1, LVar0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_koma2, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o171, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o172, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o183, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o118, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o120, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o165, LVar0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RevealFakeBowser) = { + EVT_SET(LVar0, 100) + EVT_EXEC_WAIT(N(EVS_SetModelsPos)) + EVT_SET(AF_TRD_FakeBowserRevealed, FALSE) + EVT_LABEL(0) + EVT_IF_EQ(AF_TRD_FakeBowserRevealed, FALSE) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(MakeLerp, 100, -100, 60, EASING_QUADRATIC_OUT) + EVT_CALL(PlaySoundAt, SOUND_3BE, 0, 50, 0, 0) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_EXEC_WAIT(N(EVS_SetModelsPos)) + EVT_IF_NE(LVar1, 0) + EVT_GOTO(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupFakeBowser) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH1_DEFEATED_KOOPA_BROS) + EVT_EXEC(N(EVS_HideFakeBowser)) + EVT_ELSE + EVT_EXEC(N(EVS_RevealFakeBowser)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/common/Bandit_DropCoin.inc.c b/src/world/common/Bandit_DropCoin.inc.c deleted file mode 100644 index cdb2d4c9ff..0000000000 --- a/src/world/common/Bandit_DropCoin.inc.c +++ /dev/null @@ -1,39 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(Bandit_DropCoin)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 npcID; - Npc* npc; - s32 itemEntityIndex; - s32 areaFlag; - - if (isInitialCall) { - npcID = evt_get_variable(script, *args++); - itemEntityIndex = evt_get_variable(script, *args++); - areaFlag = *args++; - - if (npcID == -1) { - npc = get_npc_unsafe(script->owner2.npcID); - } else if (npcID >= EVT_LIMIT) { - npc = get_npc_unsafe(npcID); - } else { - npc = (Npc*)npcID; - } - - script->functionTempPtr[0] = npc; - script->functionTemp[1] = itemEntityIndex; - script->functionTemp[2] = areaFlag; - } - - npc = script->functionTempPtr[0]; - itemEntityIndex = script->functionTemp[1]; - areaFlag = script->functionTemp[2]; - - if (evt_get_variable(script, areaFlag)) { - set_item_entity_position(itemEntityIndex, npc->pos.x, npc->pos.y + 30.0f, npc->pos.z); - return ApiStatus_BLOCK; - } - - return ApiStatus_DONE2; -} diff --git a/src/world/common/GetLeftRightPoints.inc.c b/src/world/common/GetLeftRightPoints.inc.c new file mode 100644 index 0000000000..dafd1233da --- /dev/null +++ b/src/world/common/GetLeftRightPoints.inc.c @@ -0,0 +1,15 @@ +#include "common.h" +#include "npc.h" + +ApiStatus N(GetLeftRightPoints)(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 posX = evt_get_variable(script, *args++); + s32 posZ = evt_get_variable(script, *args++); + f32 dist = evt_get_variable(script, *args++); + + script->varTable[0] = posX + (sin_deg(gCameras[CAM_DEFAULT].currentYaw + 270.0f + dist) * 100.0f); + script->varTable[1] = posZ - (cos_deg(gCameras[CAM_DEFAULT].currentYaw + 270.0f + dist) * 100.0f); + script->varTable[2] = posX + (sin_deg(gCameras[CAM_DEFAULT].currentYaw + 90.0f + dist) * 100.0f); + script->varTable[3] = posZ - (cos_deg(gCameras[CAM_DEFAULT].currentYaw + 90.0f + dist) * 100.0f); + return ApiStatus_DONE2; +} diff --git a/src/world/common/CheckItemFlags40.inc.c b/src/world/common/IsItemBadge.inc.c similarity index 65% rename from src/world/common/CheckItemFlags40.inc.c rename to src/world/common/IsItemBadge.inc.c index 2e7fc2f51b..3e56f0f727 100644 --- a/src/world/common/CheckItemFlags40.inc.c +++ b/src/world/common/IsItemBadge.inc.c @@ -1,12 +1,12 @@ #include "common.h" #include "npc.h" -ApiStatus N(CheckItemFlags40)(Evt* script, s32 isInitialCall) { +ApiStatus N(IsItemBadge)(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; s32 itemIndex = evt_get_variable(script, *args++); script->varTable[0] = FALSE; - if (gItemTable[itemIndex].typeFlags & 0x40) { + if (gItemTable[itemIndex].typeFlags & ITEM_TYPE_FLAG_BADGE) { script->varTable[0] = TRUE; } diff --git a/src/world/common/SomeItemEntityFunc.inc.c b/src/world/common/SomeItemEntityFunc.inc.c index 6e7a639594..0b04eaf4c1 100644 --- a/src/world/common/SomeItemEntityFunc.inc.c +++ b/src/world/common/SomeItemEntityFunc.inc.c @@ -3,17 +3,16 @@ ApiStatus N(SomeItemEntityFunc)(Evt* script, s32 isInitialCall) { ItemEntity* itemEntity = get_item_entity(script->varTable[0]); - f32* y = (f32*) &script->functionTemp[2]; if (isInitialCall) { - *y = itemEntity->position.y; + script->functionTempF[2] = itemEntity->position.y; script->functionTemp[1] = 0; script->functionTemp[3] = 0; } switch (script->functionTemp[1]) { case 0: - itemEntity->position.y = *y + ((1.0f - cos_rad((script->functionTemp[3] * + itemEntity->position.y = script->functionTempF[2] + ((1.0f - cos_rad((script->functionTemp[3] * (PI / 2)) / 30.0f)) * 20.0f); if (script->functionTemp[3] == 30) { script->functionTemp[1] = 1; @@ -23,7 +22,7 @@ ApiStatus N(SomeItemEntityFunc)(Evt* script, s32 isInitialCall) { } break; case 1: - itemEntity->position.y = *y + 17.0f + (cos_deg(script->functionTemp[3]) * 3.0f); + itemEntity->position.y = script->functionTempF[2] + 17.0f + (cos_deg(script->functionTemp[3]) * 3.0f); script->functionTemp[3] = clamp_angle(script->functionTemp[3] + 9); break; } diff --git a/src/world/common/UnkTrigFunc001.inc.c b/src/world/common/UnkTrigFunc001.inc.c deleted file mode 100644 index 85d12ae2ba..0000000000 --- a/src/world/common/UnkTrigFunc001.inc.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" -#include "npc.h" - -ApiStatus N(UnkTrigFunc001)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 temp_s2 = evt_get_variable(script, *args++); - s32 temp_s3 = evt_get_variable(script, *args++); - f32 temp_f24 = evt_get_variable(script, *args++); - - script->varTable[0] = temp_s2 + (sin_deg(gCameras[CAM_DEFAULT].currentYaw + 270.0f + temp_f24) * 100.0f); - script->varTable[1] = temp_s3 - (cos_deg(gCameras[CAM_DEFAULT].currentYaw + 270.0f + temp_f24) * 100.0f); - script->varTable[2] = temp_s2 + (sin_deg(gCameras[CAM_DEFAULT].currentYaw + 90.0f + temp_f24) * 100.0f); - script->varTable[3] = temp_s3 - (cos_deg(gCameras[CAM_DEFAULT].currentYaw + 90.0f + temp_f24) * 100.0f); - return ApiStatus_DONE2; -} diff --git a/src/world/common/atomic/Chest.inc.c b/src/world/common/atomic/Chest.inc.c index 1ee424c508..96317d841a 100644 --- a/src/world/common/atomic/Chest.inc.c +++ b/src/world/common/atomic/Chest.inc.c @@ -1,45 +1,21 @@ #include "common.h" -// see dgb_12 - -//#define CHEST_ITEM 19 -//#define CHEST_FLAG 1048 - -// temporarily copied from StashVars to allow static varStash -ApiStatus N(StashVars)(Evt* script, s32 isInitialCall) { - static s32* varStash = NULL; - s32 i; - - if (varStash == NULL) { - varStash = heap_malloc(sizeof(script->varTable)); - - for (i = 0; i < ARRAY_COUNT(script->varTable); i++) { - varStash[i] = script->varTable[i]; - } - } else { - for (i = 0; i < ARRAY_COUNT(script->varTable); i++) { - script->varTable[i] = varStash[i]; - } - - heap_free(varStash); - varStash = NULL; - } - - return ApiStatus_DONE2; -} +#include "world/common/StashVars.inc.c" #include "world/common/GetItemName.inc.c" #include "world/common/SomeItemEntityFunc.inc.c" -#include "world/common/CheckItemFlags40.inc.c" +#include "world/common/IsItemBadge.inc.c" + +s32** N(varStash) = NULL; EvtScript N(EVS_Chest_ShowGotItem) = { EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(SetTimeFreezeMode, 2) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_FULL) EVT_WAIT(40) EVT_CALL(ShowGotItem, LVar0, 0, 0) - EVT_CALL(SetTimeFreezeMode, 0) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) EVT_RETURN EVT_RETURN EVT_END @@ -48,15 +24,15 @@ EvtScript N(EVS_Chest_ShowGotItem) = { EvtScript N(EVS_Chest_GetItem) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(LVar0, LVarA) - EVT_IF_NE(LVarA, 0) + EVT_IF_NE(LVarA, ITEM_NONE) EVT_EXEC_WAIT(N(EVS_Chest_ShowGotItem)) EVT_END_IF EVT_SWITCH(LVarB) - EVT_CASE_EQ(0) + EVT_CASE_EQ(ITEM_TYPE_CONSUMABLE) EVT_CALL(AddItem, LVarA, LVar0) - EVT_CASE_EQ(1) + EVT_CASE_EQ(ITEM_TYPE_KEY) EVT_CALL(AddKeyItem, LVarA) - EVT_CASE_EQ(2) + EVT_CASE_EQ(ITEM_TYPE_BADGE) EVT_CALL(AddBadge, LVarA, LVar0) EVT_END_SWITCH EVT_WAIT(15) @@ -65,11 +41,33 @@ EvtScript N(EVS_Chest_GetItem) = { EVT_END }; -EvtScript N(EVS_Chest_Interact) = { - EVT_SET(LVarA, CHEST_ITEM) - EVT_SET(LVarB, 1) - EVT_SET(GameFlag(CHEST_FLAG), 1) - EVT_EXEC_WAIT(N(EVS_Chest_GetItem)) - EVT_RETURN - EVT_END -}; +#define EVT_OPEN_CHEST_CONSUMABLE(item, flag) \ + { \ + EVT_SET(LVarA, item) \ + EVT_SET(LVarB, ITEM_TYPE_CONSUMABLE) \ + EVT_SET(flag, TRUE) \ + EVT_EXEC_WAIT(N(EVS_Chest_GetItem)) \ + EVT_RETURN \ + EVT_END \ + } + + +#define EVT_OPEN_CHEST_KEY(item, flag) \ + { \ + EVT_SET(LVarA, item) \ + EVT_SET(LVarB, ITEM_TYPE_KEY) \ + EVT_SET(flag, TRUE) \ + EVT_EXEC_WAIT(N(EVS_Chest_GetItem)) \ + EVT_RETURN \ + EVT_END \ + } + +#define EVT_OPEN_CHEST_BADGE(item, flag) \ + { \ + EVT_SET(LVarA, item) \ + EVT_SET(LVarB, ITEM_TYPE_BADGE) \ + EVT_SET(flag, TRUE) \ + EVT_EXEC_WAIT(N(EVS_Chest_GetItem)) \ + EVT_RETURN \ + EVT_END \ + } diff --git a/src/world/common/atomic/Chest.old.inc.c b/src/world/common/atomic/Chest.old.inc.c new file mode 100644 index 0000000000..2f85ae2380 --- /dev/null +++ b/src/world/common/atomic/Chest.old.inc.c @@ -0,0 +1,75 @@ +#include "common.h" + +// see dgb_12 + +//#define CHEST_ITEM 19 +//#define CHEST_FLAG 1048 + +// temporarily copied from StashVars to allow static varStash +ApiStatus N(StashVars)(Evt* script, s32 isInitialCall) { + static s32* varStash = NULL; + s32 i; + + if (varStash == NULL) { + varStash = heap_malloc(sizeof(script->varTable)); + + for (i = 0; i < ARRAY_COUNT(script->varTable); i++) { + varStash[i] = script->varTable[i]; + } + } else { + for (i = 0; i < ARRAY_COUNT(script->varTable); i++) { + script->varTable[i] = varStash[i]; + } + + heap_free(varStash); + varStash = NULL; + } + + return ApiStatus_DONE2; +} + +#include "world/common/GetItemName.inc.c" + +#include "world/common/SomeItemEntityFunc.inc.c" + +#include "world/common/IsItemBadge.inc.c" + +EvtScript N(EVS_Chest_ShowGotItem) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, 2) + EVT_WAIT(40) + EVT_CALL(ShowGotItem, LVar0, 0, 0) + EVT_CALL(SetTimeFreezeMode, 0) + EVT_RETURN + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Chest_GetItem) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, LVarA) + EVT_IF_NE(LVarA, 0) + EVT_EXEC_WAIT(N(EVS_Chest_ShowGotItem)) + EVT_END_IF + EVT_SWITCH(LVarB) + EVT_CASE_EQ(0) + EVT_CALL(AddItem, LVarA, LVar0) + EVT_CASE_EQ(1) + EVT_CALL(AddKeyItem, LVarA) + EVT_CASE_EQ(2) + EVT_CALL(AddBadge, LVarA, LVar0) + EVT_END_SWITCH + EVT_WAIT(15) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Chest_Interact) = { + EVT_SET(LVarA, CHEST_ITEM) + EVT_SET(LVarB, 1) + EVT_SET(GameFlag(CHEST_FLAG), 1) + EVT_EXEC_WAIT(N(EVS_Chest_GetItem)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/common/enemy/StationaryAI.inc.c b/src/world/common/enemy/StationaryAI.inc.c index 9d0a26d6ec..87428fa6d1 100644 --- a/src/world/common/enemy/StationaryAI.inc.c +++ b/src/world/common/enemy/StationaryAI.inc.c @@ -3,7 +3,7 @@ // - kmr_07 GoombaBros // - kmr_11 GoombaBros/King // - sbk_30 (unused) -// - trd_01 Bombomb <-- only real use case! +// - trd_01 Bobomb <-- only real use case! // - nok_01 (unused) // - omo_02 (unused) diff --git a/src/world/common/enemy/complete/Bandit.inc.c b/src/world/common/enemy/complete/Bandit.inc.c index c6cc4c1a0e..755fa13dae 100644 --- a/src/world/common/enemy/complete/Bandit.inc.c +++ b/src/world/common/enemy/complete/Bandit.inc.c @@ -1,14 +1,49 @@ #include "common.h" -#include "world/common/Bandit_DropCoin.inc.c" +API_CALLABLE(N(Bandit_DropStolenCoin)) { + Bytecode* args = script->ptrReadPos; + s32 npcID; + Npc* npc; + s32 itemEntityIndex; + s32 areaFlag; + + if (isInitialCall) { + npcID = evt_get_variable(script, *args++); + itemEntityIndex = evt_get_variable(script, *args++); + areaFlag = *args++; + + if (npcID == -1) { + npc = get_npc_unsafe(script->owner2.npcID); + } else if (npcID >= EVT_LIMIT) { + npc = get_npc_unsafe(npcID); + } else { + npc = (Npc*)npcID; + } + + script->functionTempPtr[0] = npc; + script->functionTemp[1] = itemEntityIndex; + script->functionTemp[2] = areaFlag; + } + + npc = script->functionTempPtr[0]; + itemEntityIndex = script->functionTemp[1]; + areaFlag = script->functionTemp[2]; + + if (evt_get_variable(script, areaFlag)) { + set_item_entity_position(itemEntityIndex, npc->pos.x, npc->pos.y + 30.0f, npc->pos.z); + return ApiStatus_BLOCK; + } + + return ApiStatus_DONE2; +} EvtScript N(EVS_Bandit_CreateStolenCoin) = { EVT_SET(LVarA, LVar0) EVT_CALL(GetNpcPos, LVarA, LVar1, LVar2, LVar3) EVT_ADD(LVar2, 30) EVT_CALL(MakeItemEntity, ITEM_COIN, LVar1, LVar2, LVar3, ITEM_SPAWN_MODE_DECORATION, 0) - EVT_CALL(N(Bandit_DropCoin), LVarA, LVar0, AF_SBK_01) + EVT_CALL(N(Bandit_DropStolenCoin), LVarA, LVar0, AF_SBK_01) EVT_CALL(RemoveItemEntity, LVar0) EVT_RETURN EVT_END @@ -40,7 +75,7 @@ EvtScript N(EVS_NpcDefeat_Bandit) = { EVT_CASE_EQ(OUTCOME_PLAYER_WON) EVT_CALL(DoNpcDefeat) EVT_CASE_EQ(OUTCOME_PLAYER_FLED) - EVT_CALL(func_80045900, 0) + EVT_CALL(OnPlayerFled, 0) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) EVT_CALL(DisablePlayerInput, TRUE) EVT_SET(AF_SBK_01, TRUE) diff --git a/src/world/common/enemy/complete/Bobomb_Stationary.inc.c b/src/world/common/enemy/complete/Bobomb_Stationary.inc.c new file mode 100644 index 0000000000..c94bcad50d --- /dev/null +++ b/src/world/common/enemy/complete/Bobomb_Stationary.inc.c @@ -0,0 +1,30 @@ +#include "common.h" + +#include "world/common/enemy/StationaryAI.inc.c" + +StationaryAISettings N(AISettings_Bobomb_Stationary) = { + .unk_00 = 110.0f, + .unk_04 = 65.0f, + .playerSearchInterval = 8, + .chaseSpeed = 3.4f, + .chaseTurnRate = 120, + .chaseUpdateInterval = 2, + .chaseRadius = 110.0f, + .chaseOffsetDist = 65.0f, + .unk_20 = 1, +}; + +EvtScript N(EVS_NpcAI_Bobomb_Stationary) = { + EVT_CALL(N(StationaryAI_Main), EVT_PTR(N(AISettings_Bobomb_Stationary))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Bobomb_Stationary) = { + .height = 23, + .radius = 20, + .level = 6, + .ai = &N(EVS_NpcAI_Bobomb_Stationary), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/Bobomb_Wander.inc.c b/src/world/common/enemy/complete/Bobomb_Wander.inc.c new file mode 100644 index 0000000000..f4d1848fd7 --- /dev/null +++ b/src/world/common/enemy/complete/Bobomb_Wander.inc.c @@ -0,0 +1,31 @@ +#include "common.h" + +MobileAISettings N(AISettings_Bobomb) = { + .moveSpeed = 1.5f, + .moveTime = 60, + .waitTime = 10, + .alertRadius = 110.0f, + .alertOffsetDist = 65.0f, + .playerSearchInterval = 8, + .chaseSpeed = 3.4f, + .chaseTurnRate = 120, + .chaseUpdateInterval = 2, + .chaseRadius = 110.0f, + .chaseOffsetDist = 65.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Bobomb_Wander) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_Bobomb))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Bobomb_Wander) = { + .height = 23, + .radius = 20, + .level = 6, + .ai = &N(EVS_NpcAI_Bobomb_Wander), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/PutridPiranha.inc.c b/src/world/common/enemy/complete/PutridPiranha.inc.c index e2089e0392..db0f03d9c4 100644 --- a/src/world/common/enemy/complete/PutridPiranha.inc.c +++ b/src/world/common/enemy/complete/PutridPiranha.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "sprite/npc/LargePiranha.h" -extern EvtScript D_800936DC; +extern EvtScript EVS_NpcHitRecoil; #include "world/common/enemy/PiranhaPlantAI.inc.c" @@ -12,7 +12,7 @@ EvtScript N(EVS_NpcDefeat_PutridPiranha_Hitbox) = { EVT_CALL(RemoveNpc, NPC_SELF) EVT_CASE_EQ(OUTCOME_PLAYER_FLED) EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) - EVT_CALL(func_80045900, 1) + EVT_CALL(OnPlayerFled, 1) EVT_CASE_EQ(OUTCOME_ENEMY_FLED) EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_10, 1) EVT_CALL(RemoveNpc, NPC_SELF) @@ -71,7 +71,7 @@ EvtScript N(EVS_80244090) = { EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_HAMMER) EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_PARTNER) EVT_CALL(GetSelfAnimationFromTable, 7, LVar0) - EVT_EXEC_WAIT(D_800936DC) + EVT_EXEC_WAIT(EVS_NpcHitRecoil) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_RETURN diff --git a/src/world/common/UnkFunc41.inc.c b/src/world/common/util/ChangeNpcToPartner.inc.c similarity index 93% rename from src/world/common/UnkFunc41.inc.c rename to src/world/common/util/ChangeNpcToPartner.inc.c index f2b7cf6304..8f44ad3805 100644 --- a/src/world/common/UnkFunc41.inc.c +++ b/src/world/common/util/ChangeNpcToPartner.inc.c @@ -4,7 +4,7 @@ void func_800EB2A4(s32 arg0); -ApiStatus N(UnkFunc41)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(ChangeNpcToPartner)) { Bytecode* args = script->ptrReadPos; PlayerData* playerData = &gPlayerData; s32 npcID = evt_get_variable(script, *args++); @@ -42,7 +42,7 @@ ApiStatus N(UnkFunc41)(Evt* script, s32 isInitialCall) { set_npc_yaw(get_npc_safe(NPC_PARTNER), npc->yaw); npc->flags &= ~NPC_FLAG_4; disable_npc_shadow(npc); - npc->pos.y = -1000.0f; + npc->pos.y = NPC_DISPOSE_POS_Y; return ApiStatus_DONE2; } diff --git a/src/world/common/GetDefeatedEnemyCount.inc.c b/src/world/common/util/GetDefeatedEnemyCount.inc.c similarity index 100% rename from src/world/common/GetDefeatedEnemyCount.inc.c rename to src/world/common/util/GetDefeatedEnemyCount.inc.c diff --git a/src/world/world.c b/src/world/world.c index 39ec18e46f..7e2079852c 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -47,16 +47,16 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { clear_script_list(); switch (loadType) { - case 0: + case LOAD_FROM_MAP: clear_area_flags(); - gGameStatusPtr->loadType = 0; + gGameStatusPtr->loadType = LOAD_FROM_MAP; break; - case 1: + case LOAD_FROM_FILE_SELECT: fio_deserialize_state(); areaID = gGameStatusPtr->areaID; mapID = gGameStatusPtr->mapID; gGameStatusPtr->prevArea = areaID; - gGameStatusPtr->loadType = 1; + gGameStatusPtr->loadType = LOAD_FROM_FILE_SELECT; break; } @@ -436,17 +436,17 @@ MapConfig isk_maps[] = { /// Koopa Bros. Fortress #include "area_trd/trd.h" MapConfig trd_maps[] = { - { MAP_UNSPLIT(trd_00, 0x80240690), .bgName = "nok_bg" }, - { MAP_UNSPLIT(trd_01, 0x80241700), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(trd_02, 0x80241AA0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(trd_03, 0x80240A40), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, + { MAP(trd_00), .bgName = "nok_bg" }, + { MAP(trd_01), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, + { MAP(trd_02), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, + { MAP(trd_03), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, { MAP(trd_04), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(trd_05, 0x802407B0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(trd_06, 0x80240D60), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(trd_07, 0x80242910), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, + { MAP(trd_05), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, + { MAP(trd_06), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, + { MAP(trd_07), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, { MAP(trd_08), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(trd_09, 0x80240200), .bgName = "nok_bg" }, - { MAP_UNSPLIT(trd_10, 0x80240870), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, + { MAP(trd_09), .bgName = "nok_bg" }, + { MAP(trd_10), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, }; /// Koopa Region diff --git a/tools/splat_ext/msg.yaml b/tools/splat_ext/msg.yaml index 0e81cf6471..8d8c54486d 100644 --- a/tools/splat_ext/msg.yaml +++ b/tools/splat_ext/msg.yaml @@ -4910,9 +4910,9 @@ - [0x1A, 0x006D, NpcTattle_NOK_GenericKoopaA] - [0x1A, 0x006E, NpcTattle_NOK_GenericKoopaB] - [0x1A, 0x006F, NpcTattle_NOK_RadioLover] -- [0x1A, 0x0070, NpcTattle_NOK_BombombA] -- [0x1A, 0x0071, NpcTattle_NOK_BombombB] -- [0x1A, 0x0072, NpcTattle_NOK_BombombC] +- [0x1A, 0x0070, NpcTattle_NOK_BobombA] +- [0x1A, 0x0071, NpcTattle_NOK_BobombB] +- [0x1A, 0x0072, NpcTattle_NOK_BobombC] - [0x1A, 0x0073, NpcTattle_KoloradoWife] - [0x1A, 0x0074, NpcTattle_NOK_Kooper] - [0x1A, 0x0075, NpcTattle_KoopaKoot] @@ -4920,14 +4920,14 @@ - [0x1A, 0x0077, NpcTattle_NOK_GenericKoopaD] - [0x1A, 0x0078, NpcTattle_NOK_SenseOfJustice] - [0x1A, 0x0079, NpcTattle_NOK_PrettyMellow] -- [0x1A, 0x007A, NpcTattle_NOK_BombombD] -- [0x1A, 0x007B, NpcTattle_NOK_BombombE] -- [0x1A, 0x007C, NpcTattle_NOK_BombombF] +- [0x1A, 0x007A, NpcTattle_NOK_BobombD] +- [0x1A, 0x007B, NpcTattle_NOK_BobombE] +- [0x1A, 0x007C, NpcTattle_NOK_BobombF] - [0x1A, 0x007D, NpcTattle_TRD_Bombette] -- [0x1A, 0x007E, NpcTattle_TRD_BombombA] -- [0x1A, 0x007F, NpcTattle_TRD_BombombB] -- [0x1A, 0x0080, NpcTattle_TRD_BombombC] -- [0x1A, 0x0081, NpcTattle_TRD_BombombD] +- [0x1A, 0x007E, NpcTattle_TRD_BobombA] +- [0x1A, 0x007F, NpcTattle_TRD_BobombB] +- [0x1A, 0x0080, NpcTattle_TRD_BobombC] +- [0x1A, 0x0081, NpcTattle_TRD_BobombD] - [0x1A, 0x0082, NpcTattle_KentCKoopa] - [0x1A, 0x0083, NpcTattle_IWA_StationMaster] - [0x1A, 0x0084, NpcTattle_IWA_Parakarry] diff --git a/ver/us/asm/bss.s b/ver/us/asm/bss.s index 7665e0d28c..718341de9f 100644 --- a/ver/us/asm/bss.s +++ b/ver/us/asm/bss.s @@ -334,13 +334,13 @@ dlabel D_800A0934 dlabel gMapTransitionAlpha .space 2 -dlabel D_800A0942 +dlabel gMapTransitionFadeRate .space 2 -dlabel D_800A0944 +dlabel gMapTransitionState .space 2 -dlabel D_800A0946 +dlabel gMapTransitionStateTime .space 2 dlabel D_800A0948 diff --git a/ver/us/asm/data/dead/EE20E0.data.s b/ver/us/asm/data/dead/EE20E0.data.s index d517cc5485..9b2fd5d612 100644 --- a/ver/us/asm/data/dead/EE20E0.data.s +++ b/ver/us/asm/data/dead/EE20E0.data.s @@ -93,7 +93,7 @@ dlabel D_802450DC_EE3A9C .word 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802E20AC, 0xFE363C80, 0xFE363C82, 0x00000078, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24A9080, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DC3E0, 0x00000001, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC0004, 0x00CC0001, 0x00000000, 0x001100B4, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0x00000001, 0x00000001, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000258, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AA280, 0xF24A5A80, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000082, 0xFFFFFF38, 0x00000043, 0x00000004, 0x802D9284, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80243470_EE1E30, 0x00000037, 0x00000057, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000001, 0x00000100, 0x00000001, 0x00000045, 0x00000002, D_80244628_EE2FE8, 0xFE363C89, 0x00000043, 0x00000005, func_802E2A80, 0x00000037, D_802444E8_EE2EA8, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000002, 0x802DCB18, 0x00000008, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000005, 0x001100B5, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000001, 0x802DCEE8, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024550C_EE3ECC -.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000A, 0x00080004, 0x00000000, 0x001100A2, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFFFFFEDE, 0x00000078, 0x0000002D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00080001, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC0004, 0x00CC0001, 0x00000005, 0x001100A3, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0007, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24A9080, 0xF24A6280, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000082, 0xFFFFFF38, 0x00000043, 0x00000004, 0x802D9284, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000190, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000082, 0x0000003C, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80243470_EE1E30, 0x00000050, 0x00000057, 0x00000000, 0x00000045, 0x00000002, D_80244628_EE2FE8, 0xFE363C89, 0x00000043, 0x00000005, func_802E2A80, 0x00000050, D_802444AC_EE2E6C, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0009, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24A9080, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100A4, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC0008, 0x00CC0008, 0x00000000, 0x001100A5, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100A6, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00080001, 0x00000043, 0x00000005, 0x802DD82C, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000000, 0x001100A7, 0x00000043, 0x00000002, 0x802DE138, 0x001E0020, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80244950_EE3310, 0x00000008, 0x00000001, 0x0000000A, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD848, 0x00000001, 0x00CC0004, 0x00CC0001, 0x00000000, 0x001100A9, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100AA, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00080001, 0x00000043, 0x00000005, 0x802DD82C, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100AB, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE138, 0x001E0021, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AC, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AD, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AE, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AF, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0x00000001, 0x0000005A, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0009, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000005, 0x001100B0, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100B1, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000005, 0x001100B2, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100B3, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000057, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, 0x802DB57C, 0x00000000, 0xF24A8880, 0x00000043, 0x00000005, 0x802DB78C, 0x00000000, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, EDEA00_UnkFunc41, 0x00000000, 0x00000008, 0x00000043, 0x00000001, EE2040_LoadPartyImage, 0x00000044, 0x00000001, D_8024397C_EE233C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D0190, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, D_802439A8_EE2368, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000033, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000046, 0x00000001, D_802450DC_EE3A9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000A, 0x00080004, 0x00000000, 0x001100A2, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFFFFFEDE, 0x00000078, 0x0000002D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00080001, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000010E, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC0004, 0x00CC0001, 0x00000005, 0x001100A3, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0007, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24A9080, 0xF24A6280, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000082, 0xFFFFFF38, 0x00000043, 0x00000004, 0x802D9284, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000190, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000082, 0x0000003C, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80243470_EE1E30, 0x00000050, 0x00000057, 0x00000000, 0x00000045, 0x00000002, D_80244628_EE2FE8, 0xFE363C89, 0x00000043, 0x00000005, func_802E2A80, 0x00000050, D_802444AC_EE2E6C, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0009, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24A9080, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100A4, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC0008, 0x00CC0008, 0x00000000, 0x001100A5, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100A6, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00080001, 0x00000043, 0x00000005, 0x802DD82C, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000000, 0x001100A7, 0x00000043, 0x00000002, 0x802DE138, 0x001E0020, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80244950_EE3310, 0x00000008, 0x00000001, 0x0000000A, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD848, 0x00000001, 0x00CC0004, 0x00CC0001, 0x00000000, 0x001100A9, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100AA, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00080001, 0x00000043, 0x00000005, 0x802DD82C, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x0008000B, 0x00080003, 0x00000000, 0x001100AB, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE138, 0x001E0021, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AC, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AD, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AE, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, 0x802DD848, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100AF, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0x00000001, 0x0000005A, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x00CC0009, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000005, 0x001100B0, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100B1, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00CC000A, 0x00CC0009, 0x00000005, 0x001100B2, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00080009, 0x00080001, 0x00000000, 0x001100B3, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000057, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000003, 0x802DB57C, 0x00000000, 0xF24A8880, 0x00000043, 0x00000005, 0x802DB78C, 0x00000000, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, EDEA00_ChangeNpcToPartner, 0x00000000, 0x00000008, 0x00000043, 0x00000001, EE2040_LoadPartyImage, 0x00000044, 0x00000001, D_8024397C_EE233C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D0190, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, D_802439A8_EE2368, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000033, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000046, 0x00000001, D_802450DC_EE3A9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246100_EE4AC0 .word 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00080004, 0x00000043, 0x00000004, 0x802D8FA8, 0x00000000, 0x00000006, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000044, 0x00000001, D_8024550C_EE3ECC, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_isk/isk_07/982CA0.data.s b/ver/us/asm/data/world/area_isk/isk_07/982CA0.data.s index 3c4ce246ac..94956383be 100644 --- a/ver/us/asm/data/world/area_isk/isk_07/982CA0.data.s +++ b/ver/us/asm/data/world/area_isk/isk_07/982CA0.data.s @@ -12,7 +12,7 @@ dlabel D_802408BC_982CFC .word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240890_982CD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000 dlabel D_802408E8_982D28 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EEC, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240014_982454, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF6A, 0xFFFFFE7A, 0x0000023B, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF05, 0xFFFFFE7A, 0x00000229, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF05, 0xFFFFFE7A, 0x00000229, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0x00000011, 0xFFFFFF06, 0xFFFFFF10, 0x00000221, 0x0000000D, 0xF8405EEB, 0x00000024, 0x00000002, 0xF8405EEC, 0x00000001, 0x00000046, 0x00000001, 0x80241E84, 0x00000008, 0x00000001, 0x0000003C, 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, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EEC, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240014_982454, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF6A, 0xFFFFFE7A, 0x0000023B, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF05, 0xFFFFFE7A, 0x00000229, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF05, 0xFFFFFE7A, 0x00000229, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0x00000011, 0xFFFFFF06, 0xFFFFFF10, 0x00000221, 0x0000000D, 0xF8405EEB, 0x00000024, 0x00000002, 0xF8405EEC, 0x00000001, 0x00000046, 0x00000001, 0x80241E84, 0x00000008, 0x00000001, 0x0000003C, 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, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240BAC_982FEC .word 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF971888D, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x00000069, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x17100000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF74, 0x00000210, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x40000000, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80240890_982CD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_iwa/iwa_01/9135D0.data.s b/ver/us/asm/data/world/area_iwa/iwa_01/9135D0.data.s index 24a2d5d0b3..93a431b375 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_01/9135D0.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_01/9135D0.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80243F20_9135D0 -.word 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 +.word 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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243FF0_9136A0 .word 0x3FD9999A, 0x0000005A, 0x00000000, 0x42DC0000, 0x00000000, 0x00000002, 0x40F00000, 0x00000000, 0x00000000, 0x42DC0000, 0x00000000, 0x00000001 diff --git a/ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s b/ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s index 9ec3d5ca20..9e05eba5bf 100644 --- a/ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s +++ b/ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s @@ -21,7 +21,7 @@ dlabel D_80246E80_9253F0 .word 0x00000036, 0x00000054, 0x00000040, 0x00000000 dlabel D_80246E90_925400 -.word 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE01FA, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E41, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E42, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E43, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000000C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFE2, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C84, 0xFE363C86, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0xF24A7A80, 0xF24F2A80, 0xF24AC080, 0xF24A5280, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246E80_9253F0, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000046, 0x00000001, D_802463B8_924928, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE01FA, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0012, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0015, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0017, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001C, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001B, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0013, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000027, 0x00000002, 0xF5DE01FA, 0x00000001, 0x00000014, 0x00000001, 0xF5DE01FA, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0014, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0016, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040007, 0x00040001, 0x00000000, 0x000D0018, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0019, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001A, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001B, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001D, 0x00000043, 0x00000003, iwa_10_UnkFunc41, 0x00000004, 0x00000004, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000043, 0x00000001, func_80241510_91FA80, 0x00000044, 0x00000001, 0x8024187C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018C, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x802418B0, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0x000D001E, 0x00000043, 0x00000002, AddKeyItem, 0x00000036, 0x00000043, 0x00000002, AddKeyItem, 0x00000054, 0x00000043, 0x00000002, AddKeyItem, 0x00000040, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE01FA, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E41, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E42, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E43, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000000C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFE2, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C84, 0xFE363C86, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0xF24A7A80, 0xF24F2A80, 0xF24AC080, 0xF24A5280, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246E80_9253F0, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000046, 0x00000001, D_802463B8_924928, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE01FA, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0012, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0015, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0017, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001C, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001B, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0013, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000027, 0x00000002, 0xF5DE01FA, 0x00000001, 0x00000014, 0x00000001, 0xF5DE01FA, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0014, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0016, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040007, 0x00040001, 0x00000000, 0x000D0018, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0019, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001A, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001B, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001D, 0x00000043, 0x00000003, iwa_10_ChangeNpcToPartner, 0x00000004, 0x00000004, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000043, 0x00000001, func_80241510_91FA80, 0x00000044, 0x00000001, 0x8024187C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018C, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x802418B0, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0x000D001E, 0x00000043, 0x00000002, AddKeyItem, 0x00000036, 0x00000043, 0x00000002, AddKeyItem, 0x00000054, 0x00000043, 0x00000002, AddKeyItem, 0x00000040, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802474F8_925A68 .word 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A7E80, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFD62, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFE1B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C80, 0x00000078, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF88, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s b/ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s index 0e7dbc06ba..e54a339acd 100644 --- a/ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s +++ b/ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s @@ -27,7 +27,7 @@ dlabel D_802421DC_B4694C .word 0x41F00000, 0x00000000, 0xC2DC0000, 0x00000000 dlabel D_802421EC_B4695C -.word 0x00000024, 0x00000002, 0xFE363C80, 0xF8406049, 0x00000024, 0x00000002, 0xFE363C81, 0xF840604A, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80241FD8_B46748, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718888, 0x00000000, 0x00000047, 0x00000005, D_80241AD4_B46244, 0x00001000, 0x0000002B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241AD4_B46244, 0x00100000, D_802421DC_B4694C, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241E58_B465C8, 0xFE363C89, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000000A, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070001, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8E80, 0x00000014, 0x0000012D, 0xF24ABE80, 0xF24A5E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A5, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A6, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A7, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000003, jan_04_UnkFunc41, 0x00000000, 0x00000007, 0x00000043, 0x00000001, func_802409E0_B45150, 0x00000044, 0x00000001, 0x80241244, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018F, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80241268, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000F, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000024, 0x00000002, 0xFE363C80, 0xF8406049, 0x00000024, 0x00000002, 0xFE363C81, 0xF840604A, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80241FD8_B46748, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718888, 0x00000000, 0x00000047, 0x00000005, D_80241AD4_B46244, 0x00001000, 0x0000002B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241AD4_B46244, 0x00100000, D_802421DC_B4694C, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241E58_B465C8, 0xFE363C89, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000000A, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070001, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8E80, 0x00000014, 0x0000012D, 0xF24ABE80, 0xF24A5E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A5, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A6, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A7, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000003, jan_04_ChangeNpcToPartner, 0x00000000, 0x00000007, 0x00000043, 0x00000001, func_802409E0_B45150, 0x00000044, 0x00000001, 0x80241244, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018F, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80241268, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000F, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242570_B46CE0 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000E, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070007, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x0000000A, 0x00000002, 0xF840604A, 0x00000000, 0x0000000A, 0x00000002, 0xF8406049, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000037, 0x00000096, 0xFFFFFFA1, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000005A, 0x0000008C, 0xFFFFFFAB, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406049, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFF6, 0x00000070, 0xFFFFFFB0, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802421EC_B4695C, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 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 419d685e9f..bfb2310c13 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 @@ -60,7 +60,7 @@ dlabel D_8024514C_B4FBBC .word 0x00420000, 0xFFFFFFFF dlabel D_80245154_B4FBC4 -.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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245210_B4FC80 .word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 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 b991f6f661..d12df53836 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 @@ -39,7 +39,7 @@ dlabel D_80244FE4_B57814 .word 0x00420000, 0xFFFFFFFF dlabel D_80244FEC_B5781C -.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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802450A8_B578D8 .word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 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 5915d843f9..c448a63f34 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 @@ -9,7 +9,7 @@ dlabel D_8024145C_B5ACCC .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00420000, 0xFFFFFFFF dlabel D_802414B8_B5AD28 -.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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241574_B5ADE4 .word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 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 6cb917e137..1da12388ad 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 @@ -51,7 +51,7 @@ dlabel D_80244F54_B63204 .word 0x00420000, 0xFFFFFFFF dlabel D_80244F5C_B6320C -.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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80245018_B632C8 .word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 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 0da7b7a0ad..af1ed8505c 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 @@ -213,7 +213,7 @@ dlabel D_80244EF4_B6A9A4 .word 0x00420000, 0xFFFFFFFF dlabel D_80244EFC_B6A9AC -.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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244FB8_B6AA68 .word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 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 5ec8a27422..16574be555 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 @@ -9,7 +9,7 @@ dlabel D_80242D38_B75DE8 .word 0x00420000, 0xFFFFFFFF dlabel D_80242D40_B75DF0 -.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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242DFC_B75EAC .word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s index acad759a40..f5d9c8383f 100644 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s +++ b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s @@ -210,7 +210,7 @@ dlabel D_80249694_8B9704 .word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002D, 0x00000043, 0x00000002, ShowChoice, 0x001E0013, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002E, 0x00000043, 0x00000002, ShowChoice, 0x001E0013, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002F, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_802427B0_8B2820, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF8405BDE, 0x00000001, 0x00000043, 0x00000001, func_802427CC_8B283C, 0x00000043, 0x00000001, func_802427EC_8B285C, 0x00000024, 0x00000002, 0xF8405BDE, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802497F4_8B9864 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80242014_8B2084, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B001D, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFED9, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000269, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000015, 0x000001D2, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x00000014, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x000000A7, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x000000A9, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000016, 0x7FFFFE00, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0002, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFFA1, 0x00000000, 0xFFFFFFAA, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFFA4, 0x00000000, 0xFFFFFFD2, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF43, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF43, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF93, 0xFFFFFFC3, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFF72, 0xFFFFFFA1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF12, 0xFFFFFFDF, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242014_8B2084, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFF58, 0xFFFFFFF1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000A, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0xFFFFFFFC, 0x000B001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x009E000C, 0x009E0002, 0x00000000, 0xFFFFFFFC, 0x000B001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x009D000B, 0x009D000A, 0x00000000, 0x00000002, 0x000B0020, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFB1, 0x00000000, 0xFFFFFFF6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFEA, 0x00000000, 0x0000000C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C1A, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFB1, 0xFFFFFFF6, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFFD3, 0x00000028, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFFE9, 0xFFFFFFEB, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000001E, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000A, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D000B, 0x009D000A, 0x00000000, 0x000B0021, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000029, 0xFFFFFF6D, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000007F, 0xFFFFFF63, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000003, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000003, 0x0000000A, 0x00000002, 0xF8405B9E, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2450280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0022, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, ShowChoice, 0x001E0011, 0x00000008, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000003, FindKeyItem, 0x00000056, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFCE, 0xFFFFFFE8, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80248D28_8B8D98, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000C, 0x009E0002, 0x00000000, 0x000B0024, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0010, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0025, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0026, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80248DC8_8B8E38, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFFFFFFE2, 0x00000000, 0xFFFFFFED, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFFE9, 0xFFFFFFEB, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFAB, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0023, 0x00000024, 0x00000002, 0xF8405B9F, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0xF2462E80, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0xF2462E80, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0027, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8280, 0x00000028, 0xF2450280, 0xF24AB680, 0xF24A5E80, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000007F, 0x00000000, 0xFFFFFF63, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000020, 0xFFFFFF69, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C2, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0xFFFFFFFC, 0x000B002B, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000003, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFFC4, 0xFFFFFFF2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000121, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000003, AddBadge, 0x00000121, 0xFE363C80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000003, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80249694_8B9704, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000000, 0x00000043, 0x00000001, func_80242734_8B27A4, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0031, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0xF2462E80, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0032, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000057, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000003, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0033, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000003, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0034, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0035, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0036, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x00000002, 0x000B0037, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7F4D, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000007, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0xFFFFFFFC, 0x000B0038, 0x00000043, 0x00000001, func_802439A0_8B3A10, 0x00000044, 0x00000001, 0x80243C0C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0189, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80243C30, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x00000002, 0x000B0039, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B003A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000029, 0xFFFFFF71, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x009F0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000007F, 0xFFFFFF63, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x009F0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000050, 0xFFFFFF66, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000006F, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C2, 0x00000000, 0x00000043, 0x00000001, func_80242788_8B27F8, 0x00000043, 0x00000001, func_80242710_8B2780, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B003B, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B003C, 0x00000013, 0x00000000, 0x00000043, 0x00000003, kmr_02_UnkFunc41, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000073, 0x00000000, 0xFFFFFECB, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000040, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000008, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000B8, 0x00000000, 0xFFFFFF6B, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000C8, 0x00000000, 0x00000064, 0x00000043, 0x00000002, RestartNpcAI, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF8D, 0x00000048, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000004, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80242014_8B2084, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B001D, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFED9, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000269, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000015, 0x000001D2, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x00000014, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x000000A7, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x000000A9, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000016, 0x7FFFFE00, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0002, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFFA1, 0x00000000, 0xFFFFFFAA, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFFA4, 0x00000000, 0xFFFFFFD2, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF43, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF43, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF93, 0xFFFFFFC3, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFF72, 0xFFFFFFA1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF12, 0xFFFFFFDF, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242014_8B2084, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFF58, 0xFFFFFFF1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000A, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0xFFFFFFFC, 0x000B001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x009E000C, 0x009E0002, 0x00000000, 0xFFFFFFFC, 0x000B001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x009D000B, 0x009D000A, 0x00000000, 0x00000002, 0x000B0020, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFB1, 0x00000000, 0xFFFFFFF6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFEA, 0x00000000, 0x0000000C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C1A, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFB1, 0xFFFFFFF6, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFFD3, 0x00000028, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFFE9, 0xFFFFFFEB, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000001E, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000A, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D000B, 0x009D000A, 0x00000000, 0x000B0021, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000029, 0xFFFFFF6D, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000007F, 0xFFFFFF63, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000003, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000003, 0x0000000A, 0x00000002, 0xF8405B9E, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2450280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0022, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, ShowChoice, 0x001E0011, 0x00000008, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000003, FindKeyItem, 0x00000056, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFCE, 0xFFFFFFE8, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80248D28_8B8D98, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000C, 0x009E0002, 0x00000000, 0x000B0024, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0010, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0025, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0026, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80248DC8_8B8E38, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFFFFFFE2, 0x00000000, 0xFFFFFFED, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFFE9, 0xFFFFFFEB, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFAB, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0023, 0x00000024, 0x00000002, 0xF8405B9F, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0xF2462E80, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0xF2462E80, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0027, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8280, 0x00000028, 0xF2450280, 0xF24AB680, 0xF24A5E80, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000007F, 0x00000000, 0xFFFFFF63, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000020, 0xFFFFFF69, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C2, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0xFFFFFFFC, 0x000B002B, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000003, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFFC4, 0xFFFFFFF2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000121, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000003, AddBadge, 0x00000121, 0xFE363C80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000003, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80249694_8B9704, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000000, 0x00000043, 0x00000001, func_80242734_8B27A4, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0031, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0xF2462E80, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0032, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000057, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000003, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0033, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000003, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0034, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0035, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0036, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x00000002, 0x000B0037, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7F4D, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000007, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0xFFFFFFFC, 0x000B0038, 0x00000043, 0x00000001, func_802439A0_8B3A10, 0x00000044, 0x00000001, 0x80243C0C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0189, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80243C30, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x00000002, 0x000B0039, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B003A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000029, 0xFFFFFF71, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x009F0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000007F, 0xFFFFFF63, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x009F0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000050, 0xFFFFFF66, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000006F, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C2, 0x00000000, 0x00000043, 0x00000001, func_80242788_8B27F8, 0x00000043, 0x00000001, func_80242710_8B2780, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B003B, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B003C, 0x00000013, 0x00000000, 0x00000043, 0x00000003, kmr_02_ChangeNpcToPartner, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000073, 0x00000000, 0xFFFFFECB, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000040, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000008, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000B8, 0x00000000, 0xFFFFFF6B, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000C8, 0x00000000, 0x00000064, 0x00000043, 0x00000002, RestartNpcAI, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF8D, 0x00000048, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000004, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024B388_8BB3F8 .word 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s b/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s index 888bec8d75..455d4af842 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s @@ -54,7 +54,7 @@ dlabel D_802426B4_A4AC74 .word 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 dlabel D_80242740_A4AD00 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_03_MagikoopaAI_OnPlayerWon, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, kpa_03_MagikoopaAI_OnPlayerFled, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_03_MagikoopaAI_OnPlayerWon, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, kpa_03_MagikoopaAI_OnPlayerFled, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802427C0_A4AD80 .word 0x00000000, 0x0020001C, 0x00000000, 0x00000000, D_80242694_A4AC54, D_802426B4_A4AC74, 0x00000000, D_80242740_A4AD00, 0x00000000, 0x00000000, 0x001A0000 @@ -75,7 +75,7 @@ dlabel D_80242898_A4AE58 .word 0x00000043, 0x00000001, kpa_03_MagikoopaAI_OnHitInit, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_03_MagikoopaAI_OnHit, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802428EC_A4AEAC -.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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802429A8_A4AF68 .word 0x00560000, 0x00000000, D_8024280C_A4ADCC, 0x00000000, D_8024287C_A4AE3C, D_80242898_A4AE58, 0x00000000, D_802428EC_A4AEAC, 0x00000000, 0x00000000, 0x00000000, 0x00570000, 0x00000000, D_80242844_A4AE04, 0x00000000, D_8024287C_A4AE3C, D_80242898_A4AE58, 0x00000000, D_802428EC_A4AEAC, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_08/A4E710.data.s b/ver/us/asm/data/world/area_kpa/kpa_08/A4E710.data.s index a65a1d6a56..bedb849498 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_08/A4E710.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_08/A4E710.data.s @@ -21,7 +21,7 @@ dlabel D_80241DC4_A4E7E4 .word 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 dlabel D_80241E50_A4E870 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_08_MagikoopaAI_OnPlayerWon, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, kpa_08_MagikoopaAI_OnPlayerFled, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_08_MagikoopaAI_OnPlayerWon, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, kpa_08_MagikoopaAI_OnPlayerFled, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241ED0_A4E8F0 .word 0x00000000, 0x0020001C, 0x00000000, 0x00000000, D_80241DA4_A4E7C4, D_80241DC4_A4E7E4, 0x00000000, D_80241E50_A4E870, 0x00000000, 0x00000000, 0x001A0000 @@ -42,7 +42,7 @@ dlabel D_80241FA8_A4E9C8 .word 0x00000043, 0x00000001, kpa_08_MagikoopaAI_OnHitInit, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_08_MagikoopaAI_OnHit, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241FFC_A4EA1C -.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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802420B8_A4EAD8 .word 0x00560000, 0x00000000, D_80241F1C_A4E93C, 0x00000000, D_80241F8C_A4E9AC, D_80241FA8_A4E9C8, 0x00000000, D_80241FFC_A4EA1C, 0x00000000, 0x00000000, 0x00000000, 0x00570000, 0x00000000, D_80241F54_A4E974, 0x00000000, D_80241F8C_A4E9AC, D_80241FA8_A4E9C8, 0x00000000, D_80241FFC_A4EA1C, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_09/A50B90.data.s b/ver/us/asm/data/world/area_kpa/kpa_09/A50B90.data.s index 31cb3a3a6e..87c13cec54 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_09/A50B90.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_09/A50B90.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241B90_A50B90 -.word 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 +.word 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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241C60_A50C60 .word 0x40000000, 0x00000014, 0x00000003, 0x42F00000, 0x42F00000, 0x00000002, 0x3F800000, 0x00000000, 0x00000000, 0x43160000, 0x43160000, 0x00000001 diff --git a/ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s b/ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s index e4dc0a4b7a..9295004ff0 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80243F50_A97690 -.word 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 +.word 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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244020_A97760 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42F00000, 0x41A00000, 0x00000005, 0x40400000, 0x0000005A, 0x00000003, 0x430C0000, 0x41A00000, 0x00000000 @@ -48,7 +48,7 @@ dlabel D_80244480_A97BC0 .word 0x00000043, 0x00000002, kpa_102_FlyingMagikoopaAI_Main, D_80244450_A97B90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802444A0_A97BE0 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024453C_A97C7C .word 0x00000000, 0x00210020, 0x00000000, 0x00000000, D_80244480_A97BC0, EnemyNpcHit, 0x00000000, D_802444A0_A97BE0, 0x00000000, 0x00000000, 0x001A0000 @@ -69,7 +69,7 @@ dlabel D_80244614_A97D54 .word 0x00000043, 0x00000001, kpa_102_FlyingMagikoopaAI_OnHitInit, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_102_FlyingMagikoopaAI_OnHit, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244668_A97DA8 -.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, 0x00560000, 0x00000000, D_80244588_A97CC8, 0x00000000, D_802445F8_A97D38, D_80244614_A97D54, 0x00000000, D_80244668_A97DA8, 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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00560000, 0x00000000, D_80244588_A97CC8, 0x00000000, D_802445F8_A97D38, D_80244614_A97D54, 0x00000000, D_80244668_A97DA8, 0x00000000, 0x00000000, 0x00000000 dlabel D_80244750_A97E90 .word 0x00570000, 0x00000000, D_802445C0_A97D00, 0x00000000, D_802445F8_A97D38, D_80244614_A97D54, 0x00000000, D_80244668_A97DA8, 0x00000000, 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 2a96c7178e..394b468a65 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 @@ -12,7 +12,7 @@ dlabel D_80241BE4_A9B174 .word 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, D_80241AF0_A9B080, 0x00000040, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241BE4_A9B174, 0x00000040, 0x0000001A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241DC0_A9B350 -.word 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 +.word 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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E90_A9B420 .word 0x40000000, 0x00000014, 0x00000003, 0x42F00000, 0x42F00000, 0x00000002, 0x3F800000, 0x00000000, 0x00000000, 0x43160000, 0x43160000, 0x00000001 diff --git a/ver/us/asm/data/world/area_kpa/kpa_115/AA0B20.data.s b/ver/us/asm/data/world/area_kpa/kpa_115/AA0B20.data.s index e8710b0205..55fac79722 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_115/AA0B20.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_115/AA0B20.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241DE0_AA0B20 -.word 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 +.word 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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241EB0_AA0BF0 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42F00000, 0x41A00000, 0x00000005, 0x40400000, 0x0000005A, 0x00000003, 0x430C0000, 0x41A00000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_130/AA3870.data.s b/ver/us/asm/data/world/area_kpa/kpa_130/AA3870.data.s index 19fdec0262..f47056bdd5 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_130/AA3870.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_130/AA3870.data.s @@ -27,13 +27,13 @@ dlabel D_80240C98_AA39B8 .word 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, kpa_130_BulletBillAI_Main, D_80240C68_AA3988, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240CF8_AA3A18 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240D94_AA3AB4 -.word 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80240BC4_AA38E4, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80240BC4_AA38E4, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80240E84_AA3BA4 -.word 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000064, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001A0020, 0x00000000, 0x00000000, D_80240B74_AA3894, EnemyNpcHit, 0x00000000, D_80240CF8_AA3A18, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x000E001F, 0x00000000, 0x00000000, D_80240BC4_AA38E4, EnemyNpcHit, 0x00000000, D_80240D94_AA3AB4, 0x00000000, 0x00000000, 0x00050000 +.word 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000064, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001A0020, 0x00000000, 0x00000000, D_80240B74_AA3894, EnemyNpcHit, 0x00000000, D_80240CF8_AA3A18, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x000E001F, 0x00000000, 0x00000000, D_80240BC4_AA38E4, EnemyNpcHit, 0x00000000, D_80240D94_AA3AB4, 0x00000000, 0x00000000, 0x00050000 dlabel D_80240FA8_AA3CC8 .word 0x00000000, 0x001A0020, 0x00000000, 0x00000000, D_80240C48_AA3968, EnemyNpcHit, 0x00000000, D_80240CF8_AA3A18, 0x00000000, 0x00000000, 0x001B0000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_50/A624D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_50/A624D0.data.s index fb2db06b88..841e1672a8 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_50/A624D0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_50/A624D0.data.s @@ -15,7 +15,7 @@ dlabel D_80241C48_A62618 .word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241C00_A625D0, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000087, 0x00000024, 0x00000002, 0xFE363C83, 0x00000085, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80241C00_A625D0, 0x00000023, 0x00000000, 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, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, D_80243460_A63E30, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000082, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000084, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000044, 0x00000001, D_80241C48_A62618, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241A80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241DF0_A627C0 -.word 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 +.word 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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241EC0_A62890 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42F00000, 0x41A00000, 0x00000005, 0x40400000, 0x0000005A, 0x00000003, 0x430C0000, 0x41A00000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_51/A660E0.data.s b/ver/us/asm/data/world/area_kpa/kpa_51/A660E0.data.s index 45c5885cc1..d4ac5dd5e0 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_51/A660E0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_51/A660E0.data.s @@ -21,7 +21,7 @@ dlabel D_80242124_A661B4 .word 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 dlabel D_802421B0_A66240 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_51_MagikoopaAI_OnPlayerWon, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, kpa_51_MagikoopaAI_OnPlayerFled, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_51_MagikoopaAI_OnPlayerWon, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, kpa_51_MagikoopaAI_OnPlayerFled, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242230_A662C0 .word 0x00000000, 0x0020001C, 0x00000000, 0x00000000, D_80242104_A66194, D_80242124_A661B4, 0x00000000, D_802421B0_A66240, 0x00000000, 0x00000000, 0x001A0000 @@ -42,7 +42,7 @@ dlabel D_80242308_A66398 .word 0x00000043, 0x00000001, kpa_51_MagikoopaAI_OnHitInit, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_51_MagikoopaAI_OnHit, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024235C_A663EC -.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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242418_A664A8 .word 0x00560000, 0x00000000, D_8024227C_A6630C, 0x00000000, D_802422EC_A6637C, D_80242308_A66398, 0x00000000, D_8024235C_A663EC, 0x00000000, 0x00000000, 0x00000000, 0x00570000, 0x00000000, D_802422B4_A66344, 0x00000000, D_802422EC_A6637C, D_80242308_A66398, 0x00000000, D_8024235C_A663EC, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_52/A68B40.data.s b/ver/us/asm/data/world/area_kpa/kpa_52/A68B40.data.s index dfb727972b..d5feb5f655 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_52/A68B40.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_52/A68B40.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80241A40_A68B40 -.word 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 +.word 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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241B10_A68C10 .word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42F00000, 0x41A00000, 0x00000005, 0x40400000, 0x0000005A, 0x00000003, 0x430C0000, 0x41A00000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_61/A70FE0.data.s b/ver/us/asm/data/world/area_kpa/kpa_61/A70FE0.data.s index d7c2260490..e9aac223e6 100644 --- a/ver/us/asm/data/world/area_kpa/kpa_61/A70FE0.data.s +++ b/ver/us/asm/data/world/area_kpa/kpa_61/A70FE0.data.s @@ -18,7 +18,7 @@ dlabel D_80242CFC_A710DC .word 0x00000043, 0x00000002, kpa_61_FlyingMagikoopaAI_Main, D_80242CCC_A710AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242D1C_A710FC -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242DB8_A71198 .word 0x00000000, 0x00210020, 0x00000000, 0x00000000, D_80242CFC_A710DC, EnemyNpcHit, 0x00000000, D_80242D1C_A710FC, 0x00000000, 0x00000000, 0x001A0000 @@ -39,7 +39,7 @@ dlabel D_80242E90_A71270 .word 0x00000043, 0x00000001, kpa_61_FlyingMagikoopaAI_OnHitInit, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_61_FlyingMagikoopaAI_OnHit, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242EE4_A712C4 -.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, 0x00560000, 0x00000000, D_80242E04_A711E4, 0x00000000, D_80242E74_A71254, D_80242E90_A71270, 0x00000000, D_80242EE4_A712C4, 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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00560000, 0x00000000, D_80242E04_A711E4, 0x00000000, D_80242E74_A71254, D_80242E90_A71270, 0x00000000, D_80242EE4_A712C4, 0x00000000, 0x00000000, 0x00000000 dlabel D_80242FCC_A713AC .word 0x00570000, 0x00000000, D_80242E3C_A7121C, 0x00000000, D_80242E74_A71254, D_80242E90_A71270, 0x00000000, D_80242EE4_A712C4, 0x00000000, 0x00000000, 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 0b80a9466e..c05fd264fb 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 @@ -30,7 +30,7 @@ dlabel D_802438D0_B96D10 .word 0x00000024, 0x00000002, 0xFE363C89, 0x00000020, 0x00000044, 0x00000001, D_80243124_B96564, 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, D_80243054_B96494, 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, D_80242F34_B96374, 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, D_8024375C_B96B9C, 0x00000100, 0x0000001A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802437D8_B96C18, 0x00000100, 0x0000001E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802438D0_B96D10, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243854_B96C94, 0x00000100, 0x0000001C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243EB0_B972F0 -.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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80243F6C_B973AC .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 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 2508b329cf..38f7d6b0ec 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,7 +3,7 @@ .section .data dlabel 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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024340C_BA3B3C .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 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 e6b413afae..8f8b69b4fb 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,7 +3,7 @@ .section .data dlabel 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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244AAC_BA922C .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 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 9694050a76..4d33f9f09b 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 @@ -15,7 +15,7 @@ dlabel D_80244478_BB1DB8 .word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80244408_BB1D48, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000 dlabel D_802444A4_BB1DE4 -.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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244560_BB1EA0 .word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_nok/nok_04/9EEEB0.data.s b/ver/us/asm/data/world/area_nok/nok_04/9EEEB0.data.s index 20b24df95c..3f40d41b5c 100644 --- a/ver/us/asm/data/world/area_nok/nok_04/9EEEB0.data.s +++ b/ver/us/asm/data/world/area_nok/nok_04/9EEEB0.data.s @@ -87,7 +87,7 @@ dlabel D_8024337C_9F0F6C .word 0x0000004E, 0x00000006, D_80243258_9F0E48, 0x00000010, 0x00000000, D_80243374_9F0F64, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_80240E4C_9EEA3C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802433B8_9F0FA8 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFFFFFF98, 0x00000028, 0x00000002, 0xFE363C82, 0x000000F1, 0x00000029, 0x00000002, 0xFE363C80, 0xFFFFFF9B, 0x00000029, 0x00000002, 0xFE363C82, 0x00000023, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFFFFFEA2, 0x00000000, 0x0000015E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF24, 0x00000000, 0x0000010E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF24, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C8A, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24A7D50, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF33, 0x0000010B, 0x00000028, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFFFFFF0A, 0x00000122, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0011000A, 0x00110004, 0x00000000, 0x000C00C3, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000006, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00C4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000046, 0x00000001, D_8024337C_9F0F6C, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF31, 0x0000010C, 0x00000007, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF1, 0x00000027, 0x00000002, 0xFE363C81, 0x00000008, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00110009, 0x00110003, 0x00000000, 0x000C00C7, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x0011000D, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x00110009, 0x00110003, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x00000006, 0x00000044, 0x00000001, D_80241328_9EEF18, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C83, 0x0000003C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020010, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00C8, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00C9, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0xFFFFFFD3, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000C00CA, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CB, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00CC, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CD, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CE, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020010, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000013, 0x00000000, 0x00000043, 0x00000003, nok_04_UnkFunc41, 0x00000006, 0x00000002, 0x00000043, 0x00000001, func_80240E90_9EEA80, 0x00000044, 0x00000001, 0x80240FE8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018A, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x8024100C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFFFFFE70, 0x00000190, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00CF, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFF06, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0002, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000014, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00D0, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, BindNpcDefeat, 0x00000000, D_8024317C_9F0D6C, 0x00000043, 0x00000003, BindNpcAI, 0x00000000, D_80243110_9F0D00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF2C, 0x00000000, 0x000000ED, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000025, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080012, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000003, 0x00000001, 0x00000015, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF01, 0x00000000, 0x0000011F, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x0000001F, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x0000001F, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000002, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF3B, 0x00000000, 0x000000E3, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF17, 0x00000000, 0x0000011D, 0x0000000A, 0x00000003, 0x00000001, 0x00000016, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000016, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF2E, 0x00000000, 0x000000F4, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000020, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF86, 0x00000000, 0x000000DB, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF4F, 0x00000000, 0x000000F2, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF2B, 0x00000000, 0x0000012C, 0x0000000F, 0x00000003, 0x00000001, 0x00000017, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000017, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFFFFFF2E, 0x00000000, 0x0000010A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000021, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000021, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF9C, 0x00000000, 0x0000010D, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF27, 0x00000000, 0x000000D4, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF03, 0x00000000, 0x0000010E, 0x0000000A, 0x00000003, 0x00000001, 0x00000018, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000018, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFFFFFF49, 0x00000000, 0x00000101, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000008, 0x00000001, 0x00000005, 0x00000003, 0x00000001, 0x00000022, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000022, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFECF, 0x00000000, 0x00000149, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000032, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFEB1, 0x00000000, 0x00000163, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x00000032, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00D1, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF9718888, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFFFFFF98, 0x00000028, 0x00000002, 0xFE363C82, 0x000000F1, 0x00000029, 0x00000002, 0xFE363C80, 0xFFFFFF9B, 0x00000029, 0x00000002, 0xFE363C82, 0x00000023, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFFFFFEA2, 0x00000000, 0x0000015E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF24, 0x00000000, 0x0000010E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF24, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C8A, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24A7D50, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF33, 0x0000010B, 0x00000028, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFFFFFF0A, 0x00000122, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0011000A, 0x00110004, 0x00000000, 0x000C00C3, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000006, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00C4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000046, 0x00000001, D_8024337C_9F0F6C, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF31, 0x0000010C, 0x00000007, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF1, 0x00000027, 0x00000002, 0xFE363C81, 0x00000008, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00110009, 0x00110003, 0x00000000, 0x000C00C7, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x0011000D, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110003, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x00110009, 0x00110003, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00110000, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0x00000006, 0x00000044, 0x00000001, D_80241328_9EEF18, 0x00000043, 0x00000004, InterpNpcYaw, 0xFE363C83, 0x0000003C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, EnableNpcBlur, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000003, SetNpcSprite, 0x00000006, 0x00020010, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00C8, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00C9, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0xFFFFFFD3, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x000C00CA, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CB, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000006, 0x000C00CC, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CD, 0x00000004, 0x00000001, 0x0000000A, 0x00000012, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x000C00CE, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020010, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00020003, 0x00000043, 0x00000005, EndSpeech, 0x00000006, 0x0002000D, 0x00020003, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA4, 0x00000013, 0x00000000, 0x00000043, 0x00000003, nok_04_ChangeNpcToPartner, 0x00000006, 0x00000002, 0x00000043, 0x00000001, func_80240E90_9EEA80, 0x00000044, 0x00000001, 0x80240FE8, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018A, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x8024100C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFFFFFE70, 0x00000190, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00CF, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFF06, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0002, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x00000014, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00D0, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, BindNpcDefeat, 0x00000000, D_8024317C_9F0D6C, 0x00000043, 0x00000003, BindNpcAI, 0x00000000, D_80243110_9F0D00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF2C, 0x00000000, 0x000000ED, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000025, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080012, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000003, 0x00000001, 0x00000015, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF01, 0x00000000, 0x0000011F, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x0000001F, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x0000001F, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000002, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF9C, 0x00000000, 0x000000E1, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF3B, 0x00000000, 0x000000E3, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF17, 0x00000000, 0x0000011D, 0x0000000A, 0x00000003, 0x00000001, 0x00000016, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000016, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF2E, 0x00000000, 0x000000F4, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000003, 0x00000001, 0x00000020, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000020, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF86, 0x00000000, 0x000000DB, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF4F, 0x00000000, 0x000000F2, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFFFFFF2B, 0x00000000, 0x0000012C, 0x0000000F, 0x00000003, 0x00000001, 0x00000017, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000017, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFFFFFF2E, 0x00000000, 0x0000010A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000021, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000021, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x0000003F, 0x00000000, 0x000000D4, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF9C, 0x00000000, 0x0000010D, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF27, 0x00000000, 0x000000D4, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFFFFFF03, 0x00000000, 0x0000010E, 0x0000000A, 0x00000003, 0x00000001, 0x00000018, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000018, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFFFFFF49, 0x00000000, 0x00000101, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000008, 0x00000001, 0x00000005, 0x00000003, 0x00000001, 0x00000022, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A8280, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000004, 0x00000001, 0x00000022, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000046, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFE2, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFECF, 0x00000000, 0x00000149, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000032, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFEB1, 0x00000000, 0x00000163, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x00000032, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00D1, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x0000011C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF9718888, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80244D0C_9F28FC .word 0x00000056, 0x00000000, 0x00000043, 0x00000005, func_80240574_9EE164, 0xFE363C80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000027, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x0000002A, 0x00000002, 0xFE363C8A, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000F, 0xFFFFFFF5, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, func_80240574_9EE164, 0xFE363C80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcPointer, 0x00000000, 0xFE363C8E, 0x00000043, 0x00000003, GetNpcPointer, 0x00000001, 0xFE363C8F, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C84, 0x00000004, 0x00000043, 0x00000004, func_80240314_9EDF04, 0xFE363C8A, 0xFE363C8B, 0xFE363C84, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x0000002A, 0x00000002, 0xFE363C83, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000044, 0x00000001, D_8024303C_9F0C2C, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000002, func_80240548_9EE138, 0x00000000, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0xFE363C83, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0xFE363C8F, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0008, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8D, 0xFE363C8C, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0009, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x002B000C, 0x002B0001, 0x00000005, 0x000C00BF, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B000B, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C89, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000001E, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000000, 0x00000027, 0x00000002, 0xFD050F80, 0x00000001, 0x00000044, 0x00000001, D_802417F8_9EF3E8, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C84, 0x00000004, 0x00000043, 0x00000004, func_80240314_9EDF04, 0xFE363C8A, 0xFE363C8B, 0xFE363C84, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x00000029, 0x00000002, 0xFE363C83, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000044, 0x00000001, D_80242F9C_9F0B8C, 0x00000008, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000002, func_80240548_9EE138, 0x00000000, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0xFE363C83, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0xFE363C8F, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0008, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8D, 0xFE363C8C, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0009, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x002B000C, 0x002B0001, 0x00000005, 0x000C00C0, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B000B, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C89, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0xB0000017, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x0000001E, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000000, 0x00000027, 0x00000002, 0xFD050F80, 0x00000001, 0x00000044, 0x00000001, D_802417F8_9EF3E8, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0008, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_80240314_9EDF04, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000028, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0xFE363C8F, 0x00000043, 0x00000002, func_80240548_9EE138, 0xFE363C8E, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B0009, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x002B000C, 0x002B0001, 0x00000005, 0x000C00C1, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_8024051C_9EE10C, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000028, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7CE7, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010024, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C84, 0x00000032, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x00000027, 0x00000002, 0xFE363C83, 0x00000008, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFF0, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000000D2, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0006, 0x000000A0, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, AddKeyItem, 0x00000019, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x002B000C, 0x002B0001, 0x00000005, 0x000C00C2, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x002B000B, 0x00000043, 0x00000004, func_802403C0_9EDFB0, 0x00000000, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetModelFlags, 0x0000004C, 0x00000010, 0x00000000, 0x00000043, 0x00000002, func_80240548_9EE138, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000044, 0x00000001, D_802433B8_9F0FA8, 0x00000023, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_obk/obk_09/BDB140.data.s b/ver/us/asm/data/world/area_obk/obk_09/BDB140.data.s index f970f74e3a..85a4f3d378 100644 --- a/ver/us/asm/data/world/area_obk/obk_09/BDB140.data.s +++ b/ver/us/asm/data/world/area_obk/obk_09/BDB140.data.s @@ -3,7 +3,7 @@ .section .data dlabel D_80240990_BDB140 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFDC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFDC, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001C, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF4C, 0x00000000, 0x00000158, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF4C, 0x00000014, 0x00000158, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0x000000BE, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8E80, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000C8, 0x00000118, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x0000006E, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000030, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000E0042, 0x000000A0, 0x00000028, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000028, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x01010002, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8A80, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000C8, 0x0000012C, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFFFFFFEC, 0x0000000A, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x0000003C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFF6, 0x00000050, 0xFFFFFFDD, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x0000001E, 0x00000046, 0xFFFFFFB5, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000C1, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E0043, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0044, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E0045, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000E1, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0046, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000014, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0047, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB880, 0xF24A5480, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000226, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000C8, 0x0000012C, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000050, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0007, 0x00BF0008, 0x00000000, 0x000E0048, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000014, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0049, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000005, 0x000E004A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000005, 0x000E004B, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000226, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A4A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableGroup, 0x00000029, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0x0000028A, 0x00000050, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x8000000F, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFEE8, 0xFFFFFE20, 0x00000064, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000029, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000028A, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0xFE363C80, 0x00000050, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x0000009B, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7B4D, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AF280, 0xF24A3280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00140005, 0x00140009, 0x00000000, 0x000E004C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0x0000026C, 0x00000050, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x8000000F, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFE20, 0xFFFFFEE8, 0x00000064, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000029, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000280, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0xFE363C80, 0x00000050, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000000F, 0x00000043, 0x00000003, EnableGroup, 0x00000029, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E004D, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0006, 0x00BF0005, 0x00000000, 0x000E004E, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x00000001, 0x000E004F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF000B, 0x00BF0008, 0x00000000, 0x000E0050, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050008, 0x00050001, 0x00000000, 0x000E0051, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0007, 0x00BF0008, 0x00000000, 0x000E0052, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 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, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000028, 0x00000027, 0x00000002, 0xFE363C82, 0x00000096, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E0053, 0x00000043, 0x00000003, obk_09_UnkFunc41, 0x00000000, 0x00000009, 0x00000043, 0x00000001, func_80240350_BDAB00, 0x00000044, 0x00000001, 0x80240508, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018D, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80240534, 0x00000008, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0005000B, 0x0005000B, 0x00000000, 0x000E0054, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFDC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFDC, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001C, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF4C, 0x00000000, 0x00000158, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF4C, 0x00000014, 0x00000158, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000000, 0x000000BE, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8E80, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000C8, 0x00000118, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x0000006E, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000030, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000E0042, 0x000000A0, 0x00000028, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000028, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x01010002, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8A80, 0xF24A5680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000C8, 0x0000012C, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFFFFFFEC, 0x0000000A, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x0000003C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFF6, 0x00000050, 0xFFFFFFDD, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x0000001E, 0x00000046, 0xFFFFFFB5, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000C1, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E0043, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0044, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E0045, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000E1, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0046, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000014, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0047, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB880, 0xF24A5480, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000226, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000C8, 0x0000012C, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000050, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0007, 0x00BF0008, 0x00000000, 0x000E0048, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000014, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0049, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000005, 0x000E004A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000005, 0x000E004B, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000226, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A4A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableGroup, 0x00000029, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0x0000028A, 0x00000050, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x8000000F, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFEE8, 0xFFFFFE20, 0x00000064, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000029, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000028A, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0xFE363C80, 0x00000050, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x0000009B, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7B4D, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AF280, 0xF24A3280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00140005, 0x00140009, 0x00000000, 0x000E004C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A8680, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000032, 0xFFFFFFBA, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0x0000026C, 0x00000050, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x8000000F, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFE20, 0xFFFFFEE8, 0x00000064, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000029, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000280, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000001, 0xFE363C80, 0x00000050, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000000F, 0x00000043, 0x00000003, EnableGroup, 0x00000029, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E004D, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0006, 0x00BF0005, 0x00000000, 0x000E004E, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x00000001, 0x000E004F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF000B, 0x00BF0008, 0x00000000, 0x000E0050, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050008, 0x00050001, 0x00000000, 0x000E0051, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00BF0007, 0x00BF0008, 0x00000000, 0x000E0052, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 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, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000028, 0x00000027, 0x00000002, 0xFE363C82, 0x00000096, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00050004, 0x00050001, 0x00000000, 0x000E0053, 0x00000043, 0x00000003, obk_09_ChangeNpcToPartner, 0x00000000, 0x00000009, 0x00000043, 0x00000001, func_80240350_BDAB00, 0x00000044, 0x00000001, 0x80240508, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018D, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80240534, 0x00000008, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0005000B, 0x0005000B, 0x00000000, 0x000E0054, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241830_BDBFE0 .word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 diff --git a/ver/us/asm/data/world/area_omo/omo_01/D9C200.data.s b/ver/us/asm/data/world/area_omo/omo_01/D9C200.data.s index e1c4260ad8..8542e489c1 100644 --- a/ver/us/asm/data/world/area_omo/omo_01/D9C200.data.s +++ b/ver/us/asm/data/world/area_omo/omo_01/D9C200.data.s @@ -15,7 +15,7 @@ dlabel D_8024138C_D9C27C .word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000043, 0x00000004, SetNpcVar, 0xFE363C8A, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001A, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001A, 0x00000028, 0x00000002, 0xFE363C84, 0x00000001, 0x00000043, 0x00000005, SetItemPos, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0xFE363C8A, 0x0000000A, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C89, 0x00000014, 0x00000001, 0xFE363C8D, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000C, 0xFE363C8E, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C8B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000D, 0xFE363C8E, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C8B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000E, 0xFE363C8E, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802415C0_D9C4B0 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405FD5, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405FD5, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802416A0_D9C590 .word 0x0000000A, 0x00000002, 0xF8405FD5, 0x00000001, 0x0000000A, 0x00000002, 0xF8405FD4, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802415C0_D9C4B0, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF8405FD4, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000030, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000025, 0x00000002, 0xFE363C83, 0xF8405FD4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x000000A3, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_8024138C_D9C27C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_02/DA1CD0.data.s b/ver/us/asm/data/world/area_omo/omo_02/DA1CD0.data.s index 9dbf5e8d0f..1996128d00 100644 --- a/ver/us/asm/data/world/area_omo/omo_02/DA1CD0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_02/DA1CD0.data.s @@ -18,7 +18,7 @@ dlabel D_802448EC_DA1DBC .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 dlabel D_80244918_DA1DE8 -.word 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 +.word 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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802449E8_DA1EB8 .word 0x3FC00000, 0x0000003C, 0x0000000F, 0x42B40000, 0x42480000, 0x00000003, 0x40733333, 0x00000008, 0x00000001, 0x430C0000, 0x42700000, 0x00000001 diff --git a/ver/us/asm/data/world/area_omo/omo_09/DD4150.data.s b/ver/us/asm/data/world/area_omo/omo_09/DD4150.data.s index 3a9f2911e2..bc42f89635 100644 --- a/ver/us/asm/data/world/area_omo/omo_09/DD4150.data.s +++ b/ver/us/asm/data/world/area_omo/omo_09/DD4150.data.s @@ -30,7 +30,7 @@ dlabel D_802475E8_DD42B8 .word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802475A8_DD4278, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001, 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802475C8_DD4298, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 dlabel D_80247640_DD4310 -.word 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 +.word 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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80247710_DD43E0 .word 0x3FC00000, 0x0000003C, 0x0000000F, 0x42B40000, 0x42480000, 0x00000003, 0x40733333, 0x00000008, 0x00000001, 0x430C0000, 0x42700000, 0x00000001 diff --git a/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s b/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s index ecf334a976..f37628c452 100644 --- a/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s +++ b/ver/us/asm/data/world/area_omo/omo_12/DDFB60.data.s @@ -24,7 +24,7 @@ dlabel D_80241018_DE0328 .word 0x00000000, 0x00000000, 0x00000000, 0xC1C80000, 0xC0A00000, 0x00000000, 0xC2700000, 0x41F00000, 0x00000000, 0x00000000, 0x00000000, 0x41A00000, 0x00000000 dlabel D_8024104C_DE035C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, omo_12_SetCamera0Flag1000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8280, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF2518280, 0xF24AB680, 0xF24A6280, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00060007, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000006, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, GetEncounterTriggerHitTier, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001F5, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x006D0003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x006D0004, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000032, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE5, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFCE, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0x00000014, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0x00000014, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0x00000006, 0xFE363C82, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000048, 0x00000008, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060005, 0x00060007, 0x00000000, 0x000F0058, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060005, 0x00060007, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060006, 0x00060001, 0x00000000, 0x000F0057, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00060001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x000F0059, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080011, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000003, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80240FF4_DE0304, 0x00000003, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x0000000C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80241018_DE0328, 0x00000003, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFF4, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, GetNextPathPos, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x000F005A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, omo_12_UnkFunc41, 0x00000001, 0x00000006, 0x00000043, 0x00000001, func_80240420_DDF730, 0x00000044, 0x00000001, 0x802405E4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018E, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80240608, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x000000C8, 0x000000FF, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000008, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, CloseMessage, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802408A8_DDFBB8, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00060004, 0x00060001, 0x00000000, 0x000F005B, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000044, 0x00000001, D_80240F38_DE0248, 0x00000043, 0x00000001, omo_12_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x00000002, 0x00000043, 0x00000002, RemoveNpc, 0x00000003, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, omo_12_SetCamera0Flag1000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8280, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF2518280, 0xF24AB680, 0xF24A6280, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000006, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00060007, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000006, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, GetEncounterTriggerHitTier, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001F5, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x006D0003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x006D0004, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000032, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE5, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFCE, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0x00000014, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0x00000014, 0xFE363C82, 0x00000014, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0x00000006, 0xFE363C82, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000048, 0x00000008, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000000A, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060005, 0x00060007, 0x00000000, 0x000F0058, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060005, 0x00060007, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060006, 0x00060001, 0x00000000, 0x000F0057, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00060001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x000F0059, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080011, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000019, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000003, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80240FF4_DE0304, 0x00000003, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x0000000C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000000F, D_80241018_DE0328, 0x00000003, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFF4, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, GetNextPathPos, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x000F005A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00060004, 0x00060001, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, omo_12_ChangeNpcToPartner, 0x00000001, 0x00000006, 0x00000043, 0x00000001, func_80240420_DDF730, 0x00000044, 0x00000001, 0x802405E4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018E, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80240608, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x000000C8, 0x000000FF, 0x0000002D, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0x00000008, 0x00000043, 0x00000005, func_80240314_DDF624, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, CloseMessage, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802408A8_DDFBB8, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00060004, 0x00060001, 0x00000000, 0x000F005B, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000044, 0x00000001, D_80240F38_DE0248, 0x00000043, 0x00000001, omo_12_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x00000002, 0x00000043, 0x00000002, RemoveNpc, 0x00000003, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E60_DE1170 .word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_omo/omo_17/DF4EB0.data.s b/ver/us/asm/data/world/area_omo/omo_17/DF4EB0.data.s index 4c78969307..78b52a3fb0 100644 --- a/ver/us/asm/data/world/area_omo/omo_17/DF4EB0.data.s +++ b/ver/us/asm/data/world/area_omo/omo_17/DF4EB0.data.s @@ -30,7 +30,7 @@ dlabel D_802461CC_DF506C .word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, omo_17_FlyingAI_Main, D_8024619C_DF503C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00190016, 0x00000000, 0x00000000, D_802461CC_DF506C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 dlabel D_80246268_DF5108 -.word 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 +.word 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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80246338_DF51D8 .word 0x3FC00000, 0x0000003C, 0x0000000F, 0x42B40000, 0x42480000, 0x00000003, 0x40733333, 0x00000008, 0x00000001, 0x430C0000, 0x42700000, 0x00000001 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 caebc61442..036e46f678 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,7 +3,7 @@ .section .data dlabel 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 +.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, OnPlayerFled, 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 dlabel D_80243594_D907E4 .word 0x00390000, 0xFFFFFFFF 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 af1155e9d7..0c21bd71d6 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 @@ -21,7 +21,7 @@ dlabel D_80241C48_D94B88 .word 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, D_80241C00_D94B40, 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, D_802424C4_D95404, 0x00000044, 0x00000001, 0x80241880, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xF8406152, 0x00000044, 0x00000001, D_802419D0_D94910, 0x00000044, 0x00000001, D_80241C48_D94B88, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80241E30_D94D70 -.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 +.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, OnPlayerFled, 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 dlabel D_80241F14_D94E54 .word 0x00390000, 0xFFFFFFFF diff --git a/ver/us/asm/data/world/area_sam/sam_01/D01D90.data.s b/ver/us/asm/data/world/area_sam/sam_01/D01D90.data.s index a4faadcceb..e6c9acd59e 100644 --- a/ver/us/asm/data/world/area_sam/sam_01/D01D90.data.s +++ b/ver/us/asm/data/world/area_sam/sam_01/D01D90.data.s @@ -12,4 +12,4 @@ dlabel D_8024A460_D01FD0 .word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000013, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x00000014, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_8024A510_D02080 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x00000014, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000013, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF246CA1A, 0xF24A7A80, 0xF249C41A, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF249A3B4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x0000001C, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0004, 0x00CF0001, 0x00000000, 0x00120005, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF01, 0x00000000, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A801A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFEE4, 0x00000000, 0xFFFFFF5B, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFEC0, 0x00000000, 0xFFFFFF42, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFD8, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF5B, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF47, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0006, 0x00000008, 0x00000001, 0x00000023, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000079, 0x00000000, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0009, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0009, 0x00CF0009, 0x00000000, 0x00120006, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000080, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DC280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000000, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A9280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x0000003C, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00120007, 0x000000A0, 0x00000028, 0x00000003, 0x00000001, 0x00000064, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF253DA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x0000005A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF246CA1A, 0xF24A7A80, 0xF249C41A, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF249A3B4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFECE, 0x00000000, 0xFFFFFF8C, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0009, 0x00CF0009, 0x00000005, 0x00120008, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF01, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF01, 0xFFFFFFB5, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000003, 0x00000001, 0x00000005, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x00120009, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x000000B4, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF01, 0x00000000, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A801A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEC5, 0xFFFFFF6A, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF01, 0xFFFFFF4C, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000A, 0x00000003, 0x00000001, 0x00000006, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000006, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x0012000B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF2452880, 0xF24A7A80, 0xF247A7B4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2433E80, 0xF24D4A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2471E80, 0xF247BE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xF24A5A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00090000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000D, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x0012000E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00090000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000003, 0x00120010, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x0002000D, 0x00020003, 0x00000000, 0x00000003, 0x00120011, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x00000003, 0x00120012, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0x00000003, 0x00120013, 0x00000016, 0x00000001, 0x00000009, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000000, 0x00000003, 0x00120014, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00060004, 0x00060001, 0x00000000, 0x00000003, 0x00120015, 0x00000016, 0x00000001, 0x00000007, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00070004, 0x00070001, 0x00000000, 0x00000003, 0x00120016, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000000, 0x00000003, 0x00120017, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00120018, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 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, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120019, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001A, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0xFFFFFF6A, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0xFFFFFF88, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000B, 0x000000B4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0xFFFFFF88, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000C, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000003F, 0x00000024, 0x00000002, 0xF5DE028E, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFEFA, 0xFFFFFF99, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF01, 0x00000000, 0xFFFFFF79, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000005, 0x0012001F, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFECE, 0xFFFFFF8C, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00120020, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 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, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10004, 0x00D10001, 0x00000000, 0x00120021, 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, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120022, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000004, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000004, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10004, 0x00D10001, 0x00000000, 0x00120023, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000002, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000002, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x00120024, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xF24A6080, 0x00000043, 0x00000004, sam_01_UnkTrigFunc001, 0xFE363C80, 0xFE363C82, 0x0000002D, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120025, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, sam_01_UnkTrigFunc001, 0xFE363C80, 0xFE363C82, 0xFFFFFFA1, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0006, 0x00CE0006, 0x00000000, 0x00120026, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFEF2, 0x00000000, 0xFFFFFF33, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007A, 0x00000000, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120027, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000B4, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0004, 0x00CF0001, 0x00000000, 0x00120028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120029, 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, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00000000, 0x0012002A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00000003, 0x0012002B, 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, 0xF24EDA80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE000B, 0x00CE0001, 0x00000000, 0x0012002C, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x000000C8, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000D, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFEC0, 0xFFFFFEFE, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7F80, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000045, 0x00000002, D_8024A220_D01D90, 0xFE363C8A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF24A7A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0008, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFDD, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00000004, 0x0012002D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0009, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFB, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10005, 0x00000043, 0x00000007, SpeakToNpc, 0x00000004, 0x00D10007, 0x00D10006, 0x00000000, 0x00000000, 0x0012002E, 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, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012002F, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF07, 0xFFFFFF93, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000000, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF2E, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF06, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF06, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120030, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10007, 0x00D10006, 0x00000000, 0x00120031, 0x00000045, 0x00000002, D_8024A380_D01EF0, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000004, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFFFFFF06, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10006, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F84, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000043, 0x00000044, 0x00000001, 0x80241FB0, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000005, 0x00120032, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120033, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120034, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000004, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000040, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x00000014, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000013, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF246CA1A, 0xF24A7A80, 0xF249C41A, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF249A3B4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x0000001C, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0004, 0x00CF0001, 0x00000000, 0x00120005, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF01, 0x00000000, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A801A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFEE4, 0x00000000, 0xFFFFFF5B, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFEC0, 0x00000000, 0xFFFFFF42, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFD8, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF5B, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF47, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A7C80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0006, 0x00000008, 0x00000001, 0x00000023, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000079, 0x00000000, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0009, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0009, 0x00CF0009, 0x00000000, 0x00120006, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000080, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24DC280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000000, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A9280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x0000003C, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x0000003C, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00120007, 0x000000A0, 0x00000028, 0x00000003, 0x00000001, 0x00000064, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF253DA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000005, 0x00000008, 0x00000001, 0x0000005A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000005, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF246CA1A, 0xF24A7A80, 0xF249C41A, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF249A3B4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFECE, 0x00000000, 0xFFFFFF8C, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0009, 0x00CF0009, 0x00000005, 0x00120008, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF01, 0x00000000, 0x00000032, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF01, 0xFFFFFFB5, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF01, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000003, 0x00000001, 0x00000005, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x00120009, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x000000B4, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF01, 0x00000000, 0xFFFFFF6A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A801A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEC5, 0xFFFFFF6A, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF01, 0xFFFFFF4C, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF01, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000A, 0x00000003, 0x00000001, 0x00000006, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000006, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x0012000B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xF2452880, 0xF24A7A80, 0xF247A7B4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2433E80, 0xF24D4A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2471E80, 0xF247BE80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xF24A5A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00090000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000D, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x0012000E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00090000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000003, 0x00120010, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x0002000D, 0x00020003, 0x00000000, 0x00000003, 0x00120011, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x00000003, 0x00120012, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0x00000003, 0x00120013, 0x00000016, 0x00000001, 0x00000009, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000000, 0x00000003, 0x00120014, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00060004, 0x00060001, 0x00000000, 0x00000003, 0x00120015, 0x00000016, 0x00000001, 0x00000007, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00070004, 0x00070001, 0x00000000, 0x00000003, 0x00120016, 0x00000016, 0x00000001, 0x00000008, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000000, 0x00000003, 0x00120017, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00120018, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 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, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120019, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001A, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0xFFFFFF6A, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0xFFFFFF88, 0x00000000, 0xFFFFFFE2, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000B, 0x000000B4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0xFFFFFF88, 0x00000000, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000C, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000003F, 0x00000024, 0x00000002, 0xF5DE028E, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFEFA, 0xFFFFFF99, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF01, 0x00000000, 0xFFFFFF79, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000005, 0x0012001F, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFECE, 0xFFFFFF8C, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00120020, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 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, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10004, 0x00D10001, 0x00000000, 0x00120021, 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, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120022, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000004, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000004, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10004, 0x00D10001, 0x00000000, 0x00120023, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000002, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000002, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0008, 0x00CF0007, 0x00000000, 0x00120024, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC080, 0xF24A6080, 0x00000043, 0x00000004, sam_01_GetLeftRightPoints, 0xFE363C80, 0xFE363C82, 0x0000002D, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00005, 0x00D00007, 0x00000000, 0x00120025, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, sam_01_GetLeftRightPoints, 0xFE363C80, 0xFE363C82, 0xFFFFFFA1, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0006, 0x00CE0006, 0x00000000, 0x00120026, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003E4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0005, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000B, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFEF2, 0x00000000, 0xFFFFFF33, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000007A, 0x00000000, 0x00000008, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120027, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000B4, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00CF0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00CF0004, 0x00CF0001, 0x00000000, 0x00120028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120029, 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, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x00000000, 0x0012002A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00000003, 0x0012002B, 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, 0xF24EDA80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE000B, 0x00CE0001, 0x00000000, 0x0012002C, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x000000C8, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000D, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFEC0, 0xFFFFFEFE, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000000, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7F80, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000045, 0x00000002, D_8024A220_D01D90, 0xFE363C8A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF245CA80, 0xF24A7A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0008, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFDD, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00000004, 0x0012002D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0009, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFB, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10005, 0x00000043, 0x00000007, SpeakToNpc, 0x00000004, 0x00D10007, 0x00D10006, 0x00000000, 0x00000000, 0x0012002E, 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, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00D00004, 0x00D00001, 0x00000000, 0x0012002F, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7BB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF07, 0xFFFFFF93, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00CE0001, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000000, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000003, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF2E, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF06, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000046, 0x00000001, D_8024A460_D01FD0, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFFFFFF06, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00D00001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120030, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00D10007, 0x00D10006, 0x00000000, 0x00120031, 0x00000045, 0x00000002, D_8024A380_D01EF0, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000004, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFFFFFF06, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00D10006, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFD050F84, 0x00000046, 0x00000001, D_8024A510_D02080, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000043, 0x00000044, 0x00000001, 0x80241FB0, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000005, 0x00120032, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120033, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00CE0004, 0x00CE0001, 0x00000000, 0x00120034, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000004, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFD050F82, 0x00000000, 0x00000024, 0x00000002, 0xFD050F83, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000040, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000040, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 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 112c93a245..e3a59cced6 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 @@ -27,7 +27,7 @@ dlabel D_802414F8_D125B8 .word 0x00000000, D_80240C80_D11D40, 0x43828000, 0x00000000, 0xC2980000, 0x00440D0D, D_802413F0_D124B0, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 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, D_802414CC_D1258C, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00210003, 0x00210007, 0x00210007, 0x00210007, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00000000, 0x00000000, 0x00000000, 0x001A0006, 0x00000002, D_802414F8_D125B8, 0x02060000, 0x00000000, 0x00000000, 0x00000000 dlabel D_802418F0_D129B0 -.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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_802419AC_D12A6C .word 0x3F000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x0000000A, 0x40600000, 0x000000B4, 0x00000014, 0x43160000, 0x00000000, 0x00000001 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 c24779bc6d..9850bbe9f2 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 @@ -9,7 +9,7 @@ dlabel D_8024214C_D1A92C .word 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 dlabel D_80242178_D1A958 -.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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242234_D1AA14 .word 0x3F000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x0000000A, 0x40600000, 0x000000B4, 0x00000014, 0x43160000, 0x00000000, 0x00000001 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 beebad9b94..3ef34205bf 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,7 +3,7 @@ .section .data dlabel 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 +.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, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 dlabel D_80242D4C_D2EA7C .word 0x3F000000, 0x0000003C, 0x0000000F, 0x42C80000, 0x00000000, 0x0000000A, 0x40600000, 0x000000B4, 0x00000014, 0x43160000, 0x00000000, 0x00000001 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 a4661e4aa8..071d2d6dec 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 @@ -9,7 +9,7 @@ dlabel D_8024222C_D31EAC .word 0x00000000, 0x001E002D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 dlabel D_80242258_D31ED8 -.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 +.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, OnPlayerFled, 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 dlabel D_8024233C_D31FBC .word 0x00390000, 0xFFFFFFFF 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 e601e76ed1..9822f5e89c 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 @@ -21,7 +21,7 @@ dlabel D_8024225C_D39A5C .word 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, D_802411F0_D389F0, 0x00000005, 0x00000001, 0x0000001E, 0x00000032, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C8A, 0x00000000, 0xFE363C8B, 0x00000000, 0x00000006, 0x00000000, 0x0000004E, 0x00000006, D_802412E0_D38AE0, 0x00000100, 0x0000002B, D_8024225C_D39A5C, 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, D_80242148_D39948, 0x00100000, D_80242138_D39938, 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 dlabel D_80242580_D39D80 -.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 +.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, OnPlayerFled, 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 dlabel D_80242664_D39E64 .word 0x00390000, 0xFFFFFFFF diff --git a/ver/us/asm/data/world/area_trd/trd_00/99A2A0.data.s b/ver/us/asm/data/world/area_trd/trd_00/99A2A0.data.s deleted file mode 100644 index adfa546c01..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_00/99A2A0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240630_99A2A0 -.word 0xC4734000, 0x00000000, 0x434C0000, 0x42B40000, 0xC4034000, 0x00000000, 0x43020000, 0x43700000, 0x43C80000, 0x00000000, 0x43390000, 0x43340000, 0x4412C000, 0x00000000, 0x40C00000, 0x42B40000, 0xC46EC000, 0x43480000, 0xC2CA0000, 0x42B40000, 0xC4018000, 0x00000000, 0x43540000, 0x43700000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241058, D_80240630_99A2A0, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019004E, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFA6, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000014, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x8000005C, 0x00000016, 0x00000001, 0xFFFFFFB4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000078, 0x00000001, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000011, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x8000005C, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_00/99A410.data.s b/ver/us/asm/data/world/area_trd/trd_00/99A410.data.s deleted file mode 100644 index 21eca54f1b..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_00/99A410.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802407A0_99A410 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_00_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_00_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024083C_99A4AC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242D00, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240898_99A508 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000006, 0x00000024, 0x00000002, 0xFE363C82, 0x00000043, 0x00000024, 0x00000002, 0xFE363C83, 0x00000041, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242D08, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024093C_99A5AC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000047, 0x00000024, 0x00000002, 0xFE363C83, 0x00000045, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242D10, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409E0_99A650 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242D10, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A3C_99A6AC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000004, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242D00, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A98_99A708 -.word 0x00000047, 0x00000005, D_8024083C_99A4AC, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240898_99A508, 0x00000100, 0x00000006, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024093C_99A5AC, 0x00000100, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802409E0_99A650, 0x00080000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240A3C_99A6AC, 0x00080000, 0x0000000F, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B34_99A7A4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFD26, 0x00000000, 0x00000190, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000014, 0x00000000, 0x00000190, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFC18, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000012, 0xF24A2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE20, 0x00000000, 0x00000190, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFAEC, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000012, 0xF24A4C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000052, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFBEF, 0x00000000, 0x000000CC, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFBEF, 0x00000000, 0x000000CC, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFC7C, 0x000000C8, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D8C_99A9FC -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80240A98_99A708, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA6, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA6, 0x00000046, 0x00000001, D_80240B34_99A7A4, 0x00000044, 0x00000001, D_80240A98_99A708, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240A98_99A708, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000043, 0x00000024, 0x00000002, 0xFE363C83, 0x00000041, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240A98_99A708, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000047, 0x00000024, 0x00000002, 0xFE363C83, 0x00000045, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240A98_99A708, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, D_80240A98_99A708, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, D_80240A98_99A708, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000005, 0x00000044, 0x00000001, D_80240A98_99A708, 0x00000023, 0x00000000, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F8C_99ABFC -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000002, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000001, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000064, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000007, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF8406332, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242CD4, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000004, 0x00000023, 0x00000000, 0x00000046, 0x00000001, 0x80241524, 0x00000044, 0x00000001, D_80240F8C_99ABFC, 0x00000044, 0x00000001, 0x802406D0, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405E12, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000050, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000004D, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240D8C_99A9FC, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000008, 0x00000001, 0x00000041, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000004, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802407A0_99A410, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s b/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s deleted file mode 100644 index dafa896c3f..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_00/99AFB0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel trd_00_varStash -.word 0x00000000 - -dlabel D_80241344_99AFB4 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413AC_99B01C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241344_99AFB4, 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 - -dlabel D_8024148C_99B0FC -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000104, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405E01, 0x00000001, 0x00000046, 0x00000001, D_802413AC_99B01C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414D8_99B148 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000135, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405E02, 0x00000001, 0x00000046, 0x00000001, D_802413AC_99B01C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x0000032A, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405E01, 0x00000043, 0x00000002, AssignScript, D_8024148C_99B0FC, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0xFFFFFD12, 0x000000C8, 0xFFFFFF83, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405E02, 0x00000043, 0x00000002, AssignScript, D_802414D8_99B148, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFC68, 0x0000003C, 0x00000050, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000145, 0x0000003C, 0x000000DC, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_00/99B280.data.s b/ver/us/asm/data/world/area_trd/trd_00/99B280.data.s deleted file mode 100644 index b7f450cb27..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_00/99B280.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241610_99B280 -.word 0x00000000, 0x00220018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024163C_99B2AC -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802416C0_99B330 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFFFFFDBC, 0x00000114, 0x00000032, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000006, 0x000001C3, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000000A, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000043, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000041, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFDC6, 0x00000000, 0x000000AD, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660003, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8C80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFDD4, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x00000005, 0x00000004, 0x00000002, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0066001E, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00660014, 0x00660004, 0x00000000, 0x000C00D2, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660002, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000002D, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000173, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660003, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7DB4, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000008, 0x00000001, 0x00000008, 0x00000008, 0x00000001, 0x0000000C, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000174, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE10, 0x00000065, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x00000000, 0x0000000A, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000043, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000041, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000006, 0x000001C4, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8880, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA7, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C40_99B8B0 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802416C0_99B330, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFA7, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C8C_99B8FC -.word 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D80_99B9F0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DA4_99BA14 -.word 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFDC9, 0x0000001A, 0x000000EC, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000001, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFDF1, 0x00000000, 0x000000D8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFDF1, 0x00000000, 0x000000D8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF251E680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00120002, 0x00120001, 0x00000200, 0x000C010D, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC280, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00120003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000139, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001001F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000188, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000052, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00120001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000001, 0x00000043, 0x00000001, PostChapter1StatUpdate, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0191, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00120002, 0x00120001, 0x00000200, 0x000C010E, 0x00000043, 0x00000002, ShowChoice, 0x001E0013, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00120002, 0x00120001, 0x00000200, 0x000C010F, 0x00000043, 0x00000002, ShowChoice, 0x001E0013, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00120002, 0x00120001, 0x00000200, 0x000C0110, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00120002, 0x00120001, 0x00000200, 0x000C0111, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, FullyRestoreSP, 0x00000043, 0x00000001, trd_00_SyncStatusMenu, 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00120002, 0x00120001, 0x00000200, 0x000C0112, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFDF1, 0x00000000, 0x000000D8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC280, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00120002, 0x00120001, 0x00000200, 0x000C0113, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00040000, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000708, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0x000000B4, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFE363C85, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00002045, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFB5, 0x00000044, 0x00000001, 0x802406D0, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242830_99C4A0 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000012, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241C8C_99B8FC, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80241D80_99B9F0, 0x00000044, 0x00000001, D_80241DA4_99BA14, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428F4_99C564 -.word 0x00000000, D_80241610_99B280, 0xC3EA8000, 0x00000000, 0x42CA0000, 0x00000801, D_80241C40_99B8B0, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660304, 0x00660302, 0x00660303, 0x00660303, 0x00660304, 0x00660304, 0x0066030A, 0x0066030A, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242AE4_99C754 -.word 0x00000001, D_8024163C_99B2AC, 0x00000000, 0xC47A0000, 0x00000000, 0x00000805, D_80242830_99C4A0, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x000001F4, 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, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120000, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802428F4_99C564, 0x00000000, 0x00000001, D_80242AE4_99C754, 0x08000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_01/99E050.data.s b/ver/us/asm/data/world/area_trd/trd_01/99E050.data.s deleted file mode 100644 index ccbae581de..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_01/99E050.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802416C0_99E050 -.word 0xC39B0000, 0x00000000, 0x00000000, 0x42B40000, 0x439B0000, 0x00000000, 0x00000000, 0x43870000, 0x439B0000, 0x435C0000, 0x00000000, 0x43870000, 0x439B0000, 0x44020000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242BF4, D_802416C0_99E050, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019004F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000014, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_01/99E110.data.s b/ver/us/asm/data/world/area_trd/trd_01/99E110.data.s deleted file mode 100644 index f5fc71bd23..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_01/99E110.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241780_99E110 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_01_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_01_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024181C_99E1AC -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C83, 0x00000020, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000025, 0x00000024, 0x00000002, 0xFE363C83, 0x00000027, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000002E, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000033, 0x00000024, 0x00000002, 0xFE363C83, 0x00000035, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000023, 0x00000000, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241954_99E2E4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C83, 0x00000020, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80244420, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419F8_99E388 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000010, 0x00000024, 0x00000002, 0xFE363C82, 0x00000025, 0x00000024, 0x00000002, 0xFE363C83, 0x00000027, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80244428, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A9C_99E42C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000015, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000002E, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80244428, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B40_99E4D0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000033, 0x00000024, 0x00000002, 0xFE363C83, 0x00000035, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80244430, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BE4_99E574 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFB0, 0x0000004D, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000024, 0x00000002, 0xFE363C82, 0x000000FF, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000012, 0x0000000C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C1A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000006, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x80000006, 0x00000058, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, EnableModel, 0x00000014, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000015, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000014, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000015, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000017, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000001, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000001, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000004, 0x00000000, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000004, 0x00000001, 0xFE363C8A, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFDA8, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFDA8, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFED4, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFED4, 0x00000027, 0x00000002, 0xFE363C84, 0x0000008C, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFDA8, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFE2, 0x00000027, 0x00000002, 0xFE363C87, 0xFFFFFDA8, 0x00000027, 0x00000002, 0xFE363C88, 0x00000064, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFDA8, 0x00000027, 0x00000002, 0xFE363C8A, 0xFFFFFF9C, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFED4, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x80000007, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A8A80, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A7D4D, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x000000FA, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7F4D, 0x00000043, 0x00000002, StopSound, 0x80000007, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x000001F4, 0xFE363C82, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C84, 0xFFFFFFE5, 0xFE363C86, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFE5, 0x0000012C, 0x000000D2, 0x00000004, 0x00000005, 0x00000001, 0x000000D2, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C84, 0xFE363C80, 0xFE363C86, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00290108, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00290117, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000D2, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C84, 0xFFFFFFE5, 0xFE363C86, 0x00000008, 0x00000001, 0x00000055, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFE5, 0x0000015E, 0x000000D7, 0x00000004, 0x00000005, 0x00000001, 0x000000D7, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C84, 0xFE363C80, 0xFE363C86, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00290108, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00290117, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFE3E, 0x00000000, 0x0000012C, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000007, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C82, 0x00000190, 0x0000000F, 0x00000002, 0xFE363C82, 0xFFFFFFEC, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000023, 0x00000043, 0x00000003, EnableModel, 0x00000017, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C82, 0x00000177, 0x0000000F, 0x00000002, 0xFE363C82, 0xFFFFFFEC, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000023, 0x00000043, 0x00000005, TranslateModel, 0x00000017, 0x00000032, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C82, 0x0000015E, 0x0000000F, 0x00000002, 0xFE363C82, 0xFFFFFFEC, 0x0000000A, 0x00000002, 0xFBD3E282, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E282, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000023, 0x00000043, 0x00000005, TranslateModel, 0x00000017, 0x00000064, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C82, 0x00000145, 0x0000000F, 0x00000002, 0xFE363C82, 0xFFFFFFEC, 0x0000000A, 0x00000002, 0xFBD3E283, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E283, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000023, 0x00000043, 0x00000005, TranslateModel, 0x00000017, 0x00000096, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C82, 0x0000012B, 0x0000000F, 0x00000002, 0xFE363C82, 0xFFFFFFEC, 0x0000000A, 0x00000002, 0xFBD3E284, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E284, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000023, 0x00000043, 0x00000005, TranslateModel, 0x00000017, 0x000000C8, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C82, 0x00000111, 0x0000000F, 0x00000002, 0xFE363C82, 0xFFFFFFEC, 0x0000000A, 0x00000002, 0xFBD3E285, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E285, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000023, 0x00000043, 0x00000005, TranslateModel, 0x00000017, 0x000000FA, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C82, 0x000000F5, 0x0000000F, 0x00000002, 0xFE363C82, 0xFFFFFFEC, 0x0000000A, 0x00000002, 0xFBD3E286, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E286, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000023, 0x00000043, 0x00000005, TranslateModel, 0x00000017, 0x0000012C, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C82, 0x000000DC, 0x0000000F, 0x00000002, 0xFE363C82, 0xFFFFFFEC, 0x0000000A, 0x00000002, 0xFBD3E287, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E287, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000023, 0x00000043, 0x00000003, EnableModel, 0x00000017, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, EnableModel, 0x00000014, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000015, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x000000DC, 0x000000FF, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8080, 0x00000043, 0x00000002, StopSound, 0x80000006, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B20_99F4B0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000013, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000001, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000064, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242BEC_99F57C -.word 0x00000010, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000007, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802443D8, 0x00000046, 0x00000001, 0x802432B8, 0x00000044, 0x00000001, D_80242B20_99F4B0, 0x00000047, 0x00000005, D_80241954_99E2E4, 0x00000100, 0x0000000B, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0A, 0x00000000, 0x0000004E, 0x00000006, 0x8024310C, 0x00000100, 0x00004000, D_80242BEC_99F57C, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_802419F8_99E388, 0x00000100, 0x00000010, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80241A9C_99E42C, 0x00000100, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241B40_99E4D0, 0x00000100, 0x0000001A, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x80241740, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000007, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE3E, 0x00000043, 0x00000005, TranslateModel, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000007, 0x00000047, 0x00000005, D_80241BE4_99E574, 0x00020000, 0xF9718881, 0x00000000, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000014, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000015, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000017, 0x00000000, 0x00000044, 0x00000001, D_8024181C_99E1AC, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000013, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241780_99E110, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_01/99F960.data.s b/ver/us/asm/data/world/area_trd/trd_01/99F960.data.s deleted file mode 100644 index f31fe81ef9..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_01/99F960.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242FD0_99F960 -.word 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E05, 0x00000001, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000140, 0x00000000, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000DC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000012C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, GetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF2497A80, 0xFE363C81, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, AwaitPlayerLeave, 0x00000140, 0x00000000, 0x0000003C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000010, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF8405E0A, 0x00000001, 0x00000043, 0x00000005, trd_01_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, trd_01_SetEntityFlags100000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000050, 0x00000001, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024328C_99FC1C -.word 0x00000047, 0x00000005, D_802419F8_99E388, 0x00000100, 0x00000010, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0A, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x0000013B, 0x00000008, 0x00000000, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024328C_99FC1C, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFB0, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0x000000DC, 0x000000FF, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000109, 0xFFFFFEF4, 0x00000290, 0xFFFFFFD8, 0x00000011, 0xF8405DFE, 0x0000000A, 0x00000002, 0xF8405E19, 0x00000001, 0x0000000A, 0x00000002, 0xF8405E05, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000010, 0x000000FE, 0x00000000, 0x0000001E, 0x00000000, 0xF8405E05, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_01/99FD80.data.s b/ver/us/asm/data/world/area_trd/trd_01/99FD80.data.s deleted file mode 100644 index 2f288dce81..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_01/99FD80.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802433F0_99FD80 -.word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 - -dlabel D_80243420_99FDB0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_01_TackleAI_Main, D_802433F0_99FD80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243490_99FE20 -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80243420_99FDB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel D_802434BC_99FE4C -.word 0x42DC0000, 0x42820000, 0x00000008, 0x4059999A, 0x00000078, 0x00000002, 0x42DC0000, 0x42820000, 0x00000001 - -dlabel D_802434E0_99FE70 -.word 0x00000043, 0x00000002, trd_01_StationaryAI_Main, D_802434BC_99FE4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243500_99FE90 -.word 0x00000000, 0x00170014, 0x00000000, 0x00000000, D_802434E0_99FE70, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel D_8024352C_99FEBC -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000002D, 0xFFFFFFE2, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFBA, 0xFFFFFFE2, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xF24A7280, 0xF24A8280, 0x0000001E, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFB0, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0xF24A8280, 0xF24A7280, 0x0000001E, 0x0000000A, 0x00000003, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFB0, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000004, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000003, 0x00000001, 0x00000064, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B58B, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000BE, 0x00000014, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000F5, 0x0000004B, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A88E7, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000D2, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000104, 0x00000019, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8080, 0x00000043, 0x00000001, func_80241630_99DFC0, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80243420_99FDB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243A1C_9A03AC -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFB0, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024352C_99FEBC, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0029010E, 0x00000012, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000F0, 0x000000DC, 0x00000082, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000050, 0x000000DC, 0x00000109, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243AF4_9A0484 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405E19, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000007, MakeItemEntity, 0x00000010, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0xF8405E05, 0x00000044, 0x00000001, D_80242FD0_99F960, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243BC4_9A0554 -.word 0x0000000A, 0x00000002, 0xF8405E19, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80243AF4_9A0484, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243C18_9A05A8 -.word 0x00000000, D_80243490_99FE20, 0x43820000, 0x00000000, 0x41F00000, 0x00802C00, D_80243BC4_9A0554, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000104, 0x00000000, 0x00000028, 0x0000001E, 0x00000019, 0xFFFF8001, 0x00000001, 0x00000104, 0x00000000, 0x00000028, 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, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243E08_9A0798 -.word 0x00000001, D_80243490_99FE20, 0x00000000, 0x00000000, 0x00000000, 0x00002C00, D_80243A1C_9A03AC, 0x00000000, 0x00000000, 0x0000010E, 0x8005008A, 0x00050000, 0x00900005, 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, 0x00000001, 0x00010000, 0x000000F0, 0x000000DC, 0x00000082, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000F0, 0x000000DC, 0x00000082, 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, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243FF8_9A0988 -.word 0x00000002, D_80243490_99FE20, 0x00000000, 0x00000000, 0x00000000, 0x00002400, D_80243A1C_9A03AC, 0x00000000, 0x00000000, 0x0000005A, 0x8005008A, 0x00050000, 0x00900005, 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, 0x00000001, 0x00010000, 0x00000050, 0x000000DC, 0x00000109, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000050, 0x000000DC, 0x00000109, 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, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802441E8_9A0B78 -.word 0x00000003, D_80243500_99FE90, 0xC37F0000, 0x44200000, 0x420C0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x000000B4, 0x800500A4, 0x00050000, 0x00800005, 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, 0x00010000, 0xFFFFFF01, 0x00000280, 0x00000023, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF01, 0x00000280, 0x00000023, 0x00000064, 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, 0x002C0002, 0x002C0004, 0x002C0006, 0x002C0006, 0x002C0002, 0x002C0002, 0x002C000E, 0x002C000E, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80243C18_9A05A8, 0x06030003, 0x00000001, D_80243E08_9A0798, 0x06010008, 0x00000001, D_80243FF8_9A0988, 0x06000008, 0x00000001, D_802441E8_9A0B78, 0x06100008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_02/9A2A30.data.s b/ver/us/asm/data/world/area_trd/trd_02/9A2A30.data.s deleted file mode 100644 index 50321500e4..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_02/9A2A30.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241A50_9A2A30 -.word 0xC3808000, 0x00000000, 0x42A00000, 0x42B40000, 0x43808000, 0x00000000, 0x42A00000, 0x43870000, 0xC3808000, 0x433B0000, 0xC25C0000, 0x42B40000, 0x43808000, 0x433B0000, 0xC25C0000, 0x43870000, 0x436B0000, 0x42480000, 0xC28C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242534, D_80241A50_9A2A30, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190050, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000014, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_02/9A2B00.data.s b/ver/us/asm/data/world/area_trd/trd_02/9A2B00.data.s deleted file mode 100644 index 63933ff486..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_02/9A2B00.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241B20_9A2B00 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000019, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001B, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802432D0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BC4_9A2BA4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000007, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001D, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802432D8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C68_9A2C48 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000024, 0x00000002, 0xFE363C82, 0x00000025, 0x00000024, 0x00000002, 0xFE363C83, 0x00000027, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802432D0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D0C_9A2CEC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000021, 0x00000024, 0x00000002, 0xFE363C83, 0x00000023, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802432D8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DB0_9A2D90 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000004, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802432D8, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E0C_9A2DEC -.word 0x00000047, 0x00000005, D_80241DB0_9A2D90, 0x00080000, 0x00000015, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E38_9A2E18 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000019, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001B, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80241E0C_9A2DEC, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001D, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80241E0C_9A2DEC, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000025, 0x00000024, 0x00000002, 0xFE363C83, 0x00000027, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80241E0C_9A2DEC, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000021, 0x00000024, 0x00000002, 0xFE363C83, 0x00000023, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80241E0C_9A2DEC, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, D_80241E0C_9A2DEC, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FC8_9A2FA8 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x80000004, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7D4D, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000140, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7D4D, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7C1A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000096, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000014, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000008, 0x00000001, 0xFE363C80, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C84, 0x00000064, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C85, 0x00000064, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C85, 0x00000043, 0x0000000F, PlayEffect, 0x00000016, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x000000BB, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000001E, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000008, 0x00000001, 0xFE363C80, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0x000000BB, 0x00000000, 0x0000012C, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000016, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000015, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000017, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000002, StopSound, 0x80000004, 0x00000043, 0x00000002, PlaySound, 0x00000025, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFAF, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000050, 0x00000001, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024240C_9A33EC -.word 0x437F0000, 0x42480000, 0xC2A00000, 0x00000000 - -dlabel D_8024241C_9A33FC -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x00000011, 0x0000000B, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000F, 0x00000001, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000013, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8405E0F, 0x00000001, 0x00000050, 0x00000001, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024252C_9A350C -.word 0x00000010, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000007, 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, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802432A0, 0x00000046, 0x00000001, 0x80242A10, 0x00000047, 0x00000005, D_80241B20_9A2B00, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241BC4_9A2BA4, 0x00000100, 0x00000007, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0B, 0x00000000, 0x0000004E, 0x00000006, 0x80242890, 0x00000100, 0x00004000, D_8024252C_9A350C, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80241C68_9A2C48, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80241D0C_9A2CEC, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000F, 0x00000000, 0x00000047, 0x00000005, D_8024241C_9A33FC, 0x00100000, D_8024240C_9A33EC, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80241AE0, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001F, 0x00000016, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001E, 0x00000015, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000020, 0x00000017, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFAF, 0x00000043, 0x00000005, TranslateModel, 0x00000016, 0x00000000, 0x000000BB, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000015, 0x00000000, 0x000000BB, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000017, 0x00000000, 0x000000BB, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000047, 0x00000005, D_80241FC8_9A2FA8, 0x00020000, 0xF9718882, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001F, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000000A, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80241E38_9A2E18, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_02/9A3870.data.s b/ver/us/asm/data/world/area_trd/trd_02/9A3870.data.s deleted file mode 100644 index 96d902c7ba..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_02/9A3870.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242890_9A3870 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF8405E0B, 0x00000001, 0x00000043, 0x00000005, trd_02_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, trd_02_SetEntityFlags100000, 0x00000050, 0x00000001, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802429E4_9A39C4 -.word 0x00000047, 0x00000005, D_80241C68_9A2C48, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0B, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFEF7, 0x000000C3, 0xFFFFFFC9, 0x00000050, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802429E4_9A39C4, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFAF, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x0000000A, 0x000000BB, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000002, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_02/9A3AB0.data.s b/ver/us/asm/data/world/area_trd/trd_02/9A3AB0.data.s deleted file mode 100644 index 8314809430..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_02/9A3AB0.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242AD0_9A3AB0 -.word 0x3FC00000, 0x0000003C, 0x0000000A, 0x42DC0000, 0x42820000, 0x00000008, 0x4059999A, 0x00000078, 0x00000002, 0x42DC0000, 0x42820000, 0x00000001 - -dlabel D_80242B00_9A3AE0 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80242AD0_9A3AB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B20_9A3B00 -.word 0x00000000, 0x00170014, 0x00000000, 0x00000000, D_80242B00_9A3AE0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel D_80242B4C_9A3B2C -.word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 - -dlabel D_80242B7C_9A3B5C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_02_TackleAI_Main, D_80242B4C_9A3B2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80242B7C_9A3B5C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel D_80242C18_9A3BF8 -.word 0x3FC00000, 0x00000019, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40E00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 - -dlabel D_80242C48_9A3C28 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000002, trd_02_KoopaPatrolAI_Main, D_80242C18_9A3BF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242CA4_9A3C84 -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80242C48_9A3C28, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel D_80242CD0_9A3CB0 -.word 0x00000000, D_80242B20_9A3B00, 0xC28C0000, 0x00000000, 0x42A00000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800500A4, 0x00050000, 0x00800005, 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, 0x00010000, 0xFFFFFFBA, 0x00000000, 0x00000050, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000023, 0x000000FA, 0x000000AF, 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, 0x002C0002, 0x002C0004, 0x002C0006, 0x002C0006, 0x002C0002, 0x002C0002, 0x002C000E, 0x002C000E, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242EC0_9A3EA0 -.word 0x00000001, D_80242B20_9A3B00, 0x430C0000, 0x00000000, 0x42A00000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800500A4, 0x00050000, 0x00800005, 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, 0x00010000, 0x0000008C, 0x00000000, 0x00000050, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000023, 0x000000FA, 0x000000AF, 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, 0x002C0002, 0x002C0004, 0x002C0006, 0x002C0006, 0x002C0002, 0x002C0002, 0x002C000E, 0x002C000E, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802430B0_9A4090 -.word 0x00000002, D_80242CA4_9A3C84, 0x42480000, 0x433B0000, 0x43370000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8005008A, 0x00050000, 0x00900005, 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, 0x00000001, 0x00010000, 0x00000002, 0x00000046, 0x000000BB, 0x000000B7, 0xFFFFFFEC, 0x000000BB, 0x000000B7, 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, 0x00000014, 0x000000BB, 0x000000CF, 0x00000096, 0x00000050, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242CD0_9A3CB0, 0x0610000A, 0x00000001, D_80242EC0_9A3EA0, 0x0610000A, 0x00000001, D_802430B0_9A4090, 0x0607000D, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_03/9A5040.data.s b/ver/us/asm/data/world/area_trd/trd_03/9A5040.data.s deleted file mode 100644 index 1d47b4ae15..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_03/9A5040.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802409F0_9A5040 -.word 0xC421C000, 0x00000000, 0x42A00000, 0x42B40000, 0x44064000, 0x00000000, 0x42A00000, 0x43870000, 0xC421C000, 0x43340000, 0xC2C80000, 0x42B40000, 0x44064000, 0x43340000, 0xC2C80000, 0x43870000, 0xC4214000, 0x42340000, 0xC2C80000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802416B4, D_802409F0_9A5040, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190051, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000014, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, FadeInMusic, 0x00000001, 0x00000051, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000014, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000001, 0x00000BB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_03/9A51A0.data.s b/ver/us/asm/data/world/area_trd/trd_03/9A51A0.data.s deleted file mode 100644 index 85cf169f4d..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_03/9A51A0.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240B50_9A51A0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000002F, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243D30, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BF4_9A5244 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000007, 0x00000024, 0x00000002, 0xFE363C82, 0x00000031, 0x00000024, 0x00000002, 0xFE363C83, 0x00000033, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243D38, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C98_9A52E8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000024, 0x00000002, 0xFE363C82, 0x00000039, 0x00000024, 0x00000002, 0xFE363C83, 0x0000003B, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243D30, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D3C_9A538C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000035, 0x00000024, 0x00000002, 0xFE363C83, 0x00000037, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243D38, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DE0_9A5430 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000004, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243D30, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E3C_9A548C -.word 0x00000047, 0x00000005, D_80240B50_9A51A0, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240BF4_9A5244, 0x00000100, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240C98_9A52E8, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240D3C_9A538C, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240DE0_9A5430, 0x00080000, 0x00000015, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240ED8_9A5528 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000002F, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240E3C_9A548C, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000031, 0x00000024, 0x00000002, 0xFE363C83, 0x00000033, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240E3C_9A548C, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000039, 0x00000024, 0x00000002, 0xFE363C83, 0x0000003B, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240E3C_9A548C, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000035, 0x00000024, 0x00000002, 0xFE363C83, 0x00000037, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240E3C_9A548C, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, D_80240E3C_9A548C, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241044_9A5694 -.word 0xC3200000, 0x00000000, 0xC1200000, 0x00000000 - -dlabel D_80241054_9A56A4 -.word 0x43B40000, 0x00000000, 0xC1200000, 0x00000000 - -dlabel D_80241064_9A56B4 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x00000028, 0x0000000A, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000020, 0x00000001, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000028, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000028, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8405E10, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241168_9A57B8 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x0000002B, 0x0000000A, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000021, 0x00000001, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000002B, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000002B, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000020, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8405E11, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024126C_9A58BC -.word 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000026, 0x00000002, 0xFE363C8C, 0xF24A7A80, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000043, 0x00000003, CloneModel, 0x00000008, 0x00002710, 0x00000043, 0x00000003, EnableModel, 0x00002710, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000023, 0x00002710, 0x00000043, 0x00000003, CloneModel, 0x00000008, 0x00002711, 0x00000043, 0x00000003, EnableModel, 0x00002711, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000025, 0x00002711, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000043, 0x00000002, func_80240000_9A4650, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetFrameCounter, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000001, 0x0000002D, 0x00000002, 0xFE363C8C, 0xF24A7AE7, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8B, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000008, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C8C, 0xFFFFFFFD, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000008, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0xFFFFFFF8, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C8C, 0xF24A7B4D, 0x0000000D, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000026, 0x00000002, 0xFE363C8C, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C8C, 0xF24A7B4D, 0x0000000C, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000026, 0x00000002, 0xFE363C8C, 0xF24A7A80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000023, 0x7FFFFFFF, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000025, 0x7FFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x00002710, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00002711, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C8C, 0xF24A7A80, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000023, 0x7FFFFFFF, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000025, 0x7FFFFFFF, 0x0000000D, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000028, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C8D, 0x0000002E, 0x00000002, 0xFE363C83, 0xF24A81B4, 0x0000002D, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetFrameCounter, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000007, 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, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242E04, 0x00000046, 0x00000001, 0x802419A0, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA8, 0x00000044, 0x00000001, 0x80241C14, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80240ED8_9A5528, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000025, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E10, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000020, 0x00000000, 0x00000047, 0x00000005, D_80241064_9A56B4, 0x00100000, D_80241044_9A5694, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000028, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001B, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E11, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000021, 0x00000000, 0x00000047, 0x00000005, D_80241168_9A57B8, 0x00100000, D_80241054_9A56A4, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000002B, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000020, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80240A80, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA8, 0x00000043, 0x00000005, TranslateModel, 0x0000000C, 0x00000000, 0x00000064, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80242E40, 0x00000044, 0x00000001, D_8024126C_9A58BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_03/9A5FF0.data.s b/ver/us/asm/data/world/area_trd/trd_03/9A5FF0.data.s deleted file mode 100644 index a0ca748450..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_03/9A5FF0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802419A0_9A5FF0 -.word 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0xFFFFFEC5, 0x00000078, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, 0x80243174, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0x000000D2, 0x00000078, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, 0x8024374C, 0x00000043, 0x00000007, MakeItemEntity, 0x00000010, 0xFFFFFDBC, 0x00000000, 0xFFFFFFC4, 0x00000000, 0xF8405E06, 0x00000043, 0x00000007, MakeItemEntity, 0x00000010, 0x000001D6, 0x00000000, 0xFFFFFFC4, 0x00000000, 0xF8405E07, 0x00000043, 0x00000007, MakeItemEntity, 0x000000E4, 0xFFFFFFCE, 0x00000000, 0xFFFFFFC4, 0x00000011, 0xF8405DFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s b/ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s deleted file mode 100644 index ecc8950101..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_03/9A60F0.data.s +++ /dev/null @@ -1,54 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241AA0_9A60F0 -.word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 - -dlabel D_80241AD0_9A6120 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_03_TackleAI_Main, D_80241AA0_9A60F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B40_9A6190 -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80241AD0_9A6120, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel D_80241B6C_9A61BC -.word 0x00000000, 0x00220018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241B98_9A61E8 -.word 0x3FC00000, 0x0000003C, 0x0000000A, 0x42DC0000, 0x42820000, 0x00000008, 0x4059999A, 0x00000078, 0x00000002, 0x42DC0000, 0x42820000, 0x00000001 - -dlabel D_80241BC8_9A6218 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80241B98_9A61E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00170014, 0x00000000, 0x00000000, D_80241BC8_9A6218, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000044, 0x00000001, 0x80240ABC, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFD30, 0x00000000, 0x0000004B, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFD44, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660305, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFDC6, 0x00000000, 0xFFFFFFC7, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFDA1, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000140, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFDA1, 0x00000000, 0x00000050, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660304, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660303, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A84E7, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFDD5, 0x00000014, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660304, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660314, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660304, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00290109, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00290101, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000036, 0x0000026B, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x00000000, 0x00000028, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000000C, 0x00000000, 0xFE363C80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000036, 0x0000026C, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660303, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFDDA, 0x00000046, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660304, 0x00000008, 0x00000001, 0x0000000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00660314, 0x00660304, 0x00000005, 0x000C00D3, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000002, 0x000001C3, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000002D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000002F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFD79, 0x00000000, 0x00000050, 0x00000046, 0x00000001, D_80240ED8_9A5528, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000005, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000005, 0x00000004, 0x00000002, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0066031E, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660304, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00660314, 0x00660304, 0x00000000, 0x000C00D4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660302, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000002D, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000173, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660303, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000174, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFED4, 0x00000046, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA8, 0x00000043, 0x00000002, RemoveNpc, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000044, 0x00000001, 0x80240B04, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242334_9A6984 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFA8, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024236C_9A69BC -.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFA8, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00290103, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241AD0_9A6120, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423F8_9A6A48 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024236C_9A69BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024241C_9A6A6C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF6A, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00290109, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00290103, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF9C, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00290104, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000023, 0xFFFFFF7E, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000005A, 0xFFFFFF7E, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000069, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00290103, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241AD0_9A6120, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242620_9A6C70 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024241C_9A6A6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242644_9A6C94 -.word 0x00000000, D_80241B6C_9A61BC, 0xC40E4000, 0x00000000, 0xC2640000, 0x00000D01, D_80242334_9A6984, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660304, 0x00660302, 0x00660303, 0x00660303, 0x00660304, 0x00660304, 0x0066030A, 0x0066030A, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242834_9A6E84 -.word 0x0000000A, D_80241B40_9A6190, 0xC4020000, 0x00000000, 0x41700000, 0x00000C00, D_802423F8_9A6A48, 0x00000000, 0x00000000, 0x0000005A, 0x8005008A, 0x00050000, 0x00900005, 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, 0x00000001, 0x00010000, 0xFFFFFDF8, 0x00000000, 0x0000000F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFDF8, 0x00000000, 0x0000000F, 0x0000015E, 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, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242A24_9A7074 -.word 0x0000000B, D_80241B40_9A6190, 0xC2500000, 0x00000000, 0xC1A80000, 0x00000C00, D_80242620_9A6C70, 0x00000000, 0x00000000, 0x0000005A, 0x8005008A, 0x00050000, 0x00900005, 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, 0x00000001, 0x00010000, 0xFFFFFFCC, 0x00000000, 0xFFFFFFEB, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFCC, 0x00000000, 0xFFFFFFEB, 0x0000015E, 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, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242C14_9A7264 -.word 0x0000000C, D_80241B40_9A6190, 0x43BB8000, 0x00000000, 0x41700000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008A, 0x00050000, 0x00900005, 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, 0x00000001, 0x00010000, 0x00000177, 0x00000000, 0x0000000F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000177, 0x00000000, 0x0000000F, 0x0000015E, 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, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242644_9A6C94, 0x00000002, 0x00000001, D_80242834_9A6E84, 0x06030002, 0x00000001, D_80242A24_9A7074, 0x06040002, 0x00000001, D_80242C14_9A7264, 0x06030002, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000000E, 0x00000000, 0x00000000, 0xFFFFFFA1, 0x00000043, 0x00000005, TranslateModel, 0x0000000F, 0x00000000, 0x00000000, 0xFFFFFFA1, 0x00000043, 0x00000005, TranslateModel, 0x00000010, 0x00000000, 0x00000000, 0xFFFFFFA1, 0x00000043, 0x00000005, TranslateModel, 0x00000011, 0x00000000, 0x00000000, 0xFFFFFFA1, 0x00000043, 0x00000005, TranslateModel, 0x00000012, 0x00000000, 0x00000000, 0xFFFFFF6F, 0x00000043, 0x00000005, TranslateModel, 0x00000013, 0x00000000, 0x00000000, 0xFFFFFF6F, 0x00000043, 0x00000005, TranslateModel, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFF6F, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000033, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000034, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000035, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003A, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000039, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242FCC_9A761C -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C88, 0x00000007, 0x00000002, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C87, 0x7FFFFE00, 0x00000043, 0x00000002, PlaySound, 0x00000026, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430A0_9A76F0 -.word 0x00000043, 0x00000005, MakeLerp, 0xFE363C88, 0x00000000, 0x00000007, 0x00000002, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C87, 0x7FFFFE00, 0x00000043, 0x00000002, PlaySound, 0x00000026, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000003, 0x00000001, 0x0000007B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000007B, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEC5, 0x00000078, 0xFFFFFFCE, 0x00000043, 0x00000004, trd_03_UnkTrigFunc001, 0xFFFFFEC5, 0xFFFFFF9C, 0x0000003C, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000039, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000014, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000035, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000011, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000034, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000010, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000013, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000033, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000F, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000E, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000E, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000033, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000F, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000013, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000034, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000010, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000035, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000011, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000039, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000014, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000003, 0x00000001, 0x0000007B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000007B, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000D2, 0x00000078, 0xFFFFFFCE, 0x00000043, 0x00000004, trd_03_UnkTrigFunc001, 0x000000D2, 0xFFFFFF9C, 0xFFFFFFC4, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000E, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000033, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000F, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000013, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000034, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000010, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000035, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000011, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000039, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000014, 0x00000044, 0x00000001, D_802430A0_9A76F0, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000039, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000014, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000035, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000011, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000034, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x00000010, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000013, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000033, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000F, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000E, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C87, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000044, 0x00000001, D_80242FCC_9A761C, 0x00000008, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_05/9AEE70.data.s b/ver/us/asm/data/world/area_trd/trd_05/9AEE70.data.s deleted file mode 100644 index fc6a611be8..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_05/9AEE70.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240770_9AEE70 -.word 0xC39B0000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x439B0000, 0x00000000, 0x43910000, 0x00000000, 0x41F00000, 0x43870000, 0xC39B0000, 0x43700000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240EC0, D_80240770_9AEE70, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190053, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000014, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, FadeInMusic, 0x00000001, 0x00000051, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000014, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000043, 0x00000003, FadeOutMusic, 0x00000001, 0x00000BB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_05/9AEFC0.data.s b/ver/us/asm/data/world/area_trd/trd_05/9AEFC0.data.s deleted file mode 100644 index 606463b83b..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_05/9AEFC0.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802408C0_9AEFC0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000029, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243060, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240964_9AF064 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000007, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C83, 0x00000031, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243068, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A08_9AF108 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243068, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A64_9AF164 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000033, 0x00000024, 0x00000002, 0xFE363C83, 0x00000035, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243060, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B08_9AF208 -.word 0x00000047, 0x00000005, D_802408C0_9AEFC0, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240A08_9AF108, 0x00080000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240964_9AF064, 0x00000100, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240A64_9AF164, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B88_9AF288 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000029, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240B08_9AF208, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C83, 0x00000031, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240B08_9AF208, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_80240B08_9AF208, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000033, 0x00000024, 0x00000002, 0xFE363C83, 0x00000035, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240B08_9AF208, 0x00000023, 0x00000000, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CD4_9AF3D4 -.word 0x43960000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240CE4_9AF3E4 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x0000001D, 0x00000000, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000001C, 0x00000001, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000001F, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000001F, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8405E12, 0x00000001, 0x00000050, 0x00000001, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DF4_9AF4F4 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000027, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000001, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000064, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000007, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x8024303C, 0x00000046, 0x00000001, 0x802410C0, 0x0000000A, 0x00000002, 0xF8405E12, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000001C, 0x00000000, 0x00000047, 0x00000005, D_80240CE4_9AF3E4, 0x00100000, D_80240CD4_9AF3D4, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000001F, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x802407F0, 0x00000044, 0x00000001, D_80240DF4_9AF4F4, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003A, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFAB, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80240000_9AE700, 0x00000044, 0x00000001, 0x80241ECC, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80240B88_9AF288, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_05/9AF7C0.data.s b/ver/us/asm/data/world/area_trd/trd_05/9AF7C0.data.s deleted file mode 100644 index c04a860f4f..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_05/9AF7C0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802410C0_9AF7C0 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFAC, 0x00000043, 0x00000007, MakeEntity, Entity_TriggerBlock, 0xFFFFFFBA, 0x0000012C, 0xFFFFFFF1, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, 0x80241810, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_05/9AF820.data.s b/ver/us/asm/data/world/area_trd/trd_05/9AF820.data.s deleted file mode 100644 index e7ce0a60de..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_05/9AF820.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241120_9AF820 -.word 0x00000000, 0x00000000, 0x00000000, 0x41A00000, 0xC3160000, 0x00000000, 0x42480000, 0xC32A0000, 0x00000000, 0x42A00000, 0xC3200000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x41C80000, 0xC2A00000, 0x00000000, 0x42480000, 0xC2C80000, 0x00000000, 0x428C0000, 0xC2C80000, 0x00000000 - -dlabel D_80241180_9AF880 -.word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, PlaySound, 0x00000175, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000096, 0x0000002D, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_802405FC_9AECFC, 0x00000000, 0xF24A7A80, 0xF24A7A80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000002D, D_80241120_9AF820, 0x00000004, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000043, 0x00000004, func_80240508_9AEC08, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, PlaySound, 0x00000175, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000001E, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C87, 0xF24A7680, 0x00000026, 0x00000002, 0xFE363C88, 0xF24A7393, 0x00000026, 0x00000002, 0xFE363C89, 0xF24A7A80, 0x0000002E, 0x00000002, 0xFE363C87, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C88, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C89, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C88, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000043, 0x00000004, func_80240508_9AEC08, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414B4_9AFBB4 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, PlaySound, 0x00000176, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF79, 0x0000002D, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0xF24A7A80, 0xF24A7A80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000005, LoadPath, 0x0000002D, D_80241120_9AF820, 0x00000004, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7680, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, PlaySound, 0x00000176, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x0000001E, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C87, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C88, 0xF24A7280, 0x00000026, 0x00000002, 0xFE363C89, 0xF24A7A80, 0x0000002E, 0x00000002, 0xFE363C87, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C88, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C89, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C88, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF6, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFB, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000003, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000003A, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000005, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00002091, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000001E, 0x00000007, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000038, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000003A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080017, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000109, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240404_9AEB04, 0x00000046, 0x00000001, D_80241180_9AF880, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_802414B4_9AFBB4, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000018, 0x7FFFFE00, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C85, 0x000000C8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0xF24A7C80, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFAC, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, func_802404D0_9AEBD0, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF06, 0x000000F0, 0xFFFFFFE7, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660202, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF6A, 0xFFFFFFE7, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0066021A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660204, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00660214, 0x00660204, 0x00000005, 0x000C00D7, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660202, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF38, 0xFFFFFFE7, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFAC, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80243080, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241EA0_9B05A0 -.word 0x00000000, 0x00220018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00630000, 0x00000044, 0x00000001, 0x8024082C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFEA2, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFEA2, 0x00000000, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFBA, 0x000000F0, 0xFFFFFFF6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFBA, 0x000000F0, 0xFFFFFFF6, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660204, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000008, 0x00000043, 0x00000001, func_80240720_9AEE20, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000008, 0x00000043, 0x00000001, func_80240720_9AEE20, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000029, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0066021D, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFF9C, 0x000000F0, 0x0000001E, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000005A, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000002A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0066021D, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFFDD, 0x000000F0, 0xFFFFFFB5, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x00000029, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0066021D, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFFD8, 0x000000F0, 0x0000000A, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000002A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0066021D, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFF92, 0x000000F0, 0xFFFFFFEC, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000005A, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x00000029, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0066021D, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFFA6, 0x000000F0, 0x0000001E, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000005A, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000002A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0066021D, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFFE2, 0x000000F0, 0xFFFFFFCE, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFE0C, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFD3, 0x000000F0, 0xFFFFFFE2, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A80E7, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFD3, 0x000000F0, 0xFFFFFFE2, 0x00000006, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFD3, 0x000000F0, 0xFFFFFFE2, 0x00000006, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF88, 0x000000F0, 0x00000014, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0066021B, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660204, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF92, 0x000000F0, 0xFFFFFFBA, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000005A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A80E7, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF92, 0x000000F0, 0xFFFFFFBA, 0x00000006, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF92, 0x000000F0, 0xFFFFFFBA, 0x00000006, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFDD, 0x000000F0, 0xFFFFFFCD, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0066021B, 0x00000008, 0x00000001, 0x0000000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660204, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFD3, 0x000000F0, 0xFFFFFFE7, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A80E7, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFD3, 0x000000F0, 0xFFFFFFE7, 0x00000006, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFD3, 0x000000F0, 0xFFFFFFE7, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF88, 0x000000F0, 0x00000014, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0066021B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF88, 0x000000F0, 0x00000014, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0066021A, 0x00000008, 0x00000001, 0x0000001A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660204, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660202, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFFE7, 0xFFFFFFF1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660204, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660205, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660204, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660202, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF86, 0xFFFFFFF1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660204, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00660214, 0x00660204, 0x00000005, 0x000C00D5, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000019, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000002, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660205, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660204, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8680, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00660214, 0x00660204, 0x00000000, 0x000C00D6, 0x00000043, 0x00000002, PlaySound, 0x00000173, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660203, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, PlaySound, 0x00000174, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFE70, 0xFFFFFFF6, 0x00000000, 0x00000044, 0x00000001, 0x80240874, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEF2, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEF2, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001C3, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000002B, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFECA, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80240B88_9AF288, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFAB, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C0C_9B130C -.word 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFAC, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C5C_9B135C -.word 0x00000000, D_80241EA0_9B05A0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_80242C0C_9B130C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660204, 0x00660202, 0x00660203, 0x00660203, 0x00660204, 0x00660204, 0x0066020A, 0x0066020A, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241EA0_9B05A0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000F01, D_80242C0C_9B130C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660204, 0x00660202, 0x00660203, 0x00660203, 0x00660204, 0x00660204, 0x0066020A, 0x0066020A, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80242C5C_9B135C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_06/9B24B0.data.s b/ver/us/asm/data/world/area_trd/trd_06/9B24B0.data.s deleted file mode 100644 index 18ae377041..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_06/9B24B0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240D20_9B24B0 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xC39B0000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241634, D_80240D20_9B24B0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190054, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001B, 0x00000001, 0x00000002, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000014, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000082, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_06/9B2610.data.s b/ver/us/asm/data/world/area_trd/trd_06/9B2610.data.s deleted file mode 100644 index afc206b3a6..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_06/9B2610.data.s +++ /dev/null @@ -1,96 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240E80_9B2610 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F1C_9B26AC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000006, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000018, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802451B0, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FC0_9B2750 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_8024207C_9B380C, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000024, 0x00000002, 0xFE363C83, 0x00000018, 0x00000046, 0x00000001, EnterDoubleDoor, 0x0000001A, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000004, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000044, 0x00000001, 0x802448D8, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410EC_9B287C -.word 0x43200000, 0x00000000, 0x43200000, 0x00000000 - -dlabel D_802410FC_9B288C -.word 0x00000043, 0x00000003, SetPlayerFlagBits, 0x000000C0, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x00000013, 0x00000013, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000000F, 0x00000001, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000012, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF8405E13, 0x00000001, 0x00000008, 0x00000001, 0x0000003C, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000006E, 0x0000000C, 0x00000002, 0xFE363C82, 0x0000008C, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000100, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000006E, 0x0000008C, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000100, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00030005, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8880, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000009C, 0x0000009C, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00030003, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x000C00E2, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x000C00E3, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x000000C0, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFF88, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x0000000A, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241568_9B2CF8 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000007, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000001, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000064, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000007, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFB2, 0x00000043, 0x00000003, EnableModel, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000014, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000023, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFAE, 0x00000024, 0x00000002, 0xF8405E13, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFB2, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, D_802447FC_9B5F8C, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000040, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFB6, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80245158, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000046, 0x00000001, 0x80245170, 0x00000047, 0x00000005, D_80240F1C_9B26AC, 0x00000100, 0x00000006, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xF8405E13, 0x00000000, 0x00000047, 0x00000005, D_802410FC_9B288C, 0x00100000, D_802410EC_9B287C, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000000F, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000000F, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80240DA0, 0x00000044, 0x00000001, D_80241568_9B2CF8, 0x00000044, 0x00000001, D_80240FC0_9B2750, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000007, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240E80_9B2610, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A00_9B3190 -.word 0x00000000, 0x00000000, 0x00000000, 0x41099CB7, 0xC2419978, 0xBFFF2D2C, 0x41C7FDC2, 0xC2C1FFEA, 0xBFFF3C15, 0x424D98FA, 0xC30F6659, 0x3F80D3E1 - -dlabel D_80241A30_9B31C0 -.word 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0x00000082, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, PlaySound, 0x00000175, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000B4, 0x000000D2, 0x00000019, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_8024093C_9B20CC, 0x00000000, 0xF24A7A80, 0xF24A7A80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000005, LoadPath, 0x0000001E, D_80241A00_9B3190, 0x00000004, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000043, 0x00000004, func_80240854_9B1FE4, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000108, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFC18, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C1C_9B33AC -.word 0x00000043, 0x00000001, func_80240A70_9B2200, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, PlaySound, 0x00000176, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000B4, 0x00000096, 0x00000019, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000005, LoadPath, 0x0000001E, D_80241A00_9B3190, 0x00000004, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C86, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7680, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000108, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240AD0_9B2260, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000000B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x000003E8, 0x00000043, 0x00000004, func_80240854_9B1FE4, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000D2, 0x00000168, 0x0000000A, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_8024093C_9B20CC, 0x00000000, 0xF24A7A80, 0xF24A7A80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFFFFFC18, 0xFE363C82, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000096, 0x00000000, 0x0000000A, 0x0000000A, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024207C_9B380C -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x0000012C, 0xFFFFFE0C, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000168, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0x0000012C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0x0000012C, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000004, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_80240724_9B1EB4, 0x00000046, 0x00000001, D_80241A30_9B31C0, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000204, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000108, 0x00000001, 0x00000046, 0x00000001, D_80241C1C_9B33AC, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0003000E, 0x00030003, 0x00000000, 0x000C00D8, 0x00000043, 0x00000001, func_80240A5C_9B21EC, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000108, 0x00000000, 0x00000043, 0x00000001, func_8024081C_9B1FAC, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x000003E8, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000A, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFAD, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000001B, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFFEB, 0x0000002F, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000032, 0x00000023, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000049, 0x00000016, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000003, GetAngleToNPC, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x0003000E, 0x00030003, 0x00000000, 0x000C00D9, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x0003000E, 0x00030003, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242620_9B3DB0 -.word 0x00000000, 0x00170014, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel D_8024264C_9B3DDC -.word 0x00000000, 0x00220018, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80242678_9B3E08 -.word 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000060, 0x00000000, 0x00000081, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00030005, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000007C, 0x00000081, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000005, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000060, 0x00000081, 0x00000000, 0x00000043, 0x00000003, GetAngleToNPC, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x000C00E1, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802427F0_9B3F80 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8E80, 0x00000000, 0xF24F2A80, 0xF24AC280, 0xF24A5E80, 0x00000057, 0x00000000, 0x00000043, 0x00000003, GetAngleToPlayer, 0xFFFFFFFF, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE5, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000029, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C8A, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C81, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C82, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x0000000A, 0x00000002, 0xF8405E14, 0x00000000, 0x00000024, 0x00000002, 0xF8405E14, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DB, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DC, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DD, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7DB4, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DE, 0x00000043, 0x00000003, trd_06_UnkFunc41, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFAD, 0x00000043, 0x00000001, func_80240C80_9B2410, 0x00000044, 0x00000001, 0x80240E14, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018B, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80240E38, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x000C00DF, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0xFFFFFFD3, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000000, 0x000C00E0, 0x00000046, 0x00000001, D_80242678_9B3E08, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242CEC_9B447C -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFAD, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000012, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802427F0_9B3F80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D40_9B44D0 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000006, 0x000001C3, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000F, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000016, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000018, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0xFFFFFEA2, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000B, 0xFFFFFE8E, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0xFFFFFE7A, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000A, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000B, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000C, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00290104, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000B, 0x002C0006, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x002C0006, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000A, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000B, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000C, 0x00000100, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0xFFFFFF13, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000B, 0xFFFFFEEE, 0x00000019, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000C, 0xFFFFFEF6, 0xFFFFFFF1, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEFC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000B, 0x002C0002, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x002C0002, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00290104, 0x00290101, 0x00000000, 0x000C00F0, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000B, 0x002C0006, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x002C0006, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000F, 0x0000000A, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000016, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000018, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000006, 0x000001C4, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0xFFFFFF17, 0x00000093, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0xFFFFFF59, 0x000000DA, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000B, 0xFFFFFF02, 0x00000090, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000B, 0xFFFFFF35, 0x000000DE, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000C, 0xFFFFFEF7, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000C, 0xFFFFFF46, 0x000000AF, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcJumpscale, 0x0000000A, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000B, 0x002C0002, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x002C0002, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00290104, 0x00290101, 0x00000000, 0x000C00F1, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000B, 0x002C0006, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000C, 0x002C0006, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802433AC_9B4B3C -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFAE, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243414_9B4BA4 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242D40_9B44D0, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802433AC_9B4B3C, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFAE, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243474_9B4C04 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFAE, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802434AC_9B4C3C -.word 0x0000000A, 0x00000002, 0xF8405E13, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00910104, 0x00910101, 0x00000000, 0x000C00E4, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00910104, 0x00910101, 0x00000000, 0x000C00E5, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00910104, 0x00910101, 0x00000000, 0x000C00E6, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024357C_9B4D0C -.word 0x0000000A, 0x00000002, 0xF8405E13, 0x00000000, 0x0000000A, 0x00000002, 0xF9718887, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00910204, 0x00910201, 0x00000000, 0x000C00E7, 0x00000024, 0x00000002, 0xF9718887, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00910204, 0x00910201, 0x00000000, 0x000C00E8, 0x00000024, 0x00000002, 0xF9718887, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00910204, 0x00910201, 0x00000000, 0x000C00E9, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024364C_9B4DDC -.word 0x0000000A, 0x00000002, 0xF8405E13, 0x00000000, 0x0000000A, 0x00000002, 0xF9718888, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00910004, 0x00910001, 0x00000000, 0x000C00EA, 0x00000024, 0x00000002, 0xF9718888, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00910004, 0x00910001, 0x00000000, 0x000C00EB, 0x00000024, 0x00000002, 0xF9718888, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00910004, 0x00910001, 0x00000000, 0x000C00EC, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024371C_9B4EAC -.word 0x0000000A, 0x00000002, 0xF8405E13, 0x00000000, 0x0000000A, 0x00000002, 0xF9718889, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00910004, 0x00910001, 0x00000000, 0x000C00ED, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00910004, 0x00910001, 0x00000000, 0x000C00EE, 0x00000024, 0x00000002, 0xF9718889, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00910004, 0x00910001, 0x00000000, 0x000C00EF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802437EC_9B4F7C -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802434AC_9B4C3C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243810_9B4FA0 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024357C_9B4D0C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243834_9B4FC4 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024364C_9B4DDC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243858_9B4FE8 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024371C_9B4EAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024387C_9B500C -.word 0x00000001, D_80242620_9B3DB0, 0x00000000, 0x00000000, 0x00000000, 0x00000D01, D_80242CEC_9B447C, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030003, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030005, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x001A007D - -dlabel D_80243A6C_9B51FC -.word 0x0000000A, D_8024264C_9B3DDC, 0x00000000, 0xC47A0000, 0x00000000, 0x00040801, D_80243414_9B4BA4, 0x00000000, 0x00000000, 0x00000000, 0x8005008A, 0x00050000, 0x00A40005, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000B, D_80242620_9B3DB0, 0x00000000, 0xC47A0000, 0x00000000, 0x00040801, D_80243474_9B4C04, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002C0002, 0x002C0004, 0x002C0006, 0x002C0006, 0x002C0002, 0x002C0002, 0x002C000E, 0x002C000E, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000C, D_80242620_9B3DB0, 0x00000000, 0xC47A0000, 0x00000000, 0x00040801, D_80243474_9B4C04, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002C0002, 0x002C0004, 0x002C0006, 0x002C0006, 0x002C0002, 0x002C0002, 0x002C000E, 0x002C000E, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x002C0006, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024403C_9B57CC -.word 0x00000002, D_80242620_9B3DB0, 0x41C80000, 0x00000000, 0x42FE0000, 0x00000801, D_802437EC_9B4F7C, 0x00000000, 0x00000000, 0x0000010E, 0x800500A4, 0x00050000, 0x00800005, 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, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00910101, 0x00910102, 0x00910103, 0x00910103, 0x00910101, 0x00910101, 0x00910100, 0x00910100, 0x00910100, 0x00910100, 0x00910100, 0x00910100, 0x00910100, 0x00910100, 0x00910100, 0x00910100, 0x00000000, 0x00000000, 0x00000000, 0x001A007E, 0x00000003, D_80242620_9B3DB0, 0xC1F00000, 0x00000000, 0x43020000, 0x00000801, D_80243810_9B4FA0, 0x00000000, 0x00000000, 0x0000005A, 0x800500A4, 0x00050000, 0x00800005, 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, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00910201, 0x00910202, 0x00910203, 0x00910203, 0x00910201, 0x00910201, 0x00910200, 0x00910200, 0x00910200, 0x00910200, 0x00910200, 0x00910200, 0x00910200, 0x00910200, 0x00910200, 0x00910200, 0x00000000, 0x00000000, 0x00000000, 0x001A007F, 0x00000004, D_80242620_9B3DB0, 0xC30C0000, 0x00000000, 0xC2B40000, 0x00000801, D_80243834_9B4FC4, 0x00000000, 0x00000000, 0x0000010E, 0x800500A4, 0x00050000, 0x00800005, 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, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00910001, 0x00910002, 0x00910003, 0x00910003, 0x00910001, 0x00910001, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00000000, 0x00000000, 0x00000000, 0x001A0080, 0x00000005, D_80242620_9B3DB0, 0xC2960000, 0x00000000, 0xC2A00000, 0x00000801, D_80243858_9B4FE8, 0x00000000, 0x00000000, 0x0000005A, 0x800500A4, 0x00050000, 0x00800005, 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, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00910001, 0x00910002, 0x00910003, 0x00910003, 0x00910001, 0x00910001, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00910000, 0x00000000, 0x00000000, 0x00000000, 0x001A0081 - -dlabel D_802447FC_9B5F8C -.word 0x00000001, D_8024387C_9B500C, 0x00000000, 0x00000004, D_8024403C_9B57CC, 0x00000000, 0x00000003, D_80243A6C_9B51FC, 0x0604000C, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_06/9B5FC0.data.s b/ver/us/asm/data/world/area_trd/trd_06/9B5FC0.data.s deleted file mode 100644 index 13aae34a1d..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_06/9B5FC0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244830_9B5FC0 -.word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80244860_9B5FF0 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80244830_9B5FC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244880_9B6010 -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80244860_9B5FF0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010, 0x00000000, 0x002A0018, 0x00000000, 0x00000000, D_80244860_9B5FF0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, EnableNpcAI, 0x00000010, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000010, 0x00660118, 0x00660118, 0x00000000, 0x000C010C, 0x00000043, 0x00000003, EnableNpcAI, 0x00000010, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000007D0, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000003, GotoMap, 0x802451D0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244998_9B6128 -.word 0x00000010, D_80244880_9B6010, 0x42700000, 0x00000000, 0xC2700000, 0x00000E01, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0xFFFFFFC4, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000003C, 0x00000000, 0xFFFFFFC4, 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, 0x00660104, 0x00660102, 0x00660103, 0x00660103, 0x00660104, 0x00660104, 0x0066010A, 0x0066010A, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, D_80244880_9B6010, 0x42700000, 0x00000000, 0x00000000, 0x00000E01, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000003C, 0x00000000, 0x0000003C, 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, 0x00660004, 0x00660002, 0x00660003, 0x00660003, 0x00660004, 0x00660004, 0x0066000A, 0x0066000A, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000011, D_80244880_9B6010, 0xC1200000, 0x00000000, 0xC2700000, 0x00000E01, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFF6, 0x00000000, 0xFFFFFFC4, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFF6, 0x00000000, 0xFFFFFFC4, 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, 0x00660204, 0x00660202, 0x00660203, 0x00660203, 0x00660204, 0x00660204, 0x0066020A, 0x0066020A, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000012, D_80244880_9B6010, 0x00000000, 0x00000000, 0x00000000, 0x00000E01, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFF6, 0x00000000, 0x0000003C, 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, 0x00660304, 0x00660302, 0x00660303, 0x00660303, 0x00660304, 0x00660304, 0x0066030A, 0x0066030A, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80244998_9B6128, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HeartBlock, 0xFFFFFF6A, 0x0000003C, 0x00000064, 0x00000000, 0x00000006, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_07/9B9270.data.s b/ver/us/asm/data/world/area_trd/trd_07/9B9270.data.s deleted file mode 100644 index b114400b0b..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_07/9B9270.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802428F0_9B9270 -.word 0x435C0000, 0x00000000, 0x00000000, 0x43870000, 0xC3480000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242BE4, D_802428F0_9B9270, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190055, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000014, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_07/9B9310.data.s b/ver/us/asm/data/world/area_trd/trd_07/9B9310.data.s deleted file mode 100644 index b0e85a39f2..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_07/9B9310.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242990_9B9310 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_07_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_07_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A2C_9B93AC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244810, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A88_9B9408 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244818, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242AE4_9B9464 -.word 0x00000047, 0x00000005, D_80242A2C_9B93AC, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242A88_9B9408, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B2C_9B94AC -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000001, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000064, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000007, 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, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x8024369C, 0x00000044, 0x00000001, 0x80242950, 0x00000044, 0x00000001, D_80242B2C_9B94AC, 0x00000046, 0x00000001, 0x80244778, 0x00000024, 0x00000002, 0xFE363C80, D_80242AE4_9B9464, 0x00000045, 0x00000002, EnterWalk, 0xFD050F80, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000005, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80242990_9B9310, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_07/9B9760.data.s b/ver/us/asm/data/world/area_trd/trd_07/9B9760.data.s deleted file mode 100644 index 48b4c264d3..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_07/9B9760.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242DE0_9B9760 -.word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 - -dlabel D_80242E10_9B9790 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_07_TackleAI_Main, D_80242DE0_9B9760, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E80_9B9800 -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80242E10_9B9790, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel trd_07_FlyingAI_JumpVels -.float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 - -dlabel D_80242EC4_9B9844 -.word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x41A00000, 0x0000000A, 0x40266666, 0x0000003C, 0x0000000A, 0x43160000, 0x41A00000, 0x00000001 - -dlabel D_80242EF4_9B9874 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, trd_07_ParatroopaAI_Main, D_80242EC4_9B9844, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F64_9B98E4 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80242EF4_9B9874, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060001 - -dlabel D_80242F90_9B9910 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, trd_07_GetDefeatedEnemyCount, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xF8405E1A, 0x00000001, 0x00000044, 0x00000001, 0x8024475C, 0x00000013, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243070_9B99F0 -.word 0x00000043, 0x00000002, SetSelfEnemyFlags, 0x00800000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80242F90_9B9910, 0x0000000A, 0x00000002, 0xF8405E1A, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430CC_9B9A4C -.word 0x00000000, D_80242E80_9B9800, 0xC2960000, 0x00000000, 0xC1F00000, 0x00040C00, D_80243070_9B99F0, 0x00000000, 0x00000000, 0x0000005A, 0x8005008A, 0x00050000, 0x00900005, 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, 0x00000001, 0x00010000, 0xFFFFFFB5, 0x00000000, 0xFFFFFFE2, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 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, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802432BC_9B9C3C -.word 0x00000001, D_80242F64_9B98E4, 0x00000000, 0x42480000, 0x41F00000, 0x00040C00, D_80243070_9B99F0, 0x00000000, 0x00000000, 0x0000010E, 0x80050090, 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, 0x00000001, 0x00010000, 0x00000000, 0x00000032, 0x0000001E, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000032, 0x0000001E, 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, 0x002A0101, 0x002A0102, 0x002A0103, 0x002A0103, 0x002A0101, 0x002A0101, 0x002A0106, 0x002A0106, 0x002A0104, 0x002A010C, 0x002A010A, 0x002A010E, 0x002A0103, 0x002A0103, 0x002A0103, 0x002A0103, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802434AC_9B9E2C -.word 0x00000002, D_80242F64_9B98E4, 0x42960000, 0x42480000, 0xC1F00000, 0x00040C00, D_80243070_9B99F0, 0x00000000, 0x00000000, 0x0000010E, 0x80050090, 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, 0x00000001, 0x00010000, 0x0000004B, 0x00000032, 0xFFFFFFE2, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000004B, 0x00000032, 0xFFFFFFE2, 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, 0x002A0101, 0x002A0102, 0x002A0103, 0x002A0103, 0x002A0101, 0x002A0101, 0x002A0106, 0x002A0106, 0x002A0104, 0x002A010C, 0x002A010A, 0x002A010E, 0x002A0103, 0x002A0103, 0x002A0103, 0x002A0103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802430CC_9B9A4C, 0x06010004, 0x00000001, D_802432BC_9B9C3C, 0x06080004, 0x00000001, D_802434AC_9B9E2C, 0x060A0004, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_07/9BA050.data.s b/ver/us/asm/data/world/area_trd/trd_07/9BA050.data.s deleted file mode 100644 index 5818fa0f64..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_07/9BA050.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802436D0_9BA050 -.word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x0000002B, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x00000078, 0x00000014, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x00000050, 0x00000014, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000064, 0x00000014, 0x00000001, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x00000050, 0x00000014, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000078, 0x00000014, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x00000064, 0x00000014, 0x00000001, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000026, 0x00000002, 0xFD050F80, 0xF24A7E80, 0x00000026, 0x00000002, 0xFD050F81, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ScaleGroup, 0xFE363C89, 0xF24A7E80, 0xFD050F81, 0xFD050F80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000001E, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C89, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, ScaleGroup, 0xFE363C89, 0xF24A7E80, 0xFD050F81, 0xFD050F80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000046, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C89, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, ScaleGroup, 0xFE363C89, 0xF24A7E80, 0xFD050F81, 0xFD050F80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003D, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243C04_9BA584 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0x00000046, 0x00000000, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C89, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000002C, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000010, 0x00000043, 0x00000005, func_802427FC_9B917C, 0x0000010E, 0x00000000, 0x00000028, 0x0000010E, 0x00000043, 0x00000005, func_802427FC_9B917C, 0x0000010E, 0x00000000, 0xFFFFFFD8, 0x0000010E, 0x00000012, 0x00000000, 0x00000043, 0x00000005, func_802427FC_9B917C, 0xFFFFFF01, 0x00000000, 0x00000028, 0x0000005A, 0x00000043, 0x00000005, func_802427FC_9B917C, 0xFFFFFF01, 0x00000000, 0xFFFFFFD8, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000014, 0x0000000A, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C89, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000014, 0x00000000, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C89, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000002C, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000010, 0x00000043, 0x00000005, func_802427FC_9B917C, 0x0000010E, 0x00000000, 0x00000028, 0x0000010E, 0x00000043, 0x00000005, func_802427FC_9B917C, 0x0000010E, 0x00000000, 0xFFFFFFD8, 0x0000010E, 0x00000012, 0x00000000, 0x00000043, 0x00000005, func_802427FC_9B917C, 0xFFFFFF01, 0x00000000, 0x00000028, 0x0000005A, 0x00000043, 0x00000005, func_802427FC_9B917C, 0xFFFFFF01, 0x00000000, 0xFFFFFFD8, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000000A, 0x00000005, 0x00000004, 0x00000003, 0x00000001, 0x00000003, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C89, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000001, 0x00000004, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C89, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000002C, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000010, 0x00000043, 0x00000005, func_802427FC_9B917C, 0x0000010E, 0x00000000, 0x00000028, 0x0000010E, 0x00000043, 0x00000005, func_802427FC_9B917C, 0x0000010E, 0x00000000, 0xFFFFFFD8, 0x0000010E, 0x00000043, 0x00000003, EnableModel, 0x00000015, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, func_802427FC_9B917C, 0xFFFFFF01, 0x00000000, 0x00000028, 0x0000005A, 0x00000043, 0x00000005, func_802427FC_9B917C, 0xFFFFFF01, 0x00000000, 0xFFFFFFD8, 0x0000005A, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802440AC_9BAA2C -.word 0x00000003, 0x00000001, 0x0000000A, 0x00000055, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80242600_9B8F80, 0xFE363C80, 0xFE363C82, 0xF24AF280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, EnableModel, 0x00000015, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000046, 0x00000001, D_802436D0_9BA050, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000190, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80242600_9B8F80, 0xFE363C80, 0xFE363C82, 0xF2498A80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000046, 0x00000001, D_802436D0_9BA050, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000002, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000050, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244430_9BADB0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000008, 0x00000001, 0x0000000F, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x000000DC, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80242600_9B8F80, 0xFE363C80, 0xFE363C82, 0xF24AF280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000046, 0x00000001, D_80243C04_9BA584, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x000000DC, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000028, 0x00000002, 0xFE363C80, 0x00000190, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_80242600_9B8F80, 0xFE363C80, 0xFE363C82, 0xF2498A80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000C, 0x00000046, 0x00000001, D_80243C04_9BA584, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80244430_9BADB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000015, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E1A, 0x00000000, 0x00000044, 0x00000001, D_802440AC_9BAA2C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_09/9BD830.data.s b/ver/us/asm/data/world/area_trd/trd_09/9BD830.data.s deleted file mode 100644 index 77de7590f8..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_09/9BD830.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802401D0_9BD830 -.word 0xC40D4000, 0x42700000, 0x41200000, 0x42B40000, 0x44BD6000, 0x42700000, 0x00000000, 0x43870000, 0xC3AA0000, 0x00000000, 0x42480000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802405AC, D_802401D0_9BD830, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190057, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFB1, 0x0000000A, 0x00000002, 0xF8405E15, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000048, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000014, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000014, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_09/9BD960.data.s b/ver/us/asm/data/world/area_trd/trd_09/9BD960.data.s deleted file mode 100644 index 5b04994ebe..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_09/9BD960.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240300_9BD960 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000010, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000E, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245290, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403A4_9BDA04 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000012, 0x00000024, 0x00000002, 0xFE363C83, 0x00000010, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245298, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240448_9BDAA8 -.word 0x00000047, 0x00000005, D_80240300_9BD960, 0x00000100, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802403A4_9BDA04, 0x00000100, 0x0000000B, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240490_9BDAF0 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80240448_9BDAA8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80240448_9BDAA8, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000E, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000012, 0x00000024, 0x00000002, 0xFE363C83, 0x00000010, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000023, 0x00000000, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000007, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80244E0C, 0x00000046, 0x00000001, 0x80240740, 0x00000046, 0x00000001, 0x80245238, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0xFFFFFFB2, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80244330, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E15, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80240740, 0x00000044, 0x00000001, 0x80240240, 0x00000044, 0x00000001, D_80240490_9BDAF0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_09/9BDD80.data.s b/ver/us/asm/data/world/area_trd/trd_09/9BDD80.data.s deleted file mode 100644 index 6d425e495a..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_09/9BDD80.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240720_9BDD80 -.word 0x00000024, 0x00000002, 0xF8405E16, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E16, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BombableRock2, 0xFFFFFE2A, 0xFFFFFFB5, 0x0000008B, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240720_9BDD80, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x00000578, 0xFFFFFFF1, 0x00000087, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000005D2, 0xFFFFFFF1, 0x00000087, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFDE4, 0xFFFFFFF1, 0x00000087, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_09/9BDE80.data.s b/ver/us/asm/data/world/area_trd/trd_09/9BDE80.data.s deleted file mode 100644 index 4dee1226bf..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_09/9BDE80.data.s +++ /dev/null @@ -1,138 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240820_9BDE80 -.word 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00200000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240844_9BDEA4 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF250BA80, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C8A, 0x002E0001, 0x00000024, 0x00000002, 0xFE363C8B, 0x002E0001, 0x00000046, 0x00000001, D_800936C0, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002E0002, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C83, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C80, 0xFE363C82, 0xF24ACA80, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002E0001, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0xFE363C80, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0xFE363C80, 0x00000000, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000001E, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000008, 0x00000001, 0xFE363C80, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A48_9BE0A8 -.word 0x00000043, 0x00000002, SetBattleMusic, 0x00000003, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x002E0003, 0x00000046, 0x00000001, 0x800936DC, 0x00000016, 0x00000001, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_800458CC, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000028, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B80_9BE1E0 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C0C_9BE26C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C1C_9BE27C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C2C_9BE28C -.word 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x002E0001, 0x001A0020, D_80240820_9BDE80, 0x00000000, D_80240844_9BDEA4, D_80240A48_9BE0A8, 0x00000000, D_80240B80_9BE1E0, 0x00000000, 0x00000000, 0x000A0000, 0x002D0001, 0x000E001F, D_80240C0C_9BE26C, 0x00000000, D_80240C1C_9BE27C, EnemyNpcHit, 0x00000000, D_80240C2C_9BE28C, 0x00000000, 0x00000000, 0x00050000 - -dlabel D_80240D3C_9BE39C -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFB1, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D74_9BE3D4 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFE8E, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000007D0, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000514, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000005D2, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x000005BA, 0xF24B20E7, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x000005BA, 0xF24B20E7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000005D2, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000019, 0xFFFFFFF7, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x000001C3, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000052, 0x00000000, 0x00000008, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000006E, 0x0000000A, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000012, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000010, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000047, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000048, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000049, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660103, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7DB4, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000005D2, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0066011B, 0x0066011B, 0x00000000, 0x000C00F2, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000514, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x000005BA, 0xF24B20E7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000004E2, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660112, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000005A0, 0x0000001E, 0x00000000, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000564, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660103, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000550, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660104, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0066011B, 0x0066011B, 0x00000000, 0x000C00F3, 0x00000043, 0x00000004, SetNpcVar, 0x00000047, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetNpcVar, 0x00000048, 0x00000000, 0x00000002, 0x00000043, 0x00000004, SetNpcVar, 0x00000049, 0x00000000, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000048, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000514, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFB1, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000012, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000010, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241388_9BE9E8 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFB1, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413C0_9BEA20 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFB1, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413F8_9BEA58 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFB1, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241430_9BEA90 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660003, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7DB4, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000005F0, 0x00000014, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660012, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000005BE, 0x0000001E, 0x0000001E, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000582, 0x00000000, 0x00000028, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000532, 0x00000032, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660001, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0066001B, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241614_9BEC74 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660203, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7DB4, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000005E1, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660212, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000005AF, 0x0000001E, 0x00000005, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000573, 0x00000000, 0x00000005, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660203, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000523, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660201, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0066021B, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417F8_9BEE58 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660303, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7DB4, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000005D2, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660312, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000005A0, 0x0000001E, 0xFFFFFFEC, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000564, 0x00000000, 0xFFFFFFE2, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660303, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000514, 0xFFFFFFD8, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00660301, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0066031B, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419DC_9BF03C -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFB1, 0x00000003, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetNpcVar, 0x00000046, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000014, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, func_80240000_9BD660, 0xFE363C8A, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000043, 0x00000004, SetNpcVar, 0xFE363C8A, 0x00000000, 0xFE363C80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002E0002, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002E0001, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000008, 0x00000001, 0xFE363C80, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B6C_9BF1CC -.word 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00200000, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002D0004, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, GetNpcYaw, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, AddVectorPolar, 0xFE363C81, 0xFE363C83, 0xF24AB280, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000B, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C84, 0x00000000, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0x00000328, 0x00200000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C8A, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9280, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE4B, 0xFE363C83, 0x00000000, 0x00000016, 0x00000001, 0x0000000B, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE34, 0xFE363C83, 0x00000000, 0x00000016, 0x00000001, 0x0000000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE3E, 0xFE363C83, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000004, func_80045838, 0xFFFFFFFF, 0xB0000018, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002D0005, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000005, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7AB4, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000024, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xF24A7F4D, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000004, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FB8_9BF618 -.word 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241B6C_9BF1CC, 0x00000057, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420A0_9BF700 -.word 0x00660102, 0x00220018, D_80240D3C_9BE39C, 0x00000000, D_80240D74_9BE3D4, 0x00000000, 0x00000000, 0x00000000, 0x00000700, 0x00000000, 0x00630000 - -dlabel D_802420CC_9BF72C -.word 0x00660002, 0x00220018, D_80241388_9BE9E8, 0x00000000, D_80241430_9BEA90, 0x00000000, 0x00000000, 0x00000000, 0x00000700, 0x00000000, 0x00630000 - -dlabel D_802420F8_9BF758 -.word 0x00660202, 0x00220018, D_802413C0_9BEA20, 0x00000000, D_80241614_9BEC74, 0x00000000, 0x00000000, 0x00000000, 0x00000700, 0x00000000, 0x00630000 - -dlabel D_80242124_9BF784 -.word 0x00660302, 0x00220018, D_802413F8_9BEA58, 0x00000000, D_802417F8_9BEE58, 0x00000000, 0x00000000, 0x00000000, 0x00000700, 0x00000000, 0x00630000 - -dlabel D_80242150_9BF7B0 -.word 0x002E0001, 0x001A0020, D_80240820_9BDE80, 0x00000000, D_802419DC_9BF03C, D_80240A48_9BE0A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000A0000 - -dlabel D_8024217C_9BF7DC -.word 0x002D0001, 0x000E001F, D_80240C0C_9BE26C, 0x00000000, D_80241B6C_9BF1CC, EnemyNpcHit, 0x00000000, D_80241FB8_9BF618, 0x00000000, 0x00000000, 0x00050000 - -dlabel D_802421A8_9BF808 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8405E15, 0x00000001, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421EC_9BF84C -.word 0x0000000A, 0x00000002, 0xF8405E15, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802421A8_9BF808, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveEncounter, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242240_9BF8A0 -.word 0x0000000A, D_80242150_9BF7B0, 0x449D8000, 0x00000000, 0xC2200000, 0x00242D00, D_802421EC_9BF84C, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0003, 0x002E0003, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000C, D_80242150_9BF7B0, 0x449F6000, 0x00000000, 0x40A00000, 0x00242D00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 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, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0003, 0x002E0003, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000B, D_80242150_9BF7B0, 0x44A14000, 0x00000000, 0x42480000, 0x00242D00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0003, 0x002E0003, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x002E0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242810_9BFE70 -.word 0x00000014, D_8024217C_9BF7DC, 0x00000000, 0xC47A0000, 0x00000000, 0x00080D04, 0x00000000, 0x00000001, 0x00000000, 0x0000010E, 0x8003008A, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002D0001, 0x002D0002, 0x002D0003, 0x002D0003, 0x002D0001, 0x002D0004, 0x002D0005, 0x002D0005, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242A00_9C0060 -.word 0x00000015, D_8024217C_9BF7DC, 0x00000000, 0xC47A0000, 0x00000000, 0x00080D04, 0x00000000, 0x00000001, 0x00000000, 0x0000010E, 0x8003008A, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002D0001, 0x002D0002, 0x002D0003, 0x002D0003, 0x002D0001, 0x002D0004, 0x002D0005, 0x002D0005, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242BF0_9C0250 -.word 0x00000016, D_8024217C_9BF7DC, 0x00000000, 0xC47A0000, 0x00000000, 0x00080D04, 0x00000000, 0x00000001, 0x00000000, 0x0000010E, 0x8003008A, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002D0001, 0x002D0002, 0x002D0003, 0x002D0003, 0x002D0001, 0x002D0004, 0x002D0005, 0x002D0005, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242DE0_9C0440 -.word 0x00000017, D_8024217C_9BF7DC, 0x00000000, 0xC47A0000, 0x00000000, 0x00080D04, 0x00000000, 0x00000001, 0x00000000, 0x0000010E, 0x8003008A, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002D0001, 0x002D0002, 0x002D0003, 0x002D0003, 0x002D0001, 0x002D0004, 0x002D0005, 0x002D0005, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242FD0_9C0630 -.word 0x00000018, D_8024217C_9BF7DC, 0x00000000, 0xC47A0000, 0x00000000, 0x00080D04, 0x00000000, 0x00000001, 0x00000000, 0x0000010E, 0x8003008A, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002D0001, 0x002D0002, 0x002D0003, 0x002D0003, 0x002D0001, 0x002D0004, 0x002D0005, 0x002D0005, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802431C0_9C0820 -.word 0x00000019, D_8024217C_9BF7DC, 0x00000000, 0xC47A0000, 0x00000000, 0x00080D04, 0x00000000, 0x00000001, 0x00000000, 0x0000010E, 0x8003008A, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002D0001, 0x002D0002, 0x002D0003, 0x002D0003, 0x002D0001, 0x002D0004, 0x002D0005, 0x002D0005, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802433B0_9C0A10 -.word 0x0000001A, D_8024217C_9BF7DC, 0x00000000, 0xC47A0000, 0x00000000, 0x00080D04, 0x00000000, 0x00000001, 0x00000000, 0x0000010E, 0x8003008A, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002D0001, 0x002D0002, 0x002D0003, 0x002D0003, 0x002D0001, 0x002D0004, 0x002D0005, 0x002D0005, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802435A0_9C0C00 -.word 0x0000001B, D_8024217C_9BF7DC, 0x00000000, 0xC47A0000, 0x00000000, 0x00080D04, 0x00000000, 0x00000001, 0x00000000, 0x0000010E, 0x8003008A, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002D0001, 0x002D0002, 0x002D0003, 0x002D0003, 0x002D0001, 0x002D0004, 0x002D0005, 0x002D0005, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243790_9C0DF0 -.word 0x0000001C, D_8024217C_9BF7DC, 0x00000000, 0xC47A0000, 0x00000000, 0x00080D04, 0x00000000, 0x00000001, 0x00000000, 0x0000010E, 0x8003008A, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002D0001, 0x002D0002, 0x002D0003, 0x002D0003, 0x002D0001, 0x002D0004, 0x002D0005, 0x002D0005, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243980_9C0FE0 -.word 0x0000001D, D_8024217C_9BF7DC, 0x00000000, 0xC47A0000, 0x00000000, 0x00080D04, 0x00000000, 0x00000001, 0x00000000, 0x0000010E, 0x8003008A, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002D0001, 0x002D0002, 0x002D0003, 0x002D0003, 0x002D0001, 0x002D0004, 0x002D0005, 0x002D0005, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243B70_9C11D0 -.word 0x00000046, D_802420A0_9BF700, 0x44C6C000, 0x42700000, 0x00000000, 0x00000001, 0x00000000, 0x00000001, 0x00000000, 0x0000010E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000047, D_80242124_9BF784, 0x44C6C000, 0x42700000, 0xC1200000, 0x00000001, 0x00000000, 0x00000001, 0x00000000, 0x0000010E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000048, D_802420F8_9BF758, 0x44C8A000, 0x42700000, 0x40A00000, 0x00000001, 0x00000000, 0x00000001, 0x00000000, 0x0000010E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000049, D_802420CC_9BF72C, 0x44CA8000, 0x42700000, 0x41A00000, 0x00000001, 0x00000000, 0x00000001, 0x00000000, 0x0000010E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_80242240_9BF8A0, 0x06170007, 0x00000001, D_80242810_9BFE70, 0x061A0007, 0x00000001, D_80242A00_9C0060, 0x061A0007, 0x00000001, D_80242BF0_9C0250, 0x061A0007, 0x00000001, D_80242DE0_9C0440, 0x061A0007, 0x00000001, D_80242FD0_9C0630, 0x061A0007, 0x00000001, D_802431C0_9C0820, 0x061A0007, 0x00000001, D_802433B0_9C0A10, 0x061A0007, 0x00000001, D_802435A0_9C0C00, 0x061A0007, 0x00000001, D_80243790_9C0DF0, 0x061A0007, 0x00000001, D_80243980_9C0FE0, 0x061A0007, 0x00000004, D_80243B70_9C11D0, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802443CC_9C1A2C -.word 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE34, 0xFE363C83, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244428_9C1A88 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802443CC_9C1A2C, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024445C_9C1ABC -.word 0x00000028, D_8024217C_9BF7DC, 0xC2C80000, 0x41300000, 0x42480000, 0x00080D04, D_80244428_9C1A88, 0x00000001, 0x00000000, 0x0000010E, 0x8003008A, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002D0001, 0x002D0002, 0x002D0003, 0x002D0003, 0x002D0001, 0x002D0004, 0x002D0005, 0x002D0005, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024464C_9C1CAC -.word 0x00000029, D_8024217C_9BF7DC, 0xC3160000, 0x41300000, 0x40A00000, 0x00080D04, D_80244428_9C1A88, 0x00000001, 0x00000000, 0x0000010E, 0x8003008A, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002D0001, 0x002D0002, 0x002D0003, 0x002D0003, 0x002D0001, 0x002D0004, 0x002D0005, 0x002D0005, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024483C_9C1E9C -.word 0x0000002A, D_8024217C_9BF7DC, 0x42F00000, 0x41300000, 0x42480000, 0x00080D04, D_80244428_9C1A88, 0x00000001, 0x00000000, 0x0000010E, 0x8003008A, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002D0001, 0x002D0002, 0x002D0003, 0x002D0003, 0x002D0001, 0x002D0004, 0x002D0005, 0x002D0005, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244A2C_9C208C -.word 0x0000002B, D_8024217C_9BF7DC, 0x43A50000, 0x41300000, 0x40A00000, 0x00080D04, D_80244428_9C1A88, 0x00000001, 0x00000000, 0x0000010E, 0x8003008A, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002D0001, 0x002D0002, 0x002D0003, 0x002D0003, 0x002D0001, 0x002D0004, 0x002D0005, 0x002D0005, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244C1C_9C227C -.word 0x0000002C, D_8024217C_9BF7DC, 0x43BE0000, 0x41300000, 0xC2200000, 0x00080D04, D_80244428_9C1A88, 0x00000001, 0x00000000, 0x0000010E, 0x8003008A, 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, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 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, 0x002D0001, 0x002D0002, 0x002D0003, 0x002D0003, 0x002D0001, 0x002D0004, 0x002D0005, 0x002D0005, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x002D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024445C_9C1ABC, 0x061A0007, 0x00000001, D_8024464C_9C1CAC, 0x061A0007, 0x00000001, D_8024483C_9C1E9C, 0x061A0007, 0x00000001, D_80244A2C_9C208C, 0x061A0007, 0x00000001, D_80244C1C_9C227C, 0x061A0007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_09/9C24C0.data.s b/ver/us/asm/data/world/area_trd/trd_09/9C24C0.data.s deleted file mode 100644 index 905163979f..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_09/9C24C0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244E60_9C24C0 -.word 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004E, 0x00000000, 0x00000008, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004F, 0x00000001, 0x00000043, 0x00000002, DemoSetButtons, 0x00008000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DemoSetButtons, 0x00000000, 0x00000008, 0x00000001, 0x00000022, 0x00000043, 0x00000002, DemoSetButtons, 0x00008000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000002, DemoSetButtons, 0x00000000, 0x00000008, 0x00000001, 0x00000009, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004E, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004C, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000047, 0x0000001F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000042, 0x00000033, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000003F, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000003F, 0x0000003D, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000040, 0x0000003D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000041, 0x0000003B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000041, 0x00000038, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000043, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000047, 0x0000001C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004B, 0x0000000E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004D, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004E, 0x00000002, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000004E, 0x00000003, 0x00000043, 0x00000002, DemoSetButtons, 0x00008000, 0x00000008, 0x00000001, 0x00000009, 0x00000043, 0x00000002, DemoSetButtons, 0x00000000, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802452A0, 0x00000002, 0x00000002, 0x00000008, 0x00000001, 0x0000007B, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245174_9C27D4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802452A0, 0x00000002, 0x00000003, 0x00000008, 0x00000001, 0x00000071, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245234_9C2894 -.word 0x00000000, 0x00000043, 0x00000001, func_802400C0_9BD720, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000024, 0x00000002, 0xF8405B89, 0x00000000, 0x00000044, 0x00000001, D_80245174_9C27D4, 0x00000044, 0x00000001, D_80244E60_9C24C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_10/9C3160.data.s b/ver/us/asm/data/world/area_trd/trd_10/9C3160.data.s deleted file mode 100644 index 510379025a..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_10/9C3160.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240850_9C3160 -.word 0xC39B0000, 0x00000000, 0x00000000, 0x42B40000, 0xC3610000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240FE0_9C38F0, D_80240850_9C3160, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190058 - -dlabel D_802408B0_9C31C0 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFB2, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000052, 0x00000001, 0x00000008, 0x00000016, 0x00000001, 0xFFFFFFB2, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000014, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240950_9C3260 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFFB1, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFB2, 0x00000043, 0x00000003, GotoMap, 0x80242ABC, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFB2, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF79, 0x00000055, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7CE7, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF79, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, trd_10_StarSpiritEffectFunc2, 0x00000000, 0x000000B4, 0xFFFFFF79, 0x0000000A, 0x00000000, 0xFFFFFF79, 0x00000055, 0x00000000, 0x0000001E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, trd_10_StarSpiritEffectFunc3, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000067, 0x00000043, 0x00000001, trd_10_StarSpiritEffectFunc1, 0x00000043, 0x00000002, StopSound, 0x80000067, 0x00000043, 0x00000006, PlaySoundAt, 0x000000B2, 0x00000000, 0xFFFFFF79, 0x00000055, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, PlaySoundAt, 0x00000137, 0x00000000, 0xFFFFFF79, 0x00000055, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, trd_10_StarSpiritEffectFunc4, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF79, 0x00000000, 0x00000000, 0x00000043, 0x00000002, trd_10_StarSpiritEffectFunc4, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, trd_10_StarSpiritEffectFunc5, 0x00000000, 0xFFFFFF79, 0x0000001E, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, trd_10_StarSpiritEffectFunc6, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, trd_10_StarSpiritEffectFunc4, 0x00000003, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000138, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFB3, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242AB4, 0x00000000, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E38_9C3748 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000029, 0x00000024, 0x00000002, 0xFE363C83, 0x00000027, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF03, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F08_9C3818 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x00000029, 0x00000024, 0x00000002, 0xFE363C83, 0x00000027, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242AC4, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FB4_9C38C4 -.word 0x00000047, 0x00000005, D_80240F08_9C3818, 0x00000100, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FE0_9C38F0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000007, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000001, func_802407F4_9C3104, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x8024268C, 0x00000046, 0x00000001, 0x802426B0, 0x00000044, 0x00000001, 0x80242A4C, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFB2, 0x00000044, 0x00000001, D_80240950_9C3260, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240FB4_9C38C4, 0x00000044, 0x00000001, D_802408B0_9C31C0, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFB2, 0x00000044, 0x00000001, D_80240E38_9C3748, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_10/9C3A30.data.s b/ver/us/asm/data/world/area_trd/trd_10/9C3A30.data.s deleted file mode 100644 index 75fa94aa03..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_10/9C3A30.data.s +++ /dev/null @@ -1,90 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241120_9C3A30 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFB2, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241160_9C3A70 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241170_9C3A80 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFEB3, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFE95, 0x00000000, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF10, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF10, 0xFFFFFF56, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000012, 0xFFFFFFFD, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF10, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF10, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7B4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0xF24A7C80, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001C3, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000027, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF24, 0x00000000, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFB0, 0x00000000, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000027, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001C4, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFE0, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFFA8, 0x00000000, 0x0000000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000005, 0x00000004, 0x00000002, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0066001E, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00660004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00660002, 0x00660004, 0x00000000, 0x000C00F4, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFFE0, 0x00000000, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFFC0, 0x00000000, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00660102, 0x00660104, 0x00000000, 0x000C00F5, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0xFFFFFFF6, 0x00000004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000010, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00F6, 0x0000012C, 0x00000064, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00F7, 0x0000012C, 0x00000064, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00F8, 0x0000012C, 0x00000064, 0x00000043, 0x00000006, PlaySoundAt, 0x000001E2, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000014, 0xF24A7E80, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00F9, 0x0000012C, 0x00000064, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00FA, 0x0000012C, 0x00000064, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00FB, 0x0000012C, 0x00000064, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C00FC, 0x0000012C, 0x00000064, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF60, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF60, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7B4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF971888D, 0x00000001, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF65, 0x00000000, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241870_9C4180 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241880_9C4190 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241890_9C41A0 -.word 0x00000043, 0x00000003, SetEncounterStatusFlags, 0x00000002, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000010, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000051, 0x00000000, 0x00000008, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, EnableGroup, 0x00000026, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF56, 0x0000001E, 0xFFFFFFC9, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFF6A, 0x0000001E, 0x00000037, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFF7E, 0x0000001E, 0xFFFFFFC9, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFF92, 0x0000001E, 0x00000037, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0066001C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0066011C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x0066021C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x0066031C, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000C010B, 0x000000A0, 0x00000028, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7BB4, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7BB4, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7BB4, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7BB4, 0x00000056, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF56, 0xFFFFFE70, 0xFFFFFF38, 0x0000004B, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFFFFFF6A, 0xFFFFFE70, 0x000000C8, 0x0000004B, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFFFFFF7E, 0xFFFFFE70, 0xFFFFFF38, 0x0000004B, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFF92, 0xFFFFFE70, 0x000000C8, 0x0000004B, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000A5, 0x00000044, 0x00000001, D_80240950_9C3260, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000043, 0x00000006, PlaySoundAt, 0x000001E2, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000024, 0x00000002, 0xF8405E17, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C6C_9C457C -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFB2, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CAC_9C45BC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CBC_9C45CC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CCC_9C45DC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CDC_9C45EC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CEC_9C45FC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CFC_9C460C -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFB2, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D3C_9C464C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D4C_9C465C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D5C_9C466C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D6C_9C467C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D7C_9C468C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D8C_9C469C -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFB2, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DCC_9C46DC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DDC_9C46EC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DEC_9C46FC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DFC_9C470C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E0C_9C471C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E1C_9C472C -.word 0x00660002, 0x00220018, D_80241120_9C3A30, D_80241880_9C4190, D_80241170_9C3A80, D_80241870_9C4180, D_80241160_9C3A70, D_80241890_9C41A0, 0x00000F00, 0x00000000, 0x00000000 - -dlabel D_80241E48_9C4758 -.word 0x00660102, 0x00220018, D_80241C6C_9C457C, D_80241CDC_9C45EC, D_80241CBC_9C45CC, D_80241CCC_9C45DC, D_80241CAC_9C45BC, D_80241CEC_9C45FC, 0x00000F00, 0x00000000, 0x00000000 - -dlabel D_80241E74_9C4784 -.word 0x00660202, 0x00220018, D_80241CFC_9C460C, D_80241D6C_9C467C, D_80241D4C_9C465C, D_80241D5C_9C466C, D_80241D3C_9C464C, D_80241D7C_9C468C, 0x00000F00, 0x00000000, 0x00000000 - -dlabel D_80241EA0_9C47B0 -.word 0x00660302, 0x00220018, D_80241D8C_9C469C, D_80241DFC_9C470C, D_80241DDC_9C46EC, D_80241DEC_9C46FC, D_80241DCC_9C46DC, D_80241E0C_9C471C, 0x00000F00, 0x00000000, 0x00000000 - -dlabel D_80241ECC_9C47DC -.word 0x00000000, D_80241E1C_9C472C, 0x00000000, 0x00000000, 0x00000000, 0x00840D05, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660004, 0x00660002, 0x00660003, 0x00660003, 0x00660004, 0x00660004, 0x0066000A, 0x0066000A, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00660003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241E48_9C4758, 0x00000000, 0x00000000, 0x00000000, 0x00840D05, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660104, 0x00660102, 0x00660103, 0x00660103, 0x00660104, 0x00660104, 0x0066010A, 0x0066010A, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00660103, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80241E74_9C4784, 0x00000000, 0x00000000, 0x00000000, 0x00840D05, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660204, 0x00660202, 0x00660203, 0x00660203, 0x00660204, 0x00660204, 0x0066020A, 0x0066020A, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00660203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_80241EA0_9C47B0, 0x00000000, 0x00000000, 0x00000000, 0x00840D05, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660304, 0x00660302, 0x00660303, 0x00660303, 0x00660304, 0x00660304, 0x0066030A, 0x0066030A, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00660303, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80241ECC_9C47DC, 0x07000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_10/9C4FC0.data.s b/ver/us/asm/data/world/area_trd/trd_10/9C4FC0.data.s deleted file mode 100644 index b8161ab59c..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_10/9C4FC0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802426B0_9C4FC0 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426C0_9C4FD0 -.word 0x00000043, 0x00000003, EnableGroup, 0x0000000F, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000019, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000015, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000023, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000025, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000020, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802427D4_9C50E4 -.word 0x00000043, 0x00000005, TranslateGroup, 0x0000000F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000005, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000001, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000019, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000015, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000025, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001C, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000020, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242950_9C5260 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000064, 0x00000046, 0x00000001, D_802427D4_9C50E4, 0x00000024, 0x00000002, 0xF971888D, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF971888D, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0xFFFFFF9C, 0x0000003C, 0x00000004, 0x00000043, 0x00000006, PlaySoundAt, 0x000003BE, 0x00000000, 0x00000032, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000046, 0x00000001, D_802427D4_9C50E4, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFB2, 0x00000044, 0x00000001, D_802426C0_9C4FD0, 0x00000012, 0x00000000, 0x00000044, 0x00000001, D_80242950_9C5260, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240370_8B03E0.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240370_8B03E0.s index 7a24dda208..79590ad752 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240370_8B03E0.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240370_8B03E0.s @@ -4,7 +4,7 @@ glabel func_80240370_8B03E0 /* 8B03E0 80240370 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 8B03E4 80240374 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B03E8 80240378 0C00D77C */ jal func_80035DF0 +/* 8B03E8 80240378 0C00D77C */ jal set_map_change_fade_rate /* 8B03EC 8024037C 24040001 */ addiu $a0, $zero, 1 /* 8B03F0 80240380 8FBF0010 */ lw $ra, 0x10($sp) /* 8B03F4 80240384 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C_8DA37C.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C_8DA37C.s index 408ae8f275..d16686296e 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C_8DA37C.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C_8DA37C.s @@ -4,7 +4,7 @@ glabel func_8024027C_8DA37C /* 8DA37C 8024027C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 8DA380 80240280 AFBF0010 */ sw $ra, 0x10($sp) -/* 8DA384 80240284 0C00D77C */ jal func_80035DF0 +/* 8DA384 80240284 0C00D77C */ jal set_map_change_fade_rate /* 8DA388 80240288 2404000A */ addiu $a0, $zero, 0xa /* 8DA38C 8024028C 8FBF0010 */ lw $ra, 0x10($sp) /* 8DA390 80240290 24020002 */ addiu $v0, $zero, 2 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s b/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s deleted file mode 100644 index d85ef3cc56..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802451C0_9B6950 -.double 0.7142857142857143 - -.section .text - -glabel func_80240724_9B1EB4 -/* 9B1EB4 80240724 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B1EB8 80240728 24040001 */ addiu $a0, $zero, 1 -/* 9B1EBC 8024072C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 9B1EC0 80240730 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 9B1EC4 80240734 AFBF0014 */ sw $ra, 0x14($sp) -/* 9B1EC8 80240738 AFB00010 */ sw $s0, 0x10($sp) -/* 9B1ECC 8024073C 846200B2 */ lh $v0, 0xb2($v1) -/* 9B1ED0 80240740 3C018024 */ lui $at, %hi(D_802451C0_9B6950) -/* 9B1ED4 80240744 D42051C0 */ ldc1 $f0, %lo(D_802451C0_9B6950)($at) -/* 9B1ED8 80240748 3C013F36 */ lui $at, 0x3f36 -/* 9B1EDC 8024074C 3421DB6E */ ori $at, $at, 0xdb6e -/* 9B1EE0 80240750 44813000 */ mtc1 $at, $f6 -/* 9B1EE4 80240754 3C108024 */ lui $s0, %hi(D_802451F0) -/* 9B1EE8 80240758 261051F0 */ addiu $s0, $s0, %lo(D_802451F0) -/* 9B1EEC 8024075C AE000000 */ sw $zero, ($s0) -/* 9B1EF0 80240760 AE000010 */ sw $zero, 0x10($s0) -/* 9B1EF4 80240764 AE000020 */ sw $zero, 0x20($s0) -/* 9B1EF8 80240768 AE000024 */ sw $zero, 0x24($s0) -/* 9B1EFC 8024076C 44826000 */ mtc1 $v0, $f12 -/* 9B1F00 80240770 00000000 */ nop -/* 9B1F04 80240774 46806320 */ cvt.s.w $f12, $f12 -/* 9B1F08 80240778 46006121 */ cvt.d.s $f4, $f12 -/* 9B1F0C 8024077C 46202102 */ mul.d $f4, $f4, $f0 -/* 9B1F10 80240780 00000000 */ nop -/* 9B1F14 80240784 AE000028 */ sw $zero, 0x28($s0) -/* 9B1F18 80240788 3C013FE0 */ lui $at, 0x3fe0 -/* 9B1F1C 8024078C 44810800 */ mtc1 $at, $f1 -/* 9B1F20 80240790 44800000 */ mtc1 $zero, $f0 -/* 9B1F24 80240794 0080102D */ daddu $v0, $a0, $zero -/* 9B1F28 80240798 AE02000C */ sw $v0, 0xc($s0) -/* 9B1F2C 8024079C 846200B0 */ lh $v0, 0xb0($v1) -/* 9B1F30 802407A0 C46A0028 */ lwc1 $f10, 0x28($v1) -/* 9B1F34 802407A4 C4680030 */ lwc1 $f8, 0x30($v1) -/* 9B1F38 802407A8 46202102 */ mul.d $f4, $f4, $f0 -/* 9B1F3C 802407AC 00000000 */ nop -/* 9B1F40 802407B0 C460002C */ lwc1 $f0, 0x2c($v1) -/* 9B1F44 802407B4 44821000 */ mtc1 $v0, $f2 -/* 9B1F48 802407B8 00000000 */ nop -/* 9B1F4C 802407BC 468010A0 */ cvt.s.w $f2, $f2 -/* 9B1F50 802407C0 E6020038 */ swc1 $f2, 0x38($s0) -/* 9B1F54 802407C4 E60C003C */ swc1 $f12, 0x3c($s0) -/* 9B1F58 802407C8 E60A0014 */ swc1 $f10, 0x14($s0) -/* 9B1F5C 802407CC E608001C */ swc1 $f8, 0x1c($s0) -/* 9B1F60 802407D0 E606002C */ swc1 $f6, 0x2c($s0) -/* 9B1F64 802407D4 46000021 */ cvt.d.s $f0, $f0 -/* 9B1F68 802407D8 46240000 */ add.d $f0, $f0, $f4 -/* 9B1F6C 802407DC E6060030 */ swc1 $f6, 0x30($s0) -/* 9B1F70 802407E0 E6060034 */ swc1 $f6, 0x34($s0) -/* 9B1F74 802407E4 46200020 */ cvt.s.d $f0, $f0 -/* 9B1F78 802407E8 0C04E9C1 */ jal func_8013A704 -/* 9B1F7C 802407EC E6000018 */ swc1 $f0, 0x18($s0) -/* 9B1F80 802407F0 0000202D */ daddu $a0, $zero, $zero -/* 9B1F84 802407F4 3C058024 */ lui $a1, %hi(func_80240310_9B1AA0) -/* 9B1F88 802407F8 24A50310 */ addiu $a1, $a1, %lo(func_80240310_9B1AA0) -/* 9B1F8C 802407FC 0C048C56 */ jal create_generic_entity_world -/* 9B1F90 80240800 AE020004 */ sw $v0, 4($s0) -/* 9B1F94 80240804 AE020008 */ sw $v0, 8($s0) -/* 9B1F98 80240808 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B1F9C 8024080C 8FB00010 */ lw $s0, 0x10($sp) -/* 9B1FA0 80240810 24020002 */ addiu $v0, $zero, 2 -/* 9B1FA4 80240814 03E00008 */ jr $ra -/* 9B1FA8 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024081C_9B1FAC.s b/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024081C_9B1FAC.s deleted file mode 100644 index 554126eb82..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024081C_9B1FAC.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024081C_9B1FAC -/* 9B1FAC 8024081C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B1FB0 80240820 AFB00010 */ sw $s0, 0x10($sp) -/* 9B1FB4 80240824 3C108024 */ lui $s0, %hi(D_802451F0) -/* 9B1FB8 80240828 261051F0 */ addiu $s0, $s0, %lo(D_802451F0) -/* 9B1FBC 8024082C AFBF0014 */ sw $ra, 0x14($sp) -/* 9B1FC0 80240830 0C04EA15 */ jal func_8013A854 -/* 9B1FC4 80240834 8E040004 */ lw $a0, 4($s0) -/* 9B1FC8 80240838 0C048D70 */ jal free_generic_entity -/* 9B1FCC 8024083C 8E040008 */ lw $a0, 8($s0) -/* 9B1FD0 80240840 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B1FD4 80240844 8FB00010 */ lw $s0, 0x10($sp) -/* 9B1FD8 80240848 24020002 */ addiu $v0, $zero, 2 -/* 9B1FDC 8024084C 03E00008 */ jr $ra -/* 9B1FE0 80240850 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s b/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s deleted file mode 100644 index c9c625fc53..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240854_9B1FE4.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802451C8_9B6958 -.double 0.7142857142857143, 8.427663053820148e+252 - -.section .text - -glabel func_80240854_9B1FE4 -/* 9B1FE4 80240854 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9B1FE8 80240858 AFB10014 */ sw $s1, 0x14($sp) -/* 9B1FEC 8024085C 0080882D */ daddu $s1, $a0, $zero -/* 9B1FF0 80240860 AFBF001C */ sw $ra, 0x1c($sp) -/* 9B1FF4 80240864 AFB20018 */ sw $s2, 0x18($sp) -/* 9B1FF8 80240868 AFB00010 */ sw $s0, 0x10($sp) -/* 9B1FFC 8024086C 8E30000C */ lw $s0, 0xc($s1) -/* 9B2000 80240870 8E050000 */ lw $a1, ($s0) -/* 9B2004 80240874 0C0B210B */ jal evt_get_float_variable -/* 9B2008 80240878 26100004 */ addiu $s0, $s0, 4 -/* 9B200C 8024087C 8E050000 */ lw $a1, ($s0) -/* 9B2010 80240880 26100004 */ addiu $s0, $s0, 4 -/* 9B2014 80240884 4600018D */ trunc.w.s $f6, $f0 -/* 9B2018 80240888 44123000 */ mfc1 $s2, $f6 -/* 9B201C 8024088C 0C0B210B */ jal evt_get_float_variable -/* 9B2020 80240890 0220202D */ daddu $a0, $s1, $zero -/* 9B2024 80240894 8E050000 */ lw $a1, ($s0) -/* 9B2028 80240898 4600018D */ trunc.w.s $f6, $f0 -/* 9B202C 8024089C 44103000 */ mfc1 $s0, $f6 -/* 9B2030 802408A0 0C0B210B */ jal evt_get_float_variable -/* 9B2034 802408A4 0220202D */ daddu $a0, $s1, $zero -/* 9B2038 802408A8 3C028024 */ lui $v0, %hi(D_802451F0) -/* 9B203C 802408AC 244251F0 */ addiu $v0, $v0, %lo(D_802451F0) -/* 9B2040 802408B0 C442003C */ lwc1 $f2, 0x3c($v0) -/* 9B2044 802408B4 3C018024 */ lui $at, %hi(D_802451C8_9B6958) -/* 9B2048 802408B8 D42451C8 */ ldc1 $f4, %lo(D_802451C8_9B6958)($at) -/* 9B204C 802408BC 460010A1 */ cvt.d.s $f2, $f2 -/* 9B2050 802408C0 46241082 */ mul.d $f2, $f2, $f4 -/* 9B2054 802408C4 00000000 */ nop -/* 9B2058 802408C8 3C013FE0 */ lui $at, 0x3fe0 -/* 9B205C 802408CC 44812800 */ mtc1 $at, $f5 -/* 9B2060 802408D0 44802000 */ mtc1 $zero, $f4 -/* 9B2064 802408D4 00000000 */ nop -/* 9B2068 802408D8 46241082 */ mul.d $f2, $f2, $f4 -/* 9B206C 802408DC 00000000 */ nop -/* 9B2070 802408E0 4600018D */ trunc.w.s $f6, $f0 -/* 9B2074 802408E4 44033000 */ mfc1 $v1, $f6 -/* 9B2078 802408E8 44900000 */ mtc1 $s0, $f0 -/* 9B207C 802408EC 00000000 */ nop -/* 9B2080 802408F0 46800021 */ cvt.d.w $f0, $f0 -/* 9B2084 802408F4 44922000 */ mtc1 $s2, $f4 -/* 9B2088 802408F8 00000000 */ nop -/* 9B208C 802408FC 46802120 */ cvt.s.w $f4, $f4 -/* 9B2090 80240900 E4440014 */ swc1 $f4, 0x14($v0) -/* 9B2094 80240904 46220000 */ add.d $f0, $f0, $f2 -/* 9B2098 80240908 44831000 */ mtc1 $v1, $f2 -/* 9B209C 8024090C 00000000 */ nop -/* 9B20A0 80240910 468010A0 */ cvt.s.w $f2, $f2 -/* 9B20A4 80240914 E442001C */ swc1 $f2, 0x1c($v0) -/* 9B20A8 80240918 46200020 */ cvt.s.d $f0, $f0 -/* 9B20AC 8024091C E4400018 */ swc1 $f0, 0x18($v0) -/* 9B20B0 80240920 8FBF001C */ lw $ra, 0x1c($sp) -/* 9B20B4 80240924 8FB20018 */ lw $s2, 0x18($sp) -/* 9B20B8 80240928 8FB10014 */ lw $s1, 0x14($sp) -/* 9B20BC 8024092C 8FB00010 */ lw $s0, 0x10($sp) -/* 9B20C0 80240930 24020002 */ addiu $v0, $zero, 2 -/* 9B20C4 80240934 03E00008 */ jr $ra -/* 9B20C8 80240938 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s b/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s deleted file mode 100644 index cecff20fec..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_8024093C_9B20CC.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024093C_9B20CC -/* 9B20CC 8024093C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9B20D0 80240940 AFB10014 */ sw $s1, 0x14($sp) -/* 9B20D4 80240944 0080882D */ daddu $s1, $a0, $zero -/* 9B20D8 80240948 AFBF0020 */ sw $ra, 0x20($sp) -/* 9B20DC 8024094C AFB3001C */ sw $s3, 0x1c($sp) -/* 9B20E0 80240950 AFB20018 */ sw $s2, 0x18($sp) -/* 9B20E4 80240954 AFB00010 */ sw $s0, 0x10($sp) -/* 9B20E8 80240958 8E30000C */ lw $s0, 0xc($s1) -/* 9B20EC 8024095C 8E050000 */ lw $a1, ($s0) -/* 9B20F0 80240960 0C0B1EAF */ jal evt_get_variable -/* 9B20F4 80240964 26100004 */ addiu $s0, $s0, 4 -/* 9B20F8 80240968 8E050000 */ lw $a1, ($s0) -/* 9B20FC 8024096C 26100004 */ addiu $s0, $s0, 4 -/* 9B2100 80240970 0220202D */ daddu $a0, $s1, $zero -/* 9B2104 80240974 0C0B210B */ jal evt_get_float_variable -/* 9B2108 80240978 0040902D */ daddu $s2, $v0, $zero -/* 9B210C 8024097C 8E050000 */ lw $a1, ($s0) -/* 9B2110 80240980 26100004 */ addiu $s0, $s0, 4 -/* 9B2114 80240984 4600020D */ trunc.w.s $f8, $f0 -/* 9B2118 80240988 44134000 */ mfc1 $s3, $f8 -/* 9B211C 8024098C 0C0B210B */ jal evt_get_float_variable -/* 9B2120 80240990 0220202D */ daddu $a0, $s1, $zero -/* 9B2124 80240994 8E050000 */ lw $a1, ($s0) -/* 9B2128 80240998 4600020D */ trunc.w.s $f8, $f0 -/* 9B212C 8024099C 44104000 */ mfc1 $s0, $f8 -/* 9B2130 802409A0 0C0B210B */ jal evt_get_float_variable -/* 9B2134 802409A4 0220202D */ daddu $a0, $s1, $zero -/* 9B2138 802409A8 4600020D */ trunc.w.s $f8, $f0 -/* 9B213C 802409AC 44044000 */ mfc1 $a0, $f8 -/* 9B2140 802409B0 3C028024 */ lui $v0, %hi(D_802451F0) -/* 9B2144 802409B4 244251F0 */ addiu $v0, $v0, %lo(D_802451F0) -/* 9B2148 802409B8 1640000E */ bnez $s2, .L802409F4 -/* 9B214C 802409BC 0040182D */ daddu $v1, $v0, $zero -/* 9B2150 802409C0 44930000 */ mtc1 $s3, $f0 -/* 9B2154 802409C4 00000000 */ nop -/* 9B2158 802409C8 46800020 */ cvt.s.w $f0, $f0 -/* 9B215C 802409CC E4400020 */ swc1 $f0, 0x20($v0) -/* 9B2160 802409D0 44900000 */ mtc1 $s0, $f0 -/* 9B2164 802409D4 00000000 */ nop -/* 9B2168 802409D8 46800020 */ cvt.s.w $f0, $f0 -/* 9B216C 802409DC E4400024 */ swc1 $f0, 0x24($v0) -/* 9B2170 802409E0 44840000 */ mtc1 $a0, $f0 -/* 9B2174 802409E4 00000000 */ nop -/* 9B2178 802409E8 46800020 */ cvt.s.w $f0, $f0 -/* 9B217C 802409EC 0809028F */ j .L80240A3C -/* 9B2180 802409F0 E4400028 */ swc1 $f0, 0x28($v0) -.L802409F4: -/* 9B2184 802409F4 C4660020 */ lwc1 $f6, 0x20($v1) -/* 9B2188 802409F8 44930000 */ mtc1 $s3, $f0 -/* 9B218C 802409FC 00000000 */ nop -/* 9B2190 80240A00 46800020 */ cvt.s.w $f0, $f0 -/* 9B2194 80240A04 46003180 */ add.s $f6, $f6, $f0 -/* 9B2198 80240A08 C4640024 */ lwc1 $f4, 0x24($v1) -/* 9B219C 80240A0C 44900000 */ mtc1 $s0, $f0 -/* 9B21A0 80240A10 00000000 */ nop -/* 9B21A4 80240A14 46800020 */ cvt.s.w $f0, $f0 -/* 9B21A8 80240A18 46002100 */ add.s $f4, $f4, $f0 -/* 9B21AC 80240A1C C4620028 */ lwc1 $f2, 0x28($v1) -/* 9B21B0 80240A20 44840000 */ mtc1 $a0, $f0 -/* 9B21B4 80240A24 00000000 */ nop -/* 9B21B8 80240A28 46800020 */ cvt.s.w $f0, $f0 -/* 9B21BC 80240A2C 46001080 */ add.s $f2, $f2, $f0 -/* 9B21C0 80240A30 E4660020 */ swc1 $f6, 0x20($v1) -/* 9B21C4 80240A34 E4640024 */ swc1 $f4, 0x24($v1) -/* 9B21C8 80240A38 E4620028 */ swc1 $f2, 0x28($v1) -.L80240A3C: -/* 9B21CC 80240A3C 8FBF0020 */ lw $ra, 0x20($sp) -/* 9B21D0 80240A40 8FB3001C */ lw $s3, 0x1c($sp) -/* 9B21D4 80240A44 8FB20018 */ lw $s2, 0x18($sp) -/* 9B21D8 80240A48 8FB10014 */ lw $s1, 0x14($sp) -/* 9B21DC 80240A4C 8FB00010 */ lw $s0, 0x10($sp) -/* 9B21E0 80240A50 24020002 */ addiu $v0, $zero, 2 -/* 9B21E4 80240A54 03E00008 */ jr $ra -/* 9B21E8 80240A58 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240AD0_9B2260.s b/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240AD0_9B2260.s deleted file mode 100644 index dfac85a104..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240AD0_9B2260.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD0_9B2260 -/* 9B2260 80240AD0 3C038024 */ lui $v1, %hi(D_802451F0) -/* 9B2264 80240AD4 246351F0 */ addiu $v1, $v1, %lo(D_802451F0) -/* 9B2268 80240AD8 24020001 */ addiu $v0, $zero, 1 -/* 9B226C 80240ADC AC62000C */ sw $v0, 0xc($v1) -/* 9B2270 80240AE0 24020002 */ addiu $v0, $zero, 2 -/* 9B2274 80240AE4 03E00008 */ jr $ra -/* 9B2278 80240AE8 AC600010 */ sw $zero, 0x10($v1) -/* 9B227C 80240AEC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B2410/func_80240C80_9B2410.s b/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B2410/func_80240C80_9B2410.s deleted file mode 100644 index 37d2296523..0000000000 --- a/ver/us/asm/nonmatchings/world/area_trd/trd_06/9B2410/func_80240C80_9B2410.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_802451D8_9B6968 -.ascii "party_pinki\0\0\0\0\0\0\0\0\0\0\0\0\0" - -.section .text - -glabel func_80240C80_9B2410 -/* 9B2410 80240C80 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9B2414 80240C84 3C048024 */ lui $a0, %hi(D_802451D8_9B6968) -/* 9B2418 80240C88 248451D8 */ addiu $a0, $a0, %lo(D_802451D8_9B6968) -/* 9B241C 80240C8C 27A50010 */ addiu $a1, $sp, 0x10 -/* 9B2420 80240C90 AFBF0020 */ sw $ra, 0x20($sp) -/* 9B2424 80240C94 AFB1001C */ sw $s1, 0x1c($sp) -/* 9B2428 80240C98 0C016B3A */ jal load_asset_by_name -/* 9B242C 80240C9C AFB00018 */ sw $s0, 0x18($sp) -/* 9B2430 80240CA0 0040802D */ daddu $s0, $v0, $zero -/* 9B2434 80240CA4 0200202D */ daddu $a0, $s0, $zero -/* 9B2438 80240CA8 3C118024 */ lui $s1, %hi(D_80245230) -/* 9B243C 80240CAC 26315230 */ addiu $s1, $s1, %lo(D_80245230) -/* 9B2440 80240CB0 0C01BB7C */ jal decode_yay0 -/* 9B2444 80240CB4 0220282D */ daddu $a1, $s1, $zero -/* 9B2448 80240CB8 0C00AB1E */ jal general_heap_free -/* 9B244C 80240CBC 0200202D */ daddu $a0, $s0, $zero -/* 9B2450 80240CC0 3C048025 */ lui $a0, %hi(D_802491C0_CA70E0) -/* 9B2454 80240CC4 248491C0 */ addiu $a0, $a0, %lo(D_802491C0_CA70E0) -/* 9B2458 80240CC8 3C028024 */ lui $v0, %hi(D_80245430) -/* 9B245C 80240CCC 24425430 */ addiu $v0, $v0, %lo(D_80245430) -/* 9B2460 80240CD0 AC820000 */ sw $v0, ($a0) -/* 9B2464 80240CD4 24020096 */ addiu $v0, $zero, 0x96 -/* 9B2468 80240CD8 A4820008 */ sh $v0, 8($a0) -/* 9B246C 80240CDC 24020069 */ addiu $v0, $zero, 0x69 -/* 9B2470 80240CE0 A482000A */ sh $v0, 0xa($a0) -/* 9B2474 80240CE4 24020002 */ addiu $v0, $zero, 2 -/* 9B2478 80240CE8 AC82000C */ sw $v0, 0xc($a0) -/* 9B247C 80240CEC 24020001 */ addiu $v0, $zero, 1 -/* 9B2480 80240CF0 AC910004 */ sw $s1, 4($a0) -/* 9B2484 80240CF4 0C0496CB */ jal set_message_images -/* 9B2488 80240CF8 AC820010 */ sw $v0, 0x10($a0) -/* 9B248C 80240CFC 8FBF0020 */ lw $ra, 0x20($sp) -/* 9B2490 80240D00 8FB1001C */ lw $s1, 0x1c($sp) -/* 9B2494 80240D04 8FB00018 */ lw $s0, 0x18($sp) -/* 9B2498 80240D08 24020002 */ addiu $v0, $zero, 2 -/* 9B249C 80240D0C 03E00008 */ jr $ra -/* 9B24A0 80240D10 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9B24A4 80240D14 00000000 */ nop -/* 9B24A8 80240D18 00000000 */ nop -/* 9B24AC 80240D1C 00000000 */ nop diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 54c309139a..1fea50feec 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -8533,55 +8533,45 @@ segments: start: 0x999C70 vram: 0x80240000 subsegments: - - [0x999C70, c] - - [0x999F80, c] - - [0x99A240, c] - - [0x99A2A0, data] - - [0x99A410, data] - - [0x99AFB0, data] - - [0x99B280, data] - - [0x99C970] + - [0x999C70, c, trd_00_0_header] + - [0x999C70, c, trd_00_1_main] + - [0x999F80, c, trd_00_2_entity] + - [0x99A240, c, trd_00_3_npc] + - [0x99A2A0] - name: trd_01 dir: world/area_trd/trd_01 type: code start: 0x99C990 vram: 0x80240000 subsegments: - - [0x99C990, c] - - [0x99CCA0, c] - - [0x99CD80, c] - - [0x99E050, data] - - [0x99E110, data] - - [0x99F960, data] - - [0x99FD80, data] - - [0x9A0DB0] + - [0x99C990, c, trd_01_0_header] + - [0x99C990, c, trd_01_1_main] + - [0x99CCA0, c, trd_01_2_entity] + - [0x99CD80, c, trd_01_3_npc] + - [0x99E050] - name: trd_02 dir: world/area_trd/trd_02 type: code start: 0x9A0FE0 vram: 0x80240000 subsegments: - - [0x9A0FE0, c] - - [0x9A10C0, c] - - [0x9A2A30, data] - - [0x9A2B00, data] - - [0x9A3870, data] - - [0x9A3AB0, data] - - [0x9A42B0] + - [0x9A0FE0, c, trd_02_0_header] + - [0x9A0FE0, c, trd_02_1_main] + - [0x9A0FE0, c, trd_02_2_entity] + - [0x9A10C0, c, trd_02_3_npc] + - [0x9A2A30] - name: trd_03 dir: world/area_trd/trd_03 type: code start: 0x9A4650 vram: 0x80240000 subsegments: - - [0x9A4650, c] - - [0x9A46F0, c] - - [0x9A4ED0, c] - - [0x9A5040, data] - - [0x9A51A0, data] - - [0x9A5FF0, data] - - [0x9A60F0, data] - - [0x9A8380] + - [0x9A4650, c, trd_03_0_header] + - [0x9A4650, c, trd_03_1_main] + - [0x9A4650, c, trd_03_2_entity] + - [0x9A46F0, c, trd_03_3_npc] + - [0x9A4ED0, c, trd_03_4_puzzle] + - [0x9A5040] - name: trd_04 dir: world/area_trd/trd_04 type: code @@ -8599,40 +8589,37 @@ segments: start: 0x9AE700 vram: 0x80240000 subsegments: - - [0x9AE700, c] - - [0x9AEE20, c] - - [0x9AEE70, data] - - [0x9AEFC0, data] - - [0x9AF7C0, data] - - [0x9AF820, data] - - [0x9B1760] + - [0x9AE700, c, trd_05_0_header] + - [0x9AE700, c, trd_05_1_main] + - [0x9AE700, c, trd_05_2_entity] + - [0x9AE720, c, trd_05_3_trap] + - [0x9AEE20, c, trd_05_4_npc] + - [0x9AEE70] - name: trd_06 dir: world/area_trd/trd_06 type: code start: 0x9B1790 vram: 0x80240000 subsegments: - - [0x9B1790, c] - - [0x9B1AA0, c] - - [0x9B2280, c] - - [0x9B2410, c] - - [0x9B24B0, data] - - [0x9B2610, data] - - [0x9B5FC0, data] - - [0x9B6940] + - [0x9B1790, c, trd_06_0_header] + - [0x9B1790, c, trd_06_1_main] + - [0x9B1AA0, c, trd_06_2_falling] + - [0x9B2280, c, trd_06_3_npc_prisoners] + - [0x9B2280, c, trd_06_4_npc_koopa_bros] + - [0x9B2280, c, trd_06_5_entity] + - [0x9B2410, c, trd_06_6_party_image] + - [0x9B24B0] - name: trd_07 dir: world/area_trd/trd_07 type: code start: 0x9B6980 vram: 0x80240000 subsegments: - - [0x9B6980, c] - - [0x9B6C90, c] - - [0x9B9270, data] - - [0x9B9310, data] - - [0x9B9760, data] - - [0x9BA050, data] - - [0x9BB190] + - [0x9B6980, c, trd_07_0_header] + - [0x9B6980, c, trd_07_1_main] + - [0x9B6C90, c, trd_07_2_npc] + - [0x9B8F80, c, trd_07_3_magic_doors] + - [0x9B9270] - name: trd_08 dir: world/area_trd/trd_08 type: code @@ -8650,26 +8637,23 @@ segments: start: 0x9BD660 vram: 0x80240000 subsegments: - - [0x9BD660, c] - - [0x9BD720, c] - - [0x9BD830, data] - - [0x9BD960, data] - - [0x9BDD80, data] - - [0x9BDE80, data] - - [0x9C24C0, data] - - [0x9C28F0] + - [0x9BD660, c, trd_09_0_header] + - [0x9BD660, c, trd_09_1_main] + - [0x9BD660, c, trd_09_2_entity] + - [0x9BD660, c, trd_09_3_npcs] + - [0x9BD720, c, trd_09_4_demo] + - [0x9BD830] - name: trd_10 dir: world/area_trd/trd_10 type: code start: 0x9C2910 vram: 0x80240000 subsegments: - - [0x9C2910, c] - - [0x9C3130, c] - - [0x9C3160, data] - - [0x9C3A30, data] - - [0x9C4FC0, data] - - [0x9C53B0] + - [0x9C2910, c, trd_10_0_header] + - [0x9C2910, c, trd_10_1_main] + - [0x9C3130, c, trd_10_2_npc] + - [0x9C3130, c, trd_10_3_fake_bowser] + - [0x9C3160] - name: nok_01 dir: world/area_nok/nok_01 type: code diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 657aa3071f..6a1474a4e9 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -211,7 +211,7 @@ state_init_world = 0x80035D30; // type:func rom:0x11130 state_step_world = 0x80035D54; // type:func rom:0x11154 state_drawUI_world = 0x80035DA0; // type:func rom:0x111A0 state_world_draw_aux_ui = 0x80035DCC; // type:func rom:0x111CC -func_80035DF0 = 0x80035DF0; // type:func rom:0x111F0 +set_map_change_fade_rate = 0x80035DF0; // type:func rom:0x111F0 state_init_enter_demo = 0x80035E00; // type:func rom:0x11200 state_init_enter_world = 0x80035E24; // type:func rom:0x11224 init_enter_world_shared = 0x80035E54; // type:func rom:0x11254 @@ -415,7 +415,7 @@ func_800457F8 = 0x800457F8; // type:func rom:0x20BF8 GetEncounterTriggerHitTier = 0x8004580C; // type:func rom:0x20C0C func_80045838 = 0x80045838; // type:func rom:0x20C38 func_800458CC = 0x800458CC; // type:func rom:0x20CCC -func_80045900 = 0x80045900; // type:func rom:0x20D00 +OnPlayerFled = 0x80045900; // type:func rom:0x20D00 SetTattleMsg = 0x80045A58; // type:func rom:0x20E58 func_80045AC0 = 0x80045AC0; // type:func rom:0x20EC0 func_80045B10 = 0x80045B10; // type:func rom:0x20F10 @@ -2403,7 +2403,7 @@ mgm_maps = 0x80093450; // type:data rom:0x6E850 gv_maps = 0x800934D0; // type:data rom:0x6E8D0 gAreas = 0x800934F0; // type:data rom:0x6E8F0 size:0x1D0 D_800936C0 = 0x800936C0; // type:data rom:0x6EAC0 -D_800936DC = 0x800936DC; // type:data rom:0x6EADC +EVS_NpcHitRecoil = 0x800936DC; // type:data rom:0x6EADC D_800939A4 = 0x800939A4; // type:data rom:0x6EDA4 D_800939B4 = 0x800939B4; // type:data rom:0x6EDB4 FrameBuf = 0x80093BA8; // rom:0x6EFA8 @@ -2734,9 +2734,9 @@ D_800A0931 = 0x800A0931; // type:data rom:0x7BD31 D_800A0932 = 0x800A0932; // type:data rom:0x7BD32 D_800A0934 = 0x800A0934; // type:data rom:0x7BD34 gMapTransitionAlpha = 0x800A0940; // rom:0x7BD40 -D_800A0942 = 0x800A0942; // type:data rom:0x7BD42 -D_800A0944 = 0x800A0944; // type:data rom:0x7BD44 -D_800A0946 = 0x800A0946; // type:data rom:0x7BD46 +gMapTransitionFadeRate = 0x800A0942; // type:data rom:0x7BD42 +gMapTransitionState = 0x800A0944; // type:data rom:0x7BD44 +gMapTransitionStateTime = 0x800A0946; // type:data rom:0x7BD46 D_800A0948 = 0x800A0948; // type:data rom:0x7BD48 D_800A094C = 0x800A094C; // type:data rom:0x7BD4C D_800A0950 = 0x800A0950; // type:data rom:0x7BD50 @@ -15510,7 +15510,7 @@ tik_02_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x86C864 tik_02_StashVars = 0x80240310; // type:func rom:0x86CA50 tik_02_GetItemName = 0x802403C4; // type:func rom:0x86CB04 tik_02_SomeItemEntityFunc = 0x80240428; // type:func rom:0x86CB68 -tik_02_CheckItemFlags40 = 0x80240578; // type:func rom:0x86CCB8 +tik_02_IsItemBadge = 0x80240578; // type:func rom:0x86CCB8 tik_02_UnkPosFunc2 = 0x802405D0; // type:func rom:0x86CD10 func_80240940_86D080 = 0x80240940; // type:func rom:0x86D080 tik_02_varStash = 0x802410C0; // type:data rom:0x86D800 @@ -15548,7 +15548,7 @@ tik_05_UnkPosFunc2 = 0x80240310; // type:func rom:0x8750D0 tik_05_StashVars = 0x80240680; // type:func rom:0x875440 tik_05_GetItemName = 0x80240734; // type:func rom:0x8754F4 tik_05_SomeItemEntityFunc = 0x80240798; // type:func rom:0x875558 -tik_05_CheckItemFlags40 = 0x802408E8; // type:func rom:0x8756A8 +tik_05_IsItemBadge = 0x802408E8; // type:func rom:0x8756A8 func_8024093C_8756FC = 0x8024093C; // type:func rom:0x8756FC tik_05_SetEntityPosition = 0x80240984; // type:func rom:0x875744 D_80241800_8765C0 = 0x80241800; // type:data rom:0x8765C0 @@ -15674,7 +15674,7 @@ tik_12_UnkPosFunc2 = 0x802405F0; // type:func rom:0x8891C0 tik_12_StashVars = 0x80240960; // type:func rom:0x889530 tik_12_GetItemName = 0x80240A14; // type:func rom:0x8895E4 tik_12_SomeItemEntityFunc = 0x80240A78; // type:func rom:0x889648 -tik_12_CheckItemFlags40 = 0x80240BC8; // type:func rom:0x889798 +tik_12_IsItemBadge = 0x80240BC8; // type:func rom:0x889798 tik_12_SuperBlock_SetOverride40 = 0x80240C1C; // type:func rom:0x8897EC tik_12_SuperBlock_ClearOverride40 = 0x80240C38; // type:func rom:0x889808 tik_12_SuperBlock_HideBlockContent = 0x80240C58; // type:func rom:0x889828 @@ -15937,7 +15937,7 @@ kmr_02_StationaryAI_LosePlayer = 0x8024191C; // type:func rom:0x8B198C kmr_02_StationaryAI_ReturnHomeInit = 0x80241964; // type:func rom:0x8B19D4 kmr_02_StationaryAI_ReturnHome = 0x80241A10; // type:func rom:0x8B1A80 kmr_02_StationaryAI_Main = 0x80241C18; // type:func rom:0x8B1C88 -kmr_02_UnkFunc41 = 0x80241E90; // type:func rom:0x8B1F00 +kmr_02_ChangeNpcToPartner = 0x80241E90; // type:func rom:0x8B1F00 func_80242014_8B2084 = 0x80242014; // type:func rom:0x8B2084 func_80242040_8B20B0 = 0x80242040; // type:func rom:0x8B20B0 kmr_02_AddPlayerHandsOffset = 0x8024209C; // type:func rom:0x8B210C @@ -16003,7 +16003,7 @@ D_80257D48_8C7DB8 = 0x80257D48; // type:data rom:0x8C7DB8 D_80257D50_8C7DC0 = 0x80257D50; // type:data rom:0x8C7DC0 D_80257F08_8C7F78 = 0x80257F08; // type:data rom:0x8C7F78 D_80257F10_8C7F80 = 0x80257F10; // type:data rom:0x8C7F80 -kmr_03_UnkFunc41 = 0x80240000; // type:func rom:0x8C7F90 +kmr_03_ChangeNpcToPartner = 0x80240000; // type:func rom:0x8C7F90 kmr_03_CheckPartnerFlags1000 = 0x80240184; // type:func rom:0x8C8114 kmr_03_func_802401B0_8C8140 = 0x802401B0; // type:func rom:0x8C8140 kmr_03_UnkPositionFunc = 0x80240218; // type:func rom:0x8C81A8 @@ -16131,7 +16131,7 @@ D_80242680_8D8480 = 0x80242680; // type:data rom:0x8D8480 kmr_10_StashVars = 0x80240000; // type:func rom:0x8D84D0 kmr_10_GetItemName = 0x802400B4; // type:func rom:0x8D8584 kmr_10_SomeItemEntityFunc = 0x80240118; // type:func rom:0x8D85E8 -kmr_10_CheckItemFlags40 = 0x80240268; // type:func rom:0x8D8738 +kmr_10_IsItemBadge = 0x80240268; // type:func rom:0x8D8738 func_802402BC_8D878C = 0x802402BC; // type:func rom:0x8D878C kmr_10_SetEntityPosition = 0x80240304; // type:func rom:0x8D87D4 kmr_10_foliage_setup_shear_mtx = 0x802403D0; // type:func rom:0x8D88A0 @@ -16410,7 +16410,7 @@ D_80242D60_918AD0 = 0x80242D60; // type:data rom:0x918AD0 iwa_03_StashVars = 0x80240000; // type:func rom:0x918BB0 iwa_03_GetItemName = 0x802400B4; // type:func rom:0x918C64 iwa_03_SomeItemEntityFunc = 0x80240118; // type:func rom:0x918CC8 -iwa_03_CheckItemFlags40 = 0x80240268; // type:func rom:0x918E18 +iwa_03_IsItemBadge = 0x80240268; // type:func rom:0x918E18 func_802402BC_918E6C = 0x802402BC; // type:func rom:0x918E6C iwa_03_CleftAI_CanSeePlayer = 0x80240340; // type:func rom:0x918EF0 iwa_03_CleftAI_HidingInit = 0x802404A0; // type:func rom:0x919050 @@ -16481,7 +16481,7 @@ iwa_10_SuperBlock_WhiteScreenFlash = 0x80240E28; // type:func rom:0x91F398 iwa_10_SuperBlock_PartnerSparkles2 = 0x80240F68; // type:func rom:0x91F4D8 iwa_10_SuperBlock_PartnerSparkles4 = 0x80240FB0; // type:func rom:0x91F520 iwa_10_SuperBlock_WaitForPlayerToLand = 0x80240FF8; // type:func rom:0x91F568 -iwa_10_UnkFunc41 = 0x80241030; // type:func rom:0x91F5A0 +iwa_10_ChangeNpcToPartner = 0x80241030; // type:func rom:0x91F5A0 iwa_10_GetNpcCollisionHeight = 0x802411B4; // type:func rom:0x91F724 iwa_10_AddPlayerHandsOffset = 0x80241210; // type:func rom:0x91F780 func_802413E0_91F950 = 0x802413E0; // type:func rom:0x91F950 @@ -17219,7 +17219,7 @@ D_80241650_986480 = 0x80241650; // type:data rom:0x986480 isk_09_StashVars = 0x80240000; // type:func rom:0x9864E0 isk_09_GetItemName = 0x802400B4; // type:func rom:0x986594 isk_09_SomeItemEntityFunc = 0x80240118; // type:func rom:0x9865F8 -isk_09_CheckItemFlags40 = 0x80240268; // type:func rom:0x986748 +isk_09_IsItemBadge = 0x80240268; // type:func rom:0x986748 func_802402BC_98679C = 0x802402BC; // type:func rom:0x98679C func_802402F0_9867D0 = 0x802402F0; // type:func rom:0x9867D0 D_802406F0_986BD0 = 0x802406F0; // type:data rom:0x986BD0 @@ -17311,14 +17311,13 @@ isk_18_TackleAI_Main = 0x80240394; // type:func rom:0x998304 isk_18_func_80240814_97BE44 = 0x802407D4; // type:func rom:0x998744 isk_18_AwaitPlayerNearNpc = 0x8024081C; // type:func rom:0x99878C isk_18_func_802408B4_97BEE4 = 0x80240874; // type:func rom:0x9987E4 -D_80241770_9996E0 = 0x80241770; // type:data rom:0x9996E0 trd_00_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x999C70 trd_00_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x999D94 trd_00_StashVars = 0x80240310; // type:func rom:0x999F80 trd_00_GetItemName = 0x802403C4; // type:func rom:0x99A034 trd_00_SomeItemEntityFunc = 0x80240428; // type:func rom:0x99A098 -trd_00_CheckItemFlags40 = 0x80240578; // type:func rom:0x99A1E8 -PostChapter1StatUpdate = 0x802405D0; // type:func rom:0x99A240 +trd_00_IsItemBadge = 0x80240578; // type:func rom:0x99A1E8 +trd_00_UpgradeStarPower = 0x802405D0; // type:func rom:0x99A240 trd_00_SyncStatusMenu = 0x8024060C; // type:func rom:0x99A27C trd_00_varStash = 0x80241340; // type:data rom:0x99AFB0 trd_01_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x99C990 @@ -17340,11 +17339,7 @@ trd_01_StationaryAI_LosePlayer = 0x802410BC; // type:func rom:0x99DA4C trd_01_StationaryAI_ReturnHomeInit = 0x80241104; // type:func rom:0x99DA94 trd_01_StationaryAI_ReturnHome = 0x802411B0; // type:func rom:0x99DB40 trd_01_StationaryAI_Main = 0x802413B8; // type:func rom:0x99DD48 -func_80241630_99DFC0 = 0x80241630; // type:func rom:0x99DFC0 -D_80244440_9A0DD0 = 0x80244440; // type:data rom:0x9A0DD0 -D_802444A0_9A0E30 = 0x802444A0; // type:data rom:0x9A0E30 -D_802444A8_9A0E38 = 0x802444A8; // type:data rom:0x9A0E38 -D_802444B0_9A0E40 = 0x802444B0; // type:data rom:0x9A0E40 +trd_01_func_80241630_99DFC0 = 0x80241630; // type:func rom:0x99DFC0 trd_02_SetEntityFlags100000 = 0x80240000; // type:func rom:0x9A0FE0 trd_02_GetEntityPosition = 0x80240034; // type:func rom:0x9A1014 trd_02_set_script_owner_npc_anim = 0x802400E0; // type:func rom:0x9A10C0 @@ -17365,18 +17360,14 @@ trd_02_PatrolAI_LosePlayer = 0x80241320; // type:func rom:0x9A2300 trd_02_PatrolNoAttackAI_15 = 0x80241388; // type:func rom:0x9A2368 trd_02_PatrolNoAttackAI_Main = 0x80241448; // type:func rom:0x9A2428 trd_02_KoopaPatrolAI_Main = 0x80241744; // type:func rom:0x9A2724 -D_802432E0_9A42C0 = 0x802432E0; // type:data rom:0x9A42C0 -D_80243340_9A4320 = 0x80243340; // type:data rom:0x9A4320 -D_80243348_9A4328 = 0x80243348; // type:data rom:0x9A4328 -func_80240000_9A4650 = 0x80240000; // type:func rom:0x9A4650 -GetFrameCounter = 0x8024006C; // type:func rom:0x9A46BC +trd_02_GetHiddenDoorPushDirection = 0x80240000; // type:func rom:0x9A4650 +trd_02_GetFrameCounter = 0x8024006C; // type:func rom:0x9A46BC trd_03_set_script_owner_npc_anim = 0x802400A0; // type:func rom:0x9A46F0 trd_03_UnkDistFunc = 0x8024011C; // type:func rom:0x9A476C trd_03_UnkNpcAIFunc12 = 0x80240250; // type:func rom:0x9A48A0 trd_03_set_script_owner_npc_col_height = 0x802403B4; // type:func rom:0x9A4A04 trd_03_TackleAI_Main = 0x80240434; // type:func rom:0x9A4A84 -trd_03_UnkTrigFunc001 = 0x80240880; // type:func rom:0x9A4ED0 -D_80243D40_9A8390 = 0x80243D40; // type:data rom:0x9A8390 +trd_03_GetLeftRightPoints = 0x80240880; // type:func rom:0x9A4ED0 trd_04_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x9A83F0 trd_04_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x9A8514 trd_04_SetEntityFlags100000 = 0x80240310; // type:func rom:0x9A8700 @@ -17417,36 +17408,27 @@ trd_04_ParatroopaAI_Overshoot = 0x802434F4; // type:func rom:0x9AB8E4 trd_04_ParatroopaAI_Reset = 0x8024360C; // type:func rom:0x9AB9FC trd_04_ParatroopaAI_Main = 0x80243650; // type:func rom:0x9ABA40 trd_04_FlyingAI_JumpVels = 0x802456F4; // type:data rom:0x9ADAE4 -D_80245EE0_9AE2D0 = 0x80245EE0; // type:data rom:0x9AE2D0 -D_80245F40_9AE330 = 0x80245F40; // type:data rom:0x9AE330 -D_80245F48_9AE338 = 0x80245F48; // type:data rom:0x9AE338 -D_80246270_9AE660 = 0x80246270; // type:data rom:0x9AE660 -D_80246278_9AE668 = 0x80246278; // type:data rom:0x9AE668 -D_80246280_9AE670 = 0x80246280; // type:data rom:0x9AE670 -func_80240000_9AE700 = 0x80240000; // type:func rom:0x9AE700 -func_80240020_9AE720 = 0x80240020; // type:func rom:0x9AE720 -func_80240404_9AEB04 = 0x80240404; // type:func rom:0x9AEB04 -func_802404D0_9AEBD0 = 0x802404D0; // type:func rom:0x9AEBD0 -func_80240508_9AEC08 = 0x80240508; // type:func rom:0x9AEC08 -func_802405FC_9AECFC = 0x802405FC; // type:func rom:0x9AECFC -func_80240720_9AEE20 = 0x80240720; // type:func rom:0x9AEE20 -D_80243070_9B1770 = 0x80243070; // type:data rom:0x9B1770 -D_80243078_9B1778 = 0x80243078; // type:data rom:0x9B1778 +trd_05_SetMapChangeFadeRate = 0x80240000; // type:func rom:0x9AE700 +trd_05_appendGfx_FallingSprite = 0x80240020; // type:func rom:0x9AE720 +trd_05_InitializeFallingSprite = 0x80240404; // type:func rom:0x9AEB04 +trd_05_DeleteFallingSprite = 0x802404D0; // type:func rom:0x9AEBD0 +trd_05_SetFallingSpritePos = 0x80240508; // type:func rom:0x9AEC08 +trd_05_SetFallingSpriteRot = 0x802405FC; // type:func rom:0x9AECFC +trd_05_MakeHammerDust = 0x80240720; // type:func rom:0x9AEE20 +trd_05_D_80243070_9B1770 = 0x80243070; // type:data rom:0x9B1770 +trd_05_D_80243078_9B1778 = 0x80243078; // type:data rom:0x9B1778 trd_06_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x9B1790 trd_06_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x9B18B4 -func_80240310_9B1AA0 = 0x80240310; // type:func rom:0x9B1AA0 -func_80240724_9B1EB4 = 0x80240724; // type:func rom:0x9B1EB4 -func_8024081C_9B1FAC = 0x8024081C; // type:func rom:0x9B1FAC -func_80240854_9B1FE4 = 0x80240854; // type:func rom:0x9B1FE4 -func_8024093C_9B20CC = 0x8024093C; // type:func rom:0x9B20CC -func_80240A5C_9B21EC = 0x80240A5C; // type:func rom:0x9B21EC -func_80240A70_9B2200 = 0x80240A70; // type:func rom:0x9B2200 -func_80240AD0_9B2260 = 0x80240AD0; // type:func rom:0x9B2260 -trd_06_UnkFunc41 = 0x80240AF0; // type:func rom:0x9B2280 -func_80240C80_9B2410 = 0x80240C80; // type:func rom:0x9B2410 -D_802451C0_9B6950 = 0x802451C0; // type:data rom:0x9B6950 -D_802451C8_9B6958 = 0x802451C8; // type:data rom:0x9B6958 -D_802451D8_9B6968 = 0x802451D8; // type:data rom:0x9B6968 +trd_06_appendGfx_FallingSprite = 0x80240310; // type:func rom:0x9B1AA0 +trd_06_InitializeFallingSprite = 0x80240724; // type:func rom:0x9B1EB4 +trd_06_DeleteFallingSprite = 0x8024081C; // type:func rom:0x9B1FAC +trd_06_SetFallingSpritePos = 0x80240854; // type:func rom:0x9B1FE4 +trd_06_SetFallingSpriteRot = 0x8024093C; // type:func rom:0x9B20CC +trd_06_EnableFallingAnimation = 0x80240A5C; // type:func rom:0x9B21EC +trd_06_InitializeFallingPartner = 0x80240A70; // type:func rom:0x9B2200 +trd_06_InitializeGetUp = 0x80240AD0; // type:func rom:0x9B2260 +trd_06_ChangeNpcToPartner = 0x80240AF0; // type:func rom:0x9B2280 +trd_06_func_80240C80_9B2410 = 0x80240C80; // type:func rom:0x9B2410 trd_07_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x9B6980 trd_07_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x9B6AA4 trd_07_set_script_owner_npc_anim = 0x80240310; // type:func rom:0x9B6C90 @@ -17471,30 +17453,25 @@ trd_07_ParatroopaAI_Overshoot = 0x802421C0; // type:func rom:0x9B8B40 trd_07_ParatroopaAI_Reset = 0x802422D8; // type:func rom:0x9B8C58 trd_07_ParatroopaAI_Main = 0x8024231C; // type:func rom:0x9B8C9C trd_07_GetDefeatedEnemyCount = 0x8024256C; // type:func rom:0x9B8EEC -func_80242600_9B8F80 = 0x80242600; // type:func rom:0x9B8F80 -func_802427FC_9B917C = 0x802427FC; // type:func rom:0x9B917C +trd_07_func_80242600_9B8F80 = 0x80242600; // type:func rom:0x9B8F80 +trd_07_func_802427FC_9B917C = 0x802427FC; // type:func rom:0x9B917C trd_07_FlyingAI_JumpVels = 0x80242EAC; // type:data rom:0x9B982C -D_80244820_9BB1A0 = 0x80244820; // type:data rom:0x9BB1A0 -D_80244880_9BB200 = 0x80244880; // type:data rom:0x9BB200 -D_80244888_9BB208 = 0x80244888; // type:data rom:0x9BB208 -D_80244890_9BB210 = 0x80244890; // type:data rom:0x9BB210 trd_08_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x9BB2A0 trd_08_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x9BB3C4 trd_08_FireBarAI_Main = 0x80240310; // type:func rom:0x9BB5B0 trd_08_FireBarAI_Callback = 0x80240904; // type:func rom:0x9BBBA4 trd_08_FireBar_Sounds = 0x80240F00; // type:data rom:0x9BC1A0 trd_08_EVS_FireBar_Defeated = 0x80240F2C; // type:data rom:0x9BC1CC -func_80240000_9BD660 = 0x80240000; // type:func rom:0x9BD660 -func_802400C0_9BD720 = 0x802400C0; // type:func rom:0x9BD720 -D_80245234_9C2894 = 0x80245234; // type:data rom:0x9C2894 +trd_09_func_80240000_9BD660 = 0x80240000; // type:func rom:0x9BD660 +trd_09_func_802400C0_9BD720 = 0x802400C0; // type:func rom:0x9BD720 trd_10_StarSpiritEffectFunc1 = 0x80240000; // type:func rom:0x9C2910 trd_10_StarSpiritEffectFunc2 = 0x8024004C; // type:func rom:0x9C295C trd_10_StarSpiritEffectFunc3 = 0x802401AC; // type:func rom:0x9C2ABC trd_10_StarSpiritEffectFunc4 = 0x802405BC; // type:func rom:0x9C2ECC trd_10_StarSpiritEffectFunc5 = 0x802405FC; // type:func rom:0x9C2F0C trd_10_StarSpiritEffectFunc6 = 0x80240708; // type:func rom:0x9C3018 -func_802407F4_9C3104 = 0x802407F4; // type:func rom:0x9C3104 -func_80240820_9C3130 = 0x80240820; // type:func rom:0x9C3130 +trd_10_SetMapChangeFadeRate = 0x802407F4; // type:func rom:0x9C3104 +trd_10_func_80240820_9C3130 = 0x80240820; // type:func rom:0x9C3130 nok_01_StationaryAI_IdleInit = 0x80240000; // type:func rom:0x9C53E0 nok_01_StationaryAI_Idle = 0x802400B4; // type:func rom:0x9C5494 nok_01_StationaryAI_AlertInit = 0x802401D4; // type:func rom:0x9C55B4 @@ -17691,7 +17668,7 @@ nok_03_HoppingAI_Chase = 0x802408AC; // type:func rom:0x9EC09C nok_03_HoppingAI_LosePlayer = 0x80240BAC; // type:func rom:0x9EC39C nok_03_HoppingAI_Main = 0x80240BF0; // type:func rom:0x9EC3E0 D_802423B0_9EDBA0 = 0x802423B0; // type:data rom:0x9EDBA0 -nok_04_UnkFunc41 = 0x80240000; // type:func rom:0x9EDBF0 +nok_04_ChangeNpcToPartner = 0x80240000; // type:func rom:0x9EDBF0 nok_04_UnkFloatFunc = 0x80240184; // type:func rom:0x9EDD74 func_80240314_9EDF04 = 0x80240314; // type:func rom:0x9EDF04 func_802403C0_9EDFB0 = 0x802403C0; // type:func rom:0x9EDFB0 @@ -18234,7 +18211,7 @@ func_80241F98_A3B478 = 0x80241F98; // type:func rom:0xA3B478 dup2_hos_06_StashVars = 0x80241FD0; // type:func rom:0xA3B4B0 dup_hos_06_GetItemName = 0x80242084; // type:func rom:0xA3B564 hos_06_SomeItemEntityFunc = 0x802420E8; // type:func rom:0xA3B5C8 -hos_06_CheckItemFlags40 = 0x80242238; // type:func rom:0xA3B718 +hos_06_IsItemBadge = 0x80242238; // type:func rom:0xA3B718 func_8024228C_A3B76C = 0x8024228C; // type:func rom:0xA3B76C func_802424CC_A3B9AC = 0x802424CC; // type:func rom:0xA3B9AC hos_06_GetItemEmptyCount = 0x80242534; // type:func rom:0xA3BA14 @@ -18398,7 +18375,7 @@ func_8024034C_A577FC = 0x8024034C; // type:func rom:0xA577FC kpa_14_StashVars = 0x80240380; // type:func rom:0xA57830 kpa_14_GetItemName = 0x80240434; // type:func rom:0xA578E4 kpa_14_SomeItemEntityFunc = 0x80240498; // type:func rom:0xA57948 -kpa_14_CheckItemFlags40 = 0x802405E8; // type:func rom:0xA57A98 +kpa_14_IsItemBadge = 0x802405E8; // type:func rom:0xA57A98 kpa_14_SetEntityFlags100000 = 0x8024063C; // type:func rom:0xA57AEC kpa_14_GetEntityPosition = 0x80240670; // type:func rom:0xA57B20 kpa_14_func_80240710_A57BC0 = 0x80240710; // type:func rom:0xA57BC0 @@ -18410,7 +18387,7 @@ kpa_15_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA594B4 kpa_15_StashVars = 0x80240310; // type:func rom:0xA596A0 kpa_15_GetItemName = 0x802403C4; // type:func rom:0xA59754 kpa_15_SomeItemEntityFunc = 0x80240428; // type:func rom:0xA597B8 -kpa_15_CheckItemFlags40 = 0x80240578; // type:func rom:0xA59908 +kpa_15_IsItemBadge = 0x80240578; // type:func rom:0xA59908 kpa_15_varStash = 0x80240AA0; // type:data rom:0xA59E30 kpa_16_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xA5A030 kpa_16_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xA5A154 @@ -18958,7 +18935,7 @@ D_80244840_AF1C50 = 0x80244840; // type:data rom:0xAF1C50 kkj_17_StashVars = 0x80240000; // type:func rom:0xAF1C60 kkj_17_GetItemName = 0x802400B4; // type:func rom:0xAF1D14 kkj_17_SomeItemEntityFunc = 0x80240118; // type:func rom:0xAF1D78 -kkj_17_CheckItemFlags40 = 0x80240268; // type:func rom:0xAF1EC8 +kkj_17_IsItemBadge = 0x80240268; // type:func rom:0xAF1EC8 func_802402BC_AF1F1C = 0x802402BC; // type:func rom:0xAF1F1C func_80240500_AF2160 = 0x80240500; // type:func rom:0xAF2160 kkj_17_GetItemEmptyCount = 0x80240568; // type:func rom:0xAF21C8 @@ -19008,7 +18985,7 @@ D_80241B14_AF9464 = 0x80241B14; // type:data rom:0xAF9464 kkj_20_StashVars = 0x80240000; // type:func rom:0xAFDB40 kkj_20_GetItemName = 0x802400B4; // type:func rom:0xAFDBF4 kkj_20_SomeItemEntityFunc = 0x80240118; // type:func rom:0xAFDC58 -kkj_20_CheckItemFlags40 = 0x80240268; // type:func rom:0xAFDDA8 +kkj_20_IsItemBadge = 0x80240268; // type:func rom:0xAFDDA8 kkj_20_ToadHouse_DisableStatusMenu = 0x802402C0; // type:func rom:0xAFDE00 kkj_20_ToadHouse_ShowStatusMenu = 0x802402E0; // type:func rom:0xAFDE20 kkj_20_ToadHouse_UpdateScreenOverlay = 0x80240308; // type:func rom:0xAFDE48 @@ -19300,8 +19277,8 @@ jan_04_UpdateTexturePanStepped = 0x80240164; // type:func rom:0xB448D4 jan_04_StashVars = 0x80240350; // type:func rom:0xB44AC0 jan_04_GetItemName = 0x80240404; // type:func rom:0xB44B74 jan_04_SomeItemEntityFunc = 0x80240468; // type:func rom:0xB44BD8 -jan_04_CheckItemFlags40 = 0x802405B8; // type:func rom:0xB44D28 -jan_04_UnkFunc41 = 0x80240610; // type:func rom:0xB44D80 +jan_04_IsItemBadge = 0x802405B8; // type:func rom:0xB44D28 +jan_04_ChangeNpcToPartner = 0x80240610; // type:func rom:0xB44D80 jan_04_foliage_setup_shear_mtx = 0x802407A0; // type:func rom:0xB44F10 jan_04_TransformFoliage = 0x80240810; // type:func rom:0xB44F80 func_802409E0_B45150 = 0x802409E0; // type:func rom:0xB45150 @@ -19871,7 +19848,7 @@ D_8024100C_BCE06C = 0x8024100C; // type:data rom:0xBCE06C obk_07_StashVars = 0x80240000; // type:func rom:0xBCEBF0 obk_07_GetItemName = 0x802400B4; // type:func rom:0xBCECA4 obk_07_SomeItemEntityFunc = 0x80240118; // type:func rom:0xBCED08 -obk_07_CheckItemFlags40 = 0x80240268; // type:func rom:0xBCEE58 +obk_07_IsItemBadge = 0x80240268; // type:func rom:0xBCEE58 func_802402C0_BCEEB0 = 0x802402C0; // type:func rom:0xBCEEB0 obk_07_UnkAngleFunc004 = 0x802402CC; // type:func rom:0xBCEEBC func_80240454_BCF044 = 0x80240454; // type:func rom:0xBCF044 @@ -19934,7 +19911,7 @@ func_802412BC_BD4B2C = 0x802412BC; // type:func rom:0xBD4B2C func_80241300_BD4B70 = 0x80241300; // type:func rom:0xBD4B70 func_80241658_BD4EC8 = 0x80241658; // type:func rom:0xBD4EC8 D_80244FEC_BD885C = 0x80244FEC; // type:data rom:0xBD885C -obk_09_UnkFunc41 = 0x80240000; // type:func rom:0xBDA7B0 +obk_09_ChangeNpcToPartner = 0x80240000; // type:func rom:0xBDA7B0 func_80240190_BDA940 = 0x80240190; // type:func rom:0xBDA940 func_80240248_BDA9F8 = 0x80240248; // type:func rom:0xBDA9F8 func_80240350_BDAB00 = 0x80240350; // type:func rom:0xBDAB00 @@ -21420,7 +21397,7 @@ D_80242348_C3CD58 = 0x80242348; // type:data rom:0xC3CD58 dgb_06_StashVars = 0x80240000; // type:func rom:0xC3D080 dgb_06_GetItemName = 0x802400B4; // type:func rom:0xC3D134 dgb_06_SomeItemEntityFunc = 0x80240118; // type:func rom:0xC3D198 -dgb_06_CheckItemFlags40 = 0x80240268; // type:func rom:0xC3D2E8 +dgb_06_IsItemBadge = 0x80240268; // type:func rom:0xC3D2E8 dgb_06_entryList = 0x802402C0; // type:data rom:0xC3D340 dgb_06_settings = 0x802402E0; // type:data rom:0xC3D360 dgb_06_80240320 = 0x80240320; // type:data rom:0xC3D3A0 @@ -21696,7 +21673,7 @@ dgb_11_makeEntities = 0x80240A84; // type:data rom:0xC4DE64 dgb_12_StashVars = 0x80240000; // type:func rom:0xC4DEF0 dgb_12_GetItemName = 0x802400B4; // type:func rom:0xC4DFA4 dgb_12_SomeItemEntityFunc = 0x80240118; // type:func rom:0xC4E008 -dgb_12_CheckItemFlags40 = 0x80240268; // type:func rom:0xC4E158 +dgb_12_IsItemBadge = 0x80240268; // type:func rom:0xC4E158 dgb_12_entryList = 0x802402C0; // type:data rom:0xC4E1B0 dgb_12_settings = 0x802402D0; // type:data rom:0xC4E1C0 dgb_12_80240310 = 0x80240310; // type:data rom:0xC4E200 @@ -21856,7 +21833,7 @@ dgb_18_func_80240EBC_C56DFC = 0x80240EBC; // type:func rom:0xC56DFC dgb_18_StashVars = 0x80240FB0; // type:func rom:0xC56EF0 dgb_18_GetItemName = 0x80241064; // type:func rom:0xC56FA4 dgb_18_SomeItemEntityFunc = 0x802410C8; // type:func rom:0xC57008 -dgb_18_CheckItemFlags40 = 0x80241218; // type:func rom:0xC57158 +dgb_18_IsItemBadge = 0x80241218; // type:func rom:0xC57158 dgb_18_entryList = 0x80241270; // type:data rom:0xC571B0 dgb_18_settings = 0x80241280; // type:data rom:0xC571C0 dgb_18_802412C0 = 0x802412C0; // type:data rom:0xC57200 @@ -22064,7 +22041,7 @@ func_80240718_C71B98 = 0x80240718; // type:func rom:0xC71B98 kzn_08_StashVars = 0x80240790; // type:func rom:0xC71C10 kzn_08_GetItemName = 0x80240844; // type:func rom:0xC71CC4 kzn_08_SomeItemEntityFunc = 0x802408A8; // type:func rom:0xC71D28 -kzn_08_CheckItemFlags40 = 0x802409F8; // type:func rom:0xC71E78 +kzn_08_IsItemBadge = 0x802409F8; // type:func rom:0xC71E78 kzn_08_FlyingAI_WanderInit = 0x80240A50; // type:func rom:0xC71ED0 kzn_08_FlyingAI_Wander = 0x80240C00; // type:func rom:0xC72080 kzn_08_FlyingAI_LoiterInit = 0x80241228; // type:func rom:0xC726A8 @@ -22856,7 +22833,7 @@ flo_12_init_802423D0 = 0x802423D0; // type:data rom:0xCC3200 flo_12_npcGroup_802425D8 = 0x802425D8; // type:data rom:0xCC3408 flo_12_npcGroupList_802429B8 = 0x802429B8; // type:data rom:0xCC37E8 flo_13_func_80240000_CC3810 = 0x80240000; // type:func rom:0xCC3810 -flo_13_UnkFunc41 = 0x80240040; // type:func rom:0xCC3850 +flo_13_ChangeNpcToPartner = 0x80240040; // type:func rom:0xCC3850 flo_13_FlyingAI_WanderInit = 0x802401C4; // type:func rom:0xCC39D4 flo_13_FlyingAI_Wander = 0x80240374; // type:func rom:0xCC3B84 flo_13_FlyingAI_LoiterInit = 0x8024099C; // type:func rom:0xCC41AC @@ -23533,11 +23510,11 @@ sam_01_LetterDelivery_CalcLetterPos = 0x80241884; // type:func rom:0xCF93F4 sam_01_LetterDelivery_SaveNpcAnim = 0x80241A10; // type:func rom:0xCF9580 sam_01_LetterDelivery_RestoreNpcAnim = 0x80241A54; // type:func rom:0xCF95C4 sam_01_GetItemEntityPosition = 0x80241A80; // type:func rom:0xCF95F0 -sam_01_UnkTrigFunc001 = 0x80241B20; // type:func rom:0xCF9690 +sam_01_GetLeftRightPoints = 0x80241B20; // type:func rom:0xCF9690 dup_sam_01_StashVars = 0x80241C90; // type:func rom:0xCF9800 dup_sam_01_GetItemName = 0x80241D44; // type:func rom:0xCF98B4 sam_01_SomeItemEntityFunc = 0x80241DA8; // type:func rom:0xCF9918 -sam_01_CheckItemFlags40 = 0x80241EF8; // type:func rom:0xCF9A68 +sam_01_IsItemBadge = 0x80241EF8; // type:func rom:0xCF9A68 D_802432D0_CFAE40 = 0x802432D0; // type:data rom:0xCFAE40 D_802432D4_CFAE44 = 0x802432D4; // type:data rom:0xCFAE44 sam_01_Quizmo_varStash = 0x802435F0; // type:data rom:0xCFB160 @@ -23759,7 +23736,7 @@ sam_09_varStash = 0x802406C0; // type:data rom:0xD369B0 sam_10_StashVars = 0x80240000; // type:func rom:0xD37800 sam_10_GetItemName = 0x802400B4; // type:func rom:0xD378B4 sam_10_SomeItemEntityFunc = 0x80240118; // type:func rom:0xD37918 -sam_10_CheckItemFlags40 = 0x80240268; // type:func rom:0xD37A68 +sam_10_IsItemBadge = 0x80240268; // type:func rom:0xD37A68 func_802402BC_D37ABC = 0x802402BC; // type:func rom:0xD37ABC func_802402F0_D37AF0 = 0x802402F0; // type:func rom:0xD37AF0 sam_10_MeleeHitbox_30 = 0x802403D0; // type:func rom:0xD37BD0 @@ -23915,7 +23892,7 @@ pra_05_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD56A9C pra_05_StashVars = 0x80240F20; // type:func rom:0xD56AD0 pra_05_GetItemName = 0x80240FD4; // type:func rom:0xD56B84 pra_05_SomeItemEntityFunc = 0x80241038; // type:func rom:0xD56BE8 -pra_05_CheckItemFlags40 = 0x80241188; // type:func rom:0xD56D38 +pra_05_IsItemBadge = 0x80241188; // type:func rom:0xD56D38 pra_05_varStash = 0x80241680; // type:data rom:0xD57230 func_80240000_D57430 = 0x80240000; // type:func rom:0xD57430 pra_06_reflection_unk_resolve_anim = 0x80240050; // type:func rom:0xD57480 @@ -23993,7 +23970,7 @@ pra_11_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD623EC pra_11_StashVars = 0x80240F20; // type:func rom:0xD62420 pra_11_GetItemName = 0x80240FD4; // type:func rom:0xD624D4 pra_11_SomeItemEntityFunc = 0x80241038; // type:func rom:0xD62538 -pra_11_CheckItemFlags40 = 0x80241188; // type:func rom:0xD62688 +pra_11_IsItemBadge = 0x80241188; // type:func rom:0xD62688 pra_11_varStash = 0x80241610; // type:data rom:0xD62B10 func_80240000_D62D10 = 0x80240000; // type:func rom:0xD62D10 pra_12_reflection_unk_resolve_anim = 0x80240050; // type:func rom:0xD62D60 @@ -24012,7 +23989,7 @@ pra_12_worker_reflect_partner_wall = 0x80240F1C; // type:func rom:0xD63C2C pra_12_StashVars = 0x80240F50; // type:func rom:0xD63C60 pra_12_GetItemName = 0x80241004; // type:func rom:0xD63D14 pra_12_SomeItemEntityFunc = 0x80241068; // type:func rom:0xD63D78 -pra_12_CheckItemFlags40 = 0x802411B8; // type:func rom:0xD63EC8 +pra_12_IsItemBadge = 0x802411B8; // type:func rom:0xD63EC8 pra_12_varStash = 0x802416B0; // type:data rom:0xD643C0 D_802418A0_D645B0 = 0x802418A0; // type:data rom:0xD645B0 D_802418B0_D645C0 = 0x802418B0; // type:data rom:0xD645C0 @@ -24060,7 +24037,7 @@ pra_14_worker_reflect_partner_wall = 0x80240EEC; // type:func rom:0xD68BEC pra_14_StashVars = 0x80240F20; // type:func rom:0xD68C20 pra_14_GetItemName = 0x80240FD4; // type:func rom:0xD68CD4 pra_14_SomeItemEntityFunc = 0x80241038; // type:func rom:0xD68D38 -pra_14_CheckItemFlags40 = 0x80241188; // type:func rom:0xD68E88 +pra_14_IsItemBadge = 0x80241188; // type:func rom:0xD68E88 pra_14_varStash = 0x80241930; // type:data rom:0xD69630 pra_15_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD69810 func_80240020_D69830 = 0x80240020; // type:func rom:0xD69830 @@ -24162,7 +24139,7 @@ pra_27_worker_reflect_partner_wall = 0x80240F1C; // type:func rom:0xD7A90C pra_27_StashVars = 0x80240F50; // type:func rom:0xD7A940 pra_27_GetItemName = 0x80241004; // type:func rom:0xD7A9F4 pra_27_SomeItemEntityFunc = 0x80241068; // type:func rom:0xD7AA58 -pra_27_CheckItemFlags40 = 0x802411B8; // type:func rom:0xD7ABA8 +pra_27_IsItemBadge = 0x802411B8; // type:func rom:0xD7ABA8 pra_27_varStash = 0x80241690; // type:data rom:0xD7B080 D_80241880_D7B270 = 0x80241880; // type:data rom:0xD7B270 D_80241890_D7B280 = 0x80241890; // type:data rom:0xD7B280 @@ -24183,7 +24160,7 @@ pra_28_worker_reflect_partner_wall = 0x80240F1C; // type:func rom:0xD7C1BC pra_28_StashVars = 0x80240F50; // type:func rom:0xD7C1F0 pra_28_GetItemName = 0x80241004; // type:func rom:0xD7C2A4 pra_28_SomeItemEntityFunc = 0x80241068; // type:func rom:0xD7C308 -pra_28_CheckItemFlags40 = 0x802411B8; // type:func rom:0xD7C458 +pra_28_IsItemBadge = 0x802411B8; // type:func rom:0xD7C458 pra_28_varStash = 0x80241690; // type:data rom:0xD7C930 D_80241880_D7CB20 = 0x80241880; // type:data rom:0xD7CB20 D_80241890_D7CB30 = 0x80241890; // type:data rom:0xD7CB30 @@ -24308,7 +24285,7 @@ pra_35_WanderMeleeAI_Main = 0x80242698; // type:func rom:0xD8F8E8 pra_35_StashVars = 0x80242950; // type:func rom:0xD8FBA0 pra_35_GetItemName = 0x80242A04; // type:func rom:0xD8FC54 pra_35_SomeItemEntityFunc = 0x80242A68; // type:func rom:0xD8FCB8 -pra_35_CheckItemFlags40 = 0x80242BB8; // type:func rom:0xD8FE08 +pra_35_IsItemBadge = 0x80242BB8; // type:func rom:0xD8FE08 pra_35_varStash = 0x80243DE0; // type:data rom:0xD91030 D_80243FE0_D91230 = 0x80243FE0; // type:data rom:0xD91230 D_80243FE8_D91238 = 0x80243FE8; // type:data rom:0xD91238 @@ -24469,7 +24446,7 @@ omo_03_UpdateTexturePanStepped = 0x802406A0; // type:func rom:0xDA58E0 omo_04_StashVars = 0x80240000; // type:func rom:0xDAD400 omo_04_GetItemName = 0x802400B4; // type:func rom:0xDAD4B4 omo_04_SomeItemEntityFunc = 0x80240118; // type:func rom:0xDAD518 -omo_04_CheckItemFlags40 = 0x80240268; // type:func rom:0xDAD668 +omo_04_IsItemBadge = 0x80240268; // type:func rom:0xDAD668 omo_04_UnsetCamera0MoveFlag1 = 0x802402BC; // type:func rom:0xDAD6BC omo_04_SetCamera0MoveFlag1 = 0x802402D8; // type:func rom:0xDAD6D8 func_802402F4_DAD6F4 = 0x802402F4; // type:func rom:0xDAD6F4 @@ -24551,7 +24528,7 @@ omo_06_UpdateTexturePanStepped = 0x80240680; // type:func rom:0xDB7F90 omo_06_StashVars = 0x80240870; // type:func rom:0xDB8180 omo_06_GetItemName = 0x80240924; // type:func rom:0xDB8234 omo_06_SomeItemEntityFunc = 0x80240988; // type:func rom:0xDB8298 -omo_06_CheckItemFlags40 = 0x80240AD8; // type:func rom:0xDB83E8 +omo_06_IsItemBadge = 0x80240AD8; // type:func rom:0xDB83E8 omo_06_varStash = 0x802456C0; // type:data rom:0xDBCFD0 omo_07_ShyGuyWanderAI_14 = 0x80240000; // type:func rom:0xDBD2B0 omo_07_ShyGuyWanderAI_15 = 0x80240070; // type:func rom:0xDBD320 @@ -24592,7 +24569,7 @@ func_80242EA8_DC0158 = 0x80242EA8; // type:func rom:0xDC0158 omo_07_StashVars = 0x80242F20; // type:func rom:0xDC01D0 omo_07_GetItemName = 0x80242FD4; // type:func rom:0xDC0284 omo_07_SomeItemEntityFunc = 0x80243038; // type:func rom:0xDC02E8 -omo_07_CheckItemFlags40 = 0x80243188; // type:func rom:0xDC0438 +omo_07_IsItemBadge = 0x80243188; // type:func rom:0xDC0438 omo_07_UnsetCamera0MoveFlag1 = 0x802431DC; // type:func rom:0xDC048C omo_07_SetCamera0MoveFlag1 = 0x802431F8; // type:func rom:0xDC04A8 omo_07_UnkNpcPosFunc = 0x80243220; // type:func rom:0xDC04D0 @@ -24633,7 +24610,7 @@ func_802406E0_DCD3B0 = 0x802406E0; // type:func rom:0xDCD3B0 omo_09_StashVars = 0x80240720; // type:func rom:0xDCD3F0 omo_09_GetItemName = 0x802407D4; // type:func rom:0xDCD4A4 omo_09_SomeItemEntityFunc = 0x80240838; // type:func rom:0xDCD508 -omo_09_CheckItemFlags40 = 0x80240988; // type:func rom:0xDCD658 +omo_09_IsItemBadge = 0x80240988; // type:func rom:0xDCD658 omo_09_ShyGuyWanderAI_14 = 0x802409E0; // type:func rom:0xDCD6B0 omo_09_ShyGuyWanderAI_15 = 0x80240A50; // type:func rom:0xDCD720 omo_09_ShyGuyWanderAI_16 = 0x80240B20; // type:func rom:0xDCD7F0 @@ -24724,7 +24701,7 @@ omo_11_SuperBlock_CantUpgradeMessages = 0x80241E40; // type:data rom:0xDDE670 omo_11_SuperBlock_PartnerIDs = 0x80241E48; // type:data rom:0xDDE678 omo_11_SuperBlock_UpgradeDescMessages = 0x80241E58; // type:data rom:0xDDE688 omo_11_SuperBlock_UpgradeOrbAngles = 0x80241E98; // type:data rom:0xDDE6C8 -omo_12_UnkFunc41 = 0x80240000; // type:func rom:0xDDF310 +omo_12_ChangeNpcToPartner = 0x80240000; // type:func rom:0xDDF310 omo_12_DarkRoomUpdate = 0x80240184; // type:func rom:0xDDF494 omo_12_SetCamera0Flag1000 = 0x802402DC; // type:func rom:0xDDF5EC omo_12_UnsetCamera0Flag1000 = 0x802402F8; // type:func rom:0xDDF608 @@ -24750,7 +24727,7 @@ func_80241028_DE34B8 = 0x80241028; // type:func rom:0xDE34B8 omo_13_StashVars = 0x80241230; // type:func rom:0xDE36C0 omo_13_GetItemName = 0x802412E4; // type:func rom:0xDE3774 omo_13_SomeItemEntityFunc = 0x80241348; // type:func rom:0xDE37D8 -omo_13_CheckItemFlags40 = 0x80241498; // type:func rom:0xDE3928 +omo_13_IsItemBadge = 0x80241498; // type:func rom:0xDE3928 D_80241A78_DE3F08 = 0x80241A78; // type:data rom:0xDE3F08 D_80241C04_DE4094 = 0x80241C04; // type:data rom:0xDE4094 D_80241C08_DE4098 = 0x80241C08; // type:data rom:0xDE4098 @@ -25538,7 +25515,7 @@ EDC020_varStash = 0x802417EC; // type:data rom:0xEDD7CC D_80241850_EDD830 = 0x80241850; // type:data rom:0xEDD830 D_80241854_EDD834 = 0x80241854; // type:data rom:0xEDD834 func_80240000_EDE9C0 = 0x80240000; // type:func rom:0xEDE9C0 -EDEA00_UnkFunc41 = 0x80240040; // type:func rom:0xEDEA00 +EDEA00_ChangeNpcToPartner = 0x80240040; // type:func rom:0xEDEA00 EDEA00_FlyingAI_WanderInit = 0x802401C4; // type:func rom:0xEDEB84 EDEA00_FlyingAI_Wander = 0x80240374; // type:func rom:0xEDED34 EDEA00_FlyingAI_LoiterInit = 0x8024099C; // type:func rom:0xEDF35C