From 2561914d1a7530474006eaf88914c344db1ba5fa Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Wed, 30 Nov 2022 02:39:42 -0500 Subject: [PATCH] area_tik+ (#874) * koopa * para troopa * some fuzzy * tik_05 * tik_02 * tik_01 * tik_03 * tik_03b * tik_04 * tik_07 * tik_08 * tik_09 * tik_10/12 * tik_14 * tik_15 * tik_17/18 * more tiks * area_tik * mac_03 * cleanup * oink names Co-authored-by: HailSanta --- include/effects.h | 39 +- include/script_api/common.h | 3 + src/battle/area_jan/actor/jungle_fuzzy.c | 106 +- src/battle/area_mac/actor/master1.c | 4 +- src/battle/area_mim/actor/forest_fuzzy.c | 96 +- src/battle/area_tik/actor/dark_koopa.c | 202 ++-- src/battle/area_tik/actor/dark_paratroopa.c | 334 +++--- src/battle/common/actor/fuzzy.inc.c | 86 +- src/battle/common/actor/koopa_troopa.inc.c | 148 +-- src/battle/common/actor/paratroopa.inc.c | 280 ++--- src/common/foliage.inc.c | 6 + src/effects/lil_oink.c | 144 +-- src/evt/evt.c | 4 +- src/world/area_dgb/dgb_11/C4D3E0.c | 2 +- src/world/area_dro/dro_01/dro_01_3_npc.c | 2 +- src/world/area_iwa/iwa_10/iwa_10_2_main.c | 18 +- src/world/area_kmr/kmr.h | 7 +- src/world/area_kmr/kmr_04/kmr_04.h | 2 +- src/world/area_kmr/kmr_04/kmr_04_1_music.c | 2 +- src/world/area_kmr/kmr_04/kmr_04_5_foliage.c | 2 +- src/world/area_kzn/kzn_02/kzn_02_4_demo.c | 1 - src/world/area_mac/mac.h | 50 +- src/world/area_mac/mac_03/831800.c | 18 - src/world/area_mac/mac_03/831B20.c | 68 -- src/world/area_mac/mac_03/833500.c | 4 - src/world/area_mac/mac_03/833740.c | 172 --- src/world/area_mac/mac_03/mac_03.h | 66 +- src/world/area_mac/mac_03/mac_03_0_header.c | 16 + src/world/area_mac/mac_03/mac_03_1_music.c | 12 + src/world/area_mac/mac_03/mac_03_2_main.c | 100 ++ src/world/area_mac/mac_03/mac_03_3_train.c | 583 +++++++++ src/world/area_mac/mac_03/mac_03_4_npc.c | 1043 +++++++++++++++++ src/world/area_mac/mac_03/mac_03_5_entity.c | 41 + src/world/area_mac/mac_03/mac_03_6_foliage.c | 124 ++ src/world/area_mac/mac_03/mac_03_7_oinks.c | 671 +++++++++++ src/world/area_mac/mac_03/mac_03_8_demo.c | 152 +++ src/world/area_mgm/mgm_02/mgm_02_2_npc.c | 172 +-- src/world/area_tik/tik.h | 41 +- src/world/area_tik/tik_01/8694B0.c | 12 - src/world/area_tik/tik_01/869AA0.c | 5 - src/world/area_tik/tik_01/869EE0.c | 12 - src/world/area_tik/tik_01/tik_01.h | 21 +- src/world/area_tik/tik_01/tik_01_0_header.c | 16 + src/world/area_tik/tik_01/tik_01_1_music.c | 13 + src/world/area_tik/tik_01/tik_01_2_main.c | 64 + src/world/area_tik/tik_01/tik_01_3_drips.c | 24 + src/world/area_tik/tik_01/tik_01_4_entity.c | 88 ++ src/world/area_tik/tik_01/tik_01_5_npc.c | 104 ++ src/world/area_tik/tik_02/86C740.c | 7 - src/world/area_tik/tik_02/86CA50.c | 9 - src/world/area_tik/tik_02/86CD10.c | 14 - src/world/area_tik/tik_02/tik_02.h | 16 +- src/world/area_tik/tik_02/tik_02_0_header.c | 12 + src/world/area_tik/tik_02/tik_02_1_music.c | 13 + src/world/area_tik/tik_02/tik_02_2_main.c | 62 + src/world/area_tik/tik_02/tik_02_3_entity.c | 14 + src/world/area_tik/tik_02/tik_02_4_drips.c | 32 + src/world/area_tik/tik_02/tik_02_5_npc.c | 122 ++ src/world/area_tik/tik_03/86EB00.c | 11 - src/world/area_tik/tik_03/86F0F0.c | 53 - src/world/area_tik/tik_03/tik_03.h | 12 +- src/world/area_tik/tik_03/tik_03_0_header.c | 14 + src/world/area_tik/tik_03/tik_03_1_music.c | 7 + src/world/area_tik/tik_03/tik_03_2_main.c | 92 ++ src/world/area_tik/tik_03/tik_03_3_drips.c | 32 + .../area_tik/tik_03/tik_03_4_platforms.c | 96 ++ src/world/area_tik/tik_03/tik_03_5_entity.c | 13 + src/world/area_tik/tik_03/tik_03_6_demo.c | 87 ++ src/world/area_tik/tik_04/871A30.c | 10 - src/world/area_tik/tik_04/872020.c | 72 -- src/world/area_tik/tik_04/tik_04.h | 20 +- src/world/area_tik/tik_04/tik_04_0_header.c | 15 + src/world/area_tik/tik_04/tik_04_1_music.c | 7 + src/world/area_tik/tik_04/tik_04_2_main.c | 68 ++ src/world/area_tik/tik_04/tik_04_3_drips.c | 32 + .../area_tik/tik_04/tik_04_4_platforms.c | 154 +++ src/world/area_tik/tik_04/tik_04_5_npc.c | 97 ++ src/world/area_tik/tik_05/874DC0.c | 7 - src/world/area_tik/tik_05/8750D0.c | 30 - src/world/area_tik/tik_05/tik_05.h | 20 +- src/world/area_tik/tik_05/tik_05_0_header.c | 15 + src/world/area_tik/tik_05/tik_05_1_music.c | 7 + src/world/area_tik/tik_05/tik_05_2_main.c | 45 + src/world/area_tik/tik_05/tik_05_3_drips.c | 24 + src/world/area_tik/tik_05/tik_05_4_entity.c | 73 ++ src/world/area_tik/tik_05/tik_05_5_npc.c | 53 + src/world/area_tik/tik_07/879BE0.c | 8 - src/world/area_tik/tik_07/87AC00.c | 22 - src/world/area_tik/tik_07/tik_07.h | 21 +- src/world/area_tik/tik_07/tik_07_0_header.c | 14 + src/world/area_tik/tik_07/tik_07_1_music.c | 7 + src/world/area_tik/tik_07/tik_07_2_main.c | 53 + src/world/area_tik/tik_07/tik_07_3_entity.c | 14 + src/world/area_tik/tik_07/tik_07_4_drips.c | 40 + .../area_tik/tik_07/tik_07_5_platforms.c | 96 ++ src/world/area_tik/tik_07/tik_07_6_npc.c | 53 + src/world/area_tik/tik_08/87EDF0.c | 11 - src/world/area_tik/tik_08/87F3E0.c | 5 - src/world/area_tik/tik_08/87F820.c | 14 - src/world/area_tik/tik_08/tik_08.h | 21 +- src/world/area_tik/tik_08/tik_08_0_header.c | 16 + src/world/area_tik/tik_08/tik_08_1_music.c | 13 + src/world/area_tik/tik_08/tik_08_2_main.c | 87 ++ src/world/area_tik/tik_08/tik_08_3_drips.c | 32 + src/world/area_tik/tik_08/tik_08_4_entity.c | 53 + src/world/area_tik/tik_08/tik_08_5_npc.c | 121 ++ src/world/area_tik/tik_09/8821C0.c | 11 - src/world/area_tik/tik_09/8827B0.c | 5 - src/world/area_tik/tik_09/882BF0.c | 5 - src/world/area_tik/tik_09/tik_09.h | 22 +- src/world/area_tik/tik_09/tik_09_0_header.c | 14 + src/world/area_tik/tik_09/tik_09_1_music.c | 7 + src/world/area_tik/tik_09/tik_09_2_main.c | 136 +++ src/world/area_tik/tik_09/tik_09_3_drips.c | 24 + src/world/area_tik/tik_09/tik_09_4_entity.c | 74 ++ src/world/area_tik/tik_09/tik_09_5_npc.c | 129 ++ src/world/area_tik/tik_10/8863C0.c | 7 - src/world/area_tik/tik_10/8866D0.c | 5 - src/world/area_tik/tik_10/tik_10.h | 14 +- src/world/area_tik/tik_10/tik_10_0_header.c | 12 + src/world/area_tik/tik_10/tik_10_1_music.c | 7 + src/world/area_tik/tik_10/tik_10_2_main.c | 35 + src/world/area_tik/tik_10/tik_10_3_drips.c | 32 + src/world/area_tik/tik_10/tik_10_4_entity.c | 24 + src/world/area_tik/tik_12/888BD0.c | 9 - src/world/area_tik/tik_12/8891C0.c | 13 - src/world/area_tik/tik_12/88A530.c | 5 - src/world/area_tik/tik_12/tik_12.h | 21 +- src/world/area_tik/tik_12/tik_12_0_header.c | 12 + src/world/area_tik/tik_12/tik_12_1_music.c | 7 + src/world/area_tik/tik_12/tik_12_2_main.c | 46 + src/world/area_tik/tik_12/tik_12_3_drips.c | 24 + src/world/area_tik/tik_12/tik_12_4_entity.c | 58 + src/world/area_tik/tik_12/tik_12_5_npc.c | 31 + src/world/area_tik/tik_14/88D600.c | 9 - src/world/area_tik/tik_14/88DBF0.c | 3 - src/world/area_tik/tik_14/tik_14.h | 10 +- src/world/area_tik/tik_14/tik_14_0_header.c | 13 + src/world/area_tik/tik_14/tik_14_1_music.c | 7 + src/world/area_tik/tik_14/tik_14_2_main.c | 61 + src/world/area_tik/tik_14/tik_14_3_drips.c | 24 + src/world/area_tik/tik_14/tik_14_4_entity.c | 34 + src/world/area_tik/tik_15/88FBA0.c | 9 - src/world/area_tik/tik_15/890190.c | 29 - src/world/area_tik/tik_15/tik_15.h | 17 +- src/world/area_tik/tik_15/tik_15_0_header.c | 13 + src/world/area_tik/tik_15/tik_15_1_music.c | 7 + src/world/area_tik/tik_15/tik_15_2_main.c | 53 + src/world/area_tik/tik_15/tik_15_3_entity.c | 34 + src/world/area_tik/tik_15/tik_15_4_drips.c | 24 + src/world/area_tik/tik_15/tik_15_5_npc.c | 165 +++ src/world/area_tik/tik_17/892A20.c | 12 - src/world/area_tik/tik_17/892A50.c | 3 - src/world/area_tik/tik_17/893790.c | 6 - src/world/area_tik/tik_17/tik_17.h | 13 +- src/world/area_tik/tik_17/tik_17_0_header.c | 13 + src/world/area_tik/tik_17/tik_17_1_music.c | 16 + src/world/area_tik/tik_17/tik_17_2_entity.c | 13 + src/world/area_tik/tik_17/tik_17_3_main.c | 65 + src/world/area_tik/tik_18/8956E0.c | 7 - src/world/area_tik/tik_18/8959F0.c | 12 - src/world/area_tik/tik_18/tik_18.h | 16 +- src/world/area_tik/tik_18/tik_18_0_header.c | 13 + src/world/area_tik/tik_18/tik_18_1_music.c | 7 + src/world/area_tik/tik_18/tik_18_2_main.c | 56 + src/world/area_tik/tik_18/tik_18_3_drips.c | 24 + src/world/area_tik/tik_18/tik_18_4_npc.c | 103 ++ src/world/area_tik/tik_18/tik_18_5_entity.c | 33 + src/world/area_tik/tik_19/8975E0.c | 9 - src/world/area_tik/tik_19/897BD0.c | 3 - src/world/area_tik/tik_19/tik_19.h | 13 +- src/world/area_tik/tik_19/tik_19_0_header.c | 12 + src/world/area_tik/tik_19/tik_19_1_music.c | 7 + src/world/area_tik/tik_19/tik_19_2_main.c | 64 + src/world/area_tik/tik_19/tik_19_3_entity.c | 13 + src/world/area_tik/tik_20/89A350.c | 12 - src/world/area_tik/tik_20/89ACB0.c | 3 - src/world/area_tik/tik_20/tik_20.h | 15 +- src/world/area_tik/tik_20/tik_20_0_header.c | 14 + src/world/area_tik/tik_20/tik_20_1_music.c | 7 + src/world/area_tik/tik_20/tik_20_2_main.c | 116 ++ src/world/area_tik/tik_20/tik_20_3_npc.c | 55 + src/world/area_tik/tik_20/tik_20_4_entity.c | 9 + src/world/area_tik/tik_21/89D7A0.c | 12 - src/world/area_tik/tik_21/tik_21.h | 9 +- src/world/area_tik/tik_21/tik_21_0_header.c | 14 + src/world/area_tik/tik_21/tik_21_1_music.c | 7 + src/world/area_tik/tik_21/tik_21_2_main.c | 126 ++ src/world/area_tik/tik_21/tik_21_3_entity.c | 17 + src/world/area_tik/tik_22/89FEC0.c | 9 - src/world/area_tik/tik_22/89FEF0.c | 12 - src/world/area_tik/tik_22/tik_22.h | 8 +- src/world/area_tik/tik_22/tik_22_0_header.c | 13 + src/world/area_tik/tik_22/tik_22_1_music.c | 16 + src/world/area_tik/tik_22/tik_22_2_main.c | 112 ++ src/world/area_tik/tik_23/8A23D0.c | 10 - src/world/area_tik/tik_23/8A2D30.c | 3 - src/world/area_tik/tik_23/tik_23.h | 16 +- src/world/area_tik/tik_23/tik_23_0_header.c | 13 + src/world/area_tik/tik_23/tik_23_1_music.c | 7 + src/world/area_tik/tik_23/tik_23_2_main.c | 100 ++ src/world/area_tik/tik_23/tik_23_3_entity.c | 28 + src/world/area_tik/tik_23/tik_23_4_npc.c | 79 ++ src/world/area_tik/tik_24/8A5A80.c | 7 - src/world/area_tik/tik_24/8A5AD0.c | 4 - src/world/area_tik/tik_24/8A5DE0.c | 5 - src/world/area_tik/tik_24/tik_24.h | 16 +- src/world/area_tik/tik_24/tik_24_0_header.c | 24 + src/world/area_tik/tik_24/tik_24_1_music.c | 7 + src/world/area_tik/tik_24/tik_24_2_main.c | 57 + src/world/area_tik/tik_24/tik_24_3_drips.c | 24 + src/world/area_tik/tik_24/tik_24_4_entity.c | 31 + src/world/area_tik/tik_24/tik_24_5_npc.c | 55 + src/world/area_tik/tik_25/8A7F80.c | 8 - src/world/area_tik/tik_25/8A8600.c | 11 - src/world/area_tik/tik_25/tik_25.h | 16 +- src/world/area_tik/tik_25/tik_25_0_header.c | 12 + src/world/area_tik/tik_25/tik_25_1_music.c | 15 + src/world/area_tik/tik_25/tik_25_2_main.c | 65 + src/world/area_tik/tik_25/tik_25_3_entity.c | 120 ++ src/world/area_trd/trd_01/trd_01_1_main.c | 8 +- src/world/area_trd/trd_01/trd_01_3_npc.c | 2 +- src/world/area_trd/trd_03/trd_03_3_npc.c | 14 +- .../area_trd/trd_06/trd_06_3_npc_prisoners.c | 38 +- src/world/common/atomic/Chest.inc.c | 3 - src/world/common/atomic/tik_Flotsam.inc.c | 26 + src/world/common/complete/GiveReward.inc.c | 14 +- src/world/common/enemy/complete/Blooper.h | 29 + src/world/common/enemy/complete/Blooper.inc.c | 22 + src/world/common/enemy/complete/DarkTroopa.h | 35 + .../enemy/complete/DarkTroopa_Wander.inc.c | 36 + src/world/common/enemy/complete/ForestFuzzy.h | 32 +- src/world/common/enemy/complete/Gloomba.h | 36 + .../enemy/complete/Gloomba_Wander.inc.c | 27 + src/world/common/enemy/complete/KoopaTroopa.h | 32 +- src/world/common/enemy/complete/Paragloomba.h | 36 + .../enemy/complete/Paragloomba_Wander.inc.c | 37 + src/world/common/enemy/complete/Paratroopa.h | 32 +- src/world/common/enemy/complete/SpikeTop.h | 34 + .../common/enemy/complete/SpikeTop.inc.c | 18 +- .../common/enemy/complete/SpikedGloomba.h | 36 + .../enemy/complete/SpikedGloomba_Wander.inc.c | 27 + src/world/common/entity/Pipe.data.inc.c | 10 +- src/world/common/npc/Toad.h | 88 ++ src/world/common/npc/Toad_Wander.inc.c | 31 + src/world/common/todo/SetEntityPosition.inc.c | 2 +- src/world/world.c | 45 +- tools/splat_ext/npc.yaml | 308 ++--- .../data/world/area_mac/mac_03/834070.data.s | 6 - .../data/world/area_mac/mac_03/834170.data.s | 30 - .../data/world/area_mac/mac_03/835370.data.s | 21 - .../data/world/area_mac/mac_03/837CB0.data.s | 222 ---- .../data/world/area_mac/mac_03/83F500.data.s | 12 - .../data/world/area_mac/mac_03/83F6C0.data.s | 57 - .../data/world/area_mac/mac_03/8404A0.data.s | 45 - .../data/world/area_tik/tik_01/869F40.data.s | 6 - .../data/world/area_tik/tik_01/86A030.data.s | 21 - .../data/world/area_tik/tik_01/86B350.data.s | 15 - .../data/world/area_tik/tik_01/86BC00.data.s | 39 - .../data/world/area_tik/tik_02/86D0E0.data.s | 6 - .../data/world/area_tik/tik_02/86D190.data.s | 12 - .../data/world/area_tik/tik_02/86D800.data.s | 27 - .../data/world/area_tik/tik_02/86E2C0.data.s | 21 - .../data/world/area_tik/tik_03/86F5D0.data.s | 6 - .../data/world/area_tik/tik_03/86F670.data.s | 33 - .../data/world/area_tik/tik_03/870B60.data.s | 15 - .../data/world/area_tik/tik_03/871430.data.s | 21 - .../data/world/area_tik/tik_03/871730.data.s | 6 - .../data/world/area_tik/tik_03/8717F0.data.s | 12 - .../data/world/area_tik/tik_04/8726A0.data.s | 6 - .../data/world/area_tik/tik_04/872750.data.s | 42 - .../data/world/area_tik/tik_04/8739F0.data.s | 15 - .../data/world/area_tik/tik_04/8742C0.data.s | 9 - .../data/world/area_tik/tik_04/8746E0.data.s | 24 - .../data/world/area_tik/tik_05/875810.data.s | 6 - .../data/world/area_tik/tik_05/8758C0.data.s | 12 - .../data/world/area_tik/tik_05/875D10.data.s | 15 - .../data/world/area_tik/tik_05/8765C0.data.s | 18 - .../data/world/area_tik/tik_05/876A50.data.s | 18 - .../data/world/area_tik/tik_07/87C4D0.data.s | 6 - .../data/world/area_tik/tik_07/87C570.data.s | 30 - .../data/world/area_tik/tik_07/87D5D0.data.s | 33 - .../data/world/area_tik/tik_07/87E590.data.s | 21 - .../data/world/area_tik/tik_07/87E890.data.s | 21 - .../data/world/area_tik/tik_08/87F8B0.data.s | 6 - .../data/world/area_tik/tik_08/87F9A0.data.s | 48 - .../data/world/area_tik/tik_08/881770.data.s | 12 - .../data/world/area_tik/tik_08/8819D0.data.s | 21 - .../data/world/area_tik/tik_09/883460.data.s | 6 - .../data/world/area_tik/tik_09/883500.data.s | 45 - .../data/world/area_tik/tik_09/8856E0.data.s | 12 - .../data/world/area_tik/tik_09/885A80.data.s | 30 - .../data/world/area_tik/tik_10/887780.data.s | 6 - .../data/world/area_tik/tik_10/887800.data.s | 12 - .../data/world/area_tik/tik_10/887B20.data.s | 15 - .../data/world/area_tik/tik_10/8883F0.data.s | 21 - .../data/world/area_tik/tik_12/88AE20.data.s | 6 - .../data/world/area_tik/tik_12/88AEA0.data.s | 27 - .../data/world/area_tik/tik_12/88BF60.data.s | 15 - .../data/world/area_tik/tik_12/88C810.data.s | 57 - .../data/world/area_tik/tik_14/88DF60.data.s | 6 - .../data/world/area_tik/tik_14/88DFF0.data.s | 33 - .../data/world/area_tik/tik_14/88F180.data.s | 15 - .../data/world/area_tik/tik_14/88FA30.data.s | 9 - .../data/world/area_tik/tik_15/8906B0.data.s | 6 - .../data/world/area_tik/tik_15/890740.data.s | 30 - .../data/world/area_tik/tik_15/891890.data.s | 21 - .../data/world/area_tik/tik_15/8922A0.data.s | 24 - .../data/world/area_tik/tik_17/893D80.data.s | 6 - .../data/world/area_tik/tik_17/893E40.data.s | 21 - .../data/world/area_tik/tik_17/8944F0.data.s | 36 - .../data/world/area_tik/tik_18/895D90.data.s | 6 - .../data/world/area_tik/tik_18/895E20.data.s | 30 - .../data/world/area_tik/tik_18/896CA0.data.s | 33 - .../data/world/area_tik/tik_18/897450.data.s | 6 - .../data/world/area_tik/tik_19/898910.data.s | 6 - .../data/world/area_tik/tik_19/898990.data.s | 27 - .../data/world/area_tik/tik_19/899C90.data.s | 21 - .../data/world/area_tik/tik_20/89B490.data.s | 6 - .../data/world/area_tik/tik_20/89B530.data.s | 51 - .../data/world/area_tik/tik_20/89D200.data.s | 18 - .../data/world/area_tik/tik_21/89E100.data.s | 6 - .../data/world/area_tik/tik_21/89E1A0.data.s | 51 - .../data/world/area_tik/tik_21/89FD70.data.s | 6 - .../data/world/area_tik/tik_22/8A0870.data.s | 6 - .../data/world/area_tik/tik_22/8A0930.data.s | 45 - .../data/world/area_tik/tik_23/8A3510.data.s | 6 - .../data/world/area_tik/tik_23/8A35A0.data.s | 54 - .../data/world/area_tik/tik_23/8A5340.data.s | 21 - .../data/world/area_tik/tik_24/8A6930.data.s | 6 - .../data/world/area_tik/tik_24/8A69C0.data.s | 30 - .../data/world/area_tik/tik_24/8A7810.data.s | 6 - .../data/world/area_tik/tik_24/8A7A20.data.s | 18 - .../data/world/area_tik/tik_25/8A8740.data.s | 6 - .../data/world/area_tik/tik_25/8A8800.data.s | 27 - .../data/world/area_tik/tik_25/8A93D0.data.s | 12 - .../mac_03/831B20/func_80241770_832F70.s | 28 - .../mac_03/831B20/func_80241BD8_8333D8.s | 78 -- ver/us/splat.yaml | 306 +++-- ver/us/symbol_addrs.txt | 82 +- 340 files changed, 9789 insertions(+), 4223 deletions(-) delete mode 100644 src/world/area_mac/mac_03/831800.c delete mode 100644 src/world/area_mac/mac_03/831B20.c delete mode 100644 src/world/area_mac/mac_03/833500.c delete mode 100644 src/world/area_mac/mac_03/833740.c create mode 100644 src/world/area_mac/mac_03/mac_03_0_header.c create mode 100644 src/world/area_mac/mac_03/mac_03_1_music.c create mode 100644 src/world/area_mac/mac_03/mac_03_2_main.c create mode 100644 src/world/area_mac/mac_03/mac_03_3_train.c create mode 100644 src/world/area_mac/mac_03/mac_03_4_npc.c create mode 100644 src/world/area_mac/mac_03/mac_03_5_entity.c create mode 100644 src/world/area_mac/mac_03/mac_03_6_foliage.c create mode 100644 src/world/area_mac/mac_03/mac_03_7_oinks.c create mode 100644 src/world/area_mac/mac_03/mac_03_8_demo.c delete mode 100644 src/world/area_tik/tik_01/8694B0.c delete mode 100644 src/world/area_tik/tik_01/869AA0.c delete mode 100644 src/world/area_tik/tik_01/869EE0.c create mode 100644 src/world/area_tik/tik_01/tik_01_0_header.c create mode 100644 src/world/area_tik/tik_01/tik_01_1_music.c create mode 100644 src/world/area_tik/tik_01/tik_01_2_main.c create mode 100644 src/world/area_tik/tik_01/tik_01_3_drips.c create mode 100644 src/world/area_tik/tik_01/tik_01_4_entity.c create mode 100644 src/world/area_tik/tik_01/tik_01_5_npc.c delete mode 100644 src/world/area_tik/tik_02/86C740.c delete mode 100644 src/world/area_tik/tik_02/86CA50.c delete mode 100644 src/world/area_tik/tik_02/86CD10.c create mode 100644 src/world/area_tik/tik_02/tik_02_0_header.c create mode 100644 src/world/area_tik/tik_02/tik_02_1_music.c create mode 100644 src/world/area_tik/tik_02/tik_02_2_main.c create mode 100644 src/world/area_tik/tik_02/tik_02_3_entity.c create mode 100644 src/world/area_tik/tik_02/tik_02_4_drips.c create mode 100644 src/world/area_tik/tik_02/tik_02_5_npc.c delete mode 100644 src/world/area_tik/tik_03/86EB00.c delete mode 100644 src/world/area_tik/tik_03/86F0F0.c create mode 100644 src/world/area_tik/tik_03/tik_03_0_header.c create mode 100644 src/world/area_tik/tik_03/tik_03_1_music.c create mode 100644 src/world/area_tik/tik_03/tik_03_2_main.c create mode 100644 src/world/area_tik/tik_03/tik_03_3_drips.c create mode 100644 src/world/area_tik/tik_03/tik_03_4_platforms.c create mode 100644 src/world/area_tik/tik_03/tik_03_5_entity.c create mode 100644 src/world/area_tik/tik_03/tik_03_6_demo.c delete mode 100644 src/world/area_tik/tik_04/871A30.c delete mode 100644 src/world/area_tik/tik_04/872020.c create mode 100644 src/world/area_tik/tik_04/tik_04_0_header.c create mode 100644 src/world/area_tik/tik_04/tik_04_1_music.c create mode 100644 src/world/area_tik/tik_04/tik_04_2_main.c create mode 100644 src/world/area_tik/tik_04/tik_04_3_drips.c create mode 100644 src/world/area_tik/tik_04/tik_04_4_platforms.c create mode 100644 src/world/area_tik/tik_04/tik_04_5_npc.c delete mode 100644 src/world/area_tik/tik_05/874DC0.c delete mode 100644 src/world/area_tik/tik_05/8750D0.c create mode 100644 src/world/area_tik/tik_05/tik_05_0_header.c create mode 100644 src/world/area_tik/tik_05/tik_05_1_music.c create mode 100644 src/world/area_tik/tik_05/tik_05_2_main.c create mode 100644 src/world/area_tik/tik_05/tik_05_3_drips.c create mode 100644 src/world/area_tik/tik_05/tik_05_4_entity.c create mode 100644 src/world/area_tik/tik_05/tik_05_5_npc.c delete mode 100644 src/world/area_tik/tik_07/879BE0.c delete mode 100644 src/world/area_tik/tik_07/87AC00.c create mode 100644 src/world/area_tik/tik_07/tik_07_0_header.c create mode 100644 src/world/area_tik/tik_07/tik_07_1_music.c create mode 100644 src/world/area_tik/tik_07/tik_07_2_main.c create mode 100644 src/world/area_tik/tik_07/tik_07_3_entity.c create mode 100644 src/world/area_tik/tik_07/tik_07_4_drips.c create mode 100644 src/world/area_tik/tik_07/tik_07_5_platforms.c create mode 100644 src/world/area_tik/tik_07/tik_07_6_npc.c delete mode 100644 src/world/area_tik/tik_08/87EDF0.c delete mode 100644 src/world/area_tik/tik_08/87F3E0.c delete mode 100644 src/world/area_tik/tik_08/87F820.c create mode 100644 src/world/area_tik/tik_08/tik_08_0_header.c create mode 100644 src/world/area_tik/tik_08/tik_08_1_music.c create mode 100644 src/world/area_tik/tik_08/tik_08_2_main.c create mode 100644 src/world/area_tik/tik_08/tik_08_3_drips.c create mode 100644 src/world/area_tik/tik_08/tik_08_4_entity.c create mode 100644 src/world/area_tik/tik_08/tik_08_5_npc.c delete mode 100644 src/world/area_tik/tik_09/8821C0.c delete mode 100644 src/world/area_tik/tik_09/8827B0.c delete mode 100644 src/world/area_tik/tik_09/882BF0.c create mode 100644 src/world/area_tik/tik_09/tik_09_0_header.c create mode 100644 src/world/area_tik/tik_09/tik_09_1_music.c create mode 100644 src/world/area_tik/tik_09/tik_09_2_main.c create mode 100644 src/world/area_tik/tik_09/tik_09_3_drips.c create mode 100644 src/world/area_tik/tik_09/tik_09_4_entity.c create mode 100644 src/world/area_tik/tik_09/tik_09_5_npc.c delete mode 100644 src/world/area_tik/tik_10/8863C0.c delete mode 100644 src/world/area_tik/tik_10/8866D0.c create mode 100644 src/world/area_tik/tik_10/tik_10_0_header.c create mode 100644 src/world/area_tik/tik_10/tik_10_1_music.c create mode 100644 src/world/area_tik/tik_10/tik_10_2_main.c create mode 100644 src/world/area_tik/tik_10/tik_10_3_drips.c create mode 100644 src/world/area_tik/tik_10/tik_10_4_entity.c delete mode 100644 src/world/area_tik/tik_12/888BD0.c delete mode 100644 src/world/area_tik/tik_12/8891C0.c delete mode 100644 src/world/area_tik/tik_12/88A530.c create mode 100644 src/world/area_tik/tik_12/tik_12_0_header.c create mode 100644 src/world/area_tik/tik_12/tik_12_1_music.c create mode 100644 src/world/area_tik/tik_12/tik_12_2_main.c create mode 100644 src/world/area_tik/tik_12/tik_12_3_drips.c create mode 100644 src/world/area_tik/tik_12/tik_12_4_entity.c create mode 100644 src/world/area_tik/tik_12/tik_12_5_npc.c delete mode 100644 src/world/area_tik/tik_14/88D600.c delete mode 100644 src/world/area_tik/tik_14/88DBF0.c create mode 100644 src/world/area_tik/tik_14/tik_14_0_header.c create mode 100644 src/world/area_tik/tik_14/tik_14_1_music.c create mode 100644 src/world/area_tik/tik_14/tik_14_2_main.c create mode 100644 src/world/area_tik/tik_14/tik_14_3_drips.c create mode 100644 src/world/area_tik/tik_14/tik_14_4_entity.c delete mode 100644 src/world/area_tik/tik_15/88FBA0.c delete mode 100644 src/world/area_tik/tik_15/890190.c create mode 100644 src/world/area_tik/tik_15/tik_15_0_header.c create mode 100644 src/world/area_tik/tik_15/tik_15_1_music.c create mode 100644 src/world/area_tik/tik_15/tik_15_2_main.c create mode 100644 src/world/area_tik/tik_15/tik_15_3_entity.c create mode 100644 src/world/area_tik/tik_15/tik_15_4_drips.c create mode 100644 src/world/area_tik/tik_15/tik_15_5_npc.c delete mode 100644 src/world/area_tik/tik_17/892A20.c delete mode 100644 src/world/area_tik/tik_17/892A50.c delete mode 100644 src/world/area_tik/tik_17/893790.c create mode 100644 src/world/area_tik/tik_17/tik_17_0_header.c create mode 100644 src/world/area_tik/tik_17/tik_17_1_music.c create mode 100644 src/world/area_tik/tik_17/tik_17_2_entity.c create mode 100644 src/world/area_tik/tik_17/tik_17_3_main.c delete mode 100644 src/world/area_tik/tik_18/8956E0.c delete mode 100644 src/world/area_tik/tik_18/8959F0.c create mode 100644 src/world/area_tik/tik_18/tik_18_0_header.c create mode 100644 src/world/area_tik/tik_18/tik_18_1_music.c create mode 100644 src/world/area_tik/tik_18/tik_18_2_main.c create mode 100644 src/world/area_tik/tik_18/tik_18_3_drips.c create mode 100644 src/world/area_tik/tik_18/tik_18_4_npc.c create mode 100644 src/world/area_tik/tik_18/tik_18_5_entity.c delete mode 100644 src/world/area_tik/tik_19/8975E0.c delete mode 100644 src/world/area_tik/tik_19/897BD0.c create mode 100644 src/world/area_tik/tik_19/tik_19_0_header.c create mode 100644 src/world/area_tik/tik_19/tik_19_1_music.c create mode 100644 src/world/area_tik/tik_19/tik_19_2_main.c create mode 100644 src/world/area_tik/tik_19/tik_19_3_entity.c delete mode 100644 src/world/area_tik/tik_20/89A350.c delete mode 100644 src/world/area_tik/tik_20/89ACB0.c create mode 100644 src/world/area_tik/tik_20/tik_20_0_header.c create mode 100644 src/world/area_tik/tik_20/tik_20_1_music.c create mode 100644 src/world/area_tik/tik_20/tik_20_2_main.c create mode 100644 src/world/area_tik/tik_20/tik_20_3_npc.c create mode 100644 src/world/area_tik/tik_20/tik_20_4_entity.c delete mode 100644 src/world/area_tik/tik_21/89D7A0.c create mode 100644 src/world/area_tik/tik_21/tik_21_0_header.c create mode 100644 src/world/area_tik/tik_21/tik_21_1_music.c create mode 100644 src/world/area_tik/tik_21/tik_21_2_main.c create mode 100644 src/world/area_tik/tik_21/tik_21_3_entity.c delete mode 100644 src/world/area_tik/tik_22/89FEC0.c delete mode 100644 src/world/area_tik/tik_22/89FEF0.c create mode 100644 src/world/area_tik/tik_22/tik_22_0_header.c create mode 100644 src/world/area_tik/tik_22/tik_22_1_music.c create mode 100644 src/world/area_tik/tik_22/tik_22_2_main.c delete mode 100644 src/world/area_tik/tik_23/8A23D0.c delete mode 100644 src/world/area_tik/tik_23/8A2D30.c create mode 100644 src/world/area_tik/tik_23/tik_23_0_header.c create mode 100644 src/world/area_tik/tik_23/tik_23_1_music.c create mode 100644 src/world/area_tik/tik_23/tik_23_2_main.c create mode 100644 src/world/area_tik/tik_23/tik_23_3_entity.c create mode 100644 src/world/area_tik/tik_23/tik_23_4_npc.c delete mode 100644 src/world/area_tik/tik_24/8A5A80.c delete mode 100644 src/world/area_tik/tik_24/8A5AD0.c delete mode 100644 src/world/area_tik/tik_24/8A5DE0.c create mode 100644 src/world/area_tik/tik_24/tik_24_0_header.c create mode 100644 src/world/area_tik/tik_24/tik_24_1_music.c create mode 100644 src/world/area_tik/tik_24/tik_24_2_main.c create mode 100644 src/world/area_tik/tik_24/tik_24_3_drips.c create mode 100644 src/world/area_tik/tik_24/tik_24_4_entity.c create mode 100644 src/world/area_tik/tik_24/tik_24_5_npc.c delete mode 100644 src/world/area_tik/tik_25/8A7F80.c delete mode 100644 src/world/area_tik/tik_25/8A8600.c create mode 100644 src/world/area_tik/tik_25/tik_25_0_header.c create mode 100644 src/world/area_tik/tik_25/tik_25_1_music.c create mode 100644 src/world/area_tik/tik_25/tik_25_2_main.c create mode 100644 src/world/area_tik/tik_25/tik_25_3_entity.c create mode 100644 src/world/common/atomic/tik_Flotsam.inc.c create mode 100644 src/world/common/enemy/complete/Blooper.h create mode 100644 src/world/common/enemy/complete/Blooper.inc.c create mode 100644 src/world/common/enemy/complete/DarkTroopa.h create mode 100644 src/world/common/enemy/complete/DarkTroopa_Wander.inc.c create mode 100644 src/world/common/enemy/complete/Gloomba.h create mode 100644 src/world/common/enemy/complete/Gloomba_Wander.inc.c create mode 100644 src/world/common/enemy/complete/Paragloomba.h create mode 100644 src/world/common/enemy/complete/Paragloomba_Wander.inc.c create mode 100644 src/world/common/enemy/complete/SpikedGloomba.h create mode 100644 src/world/common/enemy/complete/SpikedGloomba_Wander.inc.c create mode 100644 src/world/common/npc/Toad_Wander.inc.c delete mode 100644 ver/us/asm/data/world/area_mac/mac_03/834070.data.s delete mode 100644 ver/us/asm/data/world/area_mac/mac_03/834170.data.s delete mode 100644 ver/us/asm/data/world/area_mac/mac_03/835370.data.s delete mode 100644 ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s delete mode 100644 ver/us/asm/data/world/area_mac/mac_03/83F500.data.s delete mode 100644 ver/us/asm/data/world/area_mac/mac_03/83F6C0.data.s delete mode 100644 ver/us/asm/data/world/area_mac/mac_03/8404A0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_01/869F40.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_01/86A030.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_01/86B350.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_01/86BC00.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_02/86D0E0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_02/86D190.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_02/86D800.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_02/86E2C0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_03/86F5D0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_03/86F670.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_03/870B60.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_03/871430.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_03/871730.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_03/8717F0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_04/8726A0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_04/872750.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_04/8739F0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_04/8742C0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_04/8746E0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_05/875810.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_05/8758C0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_05/875D10.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_05/876A50.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_07/87C4D0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_07/87C570.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_07/87E590.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_07/87E890.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_08/87F8B0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_08/881770.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_08/8819D0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_09/883460.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_09/883500.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_09/8856E0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_09/885A80.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_10/887780.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_10/887800.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_10/887B20.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_12/88AE20.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_12/88BF60.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_12/88C810.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_14/88DF60.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_14/88F180.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_14/88FA30.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_15/8906B0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_15/890740.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_15/891890.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_15/8922A0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_17/893D80.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_17/893E40.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_18/895D90.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_18/895E20.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_18/896CA0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_18/897450.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_19/898910.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_19/898990.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_19/899C90.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_20/89B490.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_20/89B530.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_20/89D200.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_21/89E100.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_21/89FD70.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_22/8A0870.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_23/8A3510.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_23/8A5340.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_24/8A6930.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_24/8A69C0.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_24/8A7810.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_24/8A7A20.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_25/8A8740.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_25/8A8800.data.s delete mode 100644 ver/us/asm/data/world/area_tik/tik_25/8A93D0.data.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241BD8_8333D8.s diff --git a/include/effects.h b/include/effects.h index c931513f6f..2d679d280f 100644 --- a/include/effects.h +++ b/include/effects.h @@ -2453,20 +2453,47 @@ typedef struct SpiritCardFXData { #define MAX_LIL_OINKS 11 +enum LilOinkFlags { + LIL_OINK_FLAG_VISIBLE = 1, + LIL_OINK_FLAG_ANIM_CHANGED = 2, +}; + +enum LilOinkTypes { + LIL_OINK_TYPE_BLACK = 0, + LIL_OINK_TYPE_WHITE = 1, + LIL_OINK_TYPE_PINK = 2, + LIL_OINK_TYPE_PIKACHU = 3, + LIL_OINK_TYPE_SHROOM = 4, + LIL_OINK_TYPE_FLOWER = 5, + LIL_OINK_TYPE_STAR = 6, + LIL_OINK_TYPE_QUESTION = 7, + LIL_OINK_TYPE_SILVER = 8, + LIL_OINK_TYPE_GOLD = 9, +}; + +enum LilOinkAnims { + LIL_OINK_ANIM_0 = 0, + LIL_OINK_ANIM_1 = 1, + LIL_OINK_ANIM_2 = 2, + LIL_OINK_ANIM_3 = 3, + LIL_OINK_ANIM_4 = 4, + LIL_OINK_ANIM_5 = 5, +}; + typedef struct LilOinkFXData { - /* 0x000 */ s32 unk_00; - /* 0x004 */ s32 unk_04; + /* 0x000 */ s32 timeLeft; + /* 0x004 */ s32 lifetime; /* 0x008 */ s32 flags[MAX_LIL_OINKS]; /* 0x034 */ f32 x[MAX_LIL_OINKS]; /* 0x060 */ f32 y[MAX_LIL_OINKS]; /* 0x08C */ f32 z[MAX_LIL_OINKS]; /* 0x0B8 */ f32 rot[MAX_LIL_OINKS]; /* 0x0E4 */ u8 type[MAX_LIL_OINKS]; - /* 0x0EF */ s8 unk_EF[MAX_LIL_OINKS]; - /* 0x0FA */ u8 unk_FA[MAX_LIL_OINKS]; - /* 0x105 */ u8 unk_105[MAX_LIL_OINKS]; + /* 0x0EF */ s8 nextAnim[MAX_LIL_OINKS]; + /* 0x0FA */ u8 anim[MAX_LIL_OINKS]; + /* 0x105 */ u8 gfxFrame[MAX_LIL_OINKS]; /* 0x110 */ f32 jumpOffset[MAX_LIL_OINKS]; - /* 0x13C */ s8 unk_13C[MAX_LIL_OINKS]; + /* 0x13C */ s8 animTime[MAX_LIL_OINKS]; } LilOinkFXData; // size = 0x148 typedef struct SomethingRotatingFXData { diff --git a/include/script_api/common.h b/include/script_api/common.h index e2b921b56d..70eca08cfb 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -48,6 +48,8 @@ ApiStatus GetSelfAnimationFromTable(Evt* script, s32 isInitialCall); ApiStatus func_800457F8(Evt* script, s32 isInitialCall); ApiStatus ShowCoinCounter(Evt* script, s32 isInitialCall); ApiStatus MakeEntity(Evt* script, s32 isInitialCall); +ApiStatus SetEntityCullMode(Evt* script, s32 isInitialCall); +ApiStatus UseDynamicShadow(Evt* script, s32 isInitialCall); ApiStatus AssignScript(Evt* script, s32 isInitialCall); ApiStatus AssignSwitchFlag(Evt* script, s32 isInitialCall); ApiStatus AssignChestFlag(Evt* script, s32 isInitialCall); @@ -92,6 +94,7 @@ ApiStatus SetCamPerspective(Evt* script, s32 isInitialCall); ApiStatus SetCamViewport(Evt* script, s32 isInitialCall); ApiStatus SetCamBGColor(Evt* script, s32 isInitialCall); ApiStatus SetCamTarget(Evt* script, s32 isInitialCall); +ApiStatus InterpCamTargetPos(Evt* script, s32 isInitialCall); ApiStatus ShakeCam(Evt* script, s32 isInitialCall); ApiStatus SetCamLeadPlayer(Evt* script, s32 isInitialCall); ApiStatus PanToTarget(Evt* script, s32 isInitialCall); diff --git a/src/battle/area_jan/actor/jungle_fuzzy.c b/src/battle/area_jan/actor/jungle_fuzzy.c index 19ef3d37c7..879c9b5b13 100644 --- a/src/battle/area_jan/actor/jungle_fuzzy.c +++ b/src/battle/area_jan/actor/jungle_fuzzy.c @@ -84,15 +84,15 @@ ActorBlueprint NAMESPACE = { }; s32 N(idleAnimations_8021EADC)[] = { - STATUS_NORMAL, ANIM_Fuzzy_Jungle_Anim01, - STATUS_STONE, ANIM_Fuzzy_Jungle_Anim00, - STATUS_SLEEP, ANIM_Fuzzy_Jungle_Anim0E, - STATUS_POISON, ANIM_Fuzzy_Jungle_Anim01, - STATUS_STOP, ANIM_Fuzzy_Jungle_Anim00, - STATUS_STATIC, ANIM_Fuzzy_Jungle_Anim01, - STATUS_PARALYZE, ANIM_Fuzzy_Jungle_Anim00, - STATUS_DIZZY, ANIM_Fuzzy_Jungle_Anim0F, - STATUS_FEAR, ANIM_Fuzzy_Jungle_Anim0F, + STATUS_NORMAL, ANIM_Fuzzy_Jungle_Idle, + STATUS_STONE, ANIM_Fuzzy_Jungle_Still, + STATUS_SLEEP, ANIM_Fuzzy_Jungle_Sleep, + STATUS_POISON, ANIM_Fuzzy_Jungle_Idle, + STATUS_STOP, ANIM_Fuzzy_Jungle_Still, + STATUS_STATIC, ANIM_Fuzzy_Jungle_Idle, + STATUS_PARALYZE, ANIM_Fuzzy_Jungle_Still, + STATUS_DIZZY, ANIM_Fuzzy_Jungle_Stunned, + STATUS_FEAR, ANIM_Fuzzy_Jungle_Stunned, STATUS_END, }; @@ -122,110 +122,110 @@ EvtScript N(handleEvent_8021EB9C) = { EVT_CALL(GetLastElement, LVar0) EVT_IF_FLAG(LVar0, DAMAGE_TYPE_ELECTRIC) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_HurtShock) EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Hurt) EVT_END_IF EVT_EXEC_WAIT(DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim10) - EVT_SET_CONST(LVar2, ANIM_Fuzzy_Jungle_Anim12) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Burn) + EVT_SET_CONST(LVar2, ANIM_Fuzzy_Jungle_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim10) - EVT_SET_CONST(LVar2, ANIM_Fuzzy_Jungle_Anim12) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Burn) + EVT_SET_CONST(LVar2, ANIM_Fuzzy_Jungle_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim12) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_BurnStill) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_CALL(func_80269470) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_HurtShock) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_HurtShock) EVT_EXEC_WAIT(DoJumpBack) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim03) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Run) EVT_EXEC_WAIT(D_8029C0A4) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_CALL(func_80269470) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_HurtShock) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_HurtShock) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_UNKNOWN_TRIGGER) EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim01) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Idle) EVT_EXEC_WAIT(DoImmune) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_CALL(GetLastElement, LVar0) EVT_IF_FLAG(LVar0, DAMAGE_TYPE_ELECTRIC) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_HurtShock) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_HurtShock) EVT_EXEC_WAIT(DoDeath) EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim01) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Idle) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim03) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Run) EVT_SET_CONST(LVar2, ANIM_Fuzzy_Jungle_Anim09) EVT_EXEC_WAIT(DoScareAway) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim03) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Run) EVT_EXEC_WAIT(DoAirLift) EVT_CASE_EQ(EVENT_BLOW_AWAY) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim03) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Run) EVT_EXEC_WAIT(DoBlowAway) EVT_RETURN EVT_CASE_EQ(EVENT_AIR_LIFT_FAILED) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Anim01) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Jungle_Idle) EVT_EXEC_WAIT(DoImmune) EVT_CASE_DEFAULT EVT_END_SWITCH @@ -259,7 +259,7 @@ EvtScript N(divide) = { EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim0D) EVT_WAIT(130) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Walk) EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_8022180C)), 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(SetActorPos, LVar0, LVar1, LVar2, LVar3) @@ -267,20 +267,20 @@ EvtScript N(divide) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) EVT_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Walk) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(JumpToGoal, ACTOR_SELF, 14, FALSE, TRUE, FALSE) EVT_END_THREAD EVT_WAIT(1) - EVT_CALL(SetAnimation, LVar0, 1, ANIM_Fuzzy_Jungle_Anim02) + EVT_CALL(SetAnimation, LVar0, 1, ANIM_Fuzzy_Jungle_Walk) EVT_CALL(SetActorJumpGravity, LVar0, EVT_FLOAT(1.4)) EVT_CALL(JumpToGoal, LVar0, 14, FALSE, TRUE, FALSE) EVT_CALL(GetActorPos, LVar0, LVar1, LVar2, LVar3) EVT_CALL(ForceHomePos, LVar0, LVar1, LVar2, LVar3) EVT_CALL(HPBarToHome, LVar0) - EVT_CALL(SetAnimation, LVar0, 1, ANIM_Fuzzy_Jungle_Anim01) + EVT_CALL(SetAnimation, LVar0, 1, ANIM_Fuzzy_Jungle_Idle) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar1) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) @@ -312,7 +312,7 @@ EvtScript N(leechAttack) = { EVT_GOTO(100) EVT_END_IF EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Run) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 50) @@ -320,7 +320,7 @@ EvtScript N(leechAttack) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_EXEC_WAIT(D_8029C12C) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Idle) EVT_LABEL(100) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim04) @@ -339,7 +339,7 @@ EvtScript N(leechAttack) = { EVT_SET(LVar1, 0) EVT_SUB(LVar2, 5) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Jump) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 11, FALSE, TRUE, FALSE) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) @@ -365,7 +365,7 @@ EvtScript N(leechAttack) = { EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -388,7 +388,7 @@ EvtScript N(leechAttack) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -3, -12, -15) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Jump) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) @@ -399,9 +399,9 @@ EvtScript N(leechAttack) = { EVT_WAIT(10) EVT_LOOP(2) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Bite) EVT_WAIT(21) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim00) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Still) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 330) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, -3, -2, 0) @@ -422,7 +422,7 @@ EvtScript N(leechAttack) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 8, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Jump) EVT_WAIT(30) EVT_END_LOOP EVT_ELSE @@ -439,7 +439,7 @@ EvtScript N(leechAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03000C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Bite) EVT_SET(LocalFlag(0), 0) EVT_LOOP(21) EVT_CALL(GetActionSuccessCopy, LVar1) @@ -453,7 +453,7 @@ EvtScript N(leechAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim00) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Still) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 330) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, -3, -2, 0) @@ -584,7 +584,7 @@ EvtScript N(leechAttack) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 8, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Jump) EVT_CALL(GetPlayerHP, LVar1) EVT_IF_EQ(LVar1, 0) EVT_CALL(func_80269470) @@ -607,10 +607,10 @@ EvtScript N(leechAttack) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 8, 0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Jump) EVT_END_IF EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Idle) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_THREAD EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.6), EVT_FLOAT(0.6), EVT_FLOAT(1.0)) @@ -667,13 +667,13 @@ EvtScript N(leechAttack) = { EVT_WAIT(5) EVT_CALL(YieldTurn) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_EXEC_WAIT(D_8029C12C) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Idle) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN diff --git a/src/battle/area_mac/actor/master1.c b/src/battle/area_mac/actor/master1.c index 499afd34b0..a85ef2d074 100644 --- a/src/battle/area_mac/actor/master1.c +++ b/src/battle/area_mac/actor/master1.c @@ -235,10 +235,10 @@ EvtScript N(takeTurn_8022AA54) = { EVT_WAIT(5) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20BB) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_WindUpLoop) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_WindupLoop) EVT_WAIT(10) EVT_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_WindUpStill) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_WindupStill) EVT_WAIT(7) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_DownwardStrike) EVT_END_THREAD diff --git a/src/battle/area_mim/actor/forest_fuzzy.c b/src/battle/area_mim/actor/forest_fuzzy.c index 5b1221f5a7..1db27969e1 100644 --- a/src/battle/area_mim/actor/forest_fuzzy.c +++ b/src/battle/area_mim/actor/forest_fuzzy.c @@ -82,15 +82,15 @@ ActorBlueprint NAMESPACE = { }; s32 N(idleAnimations_802184C4)[] = { - STATUS_NORMAL, ANIM_Fuzzy_Forest_Anim01, - STATUS_STONE, ANIM_Fuzzy_Forest_Anim00, - STATUS_SLEEP, ANIM_Fuzzy_Forest_Anim0E, - STATUS_POISON, ANIM_Fuzzy_Forest_Anim01, - STATUS_STOP, ANIM_Fuzzy_Forest_Anim00, - STATUS_STATIC, ANIM_Fuzzy_Forest_Anim01, - STATUS_PARALYZE, ANIM_Fuzzy_Forest_Anim00, - STATUS_DIZZY, ANIM_Fuzzy_Forest_Anim0F, - STATUS_FEAR, ANIM_Fuzzy_Forest_Anim0F, + STATUS_NORMAL, ANIM_Fuzzy_Forest_Idle, + STATUS_STONE, ANIM_Fuzzy_Forest_Still, + STATUS_SLEEP, ANIM_Fuzzy_Forest_Sleep, + STATUS_POISON, ANIM_Fuzzy_Forest_Idle, + STATUS_STOP, ANIM_Fuzzy_Forest_Still, + STATUS_STATIC, ANIM_Fuzzy_Forest_Idle, + STATUS_PARALYZE, ANIM_Fuzzy_Forest_Still, + STATUS_DIZZY, ANIM_Fuzzy_Forest_Stunned, + STATUS_FEAR, ANIM_Fuzzy_Forest_Stunned, STATUS_END, }; @@ -120,110 +120,110 @@ EvtScript N(handleEvent_80218584) = { EVT_CALL(GetLastElement, LVar0) EVT_IF_FLAG(LVar0, DAMAGE_TYPE_ELECTRIC) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_HurtShock) EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Hurt) EVT_END_IF EVT_EXEC_WAIT(DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim10) - EVT_SET_CONST(LVar2, ANIM_Fuzzy_Forest_Anim12) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Burn) + EVT_SET_CONST(LVar2, ANIM_Fuzzy_Forest_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim10) - EVT_SET_CONST(LVar2, ANIM_Fuzzy_Forest_Anim12) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Burn) + EVT_SET_CONST(LVar2, ANIM_Fuzzy_Forest_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim12) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_BurnStill) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_CALL(func_80269470) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_HurtShock) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_HurtShock) EVT_EXEC_WAIT(DoJumpBack) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim03) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Run) EVT_EXEC_WAIT(D_8029C0A4) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_CALL(func_80269470) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_HurtShock) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_HurtShock) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_UNKNOWN_TRIGGER) EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim01) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Idle) EVT_EXEC_WAIT(DoImmune) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_CALL(GetLastElement, LVar0) EVT_IF_FLAG(LVar0, DAMAGE_TYPE_ELECTRIC) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_HurtShock) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_HurtShock) EVT_EXEC_WAIT(DoDeath) EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim01) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Idle) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim03) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Run) EVT_SET_CONST(LVar2, ANIM_Fuzzy_Forest_Anim09) EVT_EXEC_WAIT(DoScareAway) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim03) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Run) EVT_EXEC_WAIT(DoAirLift) EVT_CASE_EQ(EVENT_BLOW_AWAY) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim03) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Run) EVT_EXEC_WAIT(DoBlowAway) EVT_RETURN EVT_CASE_EQ(EVENT_AIR_LIFT_FAILED) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Anim01) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Forest_Idle) EVT_EXEC_WAIT(DoImmune) EVT_CASE_DEFAULT EVT_END_SWITCH @@ -257,7 +257,7 @@ EvtScript N(80218C48) = { EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Anim0D) EVT_WAIT(130) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Walk) EVT_CALL(SummonEnemy, EVT_PTR(N(specialFormation_8021A800)), 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(SetActorPos, LVar0, LVar1, LVar2, LVar3) @@ -265,20 +265,20 @@ EvtScript N(80218C48) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) EVT_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Walk) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar1, LVar2, LVar3) EVT_CALL(JumpToGoal, ACTOR_SELF, 14, FALSE, TRUE, FALSE) EVT_END_THREAD EVT_WAIT(1) - EVT_CALL(SetAnimation, LVar0, 1, ANIM_Fuzzy_Forest_Anim02) + EVT_CALL(SetAnimation, LVar0, 1, ANIM_Fuzzy_Forest_Walk) EVT_CALL(SetActorJumpGravity, LVar0, EVT_FLOAT(1.4)) EVT_CALL(JumpToGoal, LVar0, 14, FALSE, TRUE, FALSE) EVT_CALL(GetActorPos, LVar0, LVar1, LVar2, LVar3) EVT_CALL(ForceHomePos, LVar0, LVar1, LVar2, LVar3) EVT_CALL(HPBarToHome, LVar0) - EVT_CALL(SetAnimation, LVar0, 1, ANIM_Fuzzy_Forest_Anim01) + EVT_CALL(SetAnimation, LVar0, 1, ANIM_Fuzzy_Forest_Idle) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar1) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) @@ -310,7 +310,7 @@ EvtScript N(80219054) = { EVT_GOTO(100) EVT_END_IF EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Run) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 50) @@ -318,7 +318,7 @@ EvtScript N(80219054) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_EXEC_WAIT(D_8029C12C) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Idle) EVT_LABEL(100) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Anim04) @@ -337,7 +337,7 @@ EvtScript N(80219054) = { EVT_SET(LVar1, 0) EVT_SUB(LVar2, 5) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Jump) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 11, FALSE, TRUE, FALSE) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) @@ -363,7 +363,7 @@ EvtScript N(80219054) = { EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -386,7 +386,7 @@ EvtScript N(80219054) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -3, -12, -15) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Jump) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) @@ -396,9 +396,9 @@ EvtScript N(80219054) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, 0x03000C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Bite) EVT_WAIT(21) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Anim00) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Still) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 330) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, -3, -2, 0) @@ -418,7 +418,7 @@ EvtScript N(80219054) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarA, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Idle) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(GetLastDamage, ACTOR_PLAYER, LVar3) EVT_IF_NE(LVar3, 0) @@ -494,13 +494,13 @@ EvtScript N(80219054) = { EVT_WAIT(5) EVT_CALL(YieldTurn) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_EXEC_WAIT(D_8029C12C) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Idle) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN diff --git a/src/battle/area_tik/actor/dark_koopa.c b/src/battle/area_tik/actor/dark_koopa.c index 42f5b910d8..165198daab 100644 --- a/src/battle/area_tik/actor/dark_koopa.c +++ b/src/battle/area_tik/actor/dark_koopa.c @@ -92,67 +92,67 @@ ActorBlueprint NAMESPACE = { }; s32 N(idleAnimations)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Anim01, - STATUS_STONE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Anim11, - STATUS_POISON, ANIM_KoopaTroopa_Dark_Anim01, - STATUS_STOP, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_STATIC, ANIM_KoopaTroopa_Dark_Anim01, - STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Anim13, - STATUS_FEAR, ANIM_KoopaTroopa_Dark_Anim13, + STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Idle, + STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, + STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, + STATUS_POISON, ANIM_KoopaTroopa_Dark_Idle, + STATUS_STOP, ANIM_KoopaTroopa_Dark_Still, + STATUS_STATIC, ANIM_KoopaTroopa_Dark_Idle, + STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Still, + STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_FEAR, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; s32 N(idleAnimations_step)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Anim03, - STATUS_STONE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Anim11, - STATUS_POISON, ANIM_KoopaTroopa_Dark_Anim03, - STATUS_STOP, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_STATIC, ANIM_KoopaTroopa_Dark_Anim03, - STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Anim13, - STATUS_FEAR, ANIM_KoopaTroopa_Dark_Anim13, + STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Walk, + STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, + STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, + STATUS_POISON, ANIM_KoopaTroopa_Dark_Walk, + STATUS_STOP, ANIM_KoopaTroopa_Dark_Still, + STATUS_STATIC, ANIM_KoopaTroopa_Dark_Walk, + STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Still, + STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_FEAR, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; s32 N(idleAnimations_active)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Anim02, - STATUS_STONE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Anim11, - STATUS_POISON, ANIM_KoopaTroopa_Dark_Anim02, - STATUS_STOP, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_STATIC, ANIM_KoopaTroopa_Dark_Anim02, - STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Anim13, - STATUS_FEAR, ANIM_KoopaTroopa_Dark_Anim13, + STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Scramble, + STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, + STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, + STATUS_POISON, ANIM_KoopaTroopa_Dark_Scramble, + STATUS_STOP, ANIM_KoopaTroopa_Dark_Still, + STATUS_STATIC, ANIM_KoopaTroopa_Dark_Scramble, + STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Still, + STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_FEAR, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; s32 N(idleAnimations_step_active)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Anim03, - STATUS_STONE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Anim11, - STATUS_POISON, ANIM_KoopaTroopa_Dark_Anim03, - STATUS_STOP, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_STATIC, ANIM_KoopaTroopa_Dark_Anim03, - STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Anim13, - STATUS_FEAR, ANIM_KoopaTroopa_Dark_Anim13, + STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Walk, + STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, + STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, + STATUS_POISON, ANIM_KoopaTroopa_Dark_Walk, + STATUS_STOP, ANIM_KoopaTroopa_Dark_Still, + STATUS_STATIC, ANIM_KoopaTroopa_Dark_Walk, + STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Still, + STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_FEAR, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; s32 N(idleAnimations_flipped)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Anim0F, - STATUS_STONE, ANIM_KoopaTroopa_Dark_Anim10, - STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Anim12, - STATUS_POISON, ANIM_KoopaTroopa_Dark_Anim0F, - STATUS_STOP, ANIM_KoopaTroopa_Dark_Anim10, - STATUS_STATIC, ANIM_KoopaTroopa_Dark_Anim0F, - STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Anim10, - STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Anim14, - STATUS_FEAR, ANIM_KoopaTroopa_Dark_Anim14, + STATUS_NORMAL, ANIM_KoopaTroopa_Dark_ToppleStruggle, + STATUS_STONE, ANIM_KoopaTroopa_Dark_ToppleStill, + STATUS_SLEEP, ANIM_KoopaTroopa_Dark_ToppleSleep, + STATUS_POISON, ANIM_KoopaTroopa_Dark_ToppleStruggle, + STATUS_STOP, ANIM_KoopaTroopa_Dark_ToppleStill, + STATUS_STATIC, ANIM_KoopaTroopa_Dark_ToppleStruggle, + STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_ToppleStill, + STATUS_DIZZY, ANIM_KoopaTroopa_Dark_ToppleStunned, + STATUS_FEAR, ANIM_KoopaTroopa_Dark_ToppleStunned, STATUS_END, }; @@ -166,7 +166,7 @@ EvtScript N(init) = { EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_active))) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Scramble) EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_RETURN @@ -358,33 +358,33 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0C) - EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Dark_Anim0D) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Dark_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0C) - EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Dark_Anim0D) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Dark_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0D) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_BurnStill) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) @@ -401,7 +401,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Hurt) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_THREAD EVT_WAIT(4) @@ -425,27 +425,27 @@ EvtScript N(handleEvent) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim0F) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(0.5)) EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoJumpBack) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim04) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Run) EVT_EXEC_WAIT(DoReturnHome) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_UNKNOWN_TRIGGER) @@ -455,36 +455,36 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(1) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim07) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_ShellEnter) EVT_EXEC_WAIT(DoImmune) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellExit) EVT_WAIT(10) EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_EXEC_WAIT(DoImmune) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_END_FIRST_STRIKE) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim04) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Run) EVT_EXEC_WAIT(DoReturnHome) EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -494,7 +494,7 @@ EvtScript N(handleEvent) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim02) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Scramble) EVT_EXEC_WAIT(DoRecover) EVT_END_IF EVT_CASE_EQ(EVENT_SCARE_AWAY) @@ -503,15 +503,15 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(1) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim04) - EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Run) + EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoScareAway) EVT_RETURN EVT_END_CASE_GROUP EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_EXEC_WAIT(DoImmune) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -521,12 +521,12 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(1) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim17) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Panic) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_EXEC_WAIT(DoAirLift) @@ -536,12 +536,12 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(1) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim17) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Panic) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_EXEC_WAIT(DoBlowAway) @@ -552,13 +552,13 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(1) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim01) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Idle) EVT_EXEC_WAIT(DoImmune) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_EXEC_WAIT(DoImmune) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -575,12 +575,12 @@ EvtScript N(attackShellToss) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellEnter) EVT_WAIT(10) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -592,7 +592,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_WAIT(10) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_END_IF @@ -608,7 +608,7 @@ EvtScript N(attackShellToss) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -40, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellExit) EVT_WAIT(8) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) @@ -616,15 +616,15 @@ EvtScript N(attackShellToss) = { EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim15) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_BeginPanic1) EVT_WAIT(1) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim16) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_BeginPanic2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim17) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Panic) EVT_WAIT(6) EVT_SUB(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -633,11 +633,11 @@ EvtScript N(attackShellToss) = { EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim17) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Panic) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -667,13 +667,13 @@ EvtScript N(attackShellToss) = { EVT_ADD(LVar0, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellExit) EVT_WAIT(8) EVT_CALL(YieldTurn) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim04) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Run) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -702,12 +702,12 @@ EvtScript N(attackDizzyTornado) = { EVT_ELSE EVT_CALL(AddGoalPos, ACTOR_SELF, 20, 0, 0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Run) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Scramble) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellEnter) EVT_WAIT(10) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -719,7 +719,7 @@ EvtScript N(attackDizzyTornado) = { EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2026) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, 7) @@ -729,7 +729,7 @@ EvtScript N(attackDizzyTornado) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellExit) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 1) EVT_WAIT(10) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) @@ -740,11 +740,11 @@ EvtScript N(attackDizzyTornado) = { EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim17) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Panic) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Scramble) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_RETURN @@ -770,16 +770,16 @@ EvtScript N(attackDizzyTornado) = { EVT_END_IF EVT_END_THREAD EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellExit) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 1) EVT_WAIT(10) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(YieldTurn) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim04) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Run) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Scramble) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -811,7 +811,7 @@ EvtScript N(standUp) = { EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim0F) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_SET(LVar0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_THREAD diff --git a/src/battle/area_tik/actor/dark_paratroopa.c b/src/battle/area_tik/actor/dark_paratroopa.c index 44eaba1c1f..ab71c378ec 100644 --- a/src/battle/area_tik/actor/dark_paratroopa.c +++ b/src/battle/area_tik/actor/dark_paratroopa.c @@ -157,41 +157,41 @@ ActorBlueprint NAMESPACE = { }; s32 N(idleAnimations2)[] = { - STATUS_NORMAL, ANIM_ParaTroopa_Dark_Anim01, - STATUS_STONE, ANIM_ParaTroopa_Dark_Anim00, - STATUS_SLEEP, ANIM_ParaTroopa_Dark_Anim12, - STATUS_POISON, ANIM_ParaTroopa_Dark_Anim00, - STATUS_STOP, ANIM_ParaTroopa_Dark_Anim00, - STATUS_STATIC, ANIM_ParaTroopa_Dark_Anim01, - STATUS_PARALYZE, ANIM_ParaTroopa_Dark_Anim00, - STATUS_DIZZY, ANIM_ParaTroopa_Dark_Anim13, - STATUS_FEAR, ANIM_ParaTroopa_Dark_Anim13, + STATUS_NORMAL, ANIM_ParaTroopa_Dark_Idle, + STATUS_STONE, ANIM_ParaTroopa_Dark_Still, + STATUS_SLEEP, ANIM_ParaTroopa_Dark_Sleep, + STATUS_POISON, ANIM_ParaTroopa_Dark_Still, + STATUS_STOP, ANIM_ParaTroopa_Dark_Still, + STATUS_STATIC, ANIM_ParaTroopa_Dark_Idle, + STATUS_PARALYZE, ANIM_ParaTroopa_Dark_Still, + STATUS_DIZZY, ANIM_ParaTroopa_Dark_Stunned, + STATUS_FEAR, ANIM_ParaTroopa_Dark_Stunned, STATUS_END, }; s32 N(idleAnimations_step)[] = { - STATUS_NORMAL, ANIM_ParaTroopa_Dark_Anim01, - STATUS_STONE, ANIM_ParaTroopa_Dark_Anim00, - STATUS_SLEEP, ANIM_ParaTroopa_Dark_Anim12, - STATUS_POISON, ANIM_ParaTroopa_Dark_Anim00, - STATUS_STOP, ANIM_ParaTroopa_Dark_Anim00, - STATUS_STATIC, ANIM_ParaTroopa_Dark_Anim01, - STATUS_PARALYZE, ANIM_ParaTroopa_Dark_Anim00, - STATUS_DIZZY, ANIM_ParaTroopa_Dark_Anim13, - STATUS_FEAR, ANIM_ParaTroopa_Dark_Anim13, + STATUS_NORMAL, ANIM_ParaTroopa_Dark_Idle, + STATUS_STONE, ANIM_ParaTroopa_Dark_Still, + STATUS_SLEEP, ANIM_ParaTroopa_Dark_Sleep, + STATUS_POISON, ANIM_ParaTroopa_Dark_Still, + STATUS_STOP, ANIM_ParaTroopa_Dark_Still, + STATUS_STATIC, ANIM_ParaTroopa_Dark_Idle, + STATUS_PARALYZE, ANIM_ParaTroopa_Dark_Still, + STATUS_DIZZY, ANIM_ParaTroopa_Dark_Stunned, + STATUS_FEAR, ANIM_ParaTroopa_Dark_Stunned, STATUS_END, }; s32 N(idleAnimations3)[] = { - STATUS_NORMAL, ANIM_ParaTroopa_Dark_Anim0F, - STATUS_STONE, ANIM_ParaTroopa_Dark_Anim00, - STATUS_SLEEP, ANIM_ParaTroopa_Dark_Anim12, - STATUS_POISON, ANIM_ParaTroopa_Dark_Anim00, - STATUS_STOP, ANIM_ParaTroopa_Dark_Anim00, - STATUS_STATIC, ANIM_ParaTroopa_Dark_Anim0F, - STATUS_PARALYZE, ANIM_ParaTroopa_Dark_Anim00, - STATUS_DIZZY, ANIM_ParaTroopa_Dark_Anim13, - STATUS_FEAR, ANIM_ParaTroopa_Dark_Anim13, + STATUS_NORMAL, ANIM_ParaTroopa_Dark_WingsStill, + STATUS_STONE, ANIM_ParaTroopa_Dark_Still, + STATUS_SLEEP, ANIM_ParaTroopa_Dark_Sleep, + STATUS_POISON, ANIM_ParaTroopa_Dark_Still, + STATUS_STOP, ANIM_ParaTroopa_Dark_Still, + STATUS_STATIC, ANIM_ParaTroopa_Dark_WingsStill, + STATUS_PARALYZE, ANIM_ParaTroopa_Dark_Still, + STATUS_DIZZY, ANIM_ParaTroopa_Dark_Stunned, + STATUS_FEAR, ANIM_ParaTroopa_Dark_Stunned, STATUS_END, }; @@ -282,11 +282,11 @@ EvtScript N(idle) = { }; EvtScript N(returnHome) = { - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Idle) EVT_RETURN EVT_END }; @@ -299,11 +299,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_CASE_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -314,66 +314,66 @@ EvtScript N(handleEvent) = { EVT_END_IF EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim06) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_HurtStill) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim08) - EVT_SET_CONST(LVar2, ANIM_ParaTroopa_Dark_Anim09) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_ParaTroopa_Dark_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim08) - EVT_SET_CONST(LVar2, ANIM_ParaTroopa_Dark_Anim09) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_ParaTroopa_Dark_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim09) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_BurnStill) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FALL_TRIGGER) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_EXEC_WAIT(N(fall)) EVT_CASE_EQ(EVENT_15) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim08) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim09) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_BurnHurt) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_EXEC_WAIT(N(fall)) EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim06) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_HurtStill) EVT_EXEC_WAIT(DoJumpBack) EVT_EXEC_WAIT(N(returnHome)) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim06) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_HurtStill) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_UNKNOWN_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_ShellEnter) EVT_EXEC_WAIT(DoImmune) EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CASE_OR_EQ(EVENT_AIR_LIFT_FAILED) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_ShellEnter) EVT_EXEC_WAIT(DoImmune) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -385,11 +385,11 @@ EvtScript N(handleEvent) = { EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim06) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_HurtStill) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE) @@ -400,22 +400,22 @@ EvtScript N(handleEvent) = { EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim01) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Idle) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim03) - EVT_SET_CONST(LVar2, ANIM_ParaTroopa_Dark_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Run) + EVT_SET_CONST(LVar2, ANIM_ParaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoScareAway) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim03) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Run) EVT_EXEC_WAIT(DoAirLift) EVT_CASE_EQ(EVENT_BLOW_AWAY) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoBlowAway) EVT_RETURN EVT_CASE_DEFAULT @@ -434,7 +434,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_F) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Run) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 30, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) @@ -448,7 +448,7 @@ EvtScript N(takeTurn) = { EVT_SET(LVarA, LVar0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(AddGoalPos, ACTOR_SELF, 6, 6, 0) @@ -462,7 +462,7 @@ EvtScript N(takeTurn) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Anim0C) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_ShellDive) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) @@ -487,13 +487,13 @@ EvtScript N(takeTurn) = { EVT_SUB(LVar0, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(4.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Hurt) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(4.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Hurt) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -517,7 +517,7 @@ EvtScript N(takeTurn) = { EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(AddGoalPos, ACTOR_SELF, 6, 6, 0) @@ -528,7 +528,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Anim0C) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_ShellDive) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 65535, 0, 3, BS_FLAGS1_SP_EVT_ACTIVE) @@ -539,7 +539,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 30, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Anim0D) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_ShellHit) EVT_THREAD EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 10, 0) EVT_SET(LVar0, 0) @@ -553,7 +553,7 @@ EvtScript N(takeTurn) = { EVT_END_LOOP EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, -10, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Dark_Idle) EVT_END_THREAD EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 30, 0) EVT_WAIT(10) @@ -578,7 +578,7 @@ EvtScript N(fall) = { EVT_ADD(LVar1, 8) EVT_SUB(LVar2, 2) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Hurt) EVT_CALL(SetActorSounds, ACTOR_SELF, 2, SOUND_301, 0) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarA) EVT_IF_EQ(LVarA, 0) @@ -629,7 +629,7 @@ EvtScript N(fall) = { EVT_CALL(SetGoalToIndex, ACTOR_SELF, LVar0) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Idle) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_koopa))) EVT_CALL(BindNextTurn, ACTOR_SELF, 0) @@ -646,67 +646,67 @@ EvtScript N(fall) = { }; s32 N(idleAnimations)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Anim01, - STATUS_STONE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Anim11, - STATUS_POISON, ANIM_KoopaTroopa_Dark_Anim01, - STATUS_STOP, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_STATIC, ANIM_KoopaTroopa_Dark_Anim01, - STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Anim13, - STATUS_FEAR, ANIM_KoopaTroopa_Dark_Anim13, + STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Idle, + STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, + STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, + STATUS_POISON, ANIM_KoopaTroopa_Dark_Idle, + STATUS_STOP, ANIM_KoopaTroopa_Dark_Still, + STATUS_STATIC, ANIM_KoopaTroopa_Dark_Idle, + STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Still, + STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_FEAR, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; s32 N(idleAnimations_koopa_step)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Anim03, - STATUS_STONE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Anim11, - STATUS_POISON, ANIM_KoopaTroopa_Dark_Anim03, - STATUS_STOP, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_STATIC, ANIM_KoopaTroopa_Dark_Anim03, - STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Anim13, - STATUS_FEAR, ANIM_KoopaTroopa_Dark_Anim13, + STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Walk, + STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, + STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, + STATUS_POISON, ANIM_KoopaTroopa_Dark_Walk, + STATUS_STOP, ANIM_KoopaTroopa_Dark_Still, + STATUS_STATIC, ANIM_KoopaTroopa_Dark_Walk, + STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Still, + STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_FEAR, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; s32 N(idleAnimations_koopa_active)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Anim02, - STATUS_STONE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Anim11, - STATUS_POISON, ANIM_KoopaTroopa_Dark_Anim02, - STATUS_STOP, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_STATIC, ANIM_KoopaTroopa_Dark_Anim02, - STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Anim13, - STATUS_FEAR, ANIM_KoopaTroopa_Dark_Anim13, + STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Scramble, + STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, + STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, + STATUS_POISON, ANIM_KoopaTroopa_Dark_Scramble, + STATUS_STOP, ANIM_KoopaTroopa_Dark_Still, + STATUS_STATIC, ANIM_KoopaTroopa_Dark_Scramble, + STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Still, + STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_FEAR, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; s32 N(idleAnimations_koopa_step_active)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Anim03, - STATUS_STONE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Anim11, - STATUS_POISON, ANIM_KoopaTroopa_Dark_Anim03, - STATUS_STOP, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_STATIC, ANIM_KoopaTroopa_Dark_Anim03, - STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Anim00, - STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Anim13, - STATUS_FEAR, ANIM_KoopaTroopa_Dark_Anim13, + STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Walk, + STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, + STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, + STATUS_POISON, ANIM_KoopaTroopa_Dark_Walk, + STATUS_STOP, ANIM_KoopaTroopa_Dark_Still, + STATUS_STATIC, ANIM_KoopaTroopa_Dark_Walk, + STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Still, + STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Stunned, + STATUS_FEAR, ANIM_KoopaTroopa_Dark_Stunned, STATUS_END, }; s32 N(idleAnimations_koopa_flipped)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Anim0F, - STATUS_STONE, ANIM_KoopaTroopa_Dark_Anim10, - STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Anim12, - STATUS_POISON, ANIM_KoopaTroopa_Dark_Anim0F, - STATUS_STOP, ANIM_KoopaTroopa_Dark_Anim10, - STATUS_STATIC, ANIM_KoopaTroopa_Dark_Anim0F, - STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_Anim10, - STATUS_DIZZY, ANIM_KoopaTroopa_Dark_Anim14, - STATUS_FEAR, ANIM_KoopaTroopa_Dark_Anim14, + STATUS_NORMAL, ANIM_KoopaTroopa_Dark_ToppleStruggle, + STATUS_STONE, ANIM_KoopaTroopa_Dark_ToppleStill, + STATUS_SLEEP, ANIM_KoopaTroopa_Dark_ToppleSleep, + STATUS_POISON, ANIM_KoopaTroopa_Dark_ToppleStruggle, + STATUS_STOP, ANIM_KoopaTroopa_Dark_ToppleStill, + STATUS_STATIC, ANIM_KoopaTroopa_Dark_ToppleStruggle, + STATUS_PARALYZE, ANIM_KoopaTroopa_Dark_ToppleStill, + STATUS_DIZZY, ANIM_KoopaTroopa_Dark_ToppleStunned, + STATUS_FEAR, ANIM_KoopaTroopa_Dark_ToppleStunned, STATUS_END, }; @@ -720,7 +720,7 @@ EvtScript N(init_koopa) = { EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_active))) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Scramble) EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_RETURN @@ -910,33 +910,33 @@ EvtScript N(handleEvent_koopa) = { EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0C) - EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Dark_Anim0D) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Dark_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0C) - EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Dark_Anim0D) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Dark_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0D) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_BurnStill) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) @@ -953,7 +953,7 @@ EvtScript N(handleEvent_koopa) = { EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Hurt) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_THREAD EVT_WAIT(4) @@ -977,27 +977,27 @@ EvtScript N(handleEvent_koopa) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim0F) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(0.5)) EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoJumpBack) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim04) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Run) EVT_EXEC_WAIT(DoReturnHome) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_UNKNOWN_TRIGGER) @@ -1007,36 +1007,36 @@ EvtScript N(handleEvent_koopa) = { EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(1) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim07) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_ShellEnter) EVT_EXEC_WAIT(DoImmune) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellExit) EVT_WAIT(10) EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_EXEC_WAIT(DoImmune) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_END_FIRST_STRIKE) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim04) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Run) EVT_EXEC_WAIT(DoReturnHome) EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1046,7 +1046,7 @@ EvtScript N(handleEvent_koopa) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim02) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Scramble) EVT_EXEC_WAIT(DoRecover) EVT_END_IF EVT_CASE_EQ(EVENT_SCARE_AWAY) @@ -1055,15 +1055,15 @@ EvtScript N(handleEvent_koopa) = { EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(1) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim04) - EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Dark_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Run) + EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Dark_Hurt) EVT_EXEC_WAIT(DoScareAway) EVT_RETURN EVT_END_CASE_GROUP EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_EXEC_WAIT(DoImmune) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -1073,12 +1073,12 @@ EvtScript N(handleEvent_koopa) = { EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(1) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim17) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Panic) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_EXEC_WAIT(DoAirLift) @@ -1088,12 +1088,12 @@ EvtScript N(handleEvent_koopa) = { EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(1) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim17) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Panic) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_EXEC_WAIT(DoBlowAway) @@ -1104,13 +1104,13 @@ EvtScript N(handleEvent_koopa) = { EVT_CASE_OR_EQ(0) EVT_CASE_OR_EQ(1) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim01) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Idle) EVT_EXEC_WAIT(DoImmune) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_EXEC_WAIT(DoImmune) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -1127,12 +1127,12 @@ EvtScript N(koopa_attackShellToss) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellEnter) EVT_WAIT(10) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1144,7 +1144,7 @@ EvtScript N(koopa_attackShellToss) = { EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_WAIT(10) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_END_IF @@ -1160,7 +1160,7 @@ EvtScript N(koopa_attackShellToss) = { EVT_CALL(AddGoalPos, ACTOR_SELF, -40, 0, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(16.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellExit) EVT_WAIT(8) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) @@ -1168,15 +1168,15 @@ EvtScript N(koopa_attackShellToss) = { EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim15) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_BeginPanic1) EVT_WAIT(1) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim16) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_BeginPanic2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim17) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Panic) EVT_WAIT(6) EVT_SUB(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1185,11 +1185,11 @@ EvtScript N(koopa_attackShellToss) = { EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim17) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Panic) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -1219,13 +1219,13 @@ EvtScript N(koopa_attackShellToss) = { EVT_ADD(LVar0, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellExit) EVT_WAIT(8) EVT_CALL(YieldTurn) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim04) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Run) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -1254,12 +1254,12 @@ EvtScript N(koopa_attackDizzyTornado) = { EVT_ELSE EVT_CALL(AddGoalPos, ACTOR_SELF, 20, 0, 0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Run) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Scramble) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellEnter) EVT_WAIT(10) EVT_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1271,7 +1271,7 @@ EvtScript N(koopa_attackDizzyTornado) = { EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellSpin) EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2026) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, 7) @@ -1281,7 +1281,7 @@ EvtScript N(koopa_attackDizzyTornado) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellExit) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 1) EVT_WAIT(10) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) @@ -1292,11 +1292,11 @@ EvtScript N(koopa_attackDizzyTornado) = { EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim17) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Panic) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Scramble) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_RETURN @@ -1322,16 +1322,16 @@ EvtScript N(koopa_attackDizzyTornado) = { EVT_END_IF EVT_END_THREAD EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ShellExit) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 1) EVT_WAIT(10) EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(YieldTurn) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Anim04) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Dark_Run) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim02) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Scramble) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -1363,7 +1363,7 @@ EvtScript N(koopa_standUp) = { EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) EVT_CALL(SetAnimationRate, ACTOR_SELF, 1, EVT_FLOAT(1.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Anim0F) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_ToppleStruggle) EVT_SET(LVar0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_THREAD diff --git a/src/battle/common/actor/fuzzy.inc.c b/src/battle/common/actor/fuzzy.inc.c index f9568d1991..259a1fb413 100644 --- a/src/battle/common/actor/fuzzy.inc.c +++ b/src/battle/common/actor/fuzzy.inc.c @@ -77,15 +77,15 @@ ActorBlueprint NAMESPACE = { }; s32 N(idleAnimations)[] = { - STATUS_NORMAL, ANIM_Fuzzy_Anim01, - STATUS_STONE, ANIM_Fuzzy_Anim00, - STATUS_SLEEP, ANIM_Fuzzy_Anim0E, - STATUS_POISON, ANIM_Fuzzy_Anim01, - STATUS_STOP, ANIM_Fuzzy_Anim00, - STATUS_STATIC, ANIM_Fuzzy_Anim01, - STATUS_PARALYZE, ANIM_Fuzzy_Anim00, - STATUS_DIZZY, ANIM_Fuzzy_Anim0F, - STATUS_FEAR, ANIM_Fuzzy_Anim0F, + STATUS_NORMAL, ANIM_Fuzzy_Idle, + STATUS_STONE, ANIM_Fuzzy_Still, + STATUS_SLEEP, ANIM_Fuzzy_Sleep, + STATUS_POISON, ANIM_Fuzzy_Idle, + STATUS_STOP, ANIM_Fuzzy_Still, + STATUS_STATIC, ANIM_Fuzzy_Idle, + STATUS_PARALYZE, ANIM_Fuzzy_Still, + STATUS_DIZZY, ANIM_Fuzzy_Stunned, + STATUS_FEAR, ANIM_Fuzzy_Stunned, STATUS_END, }; @@ -117,104 +117,104 @@ EvtScript N(handleEvent) = { EVT_CALL(GetLastElement, LVar0) EVT_IF_FLAG(LVar0, DAMAGE_TYPE_ELECTRIC) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_HurtShock) EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Hurt) EVT_END_IF EVT_EXEC_WAIT(DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim10) - EVT_SET_CONST(LVar2, ANIM_Fuzzy_Anim12) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Burn) + EVT_SET_CONST(LVar2, ANIM_Fuzzy_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim10) - EVT_SET_CONST(LVar2, ANIM_Fuzzy_Anim12) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Burn) + EVT_SET_CONST(LVar2, ANIM_Fuzzy_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim12) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_BurnStill) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_HurtShock) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_HurtShock) EVT_EXEC_WAIT(DoJumpBack) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim03) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Run) EVT_EXEC_WAIT(D_8029C0A4) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_HurtShock) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_UNKNOWN_TRIGGER) EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CASE_OR_EQ(EVENT_AIR_LIFT_FAILED) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim01) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Idle) EVT_EXEC_WAIT(DoImmune) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_CALL(GetLastElement, LVar0) EVT_IF_FLAG(LVar0, DAMAGE_TYPE_ELECTRIC) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_HurtShock) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim13) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_HurtShock) EVT_EXEC_WAIT(DoDeath) EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim08) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim01) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Idle) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim03) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Run) EVT_SET_CONST(LVar2, ANIM_Fuzzy_Anim09) EVT_EXEC_WAIT(DoScareAway) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim03) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Run) EVT_EXEC_WAIT(DoAirLift) EVT_CASE_EQ(EVENT_BLOW_AWAY) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Fuzzy_Anim03) + EVT_SET_CONST(LVar1, ANIM_Fuzzy_Run) EVT_EXEC_WAIT(DoBlowAway) EVT_RETURN EVT_CASE_DEFAULT @@ -243,7 +243,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_GOTO(100) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Run) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 50) @@ -251,7 +251,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_EXEC_WAIT(D_8029C12C) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Idle) EVT_LABEL(100) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Anim04) @@ -270,7 +270,7 @@ EvtScript N(takeTurn) = { EVT_SET(LVar1, 0) EVT_SUB(LVar2, 5) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jump) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 11, FALSE, TRUE, FALSE) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) @@ -296,7 +296,7 @@ EvtScript N(takeTurn) = { EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) @@ -319,7 +319,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, -3, -12, -15) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(3.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jump) EVT_CALL(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE) EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 0, BS_FLAGS1_SP_EVT_ACTIVE) @@ -329,9 +329,9 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000C) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Bite) EVT_WAIT(21) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Anim00) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Still) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 330) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, -3, -2, 0) @@ -350,7 +350,7 @@ EvtScript N(takeTurn) = { EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_IGNORE_DEFENSE, 0, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Idle) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_QUAKE_IMMUNE) @@ -429,13 +429,13 @@ EvtScript N(takeTurn) = { EVT_WAIT(5) EVT_CALL(YieldTurn) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_EXEC_WAIT(D_8029C12C) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index 022e6b8949..51689c4ef3 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -85,41 +85,41 @@ ActorBlueprint NAMESPACE = { }; s32 N(idleAnimations)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Anim01, - STATUS_STONE, ANIM_KoopaTroopa_Anim00, - STATUS_SLEEP, ANIM_KoopaTroopa_Anim11, - STATUS_POISON, ANIM_KoopaTroopa_Anim01, - STATUS_STOP, ANIM_KoopaTroopa_Anim00, - STATUS_STATIC, ANIM_KoopaTroopa_Anim01, - STATUS_PARALYZE, ANIM_KoopaTroopa_Anim00, - STATUS_DIZZY, ANIM_KoopaTroopa_Anim13, - STATUS_FEAR, ANIM_KoopaTroopa_Anim13, + STATUS_NORMAL, ANIM_KoopaTroopa_Idle, + STATUS_STONE, ANIM_KoopaTroopa_Still, + STATUS_SLEEP, ANIM_KoopaTroopa_Sleep, + STATUS_POISON, ANIM_KoopaTroopa_Idle, + STATUS_STOP, ANIM_KoopaTroopa_Still, + STATUS_STATIC, ANIM_KoopaTroopa_Idle, + STATUS_PARALYZE, ANIM_KoopaTroopa_Still, + STATUS_DIZZY, ANIM_KoopaTroopa_Stunned, + STATUS_FEAR, ANIM_KoopaTroopa_Stunned, STATUS_END, }; s32 N(idleAnimations_8021CADC)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Anim03, - STATUS_STONE, ANIM_KoopaTroopa_Anim00, - STATUS_SLEEP, ANIM_KoopaTroopa_Anim11, - STATUS_POISON, ANIM_KoopaTroopa_Anim03, - STATUS_STOP, ANIM_KoopaTroopa_Anim00, - STATUS_STATIC, ANIM_KoopaTroopa_Anim03, - STATUS_PARALYZE, ANIM_KoopaTroopa_Anim00, - STATUS_DIZZY, ANIM_KoopaTroopa_Anim13, - STATUS_FEAR, ANIM_KoopaTroopa_Anim13, + STATUS_NORMAL, ANIM_KoopaTroopa_Walk, + STATUS_STONE, ANIM_KoopaTroopa_Still, + STATUS_SLEEP, ANIM_KoopaTroopa_Sleep, + STATUS_POISON, ANIM_KoopaTroopa_Walk, + STATUS_STOP, ANIM_KoopaTroopa_Still, + STATUS_STATIC, ANIM_KoopaTroopa_Walk, + STATUS_PARALYZE, ANIM_KoopaTroopa_Still, + STATUS_DIZZY, ANIM_KoopaTroopa_Stunned, + STATUS_FEAR, ANIM_KoopaTroopa_Stunned, STATUS_END, }; s32 N(idleAnimations_flipped)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Anim0F, - STATUS_STONE, ANIM_KoopaTroopa_Anim10, - STATUS_SLEEP, ANIM_KoopaTroopa_Anim12, - STATUS_POISON, ANIM_KoopaTroopa_Anim0F, - STATUS_STOP, ANIM_KoopaTroopa_Anim10, - STATUS_STATIC, ANIM_KoopaTroopa_Anim0F, - STATUS_PARALYZE, ANIM_KoopaTroopa_Anim10, - STATUS_DIZZY, ANIM_KoopaTroopa_Anim14, - STATUS_FEAR, ANIM_KoopaTroopa_Anim14, + STATUS_NORMAL, ANIM_KoopaTroopa_ToppleStruggle, + STATUS_STONE, ANIM_KoopaTroopa_ToppleStill, + STATUS_SLEEP, ANIM_KoopaTroopa_ToppleSleep, + STATUS_POISON, ANIM_KoopaTroopa_ToppleStruggle, + STATUS_STOP, ANIM_KoopaTroopa_ToppleStill, + STATUS_STATIC, ANIM_KoopaTroopa_ToppleStruggle, + STATUS_PARALYZE, ANIM_KoopaTroopa_ToppleStill, + STATUS_DIZZY, ANIM_KoopaTroopa_ToppleStunned, + STATUS_FEAR, ANIM_KoopaTroopa_ToppleStunned, STATUS_END, }; @@ -250,33 +250,33 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0C) - EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Anim0D) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0C) - EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Anim0D) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0D) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_BurnStill) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) @@ -287,7 +287,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim0B) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Hurt) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_CHILD_THREAD @@ -312,26 +312,26 @@ EvtScript N(handleEvent) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim0F) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ToppleStruggle) EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoJumpBack) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim04) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Run) EVT_EXEC_WAIT(DoReturnHome) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_UNKNOWN_TRIGGER) @@ -339,33 +339,33 @@ EvtScript N(handleEvent) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim07) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_ShellEnter) EVT_EXEC_WAIT(DoImmune) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(10) EVT_END_IF EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_ToppleStruggle) EVT_EXEC_WAIT(DoImmune) EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_END_FIRST_STRIKE) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim04) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Run) EVT_EXEC_WAIT(DoReturnHome) EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -375,44 +375,44 @@ EvtScript N(handleEvent) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim01) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Idle) EVT_EXEC_WAIT(DoRecover) EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_ToppleStruggle) EVT_EXEC_WAIT(DoImmune) EVT_END_IF EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim04) - EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Run) + EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoScareAway) EVT_RETURN EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_ToppleStruggle) EVT_EXEC_WAIT(DoImmune) EVT_END_IF EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim17) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Panic) EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_ToppleStruggle) EVT_END_IF EVT_EXEC_WAIT(DoAirLift) EVT_CASE_EQ(EVENT_BLOW_AWAY) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim17) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Panic) EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_ToppleStruggle) EVT_END_IF EVT_EXEC_WAIT(DoBlowAway) EVT_RETURN @@ -420,11 +420,11 @@ EvtScript N(handleEvent) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim01) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Idle) EVT_EXEC_WAIT(DoImmune) EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_ToppleStruggle) EVT_EXEC_WAIT(DoImmune) EVT_END_IF EVT_END_SWITCH @@ -440,7 +440,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellSpin) EVT_ELSE EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 1) @@ -461,7 +461,7 @@ EvtScript N(takeTurn) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim0F) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ToppleStruggle) EVT_SET(LVar0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_CHILD_THREAD @@ -479,7 +479,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Idle) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) @@ -495,7 +495,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellEnter) EVT_WAIT(10) EVT_CHILD_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -507,7 +507,7 @@ EvtScript N(takeTurn) = { EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_END_CHILD_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellSpin) EVT_WAIT(10) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_END_IF @@ -530,7 +530,7 @@ EvtScript N(takeTurn) = { EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(8) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) @@ -538,15 +538,15 @@ EvtScript N(takeTurn) = { EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim15) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_BeginPanic1) EVT_WAIT(1) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim16) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_BeginPanic2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim17) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Panic) EVT_WAIT(6) EVT_SUB(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -555,11 +555,11 @@ EvtScript N(takeTurn) = { EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim17) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Panic) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetPartYaw, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -590,13 +590,13 @@ EvtScript N(takeTurn) = { EVT_ADD(LVar0, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(8) EVT_CALL(YieldTurn) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim04) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Run) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index 329e48d961..b4ce107727 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -143,41 +143,41 @@ ActorBlueprint NAMESPACE = { }; s32 N(idleAnimations_8021ED00)[] = { - STATUS_NORMAL, ANIM_ParaTroopa_Anim01, - STATUS_STONE, ANIM_ParaTroopa_Anim00, - STATUS_SLEEP, ANIM_ParaTroopa_Anim12, - STATUS_POISON, ANIM_ParaTroopa_Anim00, - STATUS_STOP, ANIM_ParaTroopa_Anim00, - STATUS_STATIC, ANIM_ParaTroopa_Anim01, - STATUS_PARALYZE, ANIM_ParaTroopa_Anim00, - STATUS_DIZZY, ANIM_ParaTroopa_Anim13, - STATUS_FEAR, ANIM_ParaTroopa_Anim13, + STATUS_NORMAL, ANIM_ParaTroopa_Idle, + STATUS_STONE, ANIM_ParaTroopa_Still, + STATUS_SLEEP, ANIM_ParaTroopa_Sleep, + STATUS_POISON, ANIM_ParaTroopa_Still, + STATUS_STOP, ANIM_ParaTroopa_Still, + STATUS_STATIC, ANIM_ParaTroopa_Idle, + STATUS_PARALYZE, ANIM_ParaTroopa_Still, + STATUS_DIZZY, ANIM_ParaTroopa_Stunned, + STATUS_FEAR, ANIM_ParaTroopa_Stunned, STATUS_END, }; s32 N(idleAnimations_8021ED4C)[] = { - STATUS_NORMAL, ANIM_ParaTroopa_Anim01, - STATUS_STONE, ANIM_ParaTroopa_Anim00, - STATUS_SLEEP, ANIM_ParaTroopa_Anim12, - STATUS_POISON, ANIM_ParaTroopa_Anim00, - STATUS_STOP, ANIM_ParaTroopa_Anim00, - STATUS_STATIC, ANIM_ParaTroopa_Anim01, - STATUS_PARALYZE, ANIM_ParaTroopa_Anim00, - STATUS_DIZZY, ANIM_ParaTroopa_Anim13, - STATUS_FEAR, ANIM_ParaTroopa_Anim13, + STATUS_NORMAL, ANIM_ParaTroopa_Idle, + STATUS_STONE, ANIM_ParaTroopa_Still, + STATUS_SLEEP, ANIM_ParaTroopa_Sleep, + STATUS_POISON, ANIM_ParaTroopa_Still, + STATUS_STOP, ANIM_ParaTroopa_Still, + STATUS_STATIC, ANIM_ParaTroopa_Idle, + STATUS_PARALYZE, ANIM_ParaTroopa_Still, + STATUS_DIZZY, ANIM_ParaTroopa_Stunned, + STATUS_FEAR, ANIM_ParaTroopa_Stunned, STATUS_END, }; s32 N(idleAnimations_8021ED98)[] = { - STATUS_NORMAL, ANIM_ParaTroopa_Anim0F, - STATUS_STONE, ANIM_ParaTroopa_Anim00, - STATUS_SLEEP, ANIM_ParaTroopa_Anim12, - STATUS_POISON, ANIM_ParaTroopa_Anim00, - STATUS_STOP, ANIM_ParaTroopa_Anim00, - STATUS_STATIC, ANIM_ParaTroopa_Anim0F, - STATUS_PARALYZE, ANIM_ParaTroopa_Anim00, - STATUS_DIZZY, ANIM_ParaTroopa_Anim13, - STATUS_FEAR, ANIM_ParaTroopa_Anim13, + STATUS_NORMAL, ANIM_ParaTroopa_WingsStill, + STATUS_STONE, ANIM_ParaTroopa_Still, + STATUS_SLEEP, ANIM_ParaTroopa_Sleep, + STATUS_POISON, ANIM_ParaTroopa_Still, + STATUS_STOP, ANIM_ParaTroopa_Still, + STATUS_STATIC, ANIM_ParaTroopa_WingsStill, + STATUS_PARALYZE, ANIM_ParaTroopa_Still, + STATUS_DIZZY, ANIM_ParaTroopa_Stunned, + STATUS_FEAR, ANIM_ParaTroopa_Stunned, STATUS_END, }; @@ -273,11 +273,11 @@ EvtScript N(idle_8021EF5C) = { }; EvtScript N(8021F26C) = { - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Run) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, 11) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Idle) EVT_RETURN EVT_END }; @@ -292,11 +292,11 @@ EvtScript N(handleEvent_8021F2EC) = { EVT_CASE_EQ(EVENT_HIT_COMBO) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_CASE_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -307,66 +307,66 @@ EvtScript N(handleEvent_8021F2EC) = { EVT_END_IF EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim06) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_HurtStill) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim08) - EVT_SET_CONST(LVar2, ANIM_ParaTroopa_Anim09) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_ParaTroopa_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim08) - EVT_SET_CONST(LVar2, ANIM_ParaTroopa_Anim09) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_ParaTroopa_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim09) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_BurnStill) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FALL_TRIGGER) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_EXEC_WAIT(N(802204DC)) EVT_CASE_EQ(EVENT_15) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim08) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim09) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_BurnHurt) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_EXEC_WAIT(N(802204DC)) EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Hurt) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim06) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_HurtStill) EVT_EXEC_WAIT(DoJumpBack) EVT_EXEC_WAIT(N(8021F26C)) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Hurt) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim06) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_HurtStill) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_UNKNOWN_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_ShellEnter) EVT_EXEC_WAIT(DoImmune) EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CASE_OR_EQ(EVENT_AIR_LIFT_FAILED) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_ShellEnter) EVT_EXEC_WAIT(DoImmune) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) @@ -378,11 +378,11 @@ EvtScript N(handleEvent_8021F2EC) = { EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim06) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_HurtStill) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE) @@ -393,22 +393,22 @@ EvtScript N(handleEvent_8021F2EC) = { EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim01) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Idle) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim03) - EVT_SET_CONST(LVar2, ANIM_ParaTroopa_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Run) + EVT_SET_CONST(LVar2, ANIM_ParaTroopa_Hurt) EVT_EXEC_WAIT(DoScareAway) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim03) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Run) EVT_EXEC_WAIT(DoAirLift) EVT_CASE_EQ(EVENT_BLOW_AWAY) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Anim07) + EVT_SET_CONST(LVar1, ANIM_ParaTroopa_Hurt) EVT_EXEC_WAIT(DoBlowAway) EVT_RETURN EVT_CASE_DEFAULT @@ -427,7 +427,7 @@ EvtScript N(takeTurn_8021FA24) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_F) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Run) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 30, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(7.0)) @@ -441,7 +441,7 @@ EvtScript N(takeTurn_8021FA24) = { EVT_SET(LVarA, LVar0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(AddGoalPos, ACTOR_SELF, 6, 6, 0) @@ -455,7 +455,7 @@ EvtScript N(takeTurn_8021FA24) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Anim0C) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_ShellDive) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) @@ -480,13 +480,13 @@ EvtScript N(takeTurn_8021FA24) = { EVT_SUB(LVar0, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(4.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Hurt) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(4.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Hurt) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) @@ -510,7 +510,7 @@ EvtScript N(takeTurn_8021FA24) = { EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E0) EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Windup) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(AddGoalPos, ACTOR_SELF, 6, 6, 0) @@ -521,7 +521,7 @@ EvtScript N(takeTurn_8021FA24) = { EVT_CALL(SetActorSounds, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(10.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Anim0C) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_ShellDive) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, 0) EVT_WAIT(2) EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, 0, 65535, 0, 1, BS_FLAGS1_SP_EVT_ACTIVE) @@ -532,7 +532,7 @@ EvtScript N(takeTurn_8021FA24) = { EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(AddGoalPos, ACTOR_SELF, 40, 30, 0) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Anim0D) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_ShellHit) EVT_THREAD EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 10, 0) EVT_SET(LVar0, 0) @@ -546,7 +546,7 @@ EvtScript N(takeTurn_8021FA24) = { EVT_END_LOOP EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, -10, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_ParaTroopa_Idle) EVT_END_THREAD EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 30, 0) EVT_WAIT(10) @@ -573,7 +573,7 @@ EvtScript N(802204DC) = { EVT_ADD(LVar1, 8) EVT_SUB(LVar2, 2) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim0B) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Hurt) EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 769, 0) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVarA) EVT_IF_EQ(LVarA, 0) @@ -624,7 +624,7 @@ EvtScript N(802204DC) = { EVT_CALL(SetGoalToIndex, ACTOR_SELF, LVar0) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Idle) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, 0) EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8021EB14))) EVT_CALL(BindNextTurn, ACTOR_SELF, 0) @@ -641,41 +641,41 @@ EvtScript N(802204DC) = { }; s32 N(idleAnimations_80220AA0)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Anim01, - STATUS_STONE, ANIM_KoopaTroopa_Anim00, - STATUS_SLEEP, ANIM_KoopaTroopa_Anim11, - STATUS_POISON, ANIM_KoopaTroopa_Anim01, - STATUS_STOP, ANIM_KoopaTroopa_Anim00, - STATUS_STATIC, ANIM_KoopaTroopa_Anim01, - STATUS_PARALYZE, ANIM_KoopaTroopa_Anim00, - STATUS_DIZZY, ANIM_KoopaTroopa_Anim13, - STATUS_FEAR, ANIM_KoopaTroopa_Anim13, + STATUS_NORMAL, ANIM_KoopaTroopa_Idle, + STATUS_STONE, ANIM_KoopaTroopa_Still, + STATUS_SLEEP, ANIM_KoopaTroopa_Sleep, + STATUS_POISON, ANIM_KoopaTroopa_Idle, + STATUS_STOP, ANIM_KoopaTroopa_Still, + STATUS_STATIC, ANIM_KoopaTroopa_Idle, + STATUS_PARALYZE, ANIM_KoopaTroopa_Still, + STATUS_DIZZY, ANIM_KoopaTroopa_Stunned, + STATUS_FEAR, ANIM_KoopaTroopa_Stunned, STATUS_END, }; s32 N(idleAnimations_80220AEC)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Anim03, - STATUS_STONE, ANIM_KoopaTroopa_Anim00, - STATUS_SLEEP, ANIM_KoopaTroopa_Anim11, - STATUS_POISON, ANIM_KoopaTroopa_Anim03, - STATUS_STOP, ANIM_KoopaTroopa_Anim00, - STATUS_STATIC, ANIM_KoopaTroopa_Anim03, - STATUS_PARALYZE, ANIM_KoopaTroopa_Anim00, - STATUS_DIZZY, ANIM_KoopaTroopa_Anim13, - STATUS_FEAR, ANIM_KoopaTroopa_Anim13, + STATUS_NORMAL, ANIM_KoopaTroopa_Walk, + STATUS_STONE, ANIM_KoopaTroopa_Still, + STATUS_SLEEP, ANIM_KoopaTroopa_Sleep, + STATUS_POISON, ANIM_KoopaTroopa_Walk, + STATUS_STOP, ANIM_KoopaTroopa_Still, + STATUS_STATIC, ANIM_KoopaTroopa_Walk, + STATUS_PARALYZE, ANIM_KoopaTroopa_Still, + STATUS_DIZZY, ANIM_KoopaTroopa_Stunned, + STATUS_FEAR, ANIM_KoopaTroopa_Stunned, STATUS_END, }; s32 N(idleAnimations_80220B38)[] = { - STATUS_NORMAL, ANIM_KoopaTroopa_Anim0F, - STATUS_STONE, ANIM_KoopaTroopa_Anim10, - STATUS_SLEEP, ANIM_KoopaTroopa_Anim12, - STATUS_POISON, ANIM_KoopaTroopa_Anim0F, - STATUS_STOP, ANIM_KoopaTroopa_Anim10, - STATUS_STATIC, ANIM_KoopaTroopa_Anim0F, - STATUS_PARALYZE, ANIM_KoopaTroopa_Anim10, - STATUS_DIZZY, ANIM_KoopaTroopa_Anim14, - STATUS_FEAR, ANIM_KoopaTroopa_Anim14, + STATUS_NORMAL, ANIM_KoopaTroopa_ToppleStruggle, + STATUS_STONE, ANIM_KoopaTroopa_ToppleStill, + STATUS_SLEEP, ANIM_KoopaTroopa_ToppleSleep, + STATUS_POISON, ANIM_KoopaTroopa_ToppleStruggle, + STATUS_STOP, ANIM_KoopaTroopa_ToppleStill, + STATUS_STATIC, ANIM_KoopaTroopa_ToppleStruggle, + STATUS_PARALYZE, ANIM_KoopaTroopa_ToppleStill, + STATUS_DIZZY, ANIM_KoopaTroopa_ToppleStunned, + STATUS_FEAR, ANIM_KoopaTroopa_ToppleStunned, STATUS_END, }; @@ -808,33 +808,33 @@ EvtScript N(handleEvent_80221228) = { EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0C) - EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Anim0D) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_CASE_EQ(EVENT_BURN_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0C) - EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Anim0D) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_BurnHurt) + EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_BurnStill) EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0D) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_BurnStill) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_FLIP_TRIGGER) @@ -845,7 +845,7 @@ EvtScript N(handleEvent_80221228) = { EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) EVT_CALL(func_8027D4C8, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_400, 1) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim0B) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Hurt) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_CHILD_THREAD @@ -870,26 +870,26 @@ EvtScript N(handleEvent_80221228) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim0F) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ToppleStruggle) EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoJumpBack) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim04) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Run) EVT_EXEC_WAIT(DoReturnHome) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.6)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_UNKNOWN_TRIGGER) @@ -897,33 +897,33 @@ EvtScript N(handleEvent_80221228) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim07) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_ShellEnter) EVT_EXEC_WAIT(DoImmune) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(10) EVT_END_IF EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_ToppleStruggle) EVT_EXEC_WAIT(DoImmune) EVT_END_IF EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_END_FIRST_STRIKE) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim04) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Run) EVT_EXEC_WAIT(DoReturnHome) EVT_END_IF EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -933,44 +933,44 @@ EvtScript N(handleEvent_80221228) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim01) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Idle) EVT_EXEC_WAIT(DoRecover) EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_ToppleStruggle) EVT_EXEC_WAIT(DoImmune) EVT_END_IF EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim04) - EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Anim0B) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Run) + EVT_SET_CONST(LVar2, ANIM_KoopaTroopa_Hurt) EVT_EXEC_WAIT(DoScareAway) EVT_RETURN EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_ToppleStruggle) EVT_EXEC_WAIT(DoImmune) EVT_END_IF EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim17) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Panic) EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_ToppleStruggle) EVT_END_IF EVT_EXEC_WAIT(DoAirLift) EVT_CASE_EQ(EVENT_BLOW_AWAY) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim17) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Panic) EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_ToppleStruggle) EVT_END_IF EVT_EXEC_WAIT(DoBlowAway) EVT_RETURN @@ -978,11 +978,11 @@ EvtScript N(handleEvent_80221228) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 0) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim01) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Idle) EVT_EXEC_WAIT(DoImmune) EVT_ELSE EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim0F) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_ToppleStruggle) EVT_EXEC_WAIT(DoImmune) EVT_END_IF EVT_END_SWITCH @@ -998,7 +998,7 @@ EvtScript N(takeTurn_80221DAC) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellSpin) EVT_ELSE EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_IF_EQ(LVar0, 1) @@ -1019,7 +1019,7 @@ EvtScript N(takeTurn_80221DAC) = { EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorSounds, ACTOR_SELF, 2, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_JUMP_3E2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim0F) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ToppleStruggle) EVT_SET(LVar0, 0) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) EVT_CHILD_THREAD @@ -1037,7 +1037,7 @@ EvtScript N(takeTurn_80221DAC) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Idle) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220AA0))) EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8021EAD0))) @@ -1053,7 +1053,7 @@ EvtScript N(takeTurn_80221DAC) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim07) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellEnter) EVT_WAIT(10) EVT_CHILD_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1065,7 +1065,7 @@ EvtScript N(takeTurn_80221DAC) = { EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 1, LVar0, LVar1, LVar2, 32, 4, 0, 10, 0, 0, 0, 0, 0) EVT_END_CHILD_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_2021) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellSpin) EVT_WAIT(10) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_END_IF @@ -1088,7 +1088,7 @@ EvtScript N(takeTurn_80221DAC) = { EVT_CALL(MoveBattleCamOver, 10) EVT_CALL(func_8024ECF8, -1, 1, 0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(8) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) @@ -1096,15 +1096,15 @@ EvtScript N(takeTurn_80221DAC) = { EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim15) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_BeginPanic1) EVT_WAIT(1) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim16) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_BeginPanic2) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(2.0)) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim17) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Panic) EVT_WAIT(6) EVT_SUB(LVar1, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1113,11 +1113,11 @@ EvtScript N(takeTurn_80221DAC) = { EVT_CALL(YieldTurn) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, 2) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim17) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Panic) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(8.0)) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetPartYaw, ACTOR_SELF, 1, 0) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) @@ -1148,13 +1148,13 @@ EvtScript N(takeTurn_80221DAC) = { EVT_ADD(LVar0, 20) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim08) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(8) EVT_CALL(YieldTurn) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Anim04) + EVT_SET_CONST(LVar1, ANIM_KoopaTroopa_Run) EVT_EXEC_WAIT(DoReturnHome) - EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Anim01) + EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Idle) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/common/foliage.inc.c b/src/common/foliage.inc.c index 41331489df..f5472ed22a 100644 --- a/src/common/foliage.inc.c +++ b/src/common/foliage.inc.c @@ -177,3 +177,9 @@ EvtScript N(shakeTree) = { EVT_RETURN EVT_END }; + +#define FOLIAGE_MODEL_LIST(names...) \ +{ \ + .count = __NARG__(names), \ + .models = { names } \ +} diff --git a/src/effects/lil_oink.c b/src/effects/lil_oink.c index 65145e51c4..035492351f 100644 --- a/src/effects/lil_oink.c +++ b/src/effects/lil_oink.c @@ -21,25 +21,33 @@ extern Gfx D_09003358_4025A8[]; extern Gfx D_09003370_4025C0[]; extern Gfx D_09003388_4025D8[]; -Gfx* D_E01146A0[] = { - D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, - D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, - D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, - D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, - D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, - D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, - D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, - D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, - D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8, - D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8 +Gfx* lil_oink_FramesGfx[][3] = { + [LIL_OINK_TYPE_BLACK] { D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8 }, + [LIL_OINK_TYPE_WHITE] { D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8 }, + [LIL_OINK_TYPE_PINK] { D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8 }, + [LIL_OINK_TYPE_PIKACHU] { D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8 }, + [LIL_OINK_TYPE_SHROOM] { D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8 }, + [LIL_OINK_TYPE_FLOWER] { D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8 }, + [LIL_OINK_TYPE_STAR] { D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8 }, + [LIL_OINK_TYPE_QUESTION] { D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8 }, + [LIL_OINK_TYPE_SILVER] { D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8 }, + [LIL_OINK_TYPE_GOLD] { D_09003358_4025A8, D_09003370_4025C0, D_09003388_4025D8 }, }; Gfx* D_E0114718[] = { - D_09002DD8_402028, D_09002E70_4020C0, D_09002E98_4020E8, D_09002F30_402180, D_09002FC8_402218, - D_09003060_4022B0, D_090030F8_402348, D_09003190_4023E0, D_09003228_402478, D_090032C0_402510 + [LIL_OINK_TYPE_BLACK] D_09002DD8_402028, + [LIL_OINK_TYPE_WHITE] D_09002E70_4020C0, + [LIL_OINK_TYPE_PINK] D_09002E98_4020E8, + [LIL_OINK_TYPE_PIKACHU] D_09002F30_402180, + [LIL_OINK_TYPE_SHROOM] D_09002FC8_402218, + [LIL_OINK_TYPE_FLOWER] D_09003060_4022B0, + [LIL_OINK_TYPE_STAR] D_090030F8_402348, + [LIL_OINK_TYPE_QUESTION] D_09003190_4023E0, + [LIL_OINK_TYPE_SILVER] D_09003228_402478, + [LIL_OINK_TYPE_GOLD] D_090032C0_402510 }; -s8 D_E0114740[] = { 1, 2, 1, 0 }; +s8 lil_oink_AnimateGfxSelect[] = { 1, 2, 1, 0 }; EffectInstance* lil_oink_main(void) { EffectBlueprint bp; @@ -60,8 +68,8 @@ EffectInstance* lil_oink_main(void) { data = effect->data.lilOink = shim_general_heap_malloc(numParts * sizeof(*data)); ASSERT(data != NULL); - data->unk_04 = 0; - data->unk_00 = 1000; + data->lifetime = 0; + data->timeLeft = 1000; for (i = 0; i < MAX_LIL_OINKS; i++) { data->x[i] = 0.0f; @@ -69,10 +77,10 @@ EffectInstance* lil_oink_main(void) { data->z[i] = 0.0f; data->rot[i] = 0.0f; data->flags[i] = 0; - data->unk_FA[i] = 1; - data->unk_105[i] = 1; + data->anim[i] = LIL_OINK_ANIM_1; + data->gfxFrame[i] = 1; data->jumpOffset[i] = 0.0f; - data->unk_13C[i] = 0; + data->animTime[i] = 0; } return effect; @@ -85,63 +93,63 @@ void lil_oink_update(EffectInstance* effect) { LilOinkFXData* data = effect->data.lilOink; s32 i; - data->unk_04++; + data->lifetime++; for (i = 0; i < MAX_LIL_OINKS; i++) { - s32 tmp13C = data->unk_13C[i]; - s32 cond = FALSE; + s32 time = data->animTime[i]; + s32 animDone = FALSE; - switch (data->unk_FA[i]) { - case 0: - cond = TRUE; + switch (data->anim[i]) { + case LIL_OINK_ANIM_0: + animDone = TRUE; break; - case 1: - data->unk_105[i] = 1; - cond = TRUE; + case LIL_OINK_ANIM_1: + data->gfxFrame[i] = 1; + animDone = TRUE; break; - case 3: - data->unk_105[i] = D_E0114740[tmp13C % ARRAY_COUNT(D_E0114740)]; - data->rot[i] = data->rot[i] + shim_sin_deg(tmp13C * 10); - if (tmp13C >= 36) { - cond = TRUE; - data->unk_13C[i] = 0; + case LIL_OINK_ANIM_3: + data->gfxFrame[i] = lil_oink_AnimateGfxSelect[time % ARRAY_COUNT(lil_oink_AnimateGfxSelect)]; + data->rot[i] = data->rot[i] + shim_sin_deg(time * 10); + if (time >= 36) { + animDone = TRUE; + data->animTime[i] = 0; } break; - case 2: - data->unk_105[i] = D_E0114740[tmp13C % ARRAY_COUNT(D_E0114740)]; - data->jumpOffset[i] = shim_sin_deg(tmp13C * 20) * 2.0f; - cond = TRUE; - if (tmp13C >= 9) { + case LIL_OINK_ANIM_2: + data->gfxFrame[i] = lil_oink_AnimateGfxSelect[time % ARRAY_COUNT(lil_oink_AnimateGfxSelect)]; + data->jumpOffset[i] = shim_sin_deg(time * 20) * 2.0f; + animDone = TRUE; + if (time >= 9) { data->jumpOffset[i] = 0.0f; - data->unk_13C[i] = 0; + data->animTime[i] = 0; } break; - case 4: - data->unk_105[i] = D_E0114740[tmp13C % ARRAY_COUNT(D_E0114740)]; - data->jumpOffset[i] = shim_sin_deg(tmp13C * 20) * 4.0f; - if (!(tmp13C < 9)) { - cond = TRUE; + case LIL_OINK_ANIM_4: + data->gfxFrame[i] = lil_oink_AnimateGfxSelect[time % ARRAY_COUNT(lil_oink_AnimateGfxSelect)]; + data->jumpOffset[i] = shim_sin_deg(time * 20) * 4.0f; + if (!(time < 9)) { + animDone = TRUE; data->jumpOffset[i] = 0.0f; - data->unk_13C[i] = 0; + data->animTime[i] = 0; } break; - case 5: + case LIL_OINK_ANIM_5: default: - data->unk_105[i] = D_E0114740[tmp13C % ARRAY_COUNT(D_E0114740)]; - data->jumpOffset[i] = shim_sin_deg(tmp13C * 5) * 12.0f; - if (!(tmp13C < 36)) { - cond = TRUE; + data->gfxFrame[i] = lil_oink_AnimateGfxSelect[time % ARRAY_COUNT(lil_oink_AnimateGfxSelect)]; + data->jumpOffset[i] = shim_sin_deg(time * 5) * 12.0f; + if (!(time < 36)) { + animDone = TRUE; data->jumpOffset[i] = 0.0f; - data->unk_13C[i] = 0; + data->animTime[i] = 0; } break; } - data->unk_13C[i]++; - if (cond) { - if (data->flags[i] & 2) { - data->flags[i] &= ~2; - data->unk_13C[i] = 0; - data->unk_FA[i] = data->unk_EF[i]; + data->animTime[i]++; + if (animDone) { + if (data->flags[i] & LIL_OINK_FLAG_ANIM_CHANGED) { + data->flags[i] &= ~LIL_OINK_FLAG_ANIM_CHANGED; + data->animTime[i] = 0; + data->anim[i] = data->nextAnim[i]; } } } @@ -161,10 +169,10 @@ void lil_oink_render(EffectInstance* effect) { } void lil_oink_appendGfx(void* effect) { - Matrix4f sp20; + Matrix4f mtxTransform; EffectInstance* eff = effect; LilOinkFXData* data = eff->data.lilOink; - s32 var_s4 = data->unk_04 * 30; + s32 angle = data->lifetime * 30; s32 i; gDPPipeSync(gMasterGfxPos++); @@ -174,23 +182,23 @@ void lil_oink_appendGfx(void* effect) { gSPLookAt(gMasterGfxPos++, &gDisplayContext->lookAt); for (i = 0; i < MAX_LIL_OINKS; i++) { - if (data->flags[i] & 1) { - shim_guPositionF(sp20, 0.0f, 180.0f - data->rot[i], 0.0f, 1.0f, + if (data->flags[i] & LIL_OINK_FLAG_VISIBLE) { + shim_guPositionF(mtxTransform, 0.0f, 180.0f - data->rot[i], 0.0f, 1.0f, data->x[i], data->y[i] + data->jumpOffset[i], data->z[i]); - shim_guMtxF2L(sp20, &gDisplayContext->matrixStack[gMatrixListPos]); + shim_guMtxF2L(mtxTransform, &gDisplayContext->matrixStack[gMatrixListPos]); gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gMasterGfxPos++, D_E0114718[data->type[i]]); - if (data->type[i] == 8 || data->type[i] == 9) { - f32 temp_f0 = shim_sin_deg(var_s4) * 63.0f; - s32 primColor = (s32)(temp_f0 + 63.0f) & 0xFF; + if (data->type[i] == LIL_OINK_TYPE_SILVER || data->type[i] == LIL_OINK_TYPE_GOLD) { + f32 shineVariation = shim_sin_deg(angle) * 63.0f; + s8 primColor = shineVariation + 63.0f; gDPSetPrimColor(gMasterGfxPos++, 0, 0, primColor, primColor, primColor, 0); } - gSPDisplayList(gMasterGfxPos++, D_E01146A0[(data->type[i] * 3) + data->unk_105[i]]); + gSPDisplayList(gMasterGfxPos++, lil_oink_FramesGfx[data->type[i]][data->gfxFrame[i]]); gSPPopMatrix(gMasterGfxPos++, G_MTX_MODELVIEW); } - var_s4 += 20; + angle += 20; } } diff --git a/src/evt/evt.c b/src/evt/evt.c index bf951eff30..4e402c86a7 100644 --- a/src/evt/evt.c +++ b/src/evt/evt.c @@ -1218,7 +1218,7 @@ ApiStatus evt_handle_end_child_thread(Evt* script) { return ApiStatus_BLOCK; } -ApiStatus func_802C6E14(Evt* script) { +ApiStatus evt_handle_debug_log(Evt* script) { return ApiStatus_DONE2; } @@ -1636,7 +1636,7 @@ s32 evt_execute_next_command(Evt* script) { status = evt_handle_end_child_thread(script); break; case EVT_OP_DEBUG_LOG: - status = func_802C6E14(script); + status = evt_handle_debug_log(script); break; case EVT_OP_DEBUG_PRINT_VAR: status = evt_handle_print_debug_var(script); diff --git a/src/world/area_dgb/dgb_11/C4D3E0.c b/src/world/area_dgb/dgb_11/C4D3E0.c index e6ea32b6c1..b0b37f6930 100644 --- a/src/world/area_dgb/dgb_11/C4D3E0.c +++ b/src/world/area_dgb/dgb_11/C4D3E0.c @@ -216,7 +216,7 @@ EvtScript N(makeEntities) = { }; ApiStatus N(func_80240000_C4D3E0)(Evt* script, s32 isInitialCall) { - Entity* entity = get_entity_by_index(evt_get_variable(NULL, 0xFD050F80)); + Entity* entity = get_entity_by_index(evt_get_variable(NULL, MapVar(0))); if (entity == NULL) { return ApiStatus_BLOCK; diff --git a/src/world/area_dro/dro_01/dro_01_3_npc.c b/src/world/area_dro/dro_01/dro_01_3_npc.c index e9a0438b71..b0cff76b10 100644 --- a/src/world/area_dro/dro_01/dro_01_3_npc.c +++ b/src/world/area_dro/dro_01/dro_01_3_npc.c @@ -11,8 +11,8 @@ #define CHUCK_QUIZMO_NPC_ID NPC_ChuckQuizmo #include "world/common/complete/Quizmo.inc.c" +MAP_STATIC_PAD(1,post_quizmo); // or pre_key_item? -MAP_STATIC_PAD(1,pre_key_item); // or post-quizmo? #include "world/common/complete/KeyItemChoice.inc.c" #include "world/common/util/MonitorPlayerOrbiting.inc.c" diff --git a/src/world/area_iwa/iwa_10/iwa_10_2_main.c b/src/world/area_iwa/iwa_10/iwa_10_2_main.c index 967e36ff96..b97a45a819 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_2_main.c +++ b/src/world/area_iwa/iwa_10/iwa_10_2_main.c @@ -1,14 +1,5 @@ #include "iwa_10.h" -API_CALLABLE(N(GetClockHandAngles)) { - if (script->varTable[15] > 720) { - script->varTable[15] = 0; - } - script->varTable[0] = script->varTable[15] * 6; - script->varTable[1] = script->varTable[15] / 2; - return ApiStatus_DONE2; -} - EvtScript N(EVS_ExitWalk_iwa_00_0) = EVT_EXIT_WALK(60, iwa_10_ENTRY_1, "iwa_00", iwa_00_ENTRY_0); EvtScript N(EVS_BindExitTriggers) = { @@ -36,6 +27,15 @@ EvtScript N(EVS_EnterMap) = { EVT_END }; +API_CALLABLE(N(GetClockHandAngles)) { + if (script->varTable[15] > 720) { + script->varTable[15] = 0; + } + script->varTable[0] = script->varTable[15] * 6; + script->varTable[1] = script->varTable[15] / 2; + return ApiStatus_DONE2; +} + EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_MT_RUGGED) EVT_CALL(SetSpriteShading, SHADING_NONE) diff --git a/src/world/area_kmr/kmr.h b/src/world/area_kmr/kmr.h index 90e723fd6e..0e292db2f3 100644 --- a/src/world/area_kmr/kmr.h +++ b/src/world/area_kmr/kmr.h @@ -41,12 +41,13 @@ extern MapSettings kmr_11_settings; extern MapSettings kmr_12_settings; extern MapSettings kmr_20_settings; extern MapSettings kmr_21_settings; -s32 kmr_21_map_init(void); extern MapSettings kmr_22_settings; extern MapSettings kmr_23_settings; -s32 kmr_23_map_init(void); extern MapSettings kmr_24_settings; -s32 kmr_24_map_init(void); extern MapSettings kmr_30_settings; +s32 kmr_21_map_init(void); +s32 kmr_23_map_init(void); +s32 kmr_24_map_init(void); + #endif diff --git a/src/world/area_kmr/kmr_04/kmr_04.h b/src/world/area_kmr/kmr_04/kmr_04.h index 6dd87dd31a..1fc1dedfbf 100644 --- a/src/world/area_kmr/kmr_04/kmr_04.h +++ b/src/world/area_kmr/kmr_04/kmr_04.h @@ -32,7 +32,7 @@ enum { extern EvtScript N(EVS_Main); extern EvtScript N(EVS_SetNormalMusic); extern EvtScript N(EVS_SetJrTroopaMusic); -extern EvtScript N(EVS_PushPopMusic); +extern EvtScript N(EVS_PlayUpgradeSong); extern EvtScript N(EVS_SetupFoliage); extern EvtScript N(EVS_MakeEntities); extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kmr/kmr_04/kmr_04_1_music.c b/src/world/area_kmr/kmr_04/kmr_04_1_music.c index e3c9351118..1ca2efa48d 100644 --- a/src/world/area_kmr/kmr_04/kmr_04_1_music.c +++ b/src/world/area_kmr/kmr_04/kmr_04_1_music.c @@ -12,7 +12,7 @@ EvtScript N(EVS_SetJrTroopaMusic) = { EVT_END }; -EvtScript N(EVS_PushPopMusic) = { +EvtScript N(EVS_PlayUpgradeSong) = { EVT_CALL(PushSong, SONG_ITEM_UPGRADE, 0) EVT_WAIT(130) EVT_CALL(PopSong) diff --git a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c index d4e0f2d85d..73e2f2828e 100644 --- a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c +++ b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c @@ -46,7 +46,7 @@ EvtScript N(EVS_GotHammer) = { EVT_ADD(LVar6, 16) EVT_PLAY_EFFECT(EFFECT_GOT_ITEM_OUTLINE, 0, LVar5, LVar6, LVar7, EVT_FLOAT(1.0), LVar8) EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 9, LVar5, LVar6, LVar7, EVT_FLOAT(1.0), 100) - EVT_EXEC(N(EVS_PushPopMusic)) + EVT_EXEC(N(EVS_PlayUpgradeSong)) EVT_THREAD EVT_WAIT(4) EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) 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 e638216bb4..db6bf1a5f3 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 @@ -76,7 +76,6 @@ API_CALLABLE(N(SetupDemoScene)) { return ApiStatus_BLOCK; } - EvtScript N(EVS_PlayDemoScene) = { EVT_CALL(N(SetupDemoScene)) EVT_SET(GF_DemoSceneDone, FALSE) diff --git a/src/world/area_mac/mac.h b/src/world/area_mac/mac.h index fe49c0d593..030b56b66a 100644 --- a/src/world/area_mac/mac.h +++ b/src/world/area_mac/mac.h @@ -2,24 +2,40 @@ #define _WORLD_AREA_MAC_MAC_H_ enum { - AB_MAC_0 = AreaByte(0), - AB_MAC_1 = AreaByte(1), - AB_MAC_2 = AreaByte(2), - AB_MAC_3 = AreaByte(3), - AB_MAC_4 = AreaByte(4), - AB_MAC_5 = AreaByte(5), - AB_MAC_6 = AreaByte(6), - AB_MAC_7 = AreaByte(7), - AB_MAC_8 = AreaByte(8), - AB_MAC_9 = AreaByte(9), - AB_MAC_A = AreaByte(10), - AB_MAC_B = AreaByte(11), - AB_MAC_C = AreaByte(12), - AB_MAC_D = AreaByte(13), - AB_MAC_E = AreaByte(14), - AB_MAC_F = AreaByte(15), + AB_MAC_0 = AreaByte(0), + AB_MAC_1 = AreaByte(1), + AB_MAC_2 = AreaByte(2), + AB_MAC_3 = AreaByte(3), + AB_MAC_4 = AreaByte(4), + AB_MAC_5 = AreaByte(5), + AB_MAC_6 = AreaByte(6), + AB_MAC_7 = AreaByte(7), + AB_MAC_8 = AreaByte(8), + AB_MAC_9 = AreaByte(9), + AB_MAC_A = AreaByte(10), + AB_MAC_B = AreaByte(11), + AB_MAC_C = AreaByte(12), + AB_MAC_D = AreaByte(13), + AB_MAC_E = AreaByte(14), + AB_MAC_F = AreaByte(15), }; -#define AF_MAC(index) AreaFlag(index) +enum { + AF_MAC_20 = AreaFlag(32), + AF_MAC_21 = AreaFlag(33), + AF_MAC_22 = AreaFlag(34), + AF_MAC_23 = AreaFlag(35), + AF_MAC_24 = AreaFlag(36), + AF_MAC_25 = AreaFlag(37), +}; + +extern MapSettings machi_settings; +extern MapSettings mac_00_settings; +extern MapSettings mac_01_settings; +extern MapSettings mac_02_settings; +extern MapSettings mac_03_settings; +extern MapSettings mac_04_settings; +extern MapSettings mac_05_settings; +extern MapSettings mac_06_settings; #endif diff --git a/src/world/area_mac/mac_03/831800.c b/src/world/area_mac/mac_03/831800.c deleted file mode 100644 index 50e9bf816f..0000000000 --- a/src/world/area_mac/mac_03/831800.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "mac_03.h" - -static char* N(exit_str_0) = "mac_02"; -static char* N(exit_str_1) = "mgm_00"; -static char* N(exit_str_2) = "iwa_11"; -static char* N(exit_str_3) = "mac_03"; - -#include "world/common/entity/Pipe.inc.c" - -ApiStatus func_802402E0_831AE0(Evt* script, s32 isInitialCall) { - if (script->varTable[15] > 720) { - script->varTable[15] = 0; - } - - script->varTable[0] = script->varTable[15] * 6; - script->varTable[1] = script->varTable[15] / 2; - return ApiStatus_DONE2; -} diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c deleted file mode 100644 index 760ce8ed55..0000000000 --- a/src/world/area_mac/mac_03/831B20.c +++ /dev/null @@ -1,68 +0,0 @@ -#include "mac_03.h" -#include "effects.h" - -#define CHUCK_QUIZMO_NPC_ID 23 - -#include "common/CosInterpMinMax.inc.c" - -extern s32 N(Quizmo_Worker); -extern s32 N(Quizmo_AnswerResult); -extern EffectInstance* N(Quizmo_StageEffect); -extern EffectInstance* N(Quizmo_AudienceEffect); -extern EffectInstance* N(Quizmo_VannaTEffect); - -#include "world/common/atomic/Quizmo.inc.c" - -#include "world/common/todo/GetNpcCollisionHeight.inc.c" - -#include "world/common/todo/AddPlayerHandsOffset.inc.c" - -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241770_832F70); - -extern s32 N(ItemChoice_HasSelectedItem); -extern s32 N(ItemChoice_SelectedItemID); - -ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++); - N(ItemChoice_HasSelectedItem) = TRUE; - return ApiStatus_DONE2; -} - -extern s32 mac_03_D_80251400[]; - -ApiStatus func_802417FC_832FFC(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* ptr = (s32*) evt_get_variable(script, *args++); - s32 i; - - if (ptr != NULL) { - for (i = 0; ptr[i] != 0; i++) { - mac_03_D_80251400[i] = ptr[i]; - } - mac_03_D_80251400[i] = 0; - } else { - for (i = 0; i < 112; i++) { - mac_03_D_80251400[i] = i + 16; - mac_03_D_80251400[112] = 0; - } - } - return ApiStatus_DONE2; -} - -extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/todo/LetterDelivery.inc.c" - -ApiStatus func_80241B84_833384(Evt* script, s32 isInitialCall) { - s32 gb29 = evt_get_variable(script, GameByte(29)); - - if (gb29 == 0) { - script->varTable[0] = -1; - } else { - script->varTable[0] = evt_get_variable(script, gb29 + GameByte(29)); - } - return ApiStatus_DONE2; -} - -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241BD8_8333D8); diff --git a/src/world/area_mac/mac_03/833500.c b/src/world/area_mac/mac_03/833500.c deleted file mode 100644 index 4686bd0077..0000000000 --- a/src/world/area_mac/mac_03/833500.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "mac_03.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_mac/mac_03/833740.c b/src/world/area_mac/mac_03/833740.c deleted file mode 100644 index fce3ee3b07..0000000000 --- a/src/world/area_mac/mac_03/833740.c +++ /dev/null @@ -1,172 +0,0 @@ -#include "mac_03.h" -#include "effects.h" - -typedef struct LilOinkReward { - /* 0x00 */ s32 itemID; - /* 0x04 */ s32 quantity; - /* 0x08 */ s32 chance; -} LilOinkReward; // size = 0x0C - -extern LilOinkReward D_8024F800_841000[10]; - -#include "world/common/todo/GetFloorCollider.inc.c" - -#include "world/common/todo/GetPlayerCoins.inc.c" - -ApiStatus func_80241F80_833780(Evt* script, s32 isInitialCall) { - hide_coin_counter_immediately(); - return ApiStatus_DONE2; -} - -// OINK cod start - -ApiStatus func_80241FA0_8337A0(Evt* script, s32 isInitialCall) { - // f32 angle = clamp_angle(EVT_FIXED_TO_FLOAT(script->varTable[2])); ? TODO - f32 angle = script->varTable[2] + EVT_FIXED_OFFSET; - - angle = clamp_angle(angle * (1.0f / 1024.0f)); - script->varTable[2] = (sin_deg(angle) * 110.0f) + 167.0f; - script->varTable[3] = 85; - script->varTable[4] = -343.75f - (cos_deg(angle) * 110.0f); - return ApiStatus_DONE2; -} - -ApiStatus func_8024206C_83386C(Evt* script, s32 isInitialCall) { - s32 typeBase = GB_MAC03_LilOink_00; - s32 numPigs = evt_get_variable(NULL, GB_MAC03_LilOinkCount); - EffectInstance* effect = fx_lil_oink(0, 0.0f, 0.0f, 0.0f, 0.0f, 0); - s32 i; - - evt_set_variable(script, MapVar(2), (s32) effect); - - for (i = 0; i < numPigs; i++) { - effect->data.lilOink->type[i] = evt_get_variable(NULL, typeBase + i); - effect->data.lilOink->x[i] = 300 + (i * 30); - effect->data.lilOink->y[i] = 20.0f; - effect->data.lilOink->z[i] = -180.0f; - effect->data.lilOink->rot[i] = 270.0f; - effect->data.lilOink->flags[i] |= 1; - effect->data.lilOink->flags[i] |= 2; - effect->data.lilOink->unk_EF[i] = 2; - } - return ApiStatus_DONE2; -} - -ApiStatus func_802421E8_8339E8(Evt* script, s32 isInitialCall) { - EffectInstance* effect = (EffectInstance*) evt_get_variable(script, MapVar(2)); - Bytecode* args = script->ptrReadPos; - s32 i = evt_get_variable(script, *args++); - s32 type = evt_get_variable(script, *args++); - f32 x = evt_get_variable(script, *args++); - f32 y = evt_get_variable(script, *args++); - f32 z = evt_get_variable(script, *args++); - s32 rot = evt_get_variable(script, *args++); - - effect->data.lilOink->type[i] = type; - effect->data.lilOink->x[i] = x; - effect->data.lilOink->y[i] = y; - effect->data.lilOink->z[i] = z; - effect->data.lilOink->rot[i] = rot; - effect->data.lilOink->flags[i] |= 1; - - // When the pen is full? - if (i != MAX_LIL_OINKS - 1) { - effect->data.lilOink->flags[i] |= 2; - effect->data.lilOink->unk_EF[i] = 2; - evt_set_variable(script, i + GB_MAC03_LilOink_00, type); - } - return ApiStatus_DONE2; -} - -ApiStatus func_80242384_833B84(Evt* script, s32 isInitialCall) { - EffectInstance* effect = (EffectInstance*) evt_get_variable(script, MapVar(2)); - Bytecode* args = script->ptrReadPos; - s32 i = evt_get_variable(script, *args++); - f32 x = evt_get_variable(script, *args++); - f32 y = evt_get_variable(script, *args++); - f32 z = evt_get_variable(script, *args++); - s32 rot = evt_get_variable(script, *args++); - - effect->data.lilOink->x[i] = x; - effect->data.lilOink->y[i] = y; - effect->data.lilOink->z[i] = z; - effect->data.lilOink->rot[i] = rot; - return ApiStatus_DONE2; -} - -ApiStatus func_802424A0_833CA0(Evt* script, s32 isInitialCall) { - EffectInstance* effect = (EffectInstance*) evt_get_variable(script, MapVar(2)); - Bytecode* args = script->ptrReadPos; - s32 i = evt_get_variable(script, *args++); - s32 xOut = *args++; - s32 yOut = *args++; - s32 zOut = *args++; - s32 rotOut = *args++; - - evt_set_variable(script, xOut, effect->data.lilOink->x[i]); - evt_set_variable(script, yOut, effect->data.lilOink->y[i]); - evt_set_variable(script, zOut, effect->data.lilOink->z[i]); - evt_set_variable(script, rotOut, effect->data.lilOink->rot[i]); - return ApiStatus_DONE2; -} - -ApiStatus func_802425A8_833DA8(Evt* script, s32 isInitialCall) { - EffectInstance* effect = (EffectInstance*) evt_get_variable(script, MapVar(2)); - Bytecode* args = script->ptrReadPos; - s32 i = evt_get_variable(script, *args++); - - effect->data.lilOink->flags[i] &= ~1; - return ApiStatus_DONE2; -} - -ApiStatus func_80242608_833E08(Evt* script, s32 isInitialCall) { - EffectInstance* effect = (EffectInstance*) evt_get_variable(script, MapVar(2)); - Bytecode* args = script->ptrReadPos; - s32 i = evt_get_variable(script, *args++); - s32 temp = evt_get_variable(script, *args++); - - effect->data.lilOink->flags[i] |= 2; - effect->data.lilOink->unk_EF[i] = temp; - return ApiStatus_DONE2; -} - -ApiStatus func_80242694_833E94(Evt* script, s32 isInitialCall) { - EffectInstance* effect = (EffectInstance*) evt_get_variable(script, MapVar(2)); - s32 i; - - for (i = 1; i < MAX_LIL_OINKS - 1; i++) { - s32 type = evt_get_variable(script, GB_MAC03_LilOink_00 + i); - f32 x, y, z, rot; - - evt_set_variable(script, GB_MAC03_LilOinkCount + i, type); - - x = effect->data.lilOink->x[i]; - y = effect->data.lilOink->y[i]; - z = effect->data.lilOink->z[i]; - rot = effect->data.lilOink->rot[i]; - - effect->data.lilOink->type[i - 1] = type; - effect->data.lilOink->x[i - 1] = x; - effect->data.lilOink->y[i - 1] = y; - effect->data.lilOink->z[i - 1] = z; - effect->data.lilOink->rot[i - 1] = rot; - effect->data.lilOink->flags[i - 1] |= 1; - } - effect->data.lilOink->flags[MAX_LIL_OINKS - 2] &= ~1; - evt_set_variable(script, GB_MAC03_LilOinkCount, 9); - return ApiStatus_DONE2; -} - -ApiStatus func_802427D0_833FD0(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 index = evt_get_variable(script, GB_MAC03_LilOink_00); - s32 itemID = *args++; - s32 quantity = *args++; - s32 chance = *args++; - LilOinkReward* reward = &D_8024F800_841000[index]; - - evt_set_variable(script, itemID, reward->itemID); - evt_set_variable(script, quantity, reward->quantity); - evt_set_variable(script, chance, reward->chance); - return ApiStatus_DONE2; -} diff --git a/src/world/area_mac/mac_03/mac_03.h b/src/world/area_mac/mac_03/mac_03.h index e27a14f7f2..9d68af9af1 100644 --- a/src/world/area_mac/mac_03/mac_03.h +++ b/src/world/area_mac/mac_03/mac_03.h @@ -2,8 +2,72 @@ /// @brief Toad Town - Station District #include "common.h" -#include "../mac.h" #include "message_ids.h" #include "map.h" +#include "../mac.h" +#include "mapfs/mac_03_shape.h" +#include "mapfs/mac_03_hit.h" + +#include "sprite/npc/TrainStationToad.h" +#include "sprite/npc/Toad.h" +#include "sprite/npc/ShyGuy.h" + +enum { + NPC_TrainStationToad_01 = 0, + NPC_TrainStationToad_02 = 1, + NPC_Toad_01 = 2, + NPC_ThreeSisters_01 = 3, + NPC_Toad_02 = 4, + NPC_ToadKid_01 = 5, + NPC_ToadKid_02 = 6, + NPC_ThreeSisters_02 = 7, + NPC_ThreeSisters_03 = 8, + NPC_ThreeSisters_04 = 9, + NPC_Toad_03 = 10, + NPC_ShyGuy = 11, + NPC_LilOink_01 = 12, + NPC_LilOink_02 = 13, + NPC_LilOink_03 = 14, + NPC_LilOink_04 = 15, + NPC_LilOink_05 = 16, + NPC_LilOink_06 = 17, + NPC_LilOink_07 = 18, + NPC_LilOink_08 = 19, + NPC_LilOink_09 = 20, + NPC_LilOink_10 = 21, + NPC_Capsule = 22, + NPC_ChuckQuizmo = 23, +}; + +enum { + MF_TrainDepartDoorOpen = MapFlag(0), + MF_TrainDepartPlayerBoard = MapFlag(1), + MF_TrainArriveDoorOpen = MapFlag(2), + MF_TrainArrivePlayerDisembark = MapFlag(3), + MF_TrainMoving = MapFlag(4), + MF_TrainReverseDir = MapFlag(5), + MF_Unk_06 = MapFlag(6), + MF_Unk_07 = MapFlag(7), + MF_Unk_08 = MapFlag(8), +}; + +enum { + MV_TrainMoveDist = MapVar(0), + MV_TrainMoveSpeed = MapVar(1), + MV_LilOinkEffect = MapVar(2), +}; + #define NAMESPACE mac_03 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupFoliage); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_InitializeTrainScene); +extern EvtScript N(EVS_ArriveFromMtRugged); +extern EvtScript N(EVS_DepartForMtRugged); +extern EvtScript N(EVS_InitializeLilOinks); +extern EvtScript N(EVS_PlayDemoScene); + +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_mac/mac_03/mac_03_0_header.c b/src/world/area_mac/mac_03/mac_03_0_header.c new file mode 100644 index 0000000000..096c5395e1 --- /dev/null +++ b/src/world/area_mac/mac_03/mac_03_0_header.c @@ -0,0 +1,16 @@ +#include "mac_03.h" + +EntryList N(Entrances) = { + [mac_03_ENTRY_0] { 0.0, 0.0, -600.0, 180.0 }, + [mac_03_ENTRY_1] { 590.0, 30.0, 100.0, 270.0 }, + [mac_03_ENTRY_2] { -125.0, 50.0, -562.0, 90.0 }, + [mac_03_ENTRY_3] { -415.0, 20.0, 92.0, 350.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mac_03 }, +}; diff --git a/src/world/area_mac/mac_03/mac_03_1_music.c b/src/world/area_mac/mac_03/mac_03_1_music.c new file mode 100644 index 0000000000..6eace7ca38 --- /dev/null +++ b/src/world/area_mac/mac_03/mac_03_1_music.c @@ -0,0 +1,12 @@ +#include "mac_03.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_RANGE(STORY_CH3_STAR_SPRIT_DEPARTED, STORY_CH4_STAR_SPIRIT_RESCUED) + EVT_CALL(SetMusicTrack, 0, SONG_SHY_GUY_INVASION, 0, 8) + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN, 0, 8) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_03/mac_03_2_main.c b/src/world/area_mac/mac_03/mac_03_2_main.c new file mode 100644 index 0000000000..9a4f75c01e --- /dev/null +++ b/src/world/area_mac/mac_03/mac_03_2_main.c @@ -0,0 +1,100 @@ +#include "mac_03.h" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +EvtScript N(EVS_ExitWalk_mac_02_3) = EVT_EXIT_WALK(60, mac_03_ENTRY_0, "mac_02", mac_02_ENTRY_3); + +EvtScript N(EVS_GotoMap_mgm_00_0) = { + EVT_CALL(GotoMap, EVT_PTR("mgm_00"), mgm_00_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_mgm_00_0) = EVT_EXIT_PIPE_VERTICAL(mac_02_ENTRY_2, COLLIDER_deilim, N(EVS_GotoMap_mgm_00_0)); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_mac_02_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_mgm_00_0)), TRIGGER_FLOOR_TOUCH, COLLIDER_deilim, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(mac_03_ENTRY_0) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(mac_03_ENTRY_1) + EVT_EXEC(N(EVS_ArriveFromMtRugged)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(mac_03_ENTRY_2) + EVT_ENTER_PIPE_VERTICAL(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(mac_03_ENTRY_3) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HidePlayroomPipe) = { + EVT_IF_EQ(GF_MAC03_UnlockedPlayroom, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_dokan, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilim, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o241, FALSE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +API_CALLABLE(N(GetClockHandAngles)) { + if (script->varTable[15] > 720) { + script->varTable[15] = 0; + } + script->varTable[0] = script->varTable[15] * 6; + script->varTable[1] = script->varTable[15] / 2; + return ApiStatus_DONE2; +} + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_SET(AF_MAC_20, FALSE) + EVT_SET(AF_MAC_21, FALSE) + EVT_SET(AF_MAC_22, FALSE) + EVT_SET(AF_MAC_23, FALSE) + EVT_SET(AF_MAC_24, FALSE) + EVT_SET(AF_MAC_25, FALSE) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_CALL(GetDemoState, LVar0) + EVT_IF_EQ(LVar0, DEMO_STATE_NONE) + EVT_EXEC(N(EVS_InitializeLilOinks)) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_InitializeTrainScene)) + EVT_THREAD + EVT_SET(LVarF, 0) + EVT_LABEL(10) + EVT_ADD(LVarF, 1) + EVT_CALL(N(GetClockHandAngles)) + EVT_CALL(RotateModel, MODEL_o148, LVar0, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o147, LVar1, 0, 0, -1) + EVT_WAIT(10) + EVT_GOTO(10) + EVT_END_THREAD + EVT_CALL(GetDemoState, LVar0) + EVT_IF_NE(LVar0, DEMO_STATE_NONE) + EVT_EXEC_WAIT(N(EVS_PlayDemoScene)) + EVT_RETURN + EVT_END_IF + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_HidePlayroomPipe)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_SET(GF_MAC01_RowfBadgesChosen, FALSE) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_03/mac_03_3_train.c b/src/world/area_mac/mac_03/mac_03_3_train.c new file mode 100644 index 0000000000..acbc2e60fc --- /dev/null +++ b/src/world/area_mac/mac_03/mac_03_3_train.c @@ -0,0 +1,583 @@ +#include "mac_03.h" + +#include "common/CosInterpMinMax.inc.c" + +EvtScript N(EVS_OpenCrossingGates) = { + EVT_SET(LVarF, 0) + EVT_LOOP(40) + EVT_ADD(LVarF, 1) + EVT_SET(LVar1, LVarF) + EVT_CALL(N(CosInterpMinMax), LVar1, LVar0, 0, 105, 40, 1, 0) + EVT_CALL(RotateModel, MODEL_o183, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o184, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o191, LVar0, 0, 1, 0) + EVT_SET(LVar1, LVarF) + EVT_CALL(N(CosInterpMinMax), LVar1, LVar0, 0, 75, 40, 1, 0) + EVT_CALL(RotateModel, MODEL_o187, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o188, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o192, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CloseCrossingGates) = { + EVT_SET(LVarF, 0) + EVT_LOOP(40) + EVT_ADD(LVarF, 1) + EVT_SET(LVar1, LVarF) + EVT_CALL(N(CosInterpMinMax), LVar1, LVar0, 105, 0, 40, 1, 0) + EVT_CALL(RotateModel, MODEL_o183, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o184, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o191, LVar0, 0, 1, 0) + EVT_SET(LVar1, LVarF) + EVT_CALL(N(CosInterpMinMax), LVar1, LVar0, 75, 0, 40, 1, 0) + EVT_CALL(RotateModel, MODEL_o187, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o188, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o192, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SpawnSmoke) = { + EVT_CALL(PlaySoundAtModel, MODEL_07, SOUND_B000001A, 0) + EVT_SETF(LVar0, MV_TrainMoveDist) + EVT_IF_EQ(MF_TrainReverseDir, FALSE) + EVT_ADDF(LVar0, -310) + EVT_ELSE + EVT_ADDF(LVar0, -450) + EVT_END_IF + EVT_SETF(LVar1, 140) + EVT_SETF(LVar2, 0) + EVT_SETF(LVar3, EVT_FLOAT(1.0)) + EVT_SETF(LVar4, EVT_FLOAT(3.0)) + EVT_ADD(LVarB, CLONED_MODEL(0)) + EVT_CALL(EnableModel, LVarB, TRUE) + EVT_LOOP(20) + EVT_CALL(TranslateModel, LVarB, LVar0, LVar1, LVar2) + EVT_CALL(ScaleModel, LVarB, LVar3, LVar3, 1) + EVT_ADDF(LVar1, LVar4) + EVT_ADDF(LVar3, EVT_FLOAT(0.046875)) + EVT_MULF(LVar4, EVT_FLOAT(0.90625)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(EnableModel, LVarB, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_AnimateTrain) = { + EVT_LABEL(0) + EVT_SET(LVar0, MV_TrainMoveDist) + EVT_CALL(TranslateModel, MODEL_08, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_07, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_10, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_11, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_12, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_13, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_09, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_01, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_02, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_03, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_04, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_05, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_06, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_ura, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_omote, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_ura2, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_omote2, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_14, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_15, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_16, LVar0, 0, 0) + EVT_IF_EQ(MF_TrainReverseDir, TRUE) + EVT_SET(LVar0, 180) + EVT_CALL(TranslateModel, MODEL_08, -69, -50, 0) + EVT_CALL(TranslateModel, MODEL_07, -69, -50, 0) + EVT_CALL(TranslateModel, MODEL_10, 75, 25, 2) + EVT_CALL(TranslateModel, MODEL_11, 30, 30, 2) + EVT_CALL(TranslateModel, MODEL_12, -10, 30, 2) + EVT_CALL(TranslateModel, MODEL_13, -50, 30, 2) + EVT_CALL(TranslateModel, MODEL_09, -1, -58, 0) + EVT_CALL(TranslateModel, MODEL_ura, 82, -19, -35) + EVT_CALL(TranslateModel, MODEL_omote, 82, -19, -35) + EVT_CALL(TranslateModel, MODEL_ura2, 82, -19, 35) + EVT_CALL(TranslateModel, MODEL_omote2, 82, -19, 35) + EVT_CALL(TranslateModel, MODEL_14, -21, 30, 0) + EVT_CALL(TranslateModel, MODEL_15, -25, 30, 0) + EVT_CALL(TranslateModel, MODEL_16, -63, 15, 0) + EVT_CALL(RotateModel, MODEL_08, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_07, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_10, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_11, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_12, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_13, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_09, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_01, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_02, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_03, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_04, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_05, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_06, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_ura, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_omote, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_ura2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_omote2, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_14, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_15, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_16, LVar0, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_08, 69, 50, 0) + EVT_CALL(TranslateModel, MODEL_07, 69, 50, 0) + EVT_CALL(TranslateModel, MODEL_10, -75, -25, -2) + EVT_CALL(TranslateModel, MODEL_11, -30, -30, -2) + EVT_CALL(TranslateModel, MODEL_12, 10, -30, -2) + EVT_CALL(TranslateModel, MODEL_13, 50, -30, -2) + EVT_CALL(TranslateModel, MODEL_09, 1, 58, 0) + EVT_CALL(TranslateModel, MODEL_ura, -82, 19, 35) + EVT_CALL(TranslateModel, MODEL_omote, -82, 19, 35) + EVT_CALL(TranslateModel, MODEL_ura2, -82, 19, -35) + EVT_CALL(TranslateModel, MODEL_omote2, -82, 19, -35) + EVT_CALL(TranslateModel, MODEL_14, 21, -30, 0) + EVT_CALL(TranslateModel, MODEL_15, 25, -30, 0) + EVT_CALL(TranslateModel, MODEL_16, 63, -15, 0) + EVT_END_IF + EVT_IF_EQ(MF_TrainReverseDir, FALSE) + EVT_SET(LVar2, MV_TrainMoveDist) + EVT_ELSE + EVT_SET(LVar2, 1000) + EVT_SUB(LVar2, MV_TrainMoveDist) + EVT_END_IF + EVT_SETF(LVar0, LVar2) + EVT_MULF(LVar0, EVT_FLOAT(-2.40625)) + EVT_CALL(RotateModel, MODEL_11, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_12, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_13, LVar0, 0, 0, 1) + EVT_MULF(LVar0, EVT_FLOAT(0.6)) + EVT_CALL(RotateModel, MODEL_10, LVar0, 0, 0, 1) + EVT_CALL(N(CosInterpMinMax), LVar2, LVar0, 0, -20, 75, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVar2, LVar1, -10, 10, 75, 0, -90) + EVT_CALL(TranslateModel, MODEL_14, LVar0, LVar1, 0) + EVT_CALL(N(CosInterpMinMax), LVar2, LVar0, 0, -20, 75, 0, 0) + EVT_ADD(LVar0, 5) + EVT_CALL(TranslateModel, MODEL_16, LVar0, -14, 0) + EVT_CALL(N(CosInterpMinMax), LVar2, LVar0, 0, -20, 75, 0, 0) + EVT_CALL(N(CosInterpMinMax), LVar2, LVar1, -10, 10, 75, 0, -90) + EVT_CALL(TranslateModel, MODEL_15, LVar0, LVar1, 0) + EVT_CALL(N(CosInterpMinMax), LVar2, LVar0, -40, 40, 75, 0, 90) + EVT_CALL(RotateModel, MODEL_15, LVar0, 0, 0, 1) + EVT_CALL(N(CosInterpMinMax), LVarC, LVar0, EVT_FLOAT(-3.0), EVT_FLOAT(3.0), 10, 0, 0) + EVT_MULF(LVar0, MV_TrainMoveSpeed) + EVT_CALL(RotateModel, MODEL_09, LVar0, 0, 0, 1) + EVT_IF_NE(MV_TrainMoveSpeed, 0) + EVT_IF_EQ(LVarD, 0) + EVT_THREAD + EVT_WAIT(18) + EVT_EXEC(N(EVS_SpawnSmoke)) + EVT_END_THREAD + EVT_END_IF + EVT_END_IF + EVT_IF_LE(LVarD, 20) + EVT_CALL(N(CosInterpMinMax), LVarD, LVar0, EVT_FLOAT(0.703125), EVT_FLOAT(1.0), 10, 0, 180) + EVT_CALL(N(CosInterpMinMax), LVarD, LVar2, EVT_FLOAT(0.0), EVT_FLOAT(0.296875), 10, 0, 180) + EVT_SETF(LVar1, EVT_FLOAT(0.296875)) + EVT_SUBF(LVar1, LVar2) + EVT_ADDF(LVar1, EVT_FLOAT(1.0)) + EVT_CALL(ScaleModel, MODEL_07, LVar1, LVar0, LVar1) + EVT_CALL(ScaleModel, MODEL_08, LVar1, LVar0, LVar1) + EVT_ELSE + EVT_SETF(LVar0, EVT_FLOAT(1.0)) + EVT_SETF(LVar2, EVT_FLOAT(0.296875)) + EVT_SETF(LVar1, EVT_FLOAT(0.296875)) + EVT_SUBF(LVar1, LVar2) + EVT_ADDF(LVar1, EVT_FLOAT(1.0)) + EVT_CALL(ScaleModel, MODEL_07, LVar1, LVar0, LVar1) + EVT_CALL(ScaleModel, MODEL_08, LVar1, LVar0, LVar1) + EVT_END_IF + EVT_IF_EQ(MF_TrainDepartDoorOpen, TRUE) + EVT_CALL(PlaySoundAt, SOUND_20A5, 0, -435, 84, 37) + EVT_SET(LVar8, 10) + EVT_SET(LocalFlag(1), TRUE) + EVT_SET(MF_TrainDepartDoorOpen, FALSE) + EVT_END_IF + EVT_IF_EQ(MF_TrainDepartPlayerBoard, TRUE) + EVT_SET(LVar8, -10) + EVT_SET(LocalFlag(1), TRUE) + EVT_SET(MF_TrainDepartPlayerBoard, FALSE) + EVT_END_IF + EVT_IF_EQ(MF_TrainArriveDoorOpen, TRUE) + EVT_CALL(PlaySoundAt, SOUND_20A5, 0, -413, 84, 38) + EVT_SET(LVar8, 10) + EVT_SET(LocalFlag(2), TRUE) + EVT_SET(MF_TrainArriveDoorOpen, FALSE) + EVT_END_IF + EVT_IF_EQ(MF_TrainArrivePlayerDisembark, TRUE) + EVT_SET(LVar8, -10) + EVT_SET(LocalFlag(2), TRUE) + EVT_SET(MF_TrainArrivePlayerDisembark, FALSE) + EVT_END_IF + EVT_IF_EQ(LocalFlag(1), TRUE) + EVT_ADD(LVar9, LVar8) + EVT_IF_GE(LVar9, 90) + EVT_SET(LVar9, 90) + EVT_SET(LocalFlag(1), FALSE) + EVT_END_IF + EVT_IF_LE(LVar9, 0) + EVT_SET(LVar9, 0) + EVT_SET(LocalFlag(1), FALSE) + EVT_CALL(PlaySoundAt, SOUND_20A6, 0, -435, 84, 37) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(LocalFlag(2), TRUE) + EVT_ADD(LVarA, LVar8) + EVT_IF_GE(LVarA, 90) + EVT_SET(LVarA, 90) + EVT_SET(LocalFlag(2), FALSE) + EVT_END_IF + EVT_IF_LE(LVarA, 0) + EVT_SET(LVarA, 0) + EVT_SET(LocalFlag(2), FALSE) + EVT_CALL(PlaySoundAt, SOUND_20A6, 0, -413, 84, 38) + EVT_END_IF + EVT_END_IF + EVT_CALL(RotateModel, MODEL_omote, LVar9, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_ura, LVar9, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_omote2, LVarA, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_ura2, LVarA, 0, 1, 0) + EVT_IF_GT(MV_TrainMoveDist, 100) + EVT_IF_LT(MV_TrainMoveDist, 600) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_SET(LocalFlag(0), TRUE) + EVT_EXEC(N(EVS_OpenCrossingGates)) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_IF_LE(MV_TrainMoveDist, 100) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_SET(LocalFlag(0), FALSE) + EVT_EXEC(N(EVS_CloseCrossingGates)) + EVT_END_IF + EVT_END_IF + EVT_IF_GE(MV_TrainMoveDist, 600) + EVT_IF_EQ(LocalFlag(0), TRUE) + EVT_SET(LocalFlag(0), FALSE) + EVT_EXEC(N(EVS_CloseCrossingGates)) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(MF_TrainMoving, TRUE) + EVT_IF_EQ(MF_TrainReverseDir, FALSE) + EVT_SET(LVar0, MV_TrainMoveDist) + EVT_ADD(LVar0, -425) + EVT_ADD(LVar1, 75) + EVT_ADD(LVar2, 20) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_ELSE + EVT_SET(LVar0, MV_TrainMoveDist) + EVT_ADD(LVar0, -335) + EVT_ADD(LVar1, 75) + EVT_ADD(LVar2, 20) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_END_IF + EVT_END_IF + EVT_ADD(MV_TrainMoveDist, MV_TrainMoveSpeed) + EVT_SET(LVar0, MV_TrainMoveDist) + EVT_DIV(LVar0, 75) + EVT_IF_NE(LVar0, LVarE) + EVT_SET(LVarE, LVar0) + EVT_SET(LVarD, -1) + EVT_ADD(LVarB, 1) + EVT_IF_EQ(LVarB, 10) + EVT_SET(LVarB, 0) + EVT_END_IF + EVT_END_IF + EVT_ADDF(LVarD, 1) + EVT_IF_GT(LVarD, 1000) + EVT_SET(LVarD, 1000) + EVT_END_IF + EVT_ADDF(LVarC, 1) + EVT_IF_GT(LVarC, 1000) + EVT_SET(LVarC, 0) + EVT_END_IF + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UpdatePassengerPos) = { + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SET(LVar0, MV_TrainMoveDist) + EVT_IF_EQ(MF_TrainReverseDir, FALSE) + EVT_ADD(LVar0, -425) + EVT_ELSE + EVT_ADD(LVar0, -335) + EVT_END_IF + EVT_SET(LVar3, LVar0) + EVT_SET(LVar4, LVar1) + EVT_SET(LVar5, LVar2) + EVT_IF_EQ(MF_TrainReverseDir, FALSE) + EVT_ADD(LVar3, -57) + EVT_ELSE + EVT_ADD(LVar3, 57) + EVT_END_IF + EVT_ADD(LVar4, -31) + EVT_ADD(LVar5, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5) + EVT_IF_EQ(MF_TrainReverseDir, FALSE) + EVT_ADD(LVar0, 0) + EVT_ELSE + EVT_ADD(LVar0, 0) + EVT_END_IF + EVT_ADD(LVar1, -6) + EVT_ADD(LVar2, -40) + EVT_CALL(SetNpcPos, NPC_TrainStationToad_02, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FollowTrainCamera) = { + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_EQ(MF_TrainReverseDir, FALSE) + EVT_IF_GT(LVar0, 350) + EVT_SET(LVar0, 350) + EVT_END_IF + EVT_ADD(LVar0, 40) + EVT_SET(LVar1, 30) + EVT_ADD(LVar2, 40) + EVT_ELSE + EVT_IF_GT(LVar0, 350) + EVT_SET(LVar0, 350) + EVT_END_IF + EVT_ADD(LVar0, -40) + EVT_SET(LVar1, 30) + EVT_ADD(LVar2, 40) + EVT_END_IF + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ArriveFromMtRugged) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitk, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kisya1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kisya2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kisya3, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_humikiri, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_fumikiri, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_EXEC_GET_TID(N(EVS_FollowTrainCamera), LVar9) + EVT_EXEC_GET_TID(N(EVS_UpdatePassengerPos), LVarE) + EVT_SET(MF_TrainMoving, TRUE) + EVT_SET(MV_TrainMoveDist, 1200) + EVT_SET(MV_TrainMoveSpeed, 0) + EVT_SET(MF_TrainReverseDir, TRUE) + EVT_WAIT(60) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_SET(MV_TrainMoveDist, 1200) + EVT_SET(MV_TrainMoveSpeed, -10) + EVT_SET(MF_TrainReverseDir, TRUE) + EVT_LABEL(0) + EVT_SETF(MV_TrainMoveSpeed, -90) + EVT_SUBF(MV_TrainMoveSpeed, MV_TrainMoveDist) + EVT_SUBF(MV_TrainMoveSpeed, EVT_FLOAT(10.0)) + EVT_DIVF(MV_TrainMoveSpeed, EVT_FLOAT(10.0)) + EVT_IF_LT(MV_TrainMoveSpeed, -10) + EVT_SET(MV_TrainMoveSpeed, -10) + EVT_END_IF + EVT_IF_LE(MV_TrainMoveDist, -90) + EVT_GOTO(1) + EVT_END_IF + EVT_WAIT(1) + EVT_GOTO(0) + EVT_LABEL(1) + EVT_SET(MV_TrainMoveDist, -90) + EVT_SET(MV_TrainMoveSpeed, 0) + EVT_CALL(PlaySound, SOUND_1FD) + EVT_KILL_THREAD(LVarE) + EVT_SET(MF_TrainMoving, FALSE) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_SET(LVar0, -425) + EVT_SET(LVar1, 45) + EVT_SET(LVar2, 20) + EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) + EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 15) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SET(LVar0, -410) + EVT_SET(LVar1, 45) + EVT_SET(LVar2, 20) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_KILL_THREAD(LVar9) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) + EVT_CALL(HidePlayerShadow, FALSE) + EVT_SET(MF_TrainArriveDoorOpen, TRUE) + EVT_WAIT(20) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -420, 20, 97) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -420, 20, 97) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) + EVT_CALL(PlayerJump, -420, 20, 97, 15) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_PARTNER, -406, 20, 71, 15) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilitk, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_kisya1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_kisya2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_kisya3, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_humikiri, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_fumikiri, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_SET(MF_TrainArrivePlayerDisembark, TRUE) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_TrainStationToad_01, ANIM_TrainStationToad_White_Talk, ANIM_TrainStationToad_White_Idle, 0, MSG_MAC_Station_0005) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DepartForMtRugged) = { + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mac_03_ENTRY_1) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_SET(MV_TrainMoveDist, 0) + EVT_SET(MV_TrainMoveSpeed, 0) + EVT_SET(MF_TrainReverseDir, FALSE) + EVT_SET(MF_TrainDepartDoorOpen, TRUE) + EVT_WAIT(20) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitk, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kisya1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kisya2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kisya3, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_humikiri, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_fumikiri, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetNpcFlagBits, NPC_TrainStationToad_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -425, 70, 0) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_SET(LVar0, -425) + EVT_SET(LVar1, 45) + EVT_SET(LVar2, 20) + EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) + EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 15) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(NpcMoveTo, NPC_PARTNER, -425, 70, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.0)) + EVT_SET(LVar0, -425) + EVT_SET(LVar1, 45) + EVT_SET(LVar2, 20) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 10) + EVT_SET(MF_TrainDepartPlayerBoard, TRUE) + EVT_WAIT(20) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_ADD(LVar2, -50) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_SET(LVar0, -425) + EVT_SET(LVar1, 75) + EVT_SET(LVar2, 20) + EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) + EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 15) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_SET(MF_TrainMoving, TRUE) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -57) + EVT_ADD(LVar1, -31) + EVT_ADD(LVar2, 0) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_EXEC(N(EVS_UpdatePassengerPos)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(240.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(-100.0), EVT_FLOAT(-50.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(-2.5), EVT_FLOAT(-3.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 100) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_TrainStationToad_02, ANIM_TrainStationToad_Talk, ANIM_TrainStationToad_Still, 5, MSG_MAC_Station_0009) + EVT_CALL(PlaySound, SOUND_82) + EVT_THREAD + EVT_LOOP(1000) + EVT_ADDF(MV_TrainMoveSpeed, EVT_FLOAT(0.03125)) + EVT_IF_GT(MV_TrainMoveSpeed, 10) + EVT_SETF(MV_TrainMoveSpeed, EVT_FLOAT(10.0)) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(40) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_EXEC_GET_TID(N(EVS_FollowTrainCamera), LVar9) + EVT_WAIT(170) + EVT_WAIT(100) + EVT_CALL(GotoMap, EVT_PTR("iwa_11"), iwa_11_ENTRY_0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InitializeTrainScene) = { + EVT_CALL(SetModelFlags, MODEL_km, MODEL_FLAGS_USE_CAMERA_UNK_MATRIX, TRUE) + EVT_CALL(EnableModel, MODEL_km, FALSE) + EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(0)) + EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(1)) + EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(2)) + EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(3)) + EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(4)) + EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(5)) + EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(6)) + EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(7)) + EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(8)) + EVT_CALL(CloneModel, MODEL_km, CLONED_MODEL(9)) + EVT_EXEC(N(EVS_AnimateTrain)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_03/mac_03_4_npc.c b/src/world/area_mac/mac_03/mac_03_4_npc.c new file mode 100644 index 0000000000..f5638c2228 --- /dev/null +++ b/src/world/area_mac/mac_03/mac_03_4_npc.c @@ -0,0 +1,1043 @@ +#include "mac_03.h" +#include "effects.h" + +#include "world/common/npc/TrainConductorToad.inc.c" +#include "world/common/npc/Toad_Wander.inc.c" +#include "world/common/npc/Toad_Stationary.inc.c" + +NpcSettings N(NpcSettings_ShyGuy) = { + .height = 23, + .radius = 22, + .level = 14, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, + .actionFlags = AI_ACTION_JUMP_WHEN_SEE_PLAYER, +}; + +#include "world/common/npc/Dummy.inc.c" + +#define CHUCK_QUIZMO_NPC_ID NPC_ChuckQuizmo +#include "world/common/complete/Quizmo.inc.c" +MAP_STATIC_PAD(1,post_quizmo); + +#include "world/common/complete/LetterDelivery.inc.c" + +API_CALLABLE(N(GetOinkCount)) { + s32 oinkCount = evt_get_variable(script, GB_MAC03_LilOinkCount); + + if (oinkCount == 0) { + script->varTable[0] = -1; + } else { + script->varTable[0] = evt_get_variable(script, oinkCount + GB_MAC03_LilOinkCount); + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80241BD8_8333D8)) { + EffectInstance* effect = (EffectInstance*) evt_get_variable(script, MV_LilOinkEffect); + Bytecode* args = script->ptrReadPos; + s32 index = evt_get_variable(script, *args++); + f32 x = evt_get_variable(script, *args++); + f32 y = evt_get_variable(script, *args++); + f32 z = evt_get_variable(script, *args++); + f32 yaw = evt_get_variable(script, *args++); + + effect->data.lilOink->x[index] = x; + effect->data.lilOink->y[index] = y; + effect->data.lilOink->z[index] = z; + effect->data.lilOink->rot[index] = yaw; + return ApiStatus_DONE2; +} + +s32 N(LetterList_A)[] = { + ITEM_LETTER20, + ITEM_NONE +}; + +EvtScript N(EVS_ToadKid1_LetterPromptA) = { + EVT_CALL(N(LetterDelivery_Init), NPC_ToadKid_01, + ANIM_ToadKid_Red_Talk, ANIM_ToadKid_Red_Idle, + ITEM_LETTER20, ITEM_NONE, + MSG_MAC_Station_0049, MSG_MAC_Station_004A, + MSG_MAC_Station_004B, MSG_MAC_Station_004C, + EVT_PTR(N(LetterList_A))) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadKid1_LetterRewardA) = { + EVT_IF_EQ(LVarC, 2) + EVT_CALL(SpeakToPlayer, NPC_ToadKid_02, ANIM_ToadKid_Yellow_Talk, ANIM_ToadKid_Yellow_Idle, 0, MSG_MAC_Station_004D) + EVT_SET(LVar0, ITEM_LETTER21) + EVT_SET(LVar1, 1) + EVT_EXEC_WAIT(N(GiveKeyReward)) + EVT_CALL(AddKeyItem, ITEM_LETTER21) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(LetterList_B)[] = { + ITEM_LETTER22, + ITEM_NONE +}; + +EvtScript N(EVS_ToadKid1_LetterPromptB) = { + EVT_CALL(N(LetterDelivery_Init), NPC_ToadKid_01, + ANIM_ToadKid_Red_Talk, ANIM_ToadKid_Red_Idle, + ITEM_LETTER22, ITEM_NONE, + MSG_MAC_Station_004E, MSG_MAC_Station_004F, + MSG_MAC_Station_0050, MSG_MAC_Station_0051, + EVT_PTR(N(LetterList_B))) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadKid1_LetterRewardB) = { + EVT_IF_EQ(LVarC, 2) + EVT_CALL(SpeakToPlayer, NPC_ToadKid_02, ANIM_ToadKid_Yellow_Talk, ANIM_ToadKid_Yellow_Idle, 0, MSG_MAC_Station_0052) + EVT_SET(LVar1, 1) + EVT_SET(LVar0, ITEM_LETTER23) + EVT_EXEC_WAIT(N(GiveKeyReward)) + EVT_CALL(AddKeyItem, ITEM_LETTER23) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_TrainStationToad_01) = { + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_CALL(SpeakToPlayer, NPC_TrainStationToad_01, ANIM_TrainStationToad_White_SadTalk, ANIM_TrainStationToad_White_SadIdle, 0, MSG_MAC_Station_0000) + EVT_RETURN + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_RANGE(STORY_CH3_STAR_SPRIT_DEPARTED, STORY_CH4_STAR_SPIRIT_RESCUED) + EVT_IF_EQ(GF_MAC03_ShyGuyChasedOff, FALSE) + EVT_CALL(SpeakToPlayer, NPC_TrainStationToad_01, ANIM_TrainStationToad_White_SadTalk, ANIM_TrainStationToad_White_SadIdle, 0, MSG_MAC_Station_0007) + EVT_RETURN + EVT_END_IF + EVT_END_SWITCH + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mac_03_ENTRY_1) + EVT_CALL(SpeakToPlayer, NPC_TrainStationToad_01, ANIM_TrainStationToad_White_Talk, ANIM_TrainStationToad_White_Idle, 0, MSG_MAC_Station_0006) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GF_MAC03_ShyGuyChasedOff, FALSE) + EVT_IF_EQ(GF_MAC03_Conductor_ThankYouA, FALSE) + EVT_SET(GF_MAC03_Conductor_ThankYouA, TRUE) + EVT_SET(LVar0, MSG_MAC_Station_0001) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Station_0002) + EVT_END_IF + EVT_ELSE + EVT_IF_EQ(GF_MAC03_Conductor_ThankYouB, FALSE) + EVT_SET(GF_MAC03_Conductor_ThankYouB, TRUE) + EVT_SET(LVar0, MSG_MAC_Station_0008) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Station_0002) + EVT_END_IF + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_TrainStationToad_01, ANIM_TrainStationToad_White_Talk, ANIM_TrainStationToad_White_Idle, 0, LVar0) + EVT_CALL(ShowChoice, MSG_Choice_000C) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_TrainStationToad_01, ANIM_TrainStationToad_White_Talk, ANIM_TrainStationToad_White_Idle, 0, MSG_MAC_Station_0003) + EVT_EXEC(N(EVS_DepartForMtRugged)) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_TrainStationToad_01, ANIM_TrainStationToad_White_Talk, ANIM_TrainStationToad_White_Idle, 0, MSG_MAC_Station_0004) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_TrainStationToad_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_TrainStationToad_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_01) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Station_000A) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Station_000B) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Station_000C) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_ShyGuyBlockingTracks, FALSE) + EVT_SET(LVar0, MSG_MAC_Station_000D) + EVT_ELSE + EVT_IF_EQ(GF_MAC03_ShyGuyChasedOff, FALSE) + EVT_SET(LVar0, MSG_MAC_Station_000E) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Station_000F) + EVT_END_IF + EVT_END_IF + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Station_0010) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Station_0011) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Station_0012) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Station_0013) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Station_0014) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Station_0015) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Station_0016) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_Toad_01, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ThreeSisters_01) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Station_0017) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Station_0018) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Station_0019) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_ShyGuyBlockingTracks, FALSE) + EVT_SET(LVar0, MSG_MAC_Station_001A) + EVT_ELSE + EVT_IF_EQ(GF_MAC03_ShyGuyChasedOff, FALSE) + EVT_SET(LVar0, MSG_MAC_Station_001B) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Station_001C) + EVT_END_IF + EVT_END_IF + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Station_001D) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Station_001E) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Station_001F) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Station_0020) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Station_0021) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Station_0022) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Station_0023) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_01, ANIM_Toadette_Purple_Talk, ANIM_Toadette_Purple_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ThreeSisters_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ThreeSisters_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_02) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Station_0024) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Station_0025) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Station_0026) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_ShyGuyBlockingTracks, FALSE) + EVT_SET(LVar0, MSG_MAC_Station_0027) + EVT_ELSE + EVT_IF_EQ(GF_MAC03_ShyGuyChasedOff, FALSE) + EVT_SET(LVar0, MSG_MAC_Station_0028) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Station_0029) + EVT_END_IF + EVT_END_IF + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Station_002A) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Station_002B) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Station_002C) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Station_002D) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Station_002E) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Station_002F) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Station_0030) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_Toad_02, ANIM_Toad_Green_Talk, ANIM_Toad_Green_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_02))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ToadKid_02) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_FULL) + EVT_CALL(EnableNpcAI, NPC_ToadKid_01, FALSE) + EVT_CALL(EnableNpcAI, NPC_ToadKid_02, FALSE) + EVT_CALL(GetNpcAnimation, NPC_ToadKid_01, LVar2) + EVT_CALL(GetNpcAnimation, NPC_ToadKid_02, LVar3) + EVT_CALL(SetNpcAnimation, NPC_ToadKid_01, ANIM_ToadKid_Red_Idle) + EVT_CALL(SetNpcAnimation, NPC_ToadKid_02, ANIM_ToadKid_Yellow_Idle) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Station_0031) + EVT_SET(LVar1, MSG_MAC_Station_0032) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Station_0033) + EVT_SET(LVar1, MSG_MAC_Station_0034) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Station_0035) + EVT_SET(LVar1, MSG_MAC_Station_0036) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_MAC03_ShyGuyBlockingTracks, FALSE) + EVT_ELSE + EVT_IF_EQ(GF_MAC03_ShyGuyChasedOff, FALSE) + EVT_SET(LVar0, MSG_MAC_Station_0037) + EVT_SET(LVar1, MSG_MAC_Station_0038) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Station_0039) + EVT_SET(LVar1, MSG_MAC_Station_003A) + EVT_END_IF + EVT_END_IF + EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) + EVT_SET(LVar0, MSG_MAC_Station_003B) + EVT_SET(LVar1, MSG_MAC_Station_003C) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Station_003D) + EVT_SET(LVar1, MSG_MAC_Station_003E) + EVT_CASE_LT(STORY_CH6_ARRIVED_AT_FLOWER_FIELDS) + EVT_SET(LVar0, MSG_MAC_Station_003F) + EVT_SET(LVar1, MSG_MAC_Station_0040) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_MAC_Station_0041) + EVT_SET(LVar1, MSG_MAC_Station_0042) + EVT_CASE_LT(STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_SET(LVar0, MSG_MAC_Station_0043) + EVT_SET(LVar1, MSG_MAC_Station_0044) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_MAC_Station_0045) + EVT_SET(LVar1, MSG_MAC_Station_0046) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_SET(LVar0, MSG_MAC_Station_0047) + EVT_SET(LVar1, MSG_MAC_Station_0048) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_ToadKid_01, ANIM_ToadKid_Red_Talk, ANIM_ToadKid_Red_Idle, 0, LVar0) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_ToadKid_02, ANIM_ToadKid_Yellow_Talk, ANIM_ToadKid_Yellow_Idle, 0, LVar1) + EVT_CALL(SetNpcAnimation, NPC_ToadKid_01, LVar2) + EVT_CALL(SetNpcAnimation, NPC_ToadKid_02, LVar3) + EVT_CALL(EnableNpcAI, NPC_ToadKid_01, TRUE) + EVT_CALL(EnableNpcAI, NPC_ToadKid_02, TRUE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ToadKid_01) = { + EVT_EXEC_WAIT(N(EVS_NpcInteract_ToadKid_02)) + EVT_EXEC_WAIT(N(EVS_ToadKid1_LetterPromptA)) + EVT_EXEC_WAIT(N(EVS_ToadKid1_LetterRewardA)) + EVT_IF_NE(LVarC, 0) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_ToadKid1_LetterPromptB)) + EVT_EXEC_WAIT(N(EVS_ToadKid1_LetterRewardB)) + EVT_IF_NE(LVarC, 0) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadKid_01) = { + EVT_CALL(BindNpcInteract, NPC_ToadKid_01, EVT_PTR(N(EVS_NpcInteract_ToadKid_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadKid_02) = { + EVT_CALL(BindNpcInteract, NPC_ToadKid_02, EVT_PTR(N(EVS_NpcInteract_ToadKid_02))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ThreeSisters_02) = { + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_SET(LVar0, MSG_MAC_Station_0061) + EVT_SET(LVar1, MSG_MAC_Station_0062) + EVT_SET(LVar2, MSG_MAC_Station_0063) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Station_0064) + EVT_SET(LVar1, MSG_MAC_Station_0065) + EVT_SET(LVar2, MSG_MAC_Station_0066) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_02, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, LVar0) + EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_03, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, LVar1) + EVT_CALL(SpeakToPlayer, NPC_ThreeSisters_04, ANIM_Toadette_Pink_Talk, ANIM_Toadette_Pink_Idle, 0, LVar2) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ThreeSisters_02) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH2_ARRIVED_AT_DRY_DRY_OUTPOST) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ThreeSisters_02))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_03) = { + EVT_IF_EQ(GB_MAC03_LilOinkCount, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MAC_Station_0053) + EVT_CALL(ShowChoice, MSG_Choice_000D) + EVT_IF_EQ(LVar0, 0) + EVT_SET(LVar0, MSG_MAC_Station_0056) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Station_0055) + EVT_END_IF + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVar0) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_SET(MF_Unk_08, TRUE) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(MF_Unk_07, FALSE) + EVT_SET(LVar0, MSG_MAC_Station_0054) + EVT_ELSE + EVT_CALL(N(GetOinkCount)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(9) + EVT_SET(LVar0, MSG_MAC_Station_0058) + EVT_CASE_EQ(8) + EVT_SET(LVar0, MSG_MAC_Station_0057) + EVT_CASE_EQ(0) + EVT_SET(LVar0, MSG_MAC_Station_0059) + EVT_CASE_EQ(1) + EVT_SET(LVar0, MSG_MAC_Station_005A) + EVT_CASE_EQ(2) + EVT_SET(LVar0, MSG_MAC_Station_005B) + EVT_CASE_EQ(3) + EVT_SET(LVar0, MSG_MAC_Station_005C) + EVT_CASE_EQ(4) + EVT_SET(LVar0, MSG_MAC_Station_005D) + EVT_CASE_EQ(5) + EVT_SET(LVar0, MSG_MAC_Station_005E) + EVT_CASE_EQ(6) + EVT_SET(LVar0, MSG_MAC_Station_005F) + EVT_CASE_EQ(7) + EVT_SET(LVar0, MSG_MAC_Station_0060) + EVT_END_SWITCH + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 16, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_03) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_03))) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024A7F4_83BFF4) = { + EVT_LOOP(0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_B0000021, 0) + EVT_WAIT(2) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_ShyGuy) = { + EVT_CALL(SetNpcPos, NPC_SELF, -100, 0, -25) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_LOOP(0) + EVT_CALL(NpcMoveTo, NPC_SELF, -250, -25, 30) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, -250, 0, 30, 15) + EVT_CALL(NpcMoveTo, NPC_SELF, -100, 30, 30) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, -100, 0, -25, 15) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_ShyGuy) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim0C) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, 0, LVar2, 10) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0)) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) + EVT_EXEC_GET_TID(N(D_8024A7F4_83BFF4), LVarA) + EVT_CALL(NpcMoveTo, NPC_SELF, -100, 0, 0) + EVT_KILL_THREAD(LVarA) + EVT_CALL(ShowSweat, -1, 1, 45, 1, 0, 0, 0, 0, 20) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, -30, 0, 0, 20) + EVT_CALL(ShowSweat, -1, 1, 45, 1, 0, 0, 0, 0, 20) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203F, 0) + EVT_EXEC_GET_TID(N(D_8024A7F4_83BFF4), LVarA) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(8.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 30, -200, 0) + EVT_CALL(ShowSweat, -1, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, -30, -400, 0) + EVT_CALL(ShowSweat, -1, 1, 45, 1, 0, 0, 0, 0, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, 30, -600, 0) + EVT_CALL(ShowSweat, -1, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_CALL(NpcMoveTo, NPC_SELF, 0, -650, 0) + EVT_KILL_THREAD(LVarA) + EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) + EVT_WAIT(200) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_ShyGuy) = { + EVT_CALL(GetOwnerEncounterTrigger, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_HAMMER) + EVT_SET(LVar1, 1) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_JUMP) + EVT_SET(LVar1, 1) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_PARTNER) + EVT_SET(LVar1, 1) + EVT_CASE_DEFAULT + EVT_SET(LVar1, 0) + EVT_END_SWITCH + EVT_IF_EQ(LVar1, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_HIT_PLAYER_NORMAL, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, 0) + EVT_SET(GF_MAC03_ShyGuyChasedOff, TRUE) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy))) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ShyGuy) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_RANGE(STORY_CH3_STAR_SPRIT_DEPARTED, STORY_CH4_STAR_SPIRIT_RESCUED) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mac_03_ENTRY_1) + EVT_SET(GF_MAC03_ShyGuyBlockingTracks, TRUE) + EVT_SET(GF_MAC03_ShyGuyChasedOff, TRUE) + EVT_END_IF + EVT_IF_EQ(GF_MAC03_ShyGuyChasedOff, FALSE) + EVT_SET(GF_MAC03_ShyGuyBlockingTracks, TRUE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_ShyGuy))) + EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_ShyGuy))) + EVT_RETURN + EVT_END_IF + EVT_END_SWITCH + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Toad_14) = { + EVT_LOOP(0) + EVT_SWITCH(GB_MAC03_LilOinkCapsuleState) + EVT_CASE_EQ(1) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_capsule, LVar0, LVar1, LVar2) + EVT_CASE_EQ(2) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcYaw, NPC_SELF, LVar3) + EVT_CALL(N(func_80241BD8_8333D8), 10, LVar0, LVar1, LVar2, LVar3) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_14) = { + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Toad_14))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_04) = { + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcPos, NPC_SELF, 420, 20, -170) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Toads)[] = { + { + .id = NPC_TrainStationToad_01, + .settings = &N(NpcSettings_TrainConductorToad), + .pos = { -370.0f, 20.0f, 90.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_TrainStationToad_01), + .drops = TRAIN_CONDUCTOR_DROPS, + .animations = TRAIN_CONDUCTOR_WHITE_ANIMS, + .tattle = MSG_NpcTattle_MAC_StationMaster, + }, + { + .id = NPC_TrainStationToad_02, + .settings = &N(NpcSettings_TrainConductorToad), + .pos = { -424.0f, 74.0f, 2.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .drops = TRAIN_CONDUCTOR_DROPS, + .animations = TRAIN_CONDUCTOR_ANIMS, + .tattle = MSG_NpcTattle_MAC_StationMaster, + }, + { + .id = NPC_Toad_01, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -232.0f, 10.0f, 74.0f }, + .yaw = 75, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toad_01), + .drops = TOAD_DROPS, + .animations = TOAD_BLUE_ANIMS, + .tattle = MSG_NpcTattle_MAC_TrainLover, + }, + { + .id = NPC_ThreeSisters_01, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 85.0f, 0.0f, 235.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_ThreeSisters_01), + .drops = TOADETTE_DROPS, + .animations = TOADETTE_PURPLE_ANIMS, + .tattle = MSG_NpcTattle_MAC_CaringToad, + }, + { + .id = NPC_Toad_02, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -255.0f, 20.0f, 400.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toad_02), + .drops = TOAD_DROPS, + .animations = TOAD_GREEN_ANIMS, + .tattle = MSG_NpcTattle_MAC_DesertTraveler, + }, + { + .id = NPC_ToadKid_01, + .settings = &N(NpcSettings_ToadKid_Wander), + .pos = { 260.0f, 20.0f, 410.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_ToadKid_01), + .drops = TOAD_KID_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 260, 20, 410 }, + .wanderSize = { 40, 20 }, + .detectShape = SHAPE_RECT, + .detectPos = { 260, 20, 410 }, + .detectSize = { 10, 10 }, + } + }, + .animations = TOAD_KID_RED_ANIMS, + .tattle = MSG_NpcTattle_MAC_TravelFan, + }, + { + .id = NPC_ToadKid_02, + .settings = &N(NpcSettings_ToadKid_Wander), + .pos = { 320.0f, 20.0f, 410.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_ToadKid_02), + .drops = TOAD_KID_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 320, 20, 410 }, + .wanderSize = { 40, 20 }, + .detectShape = SHAPE_RECT, + .detectPos = { 320, 20, 410 }, + .detectSize = { 10, 10 }, + } + }, + .animations = TOAD_KID_YELLOW_ANIMS, + .tattle = MSG_NpcTattle_MAC_GoodFriends, + }, + { + .id = NPC_Toad_03, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 220.0f, 20.0f, -160.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Toad_03), + .drops = TOAD_DROPS, + .animations = TOAD_RED_ANIMS, + .tattle = MSG_NpcTattle_MAC_LilOinkFan, + }, +}; + +StaticNpc N(NpcData_ThreeSisters)[] = { + { + .id = NPC_ThreeSisters_02, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -130.0f, 0.0f, 220.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_ThreeSisters_02), + .drops = TOADETTE_DROPS, + .animations = TOADETTE_PINK_ANIMS, + .tattle = MSG_NpcTattle_TravelingMaidA, + }, + { + .id = NPC_ThreeSisters_03, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -100.0f, 0.0f, 220.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_ThreeSisters_02), + .drops = TOADETTE_DROPS, + .animations = TOADETTE_PINK_ANIMS, + .tattle = MSG_NpcTattle_TravelingMaidB, + }, + { + .id = NPC_ThreeSisters_04, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { -70.0f, 0.0f, 220.0f }, + .yaw = 180, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_ThreeSisters_02), + .drops = TOADETTE_DROPS, + .animations = TOADETTE_PINK_ANIMS, + .tattle = MSG_NpcTattle_TravelingMaidC, + }, +}; + +StaticNpc N(NpcData_ShyGuy) = { + .id = NPC_ShyGuy, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ShyGuy_Red_Anim01, + .walk = ANIM_ShyGuy_Red_Anim02, + .run = ANIM_ShyGuy_Red_Anim03, + .chase = ANIM_ShyGuy_Red_Anim03, + .anim_4 = ANIM_ShyGuy_Red_Anim01, + .anim_5 = ANIM_ShyGuy_Red_Anim01, + .death = ANIM_ShyGuy_Red_Anim0C, + .hit = ANIM_ShyGuy_Red_Anim0C, + .anim_8 = ANIM_ShyGuy_Red_Anim15, + .anim_9 = ANIM_ShyGuy_Red_Anim12, + .anim_A = ANIM_ShyGuy_Red_Anim11, + .anim_B = ANIM_ShyGuy_Red_Anim10, + .anim_C = ANIM_ShyGuy_Red_Anim05, + .anim_D = ANIM_ShyGuy_Red_Anim01, + .anim_E = ANIM_ShyGuy_Red_Anim01, + .anim_F = ANIM_ShyGuy_Red_Anim01, + }, +}; + +StaticNpc N(NpcData_LilOinks)[] = { + { + .id = NPC_LilOink_01, + .settings = &N(NpcSettings_Toad_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Toad_04), + .drops = TOAD_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 430, 20, -180 }, + .wanderSize = { 150, 70 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 430, 20, -180 }, + .detectSize = { 150, 70 }, + } + }, + .animations = TOAD_BLUE_ANIMS, + }, + { + .id = NPC_LilOink_02, + .settings = &N(NpcSettings_Toad_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Toad_04), + .drops = TOAD_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 430, 20, -180 }, + .wanderSize = { 150, 70 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 430, 20, -180 }, + .detectSize = { 150, 70 }, + } + }, + .animations = TOAD_BLUE_ANIMS, + }, + { + .id = NPC_LilOink_03, + .settings = &N(NpcSettings_Toad_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Toad_04), + .drops = TOAD_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 430, 20, -180 }, + .wanderSize = { 150, 70 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 430, 20, -180 }, + .detectSize = { 150, 70 }, + } + }, + .animations = TOAD_BLUE_ANIMS, + }, + { + .id = NPC_LilOink_04, + .settings = &N(NpcSettings_Toad_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Toad_04), + .drops = TOAD_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 430, 20, -180 }, + .wanderSize = { 150, 70 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 430, 20, -180 }, + .detectSize = { 150, 70 }, + } + }, + .animations = TOAD_BLUE_ANIMS, + }, + { + .id = NPC_LilOink_05, + .settings = &N(NpcSettings_Toad_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Toad_04), + .drops = TOAD_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 430, 20, -180 }, + .wanderSize = { 150, 70 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 430, 20, -180 }, + .detectSize = { 150, 70 }, + } + }, + .animations = TOAD_BLUE_ANIMS, + }, + { + .id = NPC_LilOink_06, + .settings = &N(NpcSettings_Toad_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Toad_04), + .drops = TOAD_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 430, 20, -180 }, + .wanderSize = { 150, 70 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 430, 20, -180 }, + .detectSize = { 150, 70 }, + } + }, + .animations = TOAD_BLUE_ANIMS, + }, + { + .id = NPC_LilOink_07, + .settings = &N(NpcSettings_Toad_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Toad_04), + .drops = TOAD_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 430, 20, -180 }, + .wanderSize = { 150, 70 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 430, 20, -180 }, + .detectSize = { 150, 70 }, + } + }, + .animations = TOAD_BLUE_ANIMS, + }, + { + .id = NPC_LilOink_08, + .settings = &N(NpcSettings_Toad_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Toad_04), + .drops = TOAD_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 430, 20, -180 }, + .wanderSize = { 150, 70 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 430, 20, -180 }, + .detectSize = { 150, 70 }, + } + }, + .animations = TOAD_BLUE_ANIMS, + }, + { + .id = NPC_LilOink_09, + .settings = &N(NpcSettings_Toad_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Toad_04), + .drops = TOAD_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 430, 20, -180 }, + .wanderSize = { 150, 70 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 430, 20, -180 }, + .detectSize = { 150, 70 }, + } + }, + .animations = TOAD_BLUE_ANIMS, + }, + { + .id = NPC_LilOink_10, + .settings = &N(NpcSettings_Toad_Wander), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Toad_04), + .drops = TOAD_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 430, 20, -180 }, + .wanderSize = { 150, 70 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 430, 20, -180 }, + .detectSize = { 150, 70 }, + } + }, + .animations = TOAD_BLUE_ANIMS, + }, + { + .id = NPC_Capsule, + .settings = &N(NpcSettings_Dummy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_Toad_14), + .drops = TOAD_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 430, 20, -180 }, + .wanderSize = { 150, 70 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 430, 20, -180 }, + .detectSize = { 150, 70 }, + } + }, + .animations = TOAD_BLUE_ANIMS, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Toads)), + NPC_GROUP(N(NpcData_ThreeSisters)), + NPC_GROUP(N(NpcData_ShyGuy)), + NPC_GROUP(N(NpcData_LilOinks)), + {} +}; diff --git a/src/world/area_mac/mac_03/mac_03_5_entity.c b/src/world/area_mac/mac_03/mac_03_5_entity.c new file mode 100644 index 0000000000..8600d43a52 --- /dev/null +++ b/src/world/area_mac/mac_03/mac_03_5_entity.c @@ -0,0 +1,41 @@ +#include "mac_03.h" +#include "entity.h" + +EvtScript N(EVS_OnBlast_RailRock) = { + EVT_SET(GF_MAC03_BombedRock, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ReadSign) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0175, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnInspect_SignPost) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0172, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(GetDemoState, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_IF_EQ(GF_MAC03_BombedRock, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BombableRock), -200, 0, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnBlast_RailRock))) + EVT_END_IF + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 525, 0, 175, 0, MODEL_o11, MAKE_ENTITY_END) + EVT_CALL(AssignPanelFlag, GF_MAC03_HiddenPanel) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Signpost), 185, 20, -350, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_ReadSign))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnInspect_SignPost)), TRIGGER_WALL_PRESS_A, COLLIDER_sign, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_03/mac_03_6_foliage.c b/src/world/area_mac/mac_03/mac_03_6_foliage.c new file mode 100644 index 0000000000..f8ef964f34 --- /dev/null +++ b/src/world/area_mac/mac_03/mac_03_6_foliage.c @@ -0,0 +1,124 @@ +#include "mac_03.h" + +#include "common/foliage.inc.c" + +EvtScript N(Tree3_CallbackScript) = { + EVT_IF_EQ(GF_MAC03_UnlockedPlayroom, TRUE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(GF_MAC03_UnlockedPlayroom, TRUE) + EVT_WAIT(10) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -128, 20, -555) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -128, 20, -555) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(330.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(5) + EVT_CALL(PlaySoundWithVolume, SOUND_208E, 0) + EVT_CALL(EnableModel, MODEL_o241, TRUE) + EVT_SET(LVar0, -30) + EVT_LOOP(30) + EVT_ADD(LVar0, 1) + EVT_CALL(TranslateModel, MODEL_o241, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(TranslateModel, MODEL_o241, 0, 0, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_dokan, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deilim, COLLIDER_FLAGS_UPPER_MASK) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.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(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o240); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o128); + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { 63.0f, 100.0f, -508.0f }, + { 103.0f, 100.0f, -518.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { 79.0f, 20.0f, -504.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o238); +FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o130); + +FoliageVectorList N(Tree2_Effects) = { + .count = 2, + .vectors = { + { 538.0f, 100.0f, -293.0f }, + { 578.0f, 100.0f, -303.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .vectors = &N(Tree2_Effects), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { 554.0f, 20.0f, -289.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree3_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o239); +FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o126); + +FoliageVectorList N(Tree3_Effects) = { + .count = 2, + .vectors = { + { -285.0f, 100.0f, -565.0f }, + { -245.0f, 80.0f, -555.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree3) = { + .leaves = &N(Tree3_LeafModels), + .trunk = &N(Tree3_TrunkModels), + .vectors = &N(Tree3_Effects), + .callback = &N(Tree3_CallbackScript), +}; + +//@bug x-position should be -265 +BombTrigger N(BombPos_Tree3) = { + .pos = { 265.0f, 20.0f, -535.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o212, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o211, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_mgm_tree, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_03/mac_03_7_oinks.c b/src/world/area_mac/mac_03/mac_03_7_oinks.c new file mode 100644 index 0000000000..bfe740e390 --- /dev/null +++ b/src/world/area_mac/mac_03/mac_03_7_oinks.c @@ -0,0 +1,671 @@ +#include "mac_03.h" +#include "effects.h" + +#define LIL_OINK_COIN_COST 10 + +typedef struct LilOinkReward { + /* 0x00 */ s32 itemID; + /* 0x04 */ s32 quantity; + /* 0x08 */ s32 chance; +} LilOinkReward; // size = 0x0C + +#include "world/common/todo/GetFloorCollider.inc.c" +#include "world/common/todo/GetPlayerCoins.inc.c" + +API_CALLABLE(N(DismissCoinCounter)) { + hide_coin_counter_immediately(); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetRollingCapsulePosition)) { + // f32 angle = clamp_angle(EVT_FIXED_TO_FLOAT(script->varTable[2])); ? TODO + f32 angle = script->varTable[2] + EVT_FIXED_OFFSET; + + angle = clamp_angle(angle * (1.0f / 1024.0f)); + script->varTable[2] = 167.0f + (sin_deg(angle) * 110.0f); + script->varTable[3] = 85.0f; + script->varTable[4] = -343.75f - (cos_deg(angle) * 110.0f); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(LoadLilOinks)) { + s32 varBase = GB_MAC03_LilOink_00; + s32 numPigs = evt_get_variable(NULL, GB_MAC03_LilOinkCount); + EffectInstance* effect = fx_lil_oink(0, 0.0f, 0.0f, 0.0f, 0.0f, 0); + s32 i; + + evt_set_variable(script, MV_LilOinkEffect, (s32) effect); + + for (i = 0; i < numPigs; i++) { + effect->data.lilOink->type[i] = evt_get_variable(NULL, varBase + i); + effect->data.lilOink->x[i] = 300 + (i * 30); + effect->data.lilOink->y[i] = 20.0f; + effect->data.lilOink->z[i] = -180.0f; + effect->data.lilOink->rot[i] = 270.0f; + effect->data.lilOink->flags[i] |= LIL_OINK_FLAG_VISIBLE; + effect->data.lilOink->flags[i] |= LIL_OINK_FLAG_ANIM_CHANGED; + effect->data.lilOink->nextAnim[i] = LIL_OINK_ANIM_2; + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(CreateLilOink)) { + EffectInstance* effect = (EffectInstance*) evt_get_variable(script, MV_LilOinkEffect); + Bytecode* args = script->ptrReadPos; + s32 i = evt_get_variable(script, *args++); + s32 type = evt_get_variable(script, *args++); + f32 x = evt_get_variable(script, *args++); + f32 y = evt_get_variable(script, *args++); + f32 z = evt_get_variable(script, *args++); + s32 rot = evt_get_variable(script, *args++); + + effect->data.lilOink->type[i] = type; + effect->data.lilOink->x[i] = x; + effect->data.lilOink->y[i] = y; + effect->data.lilOink->z[i] = z; + effect->data.lilOink->rot[i] = rot; + effect->data.lilOink->flags[i] |= LIL_OINK_FLAG_VISIBLE; + + if (i != MAX_LIL_OINKS - 1) { + effect->data.lilOink->flags[i] |= LIL_OINK_FLAG_ANIM_CHANGED; + effect->data.lilOink->nextAnim[i] = LIL_OINK_ANIM_2; + evt_set_variable(script, i + GB_MAC03_LilOink_00, type); + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetLilOinkPosition)) { + EffectInstance* effect = (EffectInstance*) evt_get_variable(script, MV_LilOinkEffect); + Bytecode* args = script->ptrReadPos; + s32 i = evt_get_variable(script, *args++); + f32 x = evt_get_variable(script, *args++); + f32 y = evt_get_variable(script, *args++); + f32 z = evt_get_variable(script, *args++); + s32 rot = evt_get_variable(script, *args++); + + effect->data.lilOink->x[i] = x; + effect->data.lilOink->y[i] = y; + effect->data.lilOink->z[i] = z; + effect->data.lilOink->rot[i] = rot; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetLilOinkPosition)) { + EffectInstance* effect = (EffectInstance*) evt_get_variable(script, MV_LilOinkEffect); + Bytecode* args = script->ptrReadPos; + s32 i = evt_get_variable(script, *args++); + s32 xOut = *args++; + s32 yOut = *args++; + s32 zOut = *args++; + s32 rotOut = *args++; + + evt_set_variable(script, xOut, effect->data.lilOink->x[i]); + evt_set_variable(script, yOut, effect->data.lilOink->y[i]); + evt_set_variable(script, zOut, effect->data.lilOink->z[i]); + evt_set_variable(script, rotOut, effect->data.lilOink->rot[i]); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(HideLilOink)) { + EffectInstance* effect = (EffectInstance*) evt_get_variable(script, MV_LilOinkEffect); + Bytecode* args = script->ptrReadPos; + s32 i = evt_get_variable(script, *args++); + + effect->data.lilOink->flags[i] &= ~LIL_OINK_FLAG_VISIBLE; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetLilOinkAnim)) { + EffectInstance* effect = (EffectInstance*) evt_get_variable(script, MV_LilOinkEffect); + Bytecode* args = script->ptrReadPos; + s32 i = evt_get_variable(script, *args++); + s32 anim = evt_get_variable(script, *args++); + + effect->data.lilOink->flags[i] |= LIL_OINK_FLAG_ANIM_CHANGED; + effect->data.lilOink->nextAnim[i] = anim; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(PopLilOinkList)) { + EffectInstance* effect = (EffectInstance*) evt_get_variable(script, MV_LilOinkEffect); + s32 i; + + for (i = 1; i < MAX_LIL_OINKS - 1; i++) { + s32 type = evt_get_variable(script, GB_MAC03_LilOink_00 + i); + f32 x, y, z, rot; + + evt_set_variable(script, GB_MAC03_LilOinkCount + i, type); + + x = effect->data.lilOink->x[i]; + y = effect->data.lilOink->y[i]; + z = effect->data.lilOink->z[i]; + rot = effect->data.lilOink->rot[i]; + + effect->data.lilOink->type[i - 1] = type; + effect->data.lilOink->x[i - 1] = x; + effect->data.lilOink->y[i - 1] = y; + effect->data.lilOink->z[i - 1] = z; + effect->data.lilOink->rot[i - 1] = rot; + effect->data.lilOink->flags[i - 1] |= LIL_OINK_FLAG_VISIBLE; + } + effect->data.lilOink->flags[MAX_LIL_OINKS - 2] &= ~LIL_OINK_FLAG_VISIBLE; + evt_set_variable(script, GB_MAC03_LilOinkCount, 9); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_TurnCrank) = { + EVT_CALL(GetCurrentPartner, LVar0) + EVT_IF_EQ(LVar0, PARTNER_LAKILESTER) + EVT_RETURN + EVT_END_IF + EVT_SET(LVar0, 0) + EVT_LOOP(3) + EVT_CALL(RotateModel, MODEL_handle1, 3, -1, 0, 0) + EVT_WAIT(1) + EVT_CALL(RotateModel, MODEL_handle1, -3, -1, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_IF_EQ(MF_Unk_06, FALSE) + EVT_RETURN + EVT_END_IF + EVT_IF_NE(GB_MAC03_LilOinkCapsuleState, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(GetPlayerCoins)) + EVT_IF_LT(LVar0, LIL_OINK_COIN_COST) + EVT_CALL(PlaySound, SOUND_MENU_ERROR) + EVT_RETURN + EVT_END_IF + EVT_CALL(PlaySound, SOUND_208B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(AddCoin, -LIL_OINK_COIN_COST) + EVT_WAIT(20) + EVT_CALL(N(DismissCoinCounter)) + EVT_SET(MF_Unk_06, FALSE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 138, 25, -406) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 138, 25, -406) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 15, -13) + 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_WAIT(10) + EVT_THREAD + EVT_CALL(PlaySoundAt, SOUND_20A7, 0, 111, 89, -358) + EVT_SET(LVar0, 0) + EVT_LOOP(5) + EVT_ADD(LVar0, 6) + EVT_CALL(RotateModel, MODEL_handle1, LVar0, 0, 0, -1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(30) + EVT_ADD(LVar0, 10) + EVT_CALL(RotateModel, MODEL_handle1, LVar0, 0, 0, -1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(5) + EVT_ADD(LVar0, 6) + EVT_CALL(RotateModel, MODEL_handle1, LVar0, 0, 0, -1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_SETF(LVar0, EVT_FLOAT(1.0)) + EVT_LOOP(20) + EVT_ADDF(LVar0, EVT_FLOAT(0.2)) + EVT_CALL(ScaleModel, MODEL_boo, LVar0, LVar0, LVar0) + EVT_WAIT(1) + EVT_SUBF(LVar0, EVT_FLOAT(0.2)) + EVT_CALL(ScaleModel, MODEL_boo, LVar0, LVar0, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_SETF(LVar0, EVT_FLOAT(1.0)) + EVT_LOOP(10) + EVT_SUBF(LVar0, EVT_FLOAT(0.04)) + EVT_CALL(ScaleModel, MODEL_boo, 1, LVar0, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(20) + EVT_LOOP(10) + EVT_ADDF(LVar0, EVT_FLOAT(0.08)) + EVT_CALL(ScaleModel, MODEL_boo, 1, LVar0, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAt, SOUND_20A8, 0, 134, 132, -399) + EVT_LOOP(5) + EVT_SUBF(LVar0, EVT_FLOAT(0.08)) + EVT_CALL(ScaleModel, MODEL_boo, 1, LVar0, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAt, SOUND_2095, 0, 170, 73, -450) + EVT_SET(GB_MAC03_LilOinkCapsuleState, 1) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 230, 20, -270) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 15, -6) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(EnableModel, MODEL_capsule, TRUE) + EVT_CALL(MakeLerp, 0, 900, 30, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar2, LVar0) + EVT_DIVF(LVar2, 10) + EVT_CALL(N(GetRollingCapsulePosition)) + EVT_CALL(SetNpcPos, NPC_Capsule, LVar2, LVar3, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_LOOP(10) + EVT_ADD(LVar4, 5) + EVT_CALL(SetNpcPos, NPC_Capsule, LVar2, LVar3, LVar4) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcJumpscale, NPC_Capsule, 1) + EVT_CALL(NpcJump0, NPC_Capsule, LVar2, EVT_FLOAT(63.0), -273, 5) + EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_2095, 0) + EVT_CALL(GetNpcPos, NPC_Capsule, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Capsule, LVar0, LVar1, LVar2, 10) + EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_2095, 0) + EVT_CALL(NpcJump0, NPC_Capsule, LVar0, LVar1, LVar2, 5) + EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_2095, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_capsule, COLLIDER_FLAGS_UPPER_MASK) + EVT_WAIT(10) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LilOinkExplanation) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetNpcSpeed, NPC_Toad_03, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcAnimation, NPC_Toad_03, ANIM_Toad_Red_Run) + EVT_CALL(NpcMoveTo, NPC_Toad_03, 157, -310, 0) + EVT_CALL(SetNpcAnimation, NPC_Toad_03, ANIM_Toad_Red_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Toad_03, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MAC_Station_0053) + EVT_CALL(ShowChoice, MSG_Choice_000D) + EVT_IF_EQ(LVar0, 0) + EVT_SET(LVar0, MSG_MAC_Station_0056) + EVT_ELSE + EVT_SET(LVar0, MSG_MAC_Station_0055) + EVT_END_IF + EVT_CALL(ContinueSpeech, NPC_Toad_03, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, LVar0) + EVT_WAIT(10) + EVT_SET(MF_Unk_08, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Toad_03, ANIM_Toad_Red_Run) + EVT_CALL(NpcMoveTo, NPC_Toad_03, 220, -160, 0) + EVT_CALL(SetNpcAnimation, NPC_Toad_03, ANIM_Toad_Red_Idle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseMachinePrompt) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_IF_EQ(MF_Unk_08, FALSE) + EVT_EXEC(N(EVS_LilOinkExplanation)) + EVT_CALL(GetCurrentPartner, LVar0) + EVT_IF_NE(LVar0, PARTNER_NONE) + EVT_CALL(InterruptUsePartner) + EVT_WAIT(10) + EVT_END_IF + EVT_CALL(PlayerMoveTo, 95, -365, 10) + EVT_END_IF + EVT_LOOP(0) + EVT_IF_NE(MF_Unk_08, FALSE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(ShowCoinCounter, TRUE) + EVT_SET(MF_Unk_06, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(N(GetFloorCollider), LVar0) + EVT_IF_EQ(LVar0, COLLIDER_step) + EVT_GOTO(0) + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(N(DismissCoinCounter)) + EVT_SET(MF_Unk_06, FALSE) + EVT_RETURN + EVT_END +}; + +LilOinkReward N(LilOinkPrizes)[] = { + [LIL_OINK_TYPE_BLACK] { .itemID = ITEM_DRIED_SHROOM, .quantity = 1, .chance = 100 }, + [LIL_OINK_TYPE_WHITE] { .itemID = ITEM_SUPER_SHROOM, .quantity = 1, .chance = 100 }, + [LIL_OINK_TYPE_PINK] { .itemID = ITEM_FIRE_FLOWER, .quantity = 1, .chance = 100 }, + [LIL_OINK_TYPE_PIKACHU] { .itemID = ITEM_THUNDER_RAGE, .quantity = 1, .chance = 100 }, + [LIL_OINK_TYPE_SHROOM] { .itemID = ITEM_LIFE_SHROOM, .quantity = 1, .chance = 100 }, + [LIL_OINK_TYPE_FLOWER] { .itemID = ITEM_MAPLE_SYRUP, .quantity = 1, .chance = 100 }, + [LIL_OINK_TYPE_STAR] { .itemID = ITEM_SHOOTING_STAR, .quantity = 1, .chance = 100 }, + [LIL_OINK_TYPE_QUESTION] { .itemID = ITEM_REPEL_GEL, .quantity = 1, .chance = 100 }, + [LIL_OINK_TYPE_SILVER] { .itemID = ITEM_JAMMIN_JELLY, .quantity = 1, .chance = 100 }, + [LIL_OINK_TYPE_GOLD] { .itemID = ITEM_ULTRA_SHROOM, .quantity = 1, .chance = 100 }, +}; + +API_CALLABLE(N(GetLilOinkPrize)) { + Bytecode* args = script->ptrReadPos; + s32 oinkType = evt_get_variable(script, GB_MAC03_LilOink_00); + s32 itemID = *args++; + s32 quantity = *args++; + s32 chance = *args++; + LilOinkReward* reward = &N(LilOinkPrizes)[oinkType]; + + evt_set_variable(script, itemID, reward->itemID); + evt_set_variable(script, quantity, reward->quantity); + evt_set_variable(script, chance, reward->chance); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SpawnLilOinkPrize) = { + EVT_CALL(N(GetLilOinkPrize), LVar4, LVar5, LVar6) + EVT_CALL(RandInt, 100, LVar7) + EVT_IF_GT(LVar7, LVar6) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetNpcPos, NPC_LilOink_01, LVar1, LVar2, LVar3) + EVT_LOOP(LVar5) + EVT_CALL(MakeItemEntity, LVar4, LVar1, LVar2, LVar3, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenCapsule) = { + EVT_CALL(N(GetFloorCollider), LVar0) + EVT_IF_NE(LVar0, COLLIDER_hummer) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_SET(MF_Unk_07, TRUE) + EVT_SETF(LVar0, EVT_FLOAT(1.0)) + EVT_LOOP(5) + EVT_SUBF(LVar0, EVT_FLOAT(0.03)) + EVT_CALL(ScaleModel, MODEL_capsule, 1, LVar0, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(5) + EVT_ADDF(LVar0, EVT_FLOAT(0.03)) + EVT_CALL(ScaleModel, MODEL_capsule, 1, LVar0, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(GetNpcPos, NPC_Capsule, LVar0, LVar1, LVar2) + EVT_SUB(LVar1, 10) + EVT_PLAY_EFFECT(EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1) + EVT_CALL(EnableModel, MODEL_capsule, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_capsule, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GB_MAC03_LilOinkCapsuleState, 2) + EVT_CALL(SetNpcPos, NPC_Capsule, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcYaw, NPC_Capsule, 90) + EVT_CALL(EnableNpcShadow, NPC_Capsule, TRUE) + EVT_CALL(RandInt, 100, LVar3) + EVT_SWITCH(LVar3) + EVT_CASE_LT(3) + EVT_SET(LVar3, LIL_OINK_TYPE_GOLD) + EVT_CASE_LT(12) + EVT_SET(LVar3, LIL_OINK_TYPE_SILVER) + EVT_CASE_LT(19) + EVT_SET(LVar3, LIL_OINK_TYPE_SHROOM) + EVT_CASE_LT(26) + EVT_SET(LVar3, LIL_OINK_TYPE_FLOWER) + EVT_CASE_LT(33) + EVT_SET(LVar3, LIL_OINK_TYPE_STAR) + EVT_CASE_LT(40) + EVT_SET(LVar3, LIL_OINK_TYPE_QUESTION) + EVT_CASE_LT(55) + EVT_SET(LVar3, LIL_OINK_TYPE_BLACK) + EVT_CASE_LT(70) + EVT_SET(LVar3, LIL_OINK_TYPE_WHITE) + EVT_CASE_LT(85) + EVT_SET(LVar3, LIL_OINK_TYPE_PINK) + EVT_CASE_DEFAULT + EVT_SET(LVar3, LIL_OINK_TYPE_PIKACHU) + EVT_END_SWITCH + EVT_CALL(PlaySoundAtNpc, NPC_Capsule, SOUND_TORNADO_JUMP, 0) + EVT_CALL(N(CreateLilOink), 10, LVar3, LVar0, LVar1, LVar2, 90) + EVT_WAIT(10) + EVT_IF_GE(GB_MAC03_LilOinkCount, 10) + EVT_SET(LVarA, LVar3) + EVT_CALL(GetNpcPos, NPC_LilOink_01, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(10) + EVT_CALL(EnableNpcAI, NPC_LilOink_01, FALSE) + EVT_CALL(NpcFaceNpc, NPC_LilOink_01, NPC_Capsule, 0) + EVT_WAIT(10) + EVT_CALL(NpcJump0, NPC_LilOink_01, LVar0, LVar1, LVar2, 15) + EVT_EXEC(N(EVS_SpawnLilOinkPrize)) + EVT_CALL(PlaySoundAtNpc, NPC_LilOink_01, SOUND_15E, 0) + EVT_CALL(SetNpcSpeed, NPC_LilOink_01, 4) + EVT_CALL(NpcMoveTo, NPC_LilOink_01, 580, -170, 0) + EVT_CALL(NpcJump0, NPC_LilOink_01, 620, 20, -170, 15) + EVT_CALL(EnableNpcShadow, NPC_LilOink_01, FALSE) + EVT_CALL(SetNpcSpeed, NPC_LilOink_01, 1) + EVT_CALL(EnableNpcAI, NPC_LilOink_01, TRUE) + EVT_CALL(N(PopLilOinkList)) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, NPC_LilOink_01) + EVT_SET(LVar6, GB_MAC03_LilOinkCount) + EVT_LOOP(LVar6) + EVT_CALL(N(GetLilOinkPosition), LVar0, LVar2, LVar3, LVar4, LVar5) + EVT_CALL(SetNpcPos, LVar1, LVar2, LVar3, LVar4) + EVT_CALL(SetNpcYaw, LVar1, LVar5) + EVT_ADD(LVar0, 1) + EVT_ADD(LVar1, 1) + EVT_END_LOOP + EVT_SET(LVar3, LVarA) + EVT_END_IF + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 360, 20, -165) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 360, 20, -165) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(N(SetLilOinkAnim), 10, LIL_OINK_ANIM_2) + EVT_CALL(SetNpcJumpscale, NPC_Capsule, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Capsule, 330, 20, -220, 20) + EVT_CALL(SetNpcSpeed, NPC_Capsule, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_Capsule, 360, -180, 0) + EVT_SET(GB_MAC03_LilOinkCapsuleState, 0) + EVT_CALL(EnableNpcShadow, NPC_Capsule, FALSE) + EVT_CALL(N(GetLilOinkPosition), 10, LVar0, LVar1, LVar2, LVar4) + EVT_CALL(N(HideLilOink), 10) + EVT_SET(LVar5, NPC_LilOink_01) + EVT_ADD(LVar5, GB_MAC03_LilOinkCount) + EVT_CALL(SetNpcPos, LVar5, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcYaw, LVar5, LVar4) + EVT_CALL(EnableNpcShadow, LVar5, TRUE) + EVT_CALL(N(CreateLilOink), GB_MAC03_LilOinkCount, LVar3, LVar0, LVar1, LVar2, LVar4) + EVT_ADD(GB_MAC03_LilOinkCount, 1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LilOinkFlee) = { + EVT_SET(LVar1, NPC_LilOink_01) + EVT_ADD(LVar1, LVar0) + EVT_CALL(EnableNpcAI, LVar1, FALSE) + EVT_CALL(NpcFacePlayer, LVar1, 0) + EVT_WAIT(10) + EVT_CALL(GetNpcPos, LVar1, LVar2, LVar3, LVar4) + EVT_CALL(NpcJump0, LVar1, LVar2, LVar3, LVar4, 10) + EVT_CALL(PlaySoundAtNpc, LVar1, SOUND_15E, 0) + EVT_CALL(SetNpcSpeed, LVar1, 8) + EVT_CALL(NpcMoveTo, LVar1, 580, LVar4, 0) + EVT_CALL(NpcJump0, LVar1, 620, 20, LVar4, 15) + EVT_CALL(EnableNpcShadow, LVar1, FALSE) + EVT_CALL(SetNpcSpeed, LVar1, 1) + EVT_CALL(EnableNpcAI, LVar1, TRUE) + EVT_CALL(N(HideLilOink), LVar0) + EVT_SUB(GB_MAC03_LilOinkCount, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterPen) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(func_802D2C14, 1) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deili, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deili, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_door, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlayerMoveTo, 370, -208, 15) + EVT_CALL(MakeLerp, 80, 0, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_door, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_deili, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deili, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(func_802D2C14, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_IF_EQ(GB_MAC03_LilOinkCount, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_SET(LVar0, GB_MAC03_LilOinkCount) + EVT_SET(LVar6, GB_MAC03_LilOinkCount) + EVT_LOOP(LVar6) + EVT_ADD(LVar0, -1) + EVT_EXEC(N(EVS_LilOinkFlee)) + EVT_WAIT(5) + EVT_END_LOOP + EVT_LOOP(0) + EVT_IF_EQ(GB_MAC03_LilOinkCount, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPen) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(func_802D2C14, 1) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliu, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deiliu, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_door, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlayerMoveTo, 370, -328, 15) + EVT_CALL(MakeLerp, 80, 0, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_door, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_deiliu, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deiliu, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(func_802D2C14, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SyncLilOinkNpcPositions) = { + EVT_LOOP(0) + EVT_IF_NE(GB_MAC03_LilOinkCount, 0) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, NPC_LilOink_01) + EVT_SET(LVar6, GB_MAC03_LilOinkCount) + EVT_LOOP(LVar6) + EVT_CALL(GetNpcPos, LVar1, LVar2, LVar3, LVar4) + EVT_CALL(GetNpcYaw, LVar1, LVar5) + EVT_CALL(N(SetLilOinkPosition), LVar0, LVar2, LVar3, LVar4, LVar5) + EVT_ADD(LVar0, 1) + EVT_ADD(LVar1, 1) + EVT_END_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InitializeLilOinks) = { + EVT_IF_EQ(GB_MAC03_LilOinkCapsuleState, 1) + EVT_CALL(SetNpcPos, NPC_Capsule, 277, EVT_FLOAT(63.0), -273) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_capsule, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_capsule, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_SET(MF_Unk_06, FALSE) + EVT_SET(MF_Unk_07, FALSE) + EVT_IF_EQ(GB_MAC03_LilOinkCount, 0) + EVT_SET(MF_Unk_08, FALSE) + EVT_ELSE + EVT_SET(MF_Unk_08, TRUE) + EVT_END_IF + EVT_CALL(N(LoadLilOinks)) + EVT_IF_NE(GB_MAC03_LilOinkCount, 0) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, NPC_LilOink_01) + EVT_SET(LVar6, GB_MAC03_LilOinkCount) + EVT_LOOP(LVar6) + EVT_CALL(N(GetLilOinkPosition), LVar0, LVar2, LVar3, LVar4, LVar5) + EVT_CALL(SetNpcPos, LVar1, LVar2, LVar3, LVar4) + EVT_CALL(SetNpcYaw, LVar1, LVar5) + EVT_ADD(LVar0, 1) + EVT_ADD(LVar1, 1) + EVT_END_LOOP + EVT_END_IF + EVT_EXEC(N(EVS_SyncLilOinkNpcPositions)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseMachinePrompt)), TRIGGER_FLOOR_TOUCH, COLLIDER_step, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_TurnCrank)), TRIGGER_CEILING_TOUCH, COLLIDER_jump, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OpenCapsule)), TRIGGER_WALL_HAMMER, COLLIDER_capsule, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_EnterPen)), TRIGGER_WALL_PRESS_A, COLLIDER_deili, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPen)), TRIGGER_WALL_PRESS_A, COLLIDER_deiliu, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mac/mac_03/mac_03_8_demo.c b/src/world/area_mac/mac_03/mac_03_8_demo.c new file mode 100644 index 0000000000..b21fd1c706 --- /dev/null +++ b/src/world/area_mac/mac_03/mac_03_8_demo.c @@ -0,0 +1,152 @@ +#include "mac_03.h" + +EvtScript N(EVS_DemoFollowTrainCamera) = { + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_EQ(MF_TrainReverseDir, FALSE) + EVT_IF_GT(LVar0, 350) + EVT_SET(LVar0, 350) + EVT_END_IF + EVT_ADD(LVar0, 40) + EVT_SET(LVar1, 30) + EVT_ADD(LVar2, 40) + EVT_ELSE + EVT_IF_GT(LVar0, 350) + EVT_SET(LVar0, 350) + EVT_END_IF + EVT_ADD(LVar0, -40) + EVT_SET(LVar1, 30) + EVT_ADD(LVar2, 40) + EVT_END_IF + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DemoUpdatePassengerPos) = { + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SET(LVar0, MV_TrainMoveDist) + EVT_IF_EQ(MF_TrainReverseDir, FALSE) + EVT_ADD(LVar0, -425) + EVT_ELSE + EVT_ADD(LVar0, -335) + EVT_END_IF + EVT_SET(LVar3, LVar0) + EVT_SET(LVar4, LVar1) + EVT_SET(LVar5, LVar2) + EVT_IF_EQ(MF_TrainReverseDir, FALSE) + EVT_ADD(LVar3, -57) + EVT_ELSE + EVT_ADD(LVar3, 57) + EVT_END_IF + EVT_ADD(LVar4, -31) + EVT_ADD(LVar5, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar3, LVar4, LVar5) + EVT_IF_EQ(MF_TrainReverseDir, FALSE) + EVT_ADD(LVar0, 0) + EVT_ELSE + EVT_ADD(LVar0, 0) + EVT_END_IF + EVT_ADD(LVar1, -6) + EVT_ADD(LVar2, -40) + EVT_CALL(SetNpcPos, NPC_TrainStationToad_02, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DemoDepartForMtRugged) = { + EVT_CALL(EnableStatusMenu, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_SET(MV_TrainMoveDist, 0) + EVT_SET(MV_TrainMoveSpeed, 0) + EVT_SET(MF_TrainReverseDir, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitk, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kisya1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kisya2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kisya3, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_humikiri, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_fumikiri, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(SetPlayerPos, -425, 45, 20) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40 | NPC_FLAG_100, TRUE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SET(LVar0, -410) + EVT_SET(LVar1, 45) + EVT_SET(LVar2, 20) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(InterpPlayerYaw, 90, 1) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_SET(MF_TrainMoving, TRUE) + EVT_EXEC(N(EVS_DemoUpdatePassengerPos)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(240.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(-100.0), EVT_FLOAT(-50.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(-2.5), EVT_FLOAT(-3.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 100) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_THREAD + EVT_LOOP(1000) + EVT_ADDF(MV_TrainMoveSpeed, EVT_FLOAT(0.03125)) + EVT_IF_GT(MV_TrainMoveSpeed, 10) + EVT_SETF(MV_TrainMoveSpeed, EVT_FLOAT(10.0)) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(40) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_EXEC_GET_TID(N(EVS_DemoFollowTrainCamera), LVar9) + EVT_WAIT(180) + EVT_IF_EQ(GF_DemoSceneDone, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_DemoSceneDone, TRUE) + EVT_CALL(GotoMapSpecial, EVT_PTR("mac_03"), mac_03_ENTRY_2, TRANSITION_2) + EVT_WAIT(110) + 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("mac_03"), mac_03_ENTRY_2, TRANSITION_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayDemoScene) = { + EVT_SET(GF_DemoSceneDone, FALSE) + EVT_EXEC(N(EVS_MonitorDemoState)) + EVT_EXEC(N(EVS_DemoDepartForMtRugged)) + EVT_RETURN + EVT_END +}; 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 54eb75977e..93749eb46c 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 @@ -435,7 +435,7 @@ API_CALLABLE(N(RunMinigame)) { case BOX_STATE_FUZZY_IDLE: data->box[i].stateTimer--; if (data->box[i].stateTimer <= 0) { - npc->currentAnim = ANIM_Fuzzy_Anim02; + npc->currentAnim = ANIM_Fuzzy_Walk; data->box[i].state = BOX_STATE_FUZZY_POPUP; sfx_play_sound_at_position(enemy->varTable[8], 0x100000, npc->pos.x, npc->pos.y, npc->pos.z); get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); @@ -481,7 +481,7 @@ API_CALLABLE(N(RunMinigame)) { sfx_play_sound(enemy->varTable[8]); data->box[i].state = BOX_STATE_FUZZY_ATTACH; gPlayerStatusPtr->anim = ANIM_Mario_CrouchStill; - npc->currentAnim = ANIM_Fuzzy_Anim03; + npc->currentAnim = ANIM_Fuzzy_Run; get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); npc->pos.x = centerX; npc->pos.y = centerY; @@ -508,7 +508,7 @@ API_CALLABLE(N(RunMinigame)) { gPlayerStatusPtr->anim = ANIM_Mario_CrouchStill; npc->duration--; if (npc->duration <= 0) { - npc->currentAnim = ANIM_Fuzzy_Anim0F; + npc->currentAnim = ANIM_Fuzzy_Stunned; gPlayerStatusPtr->anim = ANIM_Mario_RunPanic; data->mashProgress = 0; npc->pos.x = gPlayerStatusPtr->position.x; @@ -534,7 +534,7 @@ API_CALLABLE(N(RunMinigame)) { hud_element_set_script(data->hudElemID_AButton, &HES_AButton); hud_element_set_alpha(data->hudElemID_AButton, 160); hud_element_set_alpha(data->hudElemID_Meter, 160); - npc->currentAnim = ANIM_Fuzzy_Anim08; + npc->currentAnim = ANIM_Fuzzy_Hurt; npc->pos.y += 3.0; } break; @@ -930,7 +930,7 @@ API_CALLABLE(N(CleanupGame)) { if (data->box[i].state != BOX_STATE_FUZZY_END) { data->box[i].state = BOX_STATE_FUZZY_END; fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, 0.0f, 30, &writeback); - npc->currentAnim = ANIM_Fuzzy_Anim0E; + npc->currentAnim = ANIM_Fuzzy_Sleep; enable_npc_shadow(npc); } break; @@ -1795,7 +1795,7 @@ StaticNpc N(NpcData_GuideToad) = { }; EvtScript N(EVS_NpcInit_Fuzzy) = { - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Anim03) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Run) EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(GetSelfNpcID, LVar0) EVT_SWITCH(LVar0) @@ -1879,22 +1879,22 @@ StaticNpc N(NpcData_Fuzzy_01) = { .flowerDrops = NO_DROPS, }, .animations = { - .idle = ANIM_Fuzzy_Anim02, - .walk = ANIM_Fuzzy_Anim02, - .run = ANIM_Fuzzy_Anim03, - .chase = ANIM_Fuzzy_Anim03, - .anim_4 = ANIM_Fuzzy_Anim01, - .anim_5 = ANIM_Fuzzy_Anim01, - .death = ANIM_Fuzzy_Anim08, - .hit = ANIM_Fuzzy_Anim08, - .anim_8 = ANIM_Fuzzy_Anim03, - .anim_9 = ANIM_Fuzzy_Anim03, - .anim_A = ANIM_Fuzzy_Anim03, - .anim_B = ANIM_Fuzzy_Anim03, - .anim_C = ANIM_Fuzzy_Anim03, - .anim_D = ANIM_Fuzzy_Anim03, - .anim_E = ANIM_Fuzzy_Anim03, - .anim_F = ANIM_Fuzzy_Anim03, + .idle = ANIM_Fuzzy_Walk, + .walk = ANIM_Fuzzy_Walk, + .run = ANIM_Fuzzy_Run, + .chase = ANIM_Fuzzy_Run, + .anim_4 = ANIM_Fuzzy_Idle, + .anim_5 = ANIM_Fuzzy_Idle, + .death = ANIM_Fuzzy_Hurt, + .hit = ANIM_Fuzzy_Hurt, + .anim_8 = ANIM_Fuzzy_Run, + .anim_9 = ANIM_Fuzzy_Run, + .anim_A = ANIM_Fuzzy_Run, + .anim_B = ANIM_Fuzzy_Run, + .anim_C = ANIM_Fuzzy_Run, + .anim_D = ANIM_Fuzzy_Run, + .anim_E = ANIM_Fuzzy_Run, + .anim_F = ANIM_Fuzzy_Run, }, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; @@ -1912,22 +1912,22 @@ StaticNpc N(NpcData_Fuzzy_02) = { .flowerDrops = NO_DROPS, }, .animations = { - .idle = ANIM_Fuzzy_Anim02, - .walk = ANIM_Fuzzy_Anim02, - .run = ANIM_Fuzzy_Anim03, - .chase = ANIM_Fuzzy_Anim03, - .anim_4 = ANIM_Fuzzy_Anim01, - .anim_5 = ANIM_Fuzzy_Anim01, - .death = ANIM_Fuzzy_Anim08, - .hit = ANIM_Fuzzy_Anim08, - .anim_8 = ANIM_Fuzzy_Anim03, - .anim_9 = ANIM_Fuzzy_Anim03, - .anim_A = ANIM_Fuzzy_Anim03, - .anim_B = ANIM_Fuzzy_Anim03, - .anim_C = ANIM_Fuzzy_Anim03, - .anim_D = ANIM_Fuzzy_Anim03, - .anim_E = ANIM_Fuzzy_Anim03, - .anim_F = ANIM_Fuzzy_Anim03, + .idle = ANIM_Fuzzy_Walk, + .walk = ANIM_Fuzzy_Walk, + .run = ANIM_Fuzzy_Run, + .chase = ANIM_Fuzzy_Run, + .anim_4 = ANIM_Fuzzy_Idle, + .anim_5 = ANIM_Fuzzy_Idle, + .death = ANIM_Fuzzy_Hurt, + .hit = ANIM_Fuzzy_Hurt, + .anim_8 = ANIM_Fuzzy_Run, + .anim_9 = ANIM_Fuzzy_Run, + .anim_A = ANIM_Fuzzy_Run, + .anim_B = ANIM_Fuzzy_Run, + .anim_C = ANIM_Fuzzy_Run, + .anim_D = ANIM_Fuzzy_Run, + .anim_E = ANIM_Fuzzy_Run, + .anim_F = ANIM_Fuzzy_Run, }, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; @@ -1945,22 +1945,22 @@ StaticNpc N(NpcData_Fuzzy_03) = { .flowerDrops = NO_DROPS, }, .animations = { - .idle = ANIM_Fuzzy_Anim02, - .walk = ANIM_Fuzzy_Anim02, - .run = ANIM_Fuzzy_Anim03, - .chase = ANIM_Fuzzy_Anim03, - .anim_4 = ANIM_Fuzzy_Anim01, - .anim_5 = ANIM_Fuzzy_Anim01, - .death = ANIM_Fuzzy_Anim08, - .hit = ANIM_Fuzzy_Anim08, - .anim_8 = ANIM_Fuzzy_Anim03, - .anim_9 = ANIM_Fuzzy_Anim03, - .anim_A = ANIM_Fuzzy_Anim03, - .anim_B = ANIM_Fuzzy_Anim03, - .anim_C = ANIM_Fuzzy_Anim03, - .anim_D = ANIM_Fuzzy_Anim03, - .anim_E = ANIM_Fuzzy_Anim03, - .anim_F = ANIM_Fuzzy_Anim03, + .idle = ANIM_Fuzzy_Walk, + .walk = ANIM_Fuzzy_Walk, + .run = ANIM_Fuzzy_Run, + .chase = ANIM_Fuzzy_Run, + .anim_4 = ANIM_Fuzzy_Idle, + .anim_5 = ANIM_Fuzzy_Idle, + .death = ANIM_Fuzzy_Hurt, + .hit = ANIM_Fuzzy_Hurt, + .anim_8 = ANIM_Fuzzy_Run, + .anim_9 = ANIM_Fuzzy_Run, + .anim_A = ANIM_Fuzzy_Run, + .anim_B = ANIM_Fuzzy_Run, + .anim_C = ANIM_Fuzzy_Run, + .anim_D = ANIM_Fuzzy_Run, + .anim_E = ANIM_Fuzzy_Run, + .anim_F = ANIM_Fuzzy_Run, }, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; @@ -1978,22 +1978,22 @@ StaticNpc N(NpcData_Fuzzy_04) = { .flowerDrops = NO_DROPS, }, .animations = { - .idle = ANIM_Fuzzy_Anim02, - .walk = ANIM_Fuzzy_Anim02, - .run = ANIM_Fuzzy_Anim03, - .chase = ANIM_Fuzzy_Anim03, - .anim_4 = ANIM_Fuzzy_Anim01, - .anim_5 = ANIM_Fuzzy_Anim01, - .death = ANIM_Fuzzy_Anim08, - .hit = ANIM_Fuzzy_Anim08, - .anim_8 = ANIM_Fuzzy_Anim03, - .anim_9 = ANIM_Fuzzy_Anim03, - .anim_A = ANIM_Fuzzy_Anim03, - .anim_B = ANIM_Fuzzy_Anim03, - .anim_C = ANIM_Fuzzy_Anim03, - .anim_D = ANIM_Fuzzy_Anim03, - .anim_E = ANIM_Fuzzy_Anim03, - .anim_F = ANIM_Fuzzy_Anim03, + .idle = ANIM_Fuzzy_Walk, + .walk = ANIM_Fuzzy_Walk, + .run = ANIM_Fuzzy_Run, + .chase = ANIM_Fuzzy_Run, + .anim_4 = ANIM_Fuzzy_Idle, + .anim_5 = ANIM_Fuzzy_Idle, + .death = ANIM_Fuzzy_Hurt, + .hit = ANIM_Fuzzy_Hurt, + .anim_8 = ANIM_Fuzzy_Run, + .anim_9 = ANIM_Fuzzy_Run, + .anim_A = ANIM_Fuzzy_Run, + .anim_B = ANIM_Fuzzy_Run, + .anim_C = ANIM_Fuzzy_Run, + .anim_D = ANIM_Fuzzy_Run, + .anim_E = ANIM_Fuzzy_Run, + .anim_F = ANIM_Fuzzy_Run, }, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; @@ -2011,22 +2011,22 @@ StaticNpc N(NpcData_Fuzzy_05) = { .flowerDrops = NO_DROPS, }, .animations = { - .idle = ANIM_Fuzzy_Anim02, - .walk = ANIM_Fuzzy_Anim02, - .run = ANIM_Fuzzy_Anim03, - .chase = ANIM_Fuzzy_Anim03, - .anim_4 = ANIM_Fuzzy_Anim01, - .anim_5 = ANIM_Fuzzy_Anim01, - .death = ANIM_Fuzzy_Anim08, - .hit = ANIM_Fuzzy_Anim08, - .anim_8 = ANIM_Fuzzy_Anim03, - .anim_9 = ANIM_Fuzzy_Anim03, - .anim_A = ANIM_Fuzzy_Anim03, - .anim_B = ANIM_Fuzzy_Anim03, - .anim_C = ANIM_Fuzzy_Anim03, - .anim_D = ANIM_Fuzzy_Anim03, - .anim_E = ANIM_Fuzzy_Anim03, - .anim_F = ANIM_Fuzzy_Anim03, + .idle = ANIM_Fuzzy_Walk, + .walk = ANIM_Fuzzy_Walk, + .run = ANIM_Fuzzy_Run, + .chase = ANIM_Fuzzy_Run, + .anim_4 = ANIM_Fuzzy_Idle, + .anim_5 = ANIM_Fuzzy_Idle, + .death = ANIM_Fuzzy_Hurt, + .hit = ANIM_Fuzzy_Hurt, + .anim_8 = ANIM_Fuzzy_Run, + .anim_9 = ANIM_Fuzzy_Run, + .anim_A = ANIM_Fuzzy_Run, + .anim_B = ANIM_Fuzzy_Run, + .anim_C = ANIM_Fuzzy_Run, + .anim_D = ANIM_Fuzzy_Run, + .anim_E = ANIM_Fuzzy_Run, + .anim_F = ANIM_Fuzzy_Run, }, .tattle = MSG_NpcTattle_MGM_SmashAttackGuide, }; diff --git a/src/world/area_tik/tik.h b/src/world/area_tik/tik.h index 3cbb29527e..7030798c47 100644 --- a/src/world/area_tik/tik.h +++ b/src/world/area_tik/tik.h @@ -2,22 +2,29 @@ #define _WORLD_AREA_TIK_TIK_H_ enum { - AB_TIK_0 = AreaByte(0), - AB_TIK_1 = AreaByte(1), - AB_TIK_2 = AreaByte(2), - AB_TIK_3 = AreaByte(3), - AB_TIK_4 = AreaByte(4), - AB_TIK_5 = AreaByte(5), - AB_TIK_6 = AreaByte(6), - AB_TIK_7 = AreaByte(7), - AB_TIK_8 = AreaByte(8), - AB_TIK_9 = AreaByte(9), - AB_TIK_A = AreaByte(10), - AB_TIK_B = AreaByte(11), - AB_TIK_C = AreaByte(12), - AB_TIK_D = AreaByte(13), - AB_TIK_E = AreaByte(14), - AB_TIK_F = AreaByte(15), + AB_TIK_0 = AreaByte(0), + AB_TIK_1 = AreaByte(1), + AB_TIK_2 = AreaByte(2), + AB_TIK_3 = AreaByte(3), + AB_TIK_4 = AreaByte(4), + AB_TIK_5 = AreaByte(5), + AB_TIK_6 = AreaByte(6), + AB_TIK_7 = AreaByte(7), + AB_TIK_8 = AreaByte(8), + AB_TIK_9 = AreaByte(9), + AB_TIK_A = AreaByte(10), + AB_TIK_B = AreaByte(11), + AB_TIK_C = AreaByte(12), + AB_TIK_D = AreaByte(13), + AB_TIK_E = AreaByte(14), + AB_TIK_F = AreaByte(15), +}; + +enum { + AF_TIK_02 = AreaFlag(2), + AF_TIK_03 = AreaFlag(3), + AF_TIK_04 = AreaFlag(4), + AF_TIK_05 = AreaFlag(5), }; #define AF_TIK(index) AreaFlag(index) @@ -45,4 +52,6 @@ extern MapSettings tik_23_settings; extern MapSettings tik_24_settings; extern MapSettings tik_25_settings; +s32 tik_24_map_init(void); + #endif diff --git a/src/world/area_tik/tik_01/8694B0.c b/src/world/area_tik/tik_01/8694B0.c deleted file mode 100644 index 9fccc8a9f0..0000000000 --- a/src/world/area_tik/tik_01/8694B0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "tik_01.h" - -static char* N(exit_str_0) = "tik_06"; -static char* N(exit_str_1) = "tik_03"; -static char* N(exit_str_2) = "kmr_02"; -static char* N(exit_str_3) = "nok_02"; -static char* N(exit_str_4) = "dro_01"; -static char* N(exit_str_5) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - -#include "world/common/entity/Pipe.inc.c" diff --git a/src/world/area_tik/tik_01/869AA0.c b/src/world/area_tik/tik_01/869AA0.c deleted file mode 100644 index b4d02eeec6..0000000000 --- a/src/world/area_tik/tik_01/869AA0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "tik_01.h" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" - -#include "world/common/todo/SetEntityPosition.inc.c" diff --git a/src/world/area_tik/tik_01/869EE0.c b/src/world/area_tik/tik_01/869EE0.c deleted file mode 100644 index d58b8f5af7..0000000000 --- a/src/world/area_tik/tik_01/869EE0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "tik_01.h" - -extern s16 D_80242B7E_86C02E[0][2]; - -ApiStatus func_80240A30_869EE0(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Enemy* enemy = script->owner1.enemy; - s32 index = evt_get_variable(script, *args++); - - gCurrentEncounter.encounterList[enemy->encounterIndex]->battle = D_80242B7E_86C02E[index][0]; - return ApiStatus_DONE2; -} diff --git a/src/world/area_tik/tik_01/tik_01.h b/src/world/area_tik/tik_01/tik_01.h index 6c3a342126..37eb402d8e 100644 --- a/src/world/area_tik/tik_01/tik_01.h +++ b/src/world/area_tik/tik_01/tik_01.h @@ -2,8 +2,27 @@ /// @brief Toad Town Tunnels - Warp Zone 1 (B1) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_01_shape.h" +#include "mapfs/tik_01_hit.h" + +enum { + NPC_Blooper = 0, +}; + +enum { + MV_Unk_01 = MapVar(1), +}; + #define NAMESPACE tik_01 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_PlayBlooperSong); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SpawnSwitch); +extern EvtScript N(EVS_SetupDrips); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_tik/tik_01/tik_01_0_header.c b/src/world/area_tik/tik_01/tik_01_0_header.c new file mode 100644 index 0000000000..3ca3f4d444 --- /dev/null +++ b/src/world/area_tik/tik_01/tik_01_0_header.c @@ -0,0 +1,16 @@ +#include "tik_01.h" + +EntryList N(Entrances) = { + [tik_01_ENTRY_0] { 320.0, -10.0, 0.0, 270.0 }, + [tik_01_ENTRY_1] { -220.0, -10.0, 0.0, 90.0 }, + [tik_01_ENTRY_2] { 150.0, 25.0, -82.0, 180.0 }, + [tik_01_ENTRY_3] { 50.0, 25.0, -82.0, 180.0 }, + [tik_01_ENTRY_4] { -50.0, 25.0, -82.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_01 }, +}; diff --git a/src/world/area_tik/tik_01/tik_01_1_music.c b/src/world/area_tik/tik_01/tik_01_1_music.c new file mode 100644 index 0000000000..8ddfb707e4 --- /dev/null +++ b/src/world/area_tik/tik_01/tik_01_1_music.c @@ -0,0 +1,13 @@ +#include "tik_01.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayBlooperSong) = { + EVT_CALL(SetMusicTrack, 0, SONG_BLOOPER_THEME, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_01/tik_01_2_main.c b/src/world/area_tik/tik_01/tik_01_2_main.c new file mode 100644 index 0000000000..11875c9493 --- /dev/null +++ b/src/world/area_tik/tik_01/tik_01_2_main.c @@ -0,0 +1,64 @@ +#include "tik_01.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_06_0) = EVT_EXIT_WALK(60, tik_01_ENTRY_0, "tik_06", tik_06_ENTRY_0); + +EvtScript N(EVS_ExitWalk_tik_03_0) = EVT_EXIT_WALK(60, tik_01_ENTRY_1, "tik_03", tik_03_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_03_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_06_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_01) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(PlaySound, SOUND_80000027) + EVT_CALL(EnableTexPanning, MODEL_nagare1, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 50, 200, 110, 500) + 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_CALL(EnableTexPanning, MODEL_mizu, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 0, -200, -100, -500) + 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_CALL(EnableTexPanning, MODEL_mizu2, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_3) + TEX_PAN_PARAMS_STEP( 0, -250, -100, -500) + 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_EXEC(N(EVS_SetupDrips)) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_LT(LVar0, tik_01_ENTRY_2) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_ELSE + EVT_SET(LVarA, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(N(EVS_Pipe_EnterVertical)) + EVT_END_IF + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_01/tik_01_3_drips.c b/src/world/area_tik/tik_01/tik_01_3_drips.c new file mode 100644 index 0000000000..b471901ab8 --- /dev/null +++ b/src/world/area_tik/tik_01/tik_01_3_drips.c @@ -0,0 +1,24 @@ +#include "tik_01.h" + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 1, + .volumes = { + { + .minPos = { -175, -65 }, + .maxPos = { 485, 140 }, + .startY = 200, + .endY = -10, + .duration = 60, + .density = 4, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_01/tik_01_4_entity.c b/src/world/area_tik/tik_01/tik_01_4_entity.c new file mode 100644 index 0000000000..ed3a8bf87e --- /dev/null +++ b/src/world/area_tik/tik_01/tik_01_4_entity.c @@ -0,0 +1,88 @@ +#include "tik_01.h" +#include "entity.h" + +#include "world/common/todo/SetEntityPosition.inc.c" + +EvtScript N(EVS_SpawnSwitch) = { + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_ADD(LVar2, -75) + EVT_CALL(PlaySoundAt, SOUND_301, 0, LVar2, 200, 25) + EVT_CALL(MakeLerp, 200, -10, 25, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetEntityPosition), MV_Unk_01, LVar2, LVar0, 25) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAt, SOUND_48, 0, LVar2, LVar0, 25) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SmashBlock) = { + EVT_SET(GF_TIK01_Hammer2Block, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o64, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_kmr_02_3) = { + EVT_CALL(GotoMap, EVT_PTR("kmr_02"), kmr_02_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_nok_02_2) = { + EVT_CALL(GotoMap, EVT_PTR("nok_02"), nok_02_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_dro_01_2) = { + EVT_CALL(GotoMap, EVT_PTR("dro_01"), dro_01_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnSwitchActivate) = { + EVT_WAIT(10) + EVT_CALL(PlaySound, SOUND_208E) + EVT_SET(GF_TIK01_WarpPipes, TRUE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_TIK01_Hammer2Block, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer2Block), -240, -10, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_SmashBlock))) + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o64, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o63, COLLIDER_FLAGS_UPPER_MASK) + EVT_IF_EQ(GF_TIK01_WarpPipes, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), NPC_DISPOSE_LOCATION, 0, MAKE_ENTITY_END) + EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_TIK_03)) + EVT_SET(MV_Unk_01, LVar0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnSwitchActivate)), TRIGGER_AREA_FLAG_SET, AF_TIK_03, 1, 0) + EVT_IF_EQ(GF_TIK01_Defeated_Blooper, TRUE) + EVT_CALL(N(SetEntityPosition), MV_Unk_01, 125, -10, 25) + EVT_END_IF + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueWarpPipe), 150, -10, -82, 0, tik_01_ENTRY_2, + EVT_PTR(N(EVS_GotoMap_kmr_02_3)), EVT_INDEX_OF_GAME_FLAG(GF_TIK01_WarpPipes), MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueWarpPipe), 50, -10, -82, 0, tik_01_ENTRY_3, + EVT_PTR(N(EVS_GotoMap_nok_02_2)), EVT_INDEX_OF_GAME_FLAG(GF_TIK01_WarpPipes), MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueWarpPipe), -50, -10, -82, 0, tik_01_ENTRY_4, + EVT_PTR(N(EVS_GotoMap_dro_01_2)), EVT_INDEX_OF_GAME_FLAG(GF_TIK01_WarpPipes), MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_01/tik_01_5_npc.c b/src/world/area_tik/tik_01/tik_01_5_npc.c new file mode 100644 index 0000000000..53cc8710c0 --- /dev/null +++ b/src/world/area_tik/tik_01/tik_01_5_npc.c @@ -0,0 +1,104 @@ +#include "tik_01.h" + +#include "world/common/enemy/complete/Blooper.inc.c" + +EvtScript N(EVS_NpcIdle_Blooper) = { + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 200) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC(N(EVS_PlayBlooperSong)) + EVT_CALL(ShowMessageAtScreenPos, MSG_MGM_0000, 160, 40) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Blooper_Anim01) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -75) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, 150, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3DC, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, 0) + EVT_CALL(NpcFlyTo, NPC_SELF, LVar0, 0, 0, 10, 0, EASING_QUADRATIC_IN) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Blooper_Anim0C) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_WAIT(15) + EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Blooper) = { + EVT_WAIT(5) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Blooper_Anim04) + EVT_CALL(MakeLerp, 0, 6 * 360, 40, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3DD, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, 0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(NpcFlyTo, NPC_SELF, LVar0, 150, 0, 15, 0, EASING_QUADRATIC_IN) + EVT_WAIT(5) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_WAIT(15) + EVT_EXEC_WAIT(N(EVS_SpawnSwitch)) + EVT_IF_EQ(GF_TIK_DefeatedOneBlooper, FALSE) + EVT_SET(GF_TIK_DefeatedOneBlooper, TRUE) + EVT_ELSE + EVT_SET(GF_TIK_DefeatedTwoBloopers, TRUE) + EVT_END_IF + EVT_SET(GF_TIK01_Defeated_Blooper, TRUE) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Blooper) = { + EVT_IF_EQ(GF_TIK01_Defeated_Blooper, FALSE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Blooper))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Blooper))) + EVT_IF_EQ(GF_TIK_DefeatedOneBlooper, FALSE) + EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(0.75), EVT_FLOAT(0.75), EVT_FLOAT(0.75)) + EVT_CALL(N(GetBlooperBattleID), 0) + EVT_ELSE + EVT_IF_EQ(GF_TIK_DefeatedTwoBloopers, FALSE) + EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(1.25), EVT_FLOAT(1.25), EVT_FLOAT(1.25)) + EVT_CALL(N(GetBlooperBattleID), 1) + EVT_ELSE + EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(2.0), EVT_FLOAT(2.0), EVT_FLOAT(2.0)) + EVT_CALL(N(GetBlooperBattleID), 2) + EVT_END_IF + EVT_END_IF + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Blooper) = { + .id = NPC_Blooper, + .settings = &N(NpcSettings_Blooper), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .init = &N(EVS_NpcInit_Blooper), + .drops = BLOOPER_NO_DROPS, + .animations = BLOOPER_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Blooper), BTL_TIK2_FORMATION_00, BTL_TIK2_STAGE_00), + {} +}; diff --git a/src/world/area_tik/tik_02/86C740.c b/src/world/area_tik/tik_02/86C740.c deleted file mode 100644 index 264e79ba79..0000000000 --- a/src/world/area_tik/tik_02/86C740.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "tik_02.h" - -static char* N(exit_str_0) = "tik_18"; -static char* N(exit_str_1) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_tik/tik_02/86CA50.c b/src/world/area_tik/tik_02/86CA50.c deleted file mode 100644 index f72f27b9eb..0000000000 --- a/src/world/area_tik/tik_02/86CA50.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "tik_02.h" - -#include "world/common/todo/StashVars.inc.c" - -#include "world/common/todo/GetItemName.inc.c" - -#include "world/common/todo/SomeItemEntityFunc.inc.c" - -#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_tik/tik_02/86CD10.c b/src/world/area_tik/tik_02/86CD10.c deleted file mode 100644 index af91f70dca..0000000000 --- a/src/world/area_tik/tik_02/86CD10.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "tik_02.h" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" - -extern s16 D_80241BAE_86E2EE[0][2]; // length unk - -ApiStatus func_80240940_86D080(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Enemy* enemy = script->owner1.enemy; - s32 index = evt_get_variable(script, *args++); - - gCurrentEncounter.encounterList[enemy->encounterIndex]->battle = D_80241BAE_86E2EE[index][0]; - return ApiStatus_DONE2; -} diff --git a/src/world/area_tik/tik_02/tik_02.h b/src/world/area_tik/tik_02/tik_02.h index 65d9d2770a..162e2ecbc3 100644 --- a/src/world/area_tik/tik_02/tik_02.h +++ b/src/world/area_tik/tik_02/tik_02.h @@ -2,8 +2,22 @@ /// @brief Toad Town Tunnels - Blooper Boss 1 (B1) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_02_shape.h" +#include "mapfs/tik_02_hit.h" + +enum { + NPC_Blooper = 0, +}; + #define NAMESPACE tik_02 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_PlayBlooperSong); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupDrips); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_tik/tik_02/tik_02_0_header.c b/src/world/area_tik/tik_02/tik_02_0_header.c new file mode 100644 index 0000000000..e4cc45c917 --- /dev/null +++ b/src/world/area_tik/tik_02/tik_02_0_header.c @@ -0,0 +1,12 @@ +#include "tik_02.h" + +EntryList N(Entrances) = { + [tik_02_ENTRY_0] { -360.0, -10.0, 0.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_02 }, +}; diff --git a/src/world/area_tik/tik_02/tik_02_1_music.c b/src/world/area_tik/tik_02/tik_02_1_music.c new file mode 100644 index 0000000000..8cc7950edf --- /dev/null +++ b/src/world/area_tik/tik_02/tik_02_1_music.c @@ -0,0 +1,13 @@ +#include "tik_02.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayBlooperSong) = { + EVT_CALL(SetMusicTrack, 0, SONG_BLOOPER_THEME, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_02/tik_02_2_main.c b/src/world/area_tik/tik_02/tik_02_2_main.c new file mode 100644 index 0000000000..f45e40ed73 --- /dev/null +++ b/src/world/area_tik/tik_02/tik_02_2_main.c @@ -0,0 +1,62 @@ +#include "tik_02.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_18_1) = EVT_EXIT_WALK(60, tik_02_ENTRY_0, "tik_18", tik_18_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_18_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_02) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(PlaySound, SOUND_80000028) + EVT_CALL(PlaySoundAtF, SOUND_80000029, 1, -230, -180, 120) + EVT_CALL(PlaySoundAtF, SOUND_8000002A, 1, 20, -180, 120) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_CALL(EnableTexPanning, MODEL_nagare1, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 50, 200, 110, 500) + 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_CALL(EnableTexPanning, MODEL_mizu, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 0, -200, -100, -500) + 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_CALL(EnableTexPanning, MODEL_mizu2, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_3) + TEX_PAN_PARAMS_STEP( 0, -250, -100, -500) + 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_CALL(EnableTexPanning, MODEL_taki, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_4) + TEX_PAN_PARAMS_STEP( -50, -900, -70,-1200) + 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_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_02/tik_02_3_entity.c b/src/world/area_tik/tik_02/tik_02_3_entity.c new file mode 100644 index 0000000000..deab3bbf8c --- /dev/null +++ b/src/world/area_tik/tik_02/tik_02_3_entity.c @@ -0,0 +1,14 @@ +#include "tik_02.h" +#include "entity.h" + +#include "world/common/atomic/Chest.inc.c" + +EvtScript N(EVS_OpenChest) = EVT_OPEN_CHEST_BADGE(ITEM_SHRINK_STOMP, GF_TIK02_Chest_ShrinkStomp); + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 280, -10, 0, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignChestFlag, GF_TIK02_Chest_ShrinkStomp) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_02/tik_02_4_drips.c b/src/world/area_tik/tik_02/tik_02_4_drips.c new file mode 100644 index 0000000000..baac5656ff --- /dev/null +++ b/src/world/area_tik/tik_02/tik_02_4_drips.c @@ -0,0 +1,32 @@ +#include "tik_02.h" + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 2, + .volumes = { + { + .minPos = { -374, -98 }, + .maxPos = { 102, 158 }, + .startY = 200, + .endY = -10, + .duration = 60, + .density = 2, + }, + { + .minPos = { 66, -106 }, + .maxPos = { 182, 152 }, + .startY = 200, + .endY = -10, + .duration = 60, + .density = 2, + }, + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_02/tik_02_5_npc.c b/src/world/area_tik/tik_02/tik_02_5_npc.c new file mode 100644 index 0000000000..c070d8adb8 --- /dev/null +++ b/src/world/area_tik/tik_02/tik_02_5_npc.c @@ -0,0 +1,122 @@ +#include "tik_02.h" + +#include "world/common/enemy/complete/Blooper.inc.c" + +EvtScript N(EVS_NpcIdle_Blooper) = { + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, 65) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC(N(EVS_PlayBlooperSong)) + EVT_CALL(ShowMessageAtScreenPos, MSG_MGM_0000, 160, 40) + EVT_THREAD + EVT_CALL(InterpPlayerYaw, 315, 0) + EVT_WAIT(50) + EVT_CALL(InterpPlayerYaw, 45, 0) + EVT_END_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -25, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -25, LVar1, LVar2) + 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_WAIT(20) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 140, LVar1, LVar2) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3DC, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, 0) + EVT_CALL(SetNpcPos, NPC_SELF, -100, -300, -120) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Blooper_Anim01) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_SELF, 175, 0, 0, 40) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Blooper_Anim0C) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_WAIT(15) + EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Blooper) = { + EVT_WAIT(5) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Blooper_Anim04) + EVT_CALL(MakeLerp, 0, 6 * 360, 40, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, LVar0, 0) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3DD, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, 0) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_SELF, -100, -300, -120, 40) + EVT_WAIT(1) + EVT_IF_EQ(GF_TIK_DefeatedOneBlooper, FALSE) + EVT_SET(GF_TIK_DefeatedOneBlooper, TRUE) + EVT_ELSE + EVT_SET(GF_TIK_DefeatedTwoBloopers, TRUE) + EVT_END_IF + EVT_SET(GF_TIK02_Defeated_Blooper, TRUE) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Blooper) = { + EVT_IF_EQ(GF_TIK02_Defeated_Blooper, FALSE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Blooper))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Blooper))) + EVT_IF_EQ(GF_TIK_DefeatedOneBlooper, FALSE) + EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(0.75), EVT_FLOAT(0.75), EVT_FLOAT(0.75)) + EVT_CALL(N(GetBlooperBattleID), 0) + EVT_ELSE + EVT_IF_EQ(GF_TIK_DefeatedTwoBloopers, FALSE) + EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(1.25), EVT_FLOAT(1.25), EVT_FLOAT(1.25)) + EVT_CALL(N(GetBlooperBattleID), 1) + EVT_ELSE + EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(2.0), EVT_FLOAT(2.0), EVT_FLOAT(2.0)) + EVT_CALL(N(GetBlooperBattleID), 2) + EVT_END_IF + EVT_END_IF + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Blooper) = { + .id = NPC_Blooper, + .settings = &N(NpcSettings_Blooper), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .init = &N(EVS_NpcInit_Blooper), + .drops = BLOOPER_NO_DROPS, + .animations = BLOOPER_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Blooper), BTL_TIK2_FORMATION_00, BTL_TIK2_STAGE_00), + {} +}; diff --git a/src/world/area_tik/tik_03/86EB00.c b/src/world/area_tik/tik_03/86EB00.c deleted file mode 100644 index fcd3f98956..0000000000 --- a/src/world/area_tik/tik_03/86EB00.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "tik_03.h" - -static char* N(exit_str_0) = "tik_01"; -static char* N(exit_str_1) = "tik_04"; -static char* N(exit_str_2) = "tik_03"; -static char* N(exit_str_3) = ""; - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_tik/tik_03/86F0F0.c b/src/world/area_tik/tik_03/86F0F0.c deleted file mode 100644 index e954910c73..0000000000 --- a/src/world/area_tik/tik_03/86F0F0.c +++ /dev/null @@ -1,53 +0,0 @@ -#include "tik_03.h" -#include "world/partners.h" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" - -extern s32 D_80242EBC_8719BC; -extern s32 D_80242930_871430[4]; - -ApiStatus func_80240960_86F460(Evt* script, s32 isInitialCall) { - PlayerStatus* player = &gPlayerStatus; - u32 i; - - for (i = 0; i < ARRAY_COUNT(D_80242930_871430); i++) { - if (gCollisionStatus.currentFloor != D_80242930_871430[i]) { - continue; - } - if ((player->actionState == ACTION_STATE_SPIN_POUND) || (player->actionState == ACTION_STATE_TORNADO_POUND)) { - return ApiStatus_BLOCK; - } - } - - return ApiStatus_DONE2; -} - -ApiStatus func_802409C0_86F4C0(Evt* script, s32 isInitialCall) { - func_800EF300(); - return ApiStatus_DONE2; -} - -ApiStatus func_802409E0_86F4E0(Evt* script, s32 isInitialCall) { - PlayerStatus* player = &gPlayerStatus; - - switch (D_80242EBC_8719BC) { - case 0: - D_80242EBC_8719BC = 1; - return ApiStatus_BLOCK; - case 1: - case 2: - D_80242EBC_8719BC++; - return ApiStatus_BLOCK; - case 3: - partner_clear_player_tracking(wPartnerNpc); - partner_set_goal_pos(player->position.x, player->position.z); - func_800EF3D4(0); - wPartnerNpc->yaw = 270.0f; - gPlayerStatus.targetYaw = 270.0f; - gPlayerStatus.currentYaw = 270.0f; - gPlayerStatus.spriteFacingAngle = 180.0f; - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/area_tik/tik_03/tik_03.h b/src/world/area_tik/tik_03/tik_03.h index fff64d04c4..7c121c7f77 100644 --- a/src/world/area_tik/tik_03/tik_03.h +++ b/src/world/area_tik/tik_03/tik_03.h @@ -2,8 +2,18 @@ /// @brief Toad Town Tunnels - Short Elevator Room (B1) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_03_shape.h" +#include "mapfs/tik_03_hit.h" + #define NAMESPACE tik_03 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupDrips); +extern EvtScript N(EVS_SetupPlatforms); +extern EvtScript N(EVS_PlayDemoScene); diff --git a/src/world/area_tik/tik_03/tik_03_0_header.c b/src/world/area_tik/tik_03/tik_03_0_header.c new file mode 100644 index 0000000000..825d13850d --- /dev/null +++ b/src/world/area_tik/tik_03/tik_03_0_header.c @@ -0,0 +1,14 @@ +#include "tik_03.h" + +EntryList N(Entrances) = { + [tik_03_ENTRY_0] { 320.0, -10.0, 0.0, 270.0 }, + [tik_03_ENTRY_1] { -215.0, 60.0, 0.0, 90.0 }, + [tik_03_ENTRY_2] { 260.0, -10.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_03 }, +}; diff --git a/src/world/area_tik/tik_03/tik_03_1_music.c b/src/world/area_tik/tik_03/tik_03_1_music.c new file mode 100644 index 0000000000..2aacb997dd --- /dev/null +++ b/src/world/area_tik/tik_03/tik_03_1_music.c @@ -0,0 +1,7 @@ +#include "tik_03.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_03/tik_03_2_main.c b/src/world/area_tik/tik_03/tik_03_2_main.c new file mode 100644 index 0000000000..f8c32e15b4 --- /dev/null +++ b/src/world/area_tik/tik_03/tik_03_2_main.c @@ -0,0 +1,92 @@ +#include "tik_03.h" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_01_1) = EVT_EXIT_WALK(60, tik_03_ENTRY_0, "tik_01", tik_01_ENTRY_1); + +EvtScript N(EVS_GotoMap_tik_04_2) = { + EVT_CALL(GotoMap, EVT_PTR("tik_04"), tik_04_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_tik_04_2) = EVT_EXIT_PIPE_HORIZONTAL(tik_03_ENTRY_1, COLLIDER_o46, N(EVS_GotoMap_tik_04_2)); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_01_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_tik_04_2)), TRIGGER_WALL_PUSH, COLLIDER_o46, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(tik_03_ENTRY_1) + EVT_ENTER_PIPE_HORIZONTAL(COLLIDER_o46, N(EVS_BindExitTriggers)) + EVT_CASE_DEFAULT + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_03) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 50, 200, 110, 500) + 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_CALL(EnableTexPanning, MODEL_mizu, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 0, -200, -100, -500) + 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_CALL(EnableTexPanning, MODEL_mizu2, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_3) + TEX_PAN_PARAMS_STEP( 0, -250, -100, -500) + 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_CALL(EnableTexPanning, MODEL_taki, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_4) + TEX_PAN_PARAMS_STEP( -50, -900, -70,-1200) + 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_EXEC(N(EVS_SetupPlatforms)) + EVT_CALL(GetDemoState, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_tik_04_2)), TRIGGER_WALL_PUSH, COLLIDER_o46, 1, 0) + EVT_EXEC_WAIT(N(EVS_PlayDemoScene)) + EVT_RETURN + EVT_END_IF + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(PlaySound, SOUND_8000002B) + EVT_CALL(PlaySoundAtF, SOUND_8000002C, 1, -10, -20, 120) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_03/tik_03_3_drips.c b/src/world/area_tik/tik_03/tik_03_3_drips.c new file mode 100644 index 0000000000..ecdeec91d4 --- /dev/null +++ b/src/world/area_tik/tik_03/tik_03_3_drips.c @@ -0,0 +1,32 @@ +#include "tik_03.h" + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 2, + .volumes = { + { + .minPos = { 107, -95 }, + .maxPos = { 208, 155 }, + .startY = 200, + .endY = -10, + .duration = 60, + .density = 2, + }, + { + .minPos = { -216, -90 }, + .maxPos = { 82, 155 }, + .startY = 270, + .endY = 60, + .duration = 60, + .density = 1, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_03/tik_03_4_platforms.c b/src/world/area_tik/tik_03/tik_03_4_platforms.c new file mode 100644 index 0000000000..e1f04f3737 --- /dev/null +++ b/src/world/area_tik/tik_03/tik_03_4_platforms.c @@ -0,0 +1,96 @@ +#include "tik_03.h" + +s32 N(PlatformColliders)[] = { + COLLIDER_1, + COLLIDER_2, + COLLIDER_3, + COLLIDER_4, +}; + +API_CALLABLE(N(PausePlatformsDuringPound)) { + PlayerStatus* player = &gPlayerStatus; + u32 i; + + for (i = 0; i < ARRAY_COUNT(N(PlatformColliders)); i++) { + if (gCollisionStatus.currentFloor != N(PlatformColliders)[i]) { + continue; + } + if ((player->actionState == ACTION_STATE_SPIN_POUND) || (player->actionState == ACTION_STATE_TORNADO_POUND)) { + return ApiStatus_BLOCK; + } + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_UpdatePlatform) = { + EVT_SET_GROUP(EVT_GROUP_EF) + EVT_CALL(ParentColliderToModel, LVarB, LVarA) + EVT_SETF(LVar0, EVT_FLOAT(0.0)) + EVT_SETF(LVarD, EVT_FLOAT(-300.0)) + EVT_SUBF(LVarD, LVarC) + EVT_LABEL(0) + EVT_SETF(LVar1, LVarC) + EVT_SUBF(LVar0, EVT_FLOAT(80.0)) + EVT_LABEL(1) + EVT_CALL(N(PausePlatformsDuringPound)) + EVT_ADDF(LVar0, EVT_FLOAT(1.5)) + EVT_ADDF(LVar1, EVT_FLOAT(1.5)) + EVT_CALL(TranslateModel, LVarA, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, LVarB) + EVT_WAIT(1) + EVT_IF_LT(LVar1, EVT_FLOAT(100.0)) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(TranslateModel, LVarA, 0, LVarD, 0) + EVT_SETF(LVar0, LVarD) + EVT_SETF(LVarC, EVT_FLOAT(-300.0)) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CreatePlatform1) = { + EVT_SET(LVarA, MODEL_erb) + EVT_SET(LVarB, COLLIDER_1) + EVT_SET(LVarC, 20) + EVT_EXEC_WAIT(N(EVS_UpdatePlatform)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CreatePlatform2) = { + EVT_SET(LVarA, MODEL_o40) + EVT_SET(LVarB, COLLIDER_3) + EVT_SET(LVarC, -80) + EVT_EXEC_WAIT(N(EVS_UpdatePlatform)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CreatePlatform3) = { + EVT_SET(LVarA, MODEL_o41) + EVT_SET(LVarB, COLLIDER_4) + EVT_SET(LVarC, -170) + EVT_EXEC_WAIT(N(EVS_UpdatePlatform)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CreatePlatform4) = { + EVT_SET(LVarA, MODEL_o39) + EVT_SET(LVarB, COLLIDER_2) + EVT_SET(LVarC, -270) + EVT_EXEC_WAIT(N(EVS_UpdatePlatform)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupPlatforms) = { + EVT_EXEC(N(EVS_CreatePlatform1)) + EVT_EXEC(N(EVS_CreatePlatform2)) + EVT_EXEC(N(EVS_CreatePlatform3)) + EVT_EXEC(N(EVS_CreatePlatform4)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_03/tik_03_5_entity.c b/src/world/area_tik/tik_03/tik_03_5_entity.c new file mode 100644 index 0000000000..b81c665be4 --- /dev/null +++ b/src/world/area_tik/tik_03/tik_03_5_entity.c @@ -0,0 +1,13 @@ +#include "tik_03.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 200, 50, -75, 0, ITEM_SNOWMAN_DOLL, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK03_ItemBlock_SnowmanDoll) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 140, 50, -75, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK03_ItemBlock_CoinA) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 260, 50, -75, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK03_ItemBlock_CoinB) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_03/tik_03_6_demo.c b/src/world/area_tik/tik_03/tik_03_6_demo.c new file mode 100644 index 0000000000..c65c8956ee --- /dev/null +++ b/src/world/area_tik/tik_03/tik_03_6_demo.c @@ -0,0 +1,87 @@ +#include "tik_03.h" +#include "world/partners.h" + +API_CALLABLE(N(ChangePartnerFollowState)) { + func_800EF300(); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ProvideDemoInputs) = { + EVT_CALL(DemoJoystickXY, -85, -1) + EVT_WAIT(32) + EVT_CALL(DemoSetButtons, BUTTON_A) + EVT_WAIT(7) + EVT_CALL(DemoSetButtons, 0) + EVT_WAIT(20) + EVT_CALL(DemoSetButtons, BUTTON_A) + EVT_WAIT(30) + EVT_CALL(DemoSetButtons, 0) + EVT_WAIT(15) + EVT_CALL(N(ChangePartnerFollowState)) + EVT_WAIT(15) + EVT_IF_EQ(GF_DemoSceneDone, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_DemoSceneDone, TRUE) + EVT_CALL(GotoMapSpecial, EVT_PTR("tik_03"), tik_03_ENTRY_2, TRANSITION_2) + EVT_WAIT(110) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MonitorDemoState) = { + EVT_WAIT(10) + EVT_LOOP(0) + EVT_CALL(GetDemoState, LVar0) + EVT_IF_EQ(LVar0, 2) + 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("tik_03"), tik_03_ENTRY_2, TRANSITION_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +s32 N(DemoSceneState) = { + 0 +}; + +API_CALLABLE(N(SetupDemoScene)) { + PlayerStatus* player = &gPlayerStatus; + + switch (N(DemoSceneState)) { + case 0: + N(DemoSceneState) = 1; + break; + case 1: + case 2: + N(DemoSceneState)++; + break; + case 3: + partner_clear_player_tracking(wPartnerNpc); + partner_set_goal_pos(player->position.x, player->position.z); + func_800EF3D4(0); + wPartnerNpc->yaw = 270.0f; + gPlayerStatus.targetYaw = 270.0f; + gPlayerStatus.currentYaw = 270.0f; + gPlayerStatus.spriteFacingAngle = 180.0f; + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_PlayDemoScene) = { + EVT_CALL(N(SetupDemoScene)) + 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_tik/tik_04/871A30.c b/src/world/area_tik/tik_04/871A30.c deleted file mode 100644 index 165d409473..0000000000 --- a/src/world/area_tik/tik_04/871A30.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "tik_04.h" - -static char* N(exit_str_0) = "tik_05"; -static char* N(exit_str_1) = "tik_07"; -static char* N(exit_str_2) = "tik_03"; -static char* N(exit_str_3) = "tik_12"; - -#include "world/common/atomic/TexturePan.inc.c" - -#include "world/common/entity/Pipe.inc.c" diff --git a/src/world/area_tik/tik_04/872020.c b/src/world/area_tik/tik_04/872020.c deleted file mode 100644 index cca2f7b378..0000000000 --- a/src/world/area_tik/tik_04/872020.c +++ /dev/null @@ -1,72 +0,0 @@ -#include "tik_04.h" -#include "mapfs/tik_04_hit.h" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" - -ApiStatus func_80240960_872390(Evt* script, s32 isInitialCall) { - Model* model1; - Model* model2; - - model1 = get_model_from_list_index(get_model_list_index_from_tree_index(0x12)); - script->array[0] = create_shadow_type(1, model1->center.x, model1->center.y - 100.0f, model1->center.z); - model2 = get_model_from_list_index(get_model_list_index_from_tree_index(0x14)); - script->array[1] = create_shadow_type(1, model2->center.x, model2->center.y - 100.0f, model2->center.z); - - return ApiStatus_DONE2; -} - -ApiStatus func_80240A00_872430(Evt* script, s32 isInitialCall) { - Model* model; - Shadow* shadow; - f32 x, y, z; - f32 hitYaw, hitPitch, hitLength; - - shadow = get_shadow_by_index(script->array[0]); - model = get_model_from_list_index(get_model_list_index_from_tree_index(0x12)); - x = model->center.x; - y = model->center.y; - z = model->center.z; - hitLength = 1000.0f; - entity_raycast_down(&x, &y, &z, &hitYaw, &hitPitch, &hitLength); - set_standard_shadow_scale(shadow, hitLength); - shadow->position.x = x; - shadow->position.y = y; - shadow->position.z = z; - shadow->rotation.x = hitYaw; - shadow->rotation.y = 0.0f; - shadow->rotation.z = hitPitch; - shadow->scale.x *= 4.5f; - shadow->scale.z *= 4.5f; - - shadow = get_shadow_by_index(script->array[1]); - model = get_model_from_list_index(get_model_list_index_from_tree_index(0x14)); - x = model->center.x; - y = model->center.y; - z = model->center.z; - hitLength = 1000.0f; - entity_raycast_down(&x, &y, &z, &hitYaw, &hitPitch, &hitLength); - set_standard_shadow_scale(shadow, hitLength); - shadow->position.x = x; - shadow->position.y = y; - shadow->position.z = z; - shadow->rotation.x = hitYaw; - shadow->rotation.y = 0.0f; - shadow->rotation.z = hitPitch; - shadow->scale.x *= 4.5f; - shadow->scale.z *= 4.5f; - - return ApiStatus_DONE2; -} - -#include "world/common/todo/GetFloorCollider.inc.c" - -ApiStatus func_80240C20_872650(Evt* script, s32 isInitialCall) { - PlayerStatus* player = &gPlayerStatus; - - if (gCollisionStatus.currentFloor == COLLIDER_erb1 || gCollisionStatus.currentFloor == COLLIDER_erb2) { - if (player->actionState == ACTION_STATE_SPIN_POUND || player->actionState == ACTION_STATE_TORNADO_POUND) { - return ApiStatus_BLOCK; - } - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_tik/tik_04/tik_04.h b/src/world/area_tik/tik_04/tik_04.h index 85518f02b1..78877d6e5a 100644 --- a/src/world/area_tik/tik_04/tik_04.h +++ b/src/world/area_tik/tik_04/tik_04.h @@ -2,8 +2,26 @@ /// @brief Toad Town Tunnels - Scales Room (B2) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_04_shape.h" +#include "mapfs/tik_04_hit.h" + +enum { + NPC_SpikedGoomba_01 = 0, + NPC_SpikedGoomba_02 = 1, +}; + +enum { + MV_Unk_00 = MapVar(0), +}; + #define NAMESPACE tik_04 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupDrips); +extern EvtScript N(EVS_SetupPlatforms); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_tik/tik_04/tik_04_0_header.c b/src/world/area_tik/tik_04/tik_04_0_header.c new file mode 100644 index 0000000000..99dd0282be --- /dev/null +++ b/src/world/area_tik/tik_04/tik_04_0_header.c @@ -0,0 +1,15 @@ +#include "tik_04.h" + +EntryList N(Entrances) = { + [tik_04_ENTRY_0] { -220.0, -10.0, 0.0, 90.0 }, + [tik_04_ENTRY_1] { 320.0, -10.0, 0.0, 270.0 }, + [tik_04_ENTRY_2] { -110.0, -10.0, -80.0, 270.0 }, + [tik_04_ENTRY_3] { 268.0, -105.0, 94.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_04 }, +}; diff --git a/src/world/area_tik/tik_04/tik_04_1_music.c b/src/world/area_tik/tik_04/tik_04_1_music.c new file mode 100644 index 0000000000..586e131189 --- /dev/null +++ b/src/world/area_tik/tik_04/tik_04_1_music.c @@ -0,0 +1,7 @@ +#include "tik_04.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_04/tik_04_2_main.c b/src/world/area_tik/tik_04/tik_04_2_main.c new file mode 100644 index 0000000000..ee97fa65a9 --- /dev/null +++ b/src/world/area_tik/tik_04/tik_04_2_main.c @@ -0,0 +1,68 @@ +#include "tik_04.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_05_0) = EVT_EXIT_WALK(60, tik_04_ENTRY_0, "tik_05", tik_05_ENTRY_0); +EvtScript N(EVS_ExitWalk_tik_07_0) = EVT_EXIT_WALK(60, tik_04_ENTRY_1, "tik_07", tik_07_ENTRY_0); + +EvtScript N(EVS_GotoMap_tik_03_1) = { + EVT_CALL(GotoMap, EVT_PTR("tik_03"), tik_03_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_tik_03_1) = EVT_EXIT_PIPE_HORIZONTAL(tik_04_ENTRY_2, COLLIDER_ttd, N(EVS_GotoMap_tik_03_1)); + +EvtScript N(EVS_GotoMap_tik_12_0) = { + EVT_CALL(GotoMap, EVT_PTR("tik_12"), tik_12_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_tik_12_0) = EVT_EXIT_PIPE_VERTICAL(tik_04_ENTRY_3, COLLIDER_ttd2, N(EVS_GotoMap_tik_12_0)); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_05_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_07_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_tik_03_1)), TRIGGER_WALL_PUSH, COLLIDER_ttd, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_tik_12_0)), TRIGGER_FLOOR_TOUCH, COLLIDER_ttd2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_04) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_CALL(EnableTexPanning, MODEL_mizu, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 0, -200, -100, -500) + 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_EXEC(N(EVS_SetupPlatforms)) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(tik_04_ENTRY_2) + EVT_ENTER_PIPE_HORIZONTAL(COLLIDER_ttd, N(EVS_BindExitTriggers)) + EVT_CASE_EQ(tik_04_ENTRY_3) + EVT_ENTER_PIPE_VERTICAL(N(EVS_BindExitTriggers)) + EVT_CASE_DEFAULT + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_04/tik_04_3_drips.c b/src/world/area_tik/tik_04/tik_04_3_drips.c new file mode 100644 index 0000000000..340af81bf8 --- /dev/null +++ b/src/world/area_tik/tik_04/tik_04_3_drips.c @@ -0,0 +1,32 @@ +#include "tik_04.h" + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 2, + .volumes = { + { + .minPos = { -230, -40 }, + .maxPos = { 150, 80 }, + .startY = 200, + .endY = -10, + .duration = 50, + .density = 1, + }, + { + .minPos = { -50, 100 }, + .maxPos = { 355, 37 }, + .startY = 200, + .endY = -135, + .duration = 80, + .density = 2, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_04/tik_04_4_platforms.c b/src/world/area_tik/tik_04/tik_04_4_platforms.c new file mode 100644 index 0000000000..f62bdf5ce9 --- /dev/null +++ b/src/world/area_tik/tik_04/tik_04_4_platforms.c @@ -0,0 +1,154 @@ +#include "tik_04.h" +#include "model.h" + +API_CALLABLE(N(CreatePlatformShadows)) { + Model* model; + + model = get_model_from_list_index(get_model_list_index_from_tree_index(MODEL_erb1)); + script->array[0] = create_shadow_type(1, model->center.x, model->center.y - 100.0f, model->center.z); + model = get_model_from_list_index(get_model_list_index_from_tree_index(MODEL_erb2)); + script->array[1] = create_shadow_type(1, model->center.x, model->center.y - 100.0f, model->center.z); + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(UpdatePlatformShadows)) { + Model* model; + Shadow* shadow; + f32 x, y, z; + f32 hitYaw, hitPitch, hitLength; + + shadow = get_shadow_by_index(script->array[0]); + model = get_model_from_list_index(get_model_list_index_from_tree_index(MODEL_erb1)); + x = model->center.x; + y = model->center.y; + z = model->center.z; + hitLength = 1000.0f; + entity_raycast_down(&x, &y, &z, &hitYaw, &hitPitch, &hitLength); + set_standard_shadow_scale(shadow, hitLength); + shadow->position.x = x; + shadow->position.y = y; + shadow->position.z = z; + shadow->rotation.x = hitYaw; + shadow->rotation.y = 0.0f; + shadow->rotation.z = hitPitch; + shadow->scale.x *= 4.5f; + shadow->scale.z *= 4.5f; + + shadow = get_shadow_by_index(script->array[1]); + model = get_model_from_list_index(get_model_list_index_from_tree_index(MODEL_erb2)); + x = model->center.x; + y = model->center.y; + z = model->center.z; + hitLength = 1000.0f; + entity_raycast_down(&x, &y, &z, &hitYaw, &hitPitch, &hitLength); + set_standard_shadow_scale(shadow, hitLength); + shadow->position.x = x; + shadow->position.y = y; + shadow->position.z = z; + shadow->rotation.x = hitYaw; + shadow->rotation.y = 0.0f; + shadow->rotation.z = hitPitch; + shadow->scale.x *= 4.5f; + shadow->scale.z *= 4.5f; + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetFloorCollider)) { + Bytecode* args = script->ptrReadPos; + s32 outVar = *args++; + + evt_set_variable(script, outVar, gCollisionStatus.currentFloor); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(PausePlatformsDuringPound)) { + PlayerStatus* player = &gPlayerStatus; + + if (gCollisionStatus.currentFloor == COLLIDER_erb1 || gCollisionStatus.currentFloor == COLLIDER_erb2) { + if (player->actionState == ACTION_STATE_SPIN_POUND || player->actionState == ACTION_STATE_TORNADO_POUND) { + return ApiStatus_BLOCK; + } + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_UpdatePlatforms) = { + EVT_CALL(N(GetFloorCollider), LVarA) + EVT_SETF(LVar0, EVT_FLOAT(0.0)) + EVT_LABEL(0) + EVT_CALL(N(PausePlatformsDuringPound)) + EVT_CALL(TranslateModel, LVar1, 10, LVar0, 0) + EVT_CALL(UpdateColliderTransform, LVar3) + EVT_SETF(LVar5, LVar0) + EVT_MULF(LVar5, EVT_FLOAT(-1.0)) + EVT_ADDF(LVar5, EVT_FLOAT(30.0)) + EVT_CALL(TranslateModel, LVar2, -10, LVar5, 0) + EVT_CALL(UpdateColliderTransform, LVar4) + EVT_SUBF(LVar0, EVT_FLOAT(0.5)) + EVT_IF_LT(LVar0, EVT_FLOAT(-120.0)) + EVT_ADDF(LVar0, EVT_FLOAT(0.5)) + EVT_END_IF + EVT_USE_ARRAY(MV_Unk_00) + EVT_CALL(N(UpdatePlatformShadows)) + EVT_WAIT(1) + EVT_CALL(N(GetFloorCollider), LVarB) + EVT_CALL(GetPlayerActionState, LVarC) + EVT_IF_EQ(LVarB, LVar3) + EVT_IF_NE(LVarC, ACTION_STATE_JUMP) + EVT_GOTO(0) + EVT_END_IF + EVT_END_IF + EVT_LABEL(1) + EVT_CALL(N(PausePlatformsDuringPound)) + EVT_ADDF(LVar0, EVT_FLOAT(0.5)) + EVT_CALL(TranslateModel, LVar1, 10, LVar0, 0) + EVT_CALL(UpdateColliderTransform, LVar3) + EVT_SETF(LVar5, LVar0) + EVT_MULF(LVar5, EVT_FLOAT(-1.0)) + EVT_ADDF(LVar5, EVT_FLOAT(30.0)) + EVT_CALL(TranslateModel, LVar2, -10, LVar5, 0) + EVT_CALL(UpdateColliderTransform, LVar4) + EVT_USE_ARRAY(MV_Unk_00) + EVT_CALL(N(UpdatePlatformShadows)) + EVT_WAIT(1) + EVT_CALL(N(GetFloorCollider), LVarB) + EVT_CALL(GetPlayerActionState, LVarC) + EVT_IF_EQ(LVarB, LVar3) + EVT_IF_NE(LVarC, ACTION_STATE_JUMP) + EVT_GOTO(0) + EVT_END_IF + EVT_END_IF + EVT_IF_LT(LVar0, 0) + EVT_GOTO(1) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnTouchPlatform) = { + EVT_SET(LVar1, MODEL_erb1) + EVT_SET(LVar2, MODEL_erb2) + EVT_SET(LVar3, COLLIDER_erb1) + EVT_SET(LVar4, COLLIDER_erb2) + EVT_EXEC_WAIT(N(EVS_UpdatePlatforms)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupPlatforms) = { + EVT_CALL(ParentColliderToModel, COLLIDER_erb1, MODEL_erb1) + EVT_CALL(ParentColliderToModel, COLLIDER_erb2, MODEL_erb2) + EVT_CALL(TranslateModel, MODEL_erb1, 10, 0, 0) + EVT_CALL(TranslateModel, MODEL_erb2, -10, 30, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_erb1) + EVT_CALL(UpdateColliderTransform, COLLIDER_erb2) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnTouchPlatform)), TRIGGER_FLOOR_TOUCH, COLLIDER_erb1, 1, 0) + EVT_MALLOC_ARRAY(2, MV_Unk_00) + EVT_USE_ARRAY(MV_Unk_00) + EVT_CALL(N(CreatePlatformShadows)) + EVT_CALL(N(UpdatePlatformShadows)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_04/tik_04_5_npc.c b/src/world/area_tik/tik_04/tik_04_5_npc.c new file mode 100644 index 0000000000..0fe69f7ead --- /dev/null +++ b/src/world/area_tik/tik_04/tik_04_5_npc.c @@ -0,0 +1,97 @@ +#include "tik_04.h" + +#include "world/common/enemy/complete/SpikedGloomba_Wander.inc.c" + +EvtScript N(EVS_NpcIdle_SpikedGloomba) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(tik_04_ENTRY_0) + EVT_CALL(SetNpcPos, NPC_SELF, 280, -10, 0) + EVT_CASE_EQ(tik_04_ENTRY_1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_SpikedGloomba_Wander))) + EVT_RETURN + EVT_CASE_EQ(tik_04_ENTRY_2) + EVT_CALL(SetNpcPos, NPC_SELF, 280, -10, 0) + EVT_CASE_EQ(tik_04_ENTRY_3) + EVT_CALL(SetNpcPos, NPC_SELF, 360, -10, 0) + EVT_END_SWITCH + EVT_LABEL(100) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, -30) + EVT_WAIT(1) + EVT_GOTO(100) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_SpikedGoomba_Dark_Run) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_NO_AI, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcSpeed, NPC_SELF, 2) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, 55, 0, 0) + EVT_ELSE + EVT_WAIT(14) + EVT_CALL(NpcMoveTo, NPC_SELF, 60, 0, 0) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_SpikedGoomba_Dark_Idle) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_SpikedGloomba_Wander))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_SpikedGloomba) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_SpikedGloomba))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_SpikedGloomba_01) = { + .id = NPC_SpikedGoomba_01, + .settings = &N(NpcSettings_SpikedGloomba_Wander), + .pos = { 40.0f, -135.0f, 10.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400, + .init = &N(EVS_NpcInit_SpikedGloomba), + .drops = SPIKED_GLOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 40, -135, 10 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 40, -135, 10 }, + .detectSize = { 200 }, + } + }, + .animations = SPIKED_GLOOMBA_ANIMS, +}; + +StaticNpc N(NpcData_SpikedGloomba_02) = { + .id = NPC_SpikedGoomba_02, + .settings = &N(NpcSettings_SpikedGloomba_Wander), + .pos = { 141.0f, -135.0f, 85.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400, + .init = &N(EVS_NpcInit_SpikedGloomba), + .drops = SPIKED_GLOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 141, -135, 85 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 141, -135, 85 }, + .detectSize = { 200 }, + } + }, + .animations = SPIKED_GLOOMBA_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_SpikedGloomba_01), BTL_TIK_FORMATION_0F, BTL_TIK_STAGE_01), + NPC_GROUP(N(NpcData_SpikedGloomba_02), BTL_TIK_FORMATION_0E, BTL_TIK_STAGE_01), + {} +}; diff --git a/src/world/area_tik/tik_05/874DC0.c b/src/world/area_tik/tik_05/874DC0.c deleted file mode 100644 index a20e2c7893..0000000000 --- a/src/world/area_tik/tik_05/874DC0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "tik_05.h" - -static char* N(exit_str_0) = "tik_04"; -static char* N(exit_str_1) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c deleted file mode 100644 index 42efa42653..0000000000 --- a/src/world/area_tik/tik_05/8750D0.c +++ /dev/null @@ -1,30 +0,0 @@ -#include "tik_05.h" -#include "battle/battle.h" -#include "effects.h" -#include "functions.h" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" - -#include "world/common/todo/StashVars.inc.c" - -#include "world/common/todo/GetItemName.inc.c" - -#include "world/common/todo/SomeItemEntityFunc.inc.c" - -#include "world/common/todo/IsItemBadge.inc.c" - -extern s16 Entity_ScriptSpring_AnimLaunch[]; - -ApiStatus func_8024093C_8756FC(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Entity* entity = get_entity_by_index(evt_get_variable(script, *args++)); - - if (entity == NULL) { - return ApiStatus_BLOCK; - } - - play_model_animation(entity->virtualModelIndex, Entity_ScriptSpring_AnimLaunch); - return ApiStatus_DONE2; -} - -#include "world/common/todo/SetEntityPosition.inc.c" diff --git a/src/world/area_tik/tik_05/tik_05.h b/src/world/area_tik/tik_05/tik_05.h index a0698237bc..0d37a15827 100644 --- a/src/world/area_tik/tik_05/tik_05.h +++ b/src/world/area_tik/tik_05/tik_05.h @@ -2,8 +2,26 @@ /// @brief Toad Town Tunnels - Spring Room (B2) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_05_shape.h" +#include "mapfs/tik_05_hit.h" + +enum { + NPC_SpikedGoomba_01 = 0, + NPC_SpikedGoomba_02 = 1, +}; + +enum { + MV_Unk_00 = MapVar(0), +}; + #define NAMESPACE tik_05 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupDrips); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_tik/tik_05/tik_05_0_header.c b/src/world/area_tik/tik_05/tik_05_0_header.c new file mode 100644 index 0000000000..83fb52ee49 --- /dev/null +++ b/src/world/area_tik/tik_05/tik_05_0_header.c @@ -0,0 +1,15 @@ +#include "tik_05.h" + +EntryList N(Entrances) = { + [tik_05_ENTRY_0] { 320.0, -10.0, 0.0, 270.0 }, + [tik_05_ENTRY_1] { 100.0, 25.0, -82.0, 180.0 }, + [tik_05_ENTRY_2] { 185.0, 25.0, -82.0, 180.0 }, + [tik_05_ENTRY_3] { 270.0, 25.0, -82.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_05 }, +}; diff --git a/src/world/area_tik/tik_05/tik_05_1_music.c b/src/world/area_tik/tik_05/tik_05_1_music.c new file mode 100644 index 0000000000..7201da9677 --- /dev/null +++ b/src/world/area_tik/tik_05/tik_05_1_music.c @@ -0,0 +1,7 @@ +#include "tik_05.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_05/tik_05_2_main.c b/src/world/area_tik/tik_05/tik_05_2_main.c new file mode 100644 index 0000000000..9af5a93999 --- /dev/null +++ b/src/world/area_tik/tik_05/tik_05_2_main.c @@ -0,0 +1,45 @@ +#include "tik_05.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_04_0) = EVT_EXIT_WALK(60, tik_05_ENTRY_0, "tik_04", tik_04_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_04_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_05) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(PlaySound, SOUND_8000002D) + EVT_CALL(PlaySoundAtF, SOUND_8000002E, 1, -85, -20, 120) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 50, 200, 110, 500) + 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_CALL(EnableTexPanning, MODEL_taki, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_4) + TEX_PAN_PARAMS_STEP( -50, -900, -70,-1200) + 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_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_05/tik_05_3_drips.c b/src/world/area_tik/tik_05/tik_05_3_drips.c new file mode 100644 index 0000000000..2e50e3212f --- /dev/null +++ b/src/world/area_tik/tik_05/tik_05_3_drips.c @@ -0,0 +1,24 @@ +#include "tik_05.h" + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 1, + .volumes = { + { + .minPos = { -21, -90 }, + .maxPos = { 86, 156 }, + .startY = 300, + .endY = -10, + .duration = 90, + .density = 2, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_05/tik_05_4_entity.c b/src/world/area_tik/tik_05/tik_05_4_entity.c new file mode 100644 index 0000000000..c611cea2a9 --- /dev/null +++ b/src/world/area_tik/tik_05/tik_05_4_entity.c @@ -0,0 +1,73 @@ +#include "tik_05.h" +#include "entity.h" + +#include "world/common/atomic/Chest.inc.c" + +extern s16 Entity_ScriptSpring_AnimLaunch[]; + +API_CALLABLE(N(PlaySpringAnimation)) { + Bytecode* args = script->ptrReadPos; + Entity* entity = get_entity_by_index(evt_get_variable(script, *args++)); + + if (entity == NULL) { + return ApiStatus_BLOCK; + } + + play_model_animation(entity->virtualModelIndex, Entity_ScriptSpring_AnimLaunch); + return ApiStatus_DONE2; +} + +#include "world/common/todo/SetEntityPosition.inc.c" + +EvtScript N(EVS_BreakBlock_DropSpring) = { + EVT_IF_EQ(GF_TIK05_SpringBrick, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_TIK05_SpringBrick, TRUE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar5, 25) + EVT_CALL(MakeLerp, 75, 105, 8, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetEntityPosition), MV_Unk_00, LVar5, LVar0, 0) + EVT_WAIT(1) + EVT_SUB(LVar5, 2) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, LVar0, -10, 22, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetEntityPosition), MV_Unk_00, LVar5, LVar0, 0) + EVT_WAIT(1) + EVT_SUB(LVar5, 2) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAt, SOUND_48, 0, LVar5, LVar0, 0) + EVT_CALL(PlaySoundAt, SOUND_2086, 0, LVar5, LVar0, 0) + EVT_CALL(N(PlaySpringAnimation), MV_Unk_00) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenChest) = EVT_OPEN_CHEST_BADGE(ITEM_POWER_SMASH1, GF_TIK05_Chest_PowerSmash1); + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), -185, 60, -25, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignChestFlag, GF_TIK05_Chest_PowerSmash1) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest))) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 25, 50, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_BreakBlock_DropSpring))) + EVT_IF_EQ(GF_TIK05_SpringBrick, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SimpleSpring), 25, 75, 0, 0, 100, MAKE_ENTITY_END) + EVT_SET(MV_Unk_00, LVar0) + EVT_ELSE + EVT_CALL(MakeEntity, EVT_PTR(Entity_SimpleSpring), -35, -10, 0, 0, 100, MAKE_ENTITY_END) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_05/tik_05_5_npc.c b/src/world/area_tik/tik_05/tik_05_5_npc.c new file mode 100644 index 0000000000..e2853647c1 --- /dev/null +++ b/src/world/area_tik/tik_05/tik_05_5_npc.c @@ -0,0 +1,53 @@ +#include "tik_05.h" + +#include "world/common/enemy/complete/SpikedGloomba_Wander.inc.c" + +StaticNpc N(NpcData_SpikedGloomba_01) = { + .id = NPC_SpikedGoomba_01, + .settings = &N(NpcSettings_SpikedGloomba_Wander), + .pos = { 220.0f, -10.0f, -80.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .drops = SPIKED_GLOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 220, -10, -80 }, + .wanderSize = { 20 }, + .detectShape = SHAPE_RECT, + .detectPos = { 160, 0, -20 }, + .detectSize = { 180, 100 }, + } + }, + .animations = SPIKED_GLOOMBA_ANIMS, +}; + +StaticNpc N(NpcData_SpikedGloomba_02) = { + .id = NPC_SpikedGoomba_02, + .settings = &N(NpcSettings_SpikedGloomba_Wander), + .pos = { 130.0f, -10.0f, 45.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .drops = SPIKED_GLOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 130, -10, 45 }, + .wanderSize = { 20 }, + .detectShape = SHAPE_RECT, + .detectPos = { 160, 0, -20 }, + .detectSize = { 180, 100 }, + } + }, + .animations = SPIKED_GLOOMBA_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_SpikedGloomba_01), BTL_TIK_FORMATION_10, BTL_TIK_STAGE_00), + NPC_GROUP(N(NpcData_SpikedGloomba_02), BTL_TIK_FORMATION_12, BTL_TIK_STAGE_00), + {} +}; diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c deleted file mode 100644 index f5631460c6..0000000000 --- a/src/world/area_tik/tik_07/879BE0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "tik_07.h" - -static char* N(exit_str_0) = "tik_04"; -static char* N(exit_str_1) = "tik_07"; - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c deleted file mode 100644 index 6541e1af44..0000000000 --- a/src/world/area_tik/tik_07/87AC00.c +++ /dev/null @@ -1,22 +0,0 @@ -#include "tik_07.h" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" - -extern s32 D_802449B0_87E590[4]; - -ApiStatus func_80241390_87AF70(Evt* script, s32 isInitialCall) { - PlayerStatus* player = &gPlayerStatus; - u32 i; - - for (i = 0; i < ARRAY_COUNT(D_802449B0_87E590); i++) { - if (gCollisionStatus.currentFloor != D_802449B0_87E590[i]) { - continue; - } - if ((player->actionState == ACTION_STATE_SPIN_POUND) || (player->actionState == ACTION_STATE_TORNADO_POUND)) { - return ApiStatus_BLOCK; - } - } - return ApiStatus_DONE2; -} - -#include "world/common/enemy/ai/FlyingAI.inc.c" diff --git a/src/world/area_tik/tik_07/tik_07.h b/src/world/area_tik/tik_07/tik_07.h index ee09902d62..6519824151 100644 --- a/src/world/area_tik/tik_07/tik_07.h +++ b/src/world/area_tik/tik_07/tik_07.h @@ -2,8 +2,27 @@ /// @brief Toad Town Tunnels - Elevator Attic Room (B2) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_07_shape.h" +#include "mapfs/tik_07_hit.h" + +enum { + NPC_Paragoomba_01 = 0, + NPC_Paragoomba_02 = 1, +}; + +enum { + MV_SuperBlock = MapVar(0), +}; + #define NAMESPACE tik_07 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupPlatforms); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupDrips); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_tik/tik_07/tik_07_0_header.c b/src/world/area_tik/tik_07/tik_07_0_header.c new file mode 100644 index 0000000000..b694c9bbad --- /dev/null +++ b/src/world/area_tik/tik_07/tik_07_0_header.c @@ -0,0 +1,14 @@ +#include "tik_07.h" + +EntryList N(Entrances) = { + [tik_07_ENTRY_0] { -270.0, -10.0, 0.0, 90.0 }, + [tik_07_ENTRY_1] { -275.0, 90.0, -110.0, 180.0 }, + [tik_07_ENTRY_2] { 525.0, 25.0, -100.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_07 }, +}; diff --git a/src/world/area_tik/tik_07/tik_07_1_music.c b/src/world/area_tik/tik_07/tik_07_1_music.c new file mode 100644 index 0000000000..89bd2c04a0 --- /dev/null +++ b/src/world/area_tik/tik_07/tik_07_1_music.c @@ -0,0 +1,7 @@ +#include "tik_07.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_07/tik_07_2_main.c b/src/world/area_tik/tik_07/tik_07_2_main.c new file mode 100644 index 0000000000..14b1fcb371 --- /dev/null +++ b/src/world/area_tik/tik_07/tik_07_2_main.c @@ -0,0 +1,53 @@ +#include "tik_07.h" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_04_1) = EVT_EXIT_WALK(60, tik_07_ENTRY_0, "tik_04", tik_04_ENTRY_1); + +EvtScript N(EVS_GotoMap_tik_07_2) = { + EVT_CALL(GotoMap, EVT_PTR("tik_07"), tik_07_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_tik_07_1) = { + EVT_CALL(GotoMap, EVT_PTR("tik_07"), tik_07_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_tik_07_2) = EVT_EXIT_PIPE_VERTICAL(tik_07_ENTRY_1, COLLIDER_dokan_e1, N(EVS_GotoMap_tik_07_2)); +EvtScript N(EVS_ExitWalk_tik_07_1) = EVT_EXIT_PIPE_VERTICAL(tik_07_ENTRY_2, COLLIDER_dokan_e2, N(EVS_GotoMap_tik_07_1)); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_04_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_07_2)), TRIGGER_FLOOR_TOUCH, COLLIDER_dokan_e1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_07_1)), TRIGGER_FLOOR_TOUCH, COLLIDER_dokan_e2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_07) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_EXEC(N(EVS_SetupPlatforms)) + EVT_WAIT(1) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, tik_07_ENTRY_0) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_ELSE + EVT_ENTER_PIPE_VERTICAL(N(EVS_BindExitTriggers)) + EVT_END_IF + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_07/tik_07_3_entity.c b/src/world/area_tik/tik_07/tik_07_3_entity.c new file mode 100644 index 0000000000..590f198666 --- /dev/null +++ b/src/world/area_tik/tik_07/tik_07_3_entity.c @@ -0,0 +1,14 @@ +#include "tik_07.h" +#include "entity.h" + +#define SUPER_BLOCK_MAPVAR MV_SuperBlock +#define SUPER_BLOCK_GAMEFLAG GF_TIK07_SuperBlock +#include "world/common/entity/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.data.inc.c" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, 306, 90, -104, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_TIK07_Item_StarPiece) + EVT_MAKE_SUPER_BLOCK(820, 70, -5, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_07/tik_07_4_drips.c b/src/world/area_tik/tik_07/tik_07_4_drips.c new file mode 100644 index 0000000000..08e167f8b4 --- /dev/null +++ b/src/world/area_tik/tik_07/tik_07_4_drips.c @@ -0,0 +1,40 @@ +#include "tik_07.h" + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 3, + .volumes = { + { + .minPos = { -264, -61 }, + .maxPos = { 150, 188 }, + .startY = 230, + .endY = -10, + .duration = 60, + .density = 2, + }, + { + .minPos = { 31, -20 }, + .maxPos = { 297, 156 }, + .startY = 230, + .endY = -10, + .duration = 60, + .density = 2, + }, + { + .minPos = { 108, -117 }, + .maxPos = { 56, 43 }, + .startY = 230, + .endY = 90, + .duration = 40, + .density = 1, + }, + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_07/tik_07_5_platforms.c b/src/world/area_tik/tik_07/tik_07_5_platforms.c new file mode 100644 index 0000000000..df2b904b4e --- /dev/null +++ b/src/world/area_tik/tik_07/tik_07_5_platforms.c @@ -0,0 +1,96 @@ +#include "tik_07.h" + +s32 N(PlatformColliders)[] = { + COLLIDER_o31, + COLLIDER_o32, + COLLIDER_o33, + COLLIDER_o34, +}; + +API_CALLABLE(N(PausePlatformsDuringPound)) { + PlayerStatus* player = &gPlayerStatus; + u32 i; + + for (i = 0; i < ARRAY_COUNT(N(PlatformColliders)); i++) { + if (gCollisionStatus.currentFloor != N(PlatformColliders)[i]) { + continue; + } + if ((player->actionState == ACTION_STATE_SPIN_POUND) || (player->actionState == ACTION_STATE_TORNADO_POUND)) { + return ApiStatus_BLOCK; + } + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_UpdatePlatform) = { + EVT_SET_GROUP(EVT_GROUP_EF) + EVT_CALL(ParentColliderToModel, LVarB, LVarA) + EVT_SETF(LVar0, EVT_FLOAT(0.0)) + EVT_SETF(LVarD, EVT_FLOAT(-90.0)) + EVT_SUBF(LVarD, LVarC) + EVT_LABEL(0) + EVT_SETF(LVar1, LVarC) + EVT_LABEL(1) + EVT_CALL(N(PausePlatformsDuringPound)) + EVT_ADDF(LVar0, EVT_FLOAT(1.5)) + EVT_ADDF(LVar1, EVT_FLOAT(1.5)) + EVT_CALL(TranslateModel, LVarA, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, LVarB) + EVT_WAIT(1) + EVT_IF_LT(LVar1, EVT_FLOAT(310.0)) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(TranslateModel, LVarA, 0, LVarD, 0) + EVT_SETF(LVar0, LVarD) + EVT_SETF(LVarC, EVT_FLOAT(-90.0)) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CreatePlatform1) = { + EVT_SET(LVarA, MODEL_o32) + EVT_SET(LVarB, COLLIDER_o32) + EVT_SET(LVarC, 110) + EVT_EXEC_WAIT(N(EVS_UpdatePlatform)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CreatePlatform2) = { + EVT_SET(LVarA, MODEL_o31) + EVT_SET(LVarB, COLLIDER_o31) + EVT_SET(LVarC, 10) + EVT_EXEC_WAIT(N(EVS_UpdatePlatform)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CreatePlatform3) = { + EVT_SET(LVarA, MODEL_o33) + EVT_SET(LVarB, COLLIDER_o33) + EVT_SET(LVarC, -90) + EVT_EXEC_WAIT(N(EVS_UpdatePlatform)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CreatePlatform4) = { + EVT_SET(LVarA, MODEL_o34) + EVT_SET(LVarB, COLLIDER_o34) + EVT_SET(LVarC, -190) + EVT_EXEC_WAIT(N(EVS_UpdatePlatform)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupPlatforms) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o48, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_CreatePlatform1)) + EVT_EXEC(N(EVS_CreatePlatform2)) + EVT_EXEC(N(EVS_CreatePlatform3)) + EVT_EXEC(N(EVS_CreatePlatform4)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_07/tik_07_6_npc.c b/src/world/area_tik/tik_07/tik_07_6_npc.c new file mode 100644 index 0000000000..9f1c8d7577 --- /dev/null +++ b/src/world/area_tik/tik_07/tik_07_6_npc.c @@ -0,0 +1,53 @@ +#include "tik_07.h" + +#include "world/common/enemy/complete/Paragloomba_Wander.inc.c" + +StaticNpc N(NpcData_Paragloomba_01) = { + .id = NPC_Paragoomba_01, + .settings = &N(NpcSettings_Paragloomba_Wander), + .pos = { 230.0f, 50.0f, 50.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = PARAGLOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 230, 50, 50 }, + .wanderSize = { 20 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 230, 50, 50 }, + .detectSize = { 150 }, + } + }, + .animations = PARAGLOOMBA_ANIMS, +}; + +StaticNpc N(NpcData_Paragloomba_02) = { + .id = NPC_Paragoomba_02, + .settings = &N(NpcSettings_Paragloomba_Wander), + .pos = { 535.0f, 50.0f, 20.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = PARAGLOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 535, 50, 20 }, + .wanderSize = { 20 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 535, 50, 20 }, + .detectSize = { 150 }, + } + }, + .animations = PARAGLOOMBA_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Paragloomba_01), BTL_TIK_FORMATION_0C, BTL_TIK_STAGE_01), + NPC_GROUP(N(NpcData_Paragloomba_02), BTL_TIK_FORMATION_0D, BTL_TIK_STAGE_01), + {} +}; diff --git a/src/world/area_tik/tik_08/87EDF0.c b/src/world/area_tik/tik_08/87EDF0.c deleted file mode 100644 index a897859af9..0000000000 --- a/src/world/area_tik/tik_08/87EDF0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "tik_08.h" - -static char* N(exit_str_0) = "tik_09"; -static char* N(exit_str_1) = "tik_20"; -static char* N(exit_str_2) = "tik_06"; -static char* N(exit_str_3) = "jan_03"; - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_tik/tik_08/87F3E0.c b/src/world/area_tik/tik_08/87F3E0.c deleted file mode 100644 index de1db4bd10..0000000000 --- a/src/world/area_tik/tik_08/87F3E0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "tik_08.h" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" - -#include "world/common/todo/SetEntityPosition.inc.c" diff --git a/src/world/area_tik/tik_08/87F820.c b/src/world/area_tik/tik_08/87F820.c deleted file mode 100644 index 0a104ebdc2..0000000000 --- a/src/world/area_tik/tik_08/87F820.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "tik_08.h" - -#include "world/common/todo/GetFloorCollider.inc.c" - -extern s16 D_80242C0E_8819FE[0][2]; - -ApiStatus func_80240A5C_87F84C(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Enemy* enemy = script->owner1.enemy; - s32 index = evt_get_variable(script, *args++); - - gCurrentEncounter.encounterList[enemy->encounterIndex]->battle = D_80242C0E_8819FE[index][0]; - return ApiStatus_DONE2; -} diff --git a/src/world/area_tik/tik_08/tik_08.h b/src/world/area_tik/tik_08/tik_08.h index 90618a8728..76e25eee41 100644 --- a/src/world/area_tik/tik_08/tik_08.h +++ b/src/world/area_tik/tik_08/tik_08.h @@ -2,8 +2,27 @@ /// @brief Toad Town Tunnels - Second Level Entry (B2) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_08_shape.h" +#include "mapfs/tik_08_hit.h" + +enum { + NPC_Blooper = 0, +}; + +enum { + MV_BlueSwitch = MapVar(0), +}; + #define NAMESPACE tik_08 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_PlayBlooperSong); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SpawnSwitch); +extern EvtScript N(EVS_SetupDrips); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_tik/tik_08/tik_08_0_header.c b/src/world/area_tik/tik_08/tik_08_0_header.c new file mode 100644 index 0000000000..f1f3ce05b3 --- /dev/null +++ b/src/world/area_tik/tik_08/tik_08_0_header.c @@ -0,0 +1,16 @@ +#include "tik_08.h" + +EntryList N(Entrances) = { + [tik_08_ENTRY_0] { -520.0, -10.0, 0.0, 90.0 }, + [tik_08_ENTRY_1] { 170.0, -10.0, 0.0, 270.0 }, + [tik_08_ENTRY_2] { -375.0, 200.0, 0.0, 90.0 }, + [tik_08_ENTRY_3] { -467.0, -10.0, -110.0, 90.0 }, + [tik_08_ENTRY_4] { 95.0, 25.0, -88.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_08 }, +}; diff --git a/src/world/area_tik/tik_08/tik_08_1_music.c b/src/world/area_tik/tik_08/tik_08_1_music.c new file mode 100644 index 0000000000..8de69840c8 --- /dev/null +++ b/src/world/area_tik/tik_08/tik_08_1_music.c @@ -0,0 +1,13 @@ +#include "tik_08.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayBlooperSong) = { + EVT_CALL(SetMusicTrack, 0, SONG_BLOOPER_THEME, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_08/tik_08_2_main.c b/src/world/area_tik/tik_08/tik_08_2_main.c new file mode 100644 index 0000000000..94aa20394a --- /dev/null +++ b/src/world/area_tik/tik_08/tik_08_2_main.c @@ -0,0 +1,87 @@ +#include "tik_08.h" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_09_1) = EVT_EXIT_WALK(60, tik_08_ENTRY_0, "tik_09", tik_09_ENTRY_1); +EvtScript N(EVS_ExitWalk_tik_20_0) = EVT_EXIT_WALK(60, tik_08_ENTRY_1, "tik_20", tik_20_ENTRY_0); + +EvtScript N(EVS_GotoMap_tik_06_2) = { + EVT_CALL(GotoMap, EVT_PTR("tik_06"), tik_06_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_tik_06_2) = EVT_EXIT_PIPE_HORIZONTAL(tik_06_ENTRY_3, COLLIDER_ttd, N(EVS_GotoMap_tik_06_2)); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_09_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_20_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ttd, COLLIDER_FLAGS_UPPER_MASK) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_tik_06_2)), TRIGGER_WALL_PUSH, COLLIDER_ttd, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_08) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(PlaySound, SOUND_80000033) + EVT_CALL(PlaySoundAtF, SOUND_80000034, 1, -30, -30, -85) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_CALL(EnableTexPanning, MODEL_nagare1, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o92, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 70, 100, 100, 130) + 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_CALL(EnableTexPanning, MODEL_taki, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_4) + TEX_PAN_PARAMS_STEP( -50, -900, -70,-1200) + 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_CALL(EnableTexPanning, MODEL_takib, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_5) + TEX_PAN_PARAMS_STEP( 0,-1400,-2600, -60) + 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_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o77, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o75, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o77, COLLIDER_FLAGS_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o75, COLLIDER_FLAGS_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_suimen, SURFACE_TYPE_WATER) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttd, COLLIDER_FLAGS_UPPER_MASK) + EVT_WAIT(1) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(tik_08_ENTRY_2) + EVT_EXEC_WAIT(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(tik_08_ENTRY_4) + EVT_ENTER_PIPE_VERTICAL(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(tik_08_ENTRY_3) + EVT_ENTER_PIPE_HORIZONTAL(COLLIDER_ttd, N(EVS_BindExitTriggers)) + EVT_CASE_DEFAULT + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_08/tik_08_3_drips.c b/src/world/area_tik/tik_08/tik_08_3_drips.c new file mode 100644 index 0000000000..811e971a7d --- /dev/null +++ b/src/world/area_tik/tik_08/tik_08_3_drips.c @@ -0,0 +1,32 @@ +#include "tik_08.h" + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 2, + .volumes = { + { + .minPos = { -519, -19 }, + .maxPos = { 259, 46 }, + .startY = 200, + .endY = -10, + .duration = 60, + .density = 2, + }, + { + .minPos = { 133, -100 }, + .maxPos = { 45, 235 }, + .startY = 200, + .endY = -10, + .duration = 60, + .density = 1, + }, + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_08/tik_08_4_entity.c b/src/world/area_tik/tik_08/tik_08_4_entity.c new file mode 100644 index 0000000000..9abdd07d9c --- /dev/null +++ b/src/world/area_tik/tik_08/tik_08_4_entity.c @@ -0,0 +1,53 @@ +#include "tik_08.h" +#include "entity.h" + +#include "world/common/todo/SetEntityPosition.inc.c" + +EvtScript N(EVS_SpawnSwitch) = { + EVT_CALL(PlaySoundAt, SOUND_301, 0, 90, 200, 100) + EVT_CALL(MakeLerp, 200, -10, 25, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetEntityPosition), MV_BlueSwitch, 90, LVar0, 100) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAt, SOUND_48, 0, 90, LVar0, 100) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_jan_03_3) = { + EVT_CALL(GotoMap, EVT_PTR("jan_03"), jan_03_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnSwitchActivate) = { + EVT_WAIT(10) + EVT_CALL(PlaySound, SOUND_208E) + EVT_SET(GF_TIK08_WarpPipe, TRUE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_TIK08_WarpPipe, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), 0, -1000, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_TIK_04)) + EVT_SET(MV_BlueSwitch, LVar0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnSwitchActivate)), TRIGGER_AREA_FLAG_SET, AF_TIK_04, 1, 0) + EVT_IF_EQ(GF_TIK08_Defeated_Blooper, TRUE) + EVT_CALL(N(SetEntityPosition), MV_BlueSwitch, 90, -10, 100) + EVT_END_IF + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueWarpPipe), 95, -10, -88, 0, tik_08_ENTRY_4, EVT_PTR(N(EVS_GotoMap_jan_03_3)), EVT_INDEX_OF_GAME_FLAG(GF_TIK08_WarpPipe), MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_08/tik_08_5_npc.c b/src/world/area_tik/tik_08/tik_08_5_npc.c new file mode 100644 index 0000000000..ed433f690a --- /dev/null +++ b/src/world/area_tik/tik_08/tik_08_5_npc.c @@ -0,0 +1,121 @@ +#include "tik_08.h" + +#include "world/common/todo/GetFloorCollider.inc.c" + +#include "world/common/enemy/complete/Blooper.inc.c" + +EvtScript N(EVS_NpcIdle_Blooper) = { + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(N(GetFloorCollider), LVar0) + EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) + EVT_IF_EQ(LVar0, 11) + EVT_IF_GE(LVar2, -20) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC(N(EVS_PlayBlooperSong)) + EVT_CALL(ShowMessageAtScreenPos, MSG_MGM_0000, 160, 40) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -25, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -25, LVar1, LVar2) + 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(InterpPlayerYaw, 270, 0) + EVT_WAIT(20) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3DC, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, 0) + EVT_CALL(MakeLerp, -250, -60, 15, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcPos, NPC_SELF, -40, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_LOOP(6) + EVT_CALL(SetNpcPos, NPC_SELF, -40, -57, 0) + EVT_WAIT(1) + EVT_CALL(SetNpcPos, NPC_SELF, -40, -60, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(5) + EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Blooper) = { + EVT_WAIT(5) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Blooper_Anim04) + EVT_CALL(MakeLerp, 0, 6 * 360, 40, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3DD, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E7, 0) + EVT_CALL(NpcFlyTo, NPC_SELF, -40, -250, 0, 40, 0, EASING_LINEAR) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC_WAIT(N(EVS_SpawnSwitch)) + EVT_IF_EQ(GF_TIK_DefeatedOneBlooper, FALSE) + EVT_SET(GF_TIK_DefeatedOneBlooper, TRUE) + EVT_ELSE + EVT_SET(GF_TIK_DefeatedTwoBloopers, TRUE) + EVT_END_IF + EVT_SET(GF_TIK08_Defeated_Blooper, TRUE) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Blooper) = { + EVT_IF_EQ(GF_TIK08_Defeated_Blooper, FALSE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Blooper))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Blooper))) + EVT_IF_EQ(GF_TIK_DefeatedOneBlooper, FALSE) + EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(0.75), EVT_FLOAT(0.75), EVT_FLOAT(0.75)) + EVT_CALL(N(GetBlooperBattleID), 0) + EVT_ELSE + EVT_IF_EQ(GF_TIK_DefeatedTwoBloopers, FALSE) + EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(1.25), EVT_FLOAT(1.25), EVT_FLOAT(1.25)) + EVT_CALL(N(GetBlooperBattleID), 1) + EVT_ELSE + EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(2.0), EVT_FLOAT(2.0), EVT_FLOAT(2.0)) + EVT_CALL(N(GetBlooperBattleID), 2) + EVT_END_IF + EVT_END_IF + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Blooper) = { + .id = NPC_Blooper, + .settings = &N(NpcSettings_Blooper), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .init = &N(EVS_NpcInit_Blooper), + .drops = BLOOPER_NO_DROPS, + .animations = BLOOPER_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Blooper), BTL_TIK2_FORMATION_00, BTL_TIK2_STAGE_00), + {} +}; diff --git a/src/world/area_tik/tik_09/8821C0.c b/src/world/area_tik/tik_09/8821C0.c deleted file mode 100644 index 2bcce9e795..0000000000 --- a/src/world/area_tik/tik_09/8821C0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "tik_09.h" - -static char* N(exit_str_0) = "tik_10"; -static char* N(exit_str_1) = "tik_08"; -static char* N(exit_str_2) = "mim_11"; -static char* N(exit_str_3) = ""; - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_tik/tik_09/8827B0.c b/src/world/area_tik/tik_09/8827B0.c deleted file mode 100644 index 3bbe192bbf..0000000000 --- a/src/world/area_tik/tik_09/8827B0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "tik_09.h" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" - -#include "world/common/todo/SetEntityPosition.inc.c" diff --git a/src/world/area_tik/tik_09/882BF0.c b/src/world/area_tik/tik_09/882BF0.c deleted file mode 100644 index 1ae7bb7bc9..0000000000 --- a/src/world/area_tik/tik_09/882BF0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "tik_09.h" - -#include "world/common/enemy/ai/TackleAI.inc.c" - -#include "world/common/util/GetDefeatedEnemyCount.inc.c" diff --git a/src/world/area_tik/tik_09/tik_09.h b/src/world/area_tik/tik_09/tik_09.h index e1afa2e885..ddd2bfb3b6 100644 --- a/src/world/area_tik/tik_09/tik_09.h +++ b/src/world/area_tik/tik_09/tik_09.h @@ -2,8 +2,28 @@ /// @brief Toad Town Tunnels - Warp Zone 2 (B2) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_09_shape.h" +#include "mapfs/tik_09_hit.h" + +enum { + NPC_KoopaTroopa_01 = 0, + NPC_KoopaTroopa_02 = 1, + NPC_KoopaTroopa_03 = 2, +}; + +enum { + MV_Unk_00 = MapVar(0), +}; + #define NAMESPACE tik_09 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupDrips); +extern EvtScript N(EVS_SpawnSwitch); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_tik/tik_09/tik_09_0_header.c b/src/world/area_tik/tik_09/tik_09_0_header.c new file mode 100644 index 0000000000..5b82039dba --- /dev/null +++ b/src/world/area_tik/tik_09/tik_09_0_header.c @@ -0,0 +1,14 @@ +#include "tik_09.h" + +EntryList N(Entrances) = { + [tik_09_ENTRY_0] { -225.0, -10.0, 0.0, 90.0 }, + [tik_09_ENTRY_1] { 325.0, -10.0, 0.0, 270.0 }, + [tik_09_ENTRY_2] { -30.0, 25.0, -40.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_09 }, +}; diff --git a/src/world/area_tik/tik_09/tik_09_1_music.c b/src/world/area_tik/tik_09/tik_09_1_music.c new file mode 100644 index 0000000000..0fce685e49 --- /dev/null +++ b/src/world/area_tik/tik_09/tik_09_1_music.c @@ -0,0 +1,7 @@ +#include "tik_09.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_09/tik_09_2_main.c b/src/world/area_tik/tik_09/tik_09_2_main.c new file mode 100644 index 0000000000..fdb7e493e7 --- /dev/null +++ b/src/world/area_tik/tik_09/tik_09_2_main.c @@ -0,0 +1,136 @@ +#include "tik_09.h" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_CloseGates) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(PlaySound, SOUND_A) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o59, SOUND_26B, 0) + EVT_CALL(MakeLerp, 60, 0, 25, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_ew_kousi, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_ee_kousi, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_o59, SOUND_26C, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o58, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o59, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_WAIT(1) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_tik_10_0) = EVT_EXIT_WALK(60, tik_09_ENTRY_0, "tik_10", tik_10_ENTRY_0); +EvtScript N(EVS_ExitWalk_tik_08_0) = EVT_EXIT_WALK(60, tik_09_ENTRY_1, "tik_08", tik_08_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_10_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_08_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, tik_09_ENTRY_2) + EVT_ENTER_PIPE_VERTICAL(N(EVS_BindExitTriggers)) + EVT_ELSE + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC_WAIT(EnterWalk) + EVT_IF_EQ(GF_TIK09_Defeated_Ambush, FALSE) + EVT_EXEC_WAIT(N(EVS_CloseGates)) + EVT_END_IF + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +#include "world/common/atomic/tik_Flotsam.inc.c" + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_09) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(PlaySound, SOUND_80000035) + EVT_CALL(PlaySoundAtF, SOUND_80000036, 1, -190, -20, -120) + EVT_CALL(PlaySoundAtF, SOUND_80000037, 1, 50, -20, -120) + EVT_CALL(PlaySoundAtF, SOUND_80000038, 1, 290, -20, -120) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o84, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o85, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o86, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 70, 100, 100, 130) + 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_CALL(EnableTexPanning, MODEL_taki, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_4) + TEX_PAN_PARAMS_STEP( -50, -900, -70,-1200) + 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_CALL(EnableTexPanning, MODEL_takib, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_5) + TEX_PAN_PARAMS_STEP( 0,-1400,-2600, -60) + 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_CALL(EnableTexPanning, MODEL_nagare2, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o87, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o88, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o89, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_6) + TEX_PAN_PARAMS_STEP( 200, 400, 250, 0) + 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_CALL(SetRenderMode, MODEL_o90, RENDER_MODE_SURFACE_XLU_LAYER2) + EVT_CALL(SetRenderMode, MODEL_nagab, RENDER_MODE_SURFACE_XLU_LAYER2) + EVT_THREAD + EVT_SET(LVar2, MODEL_bin) + EVT_EXEC(N(EVS_Flotsam_Bobbing)) + EVT_WAIT(5) + EVT_SET(LVar2, MODEL_kan1) + EVT_EXEC(N(EVS_Flotsam_Bobbing)) + EVT_WAIT(5) + EVT_SET(LVar2, MODEL_kan2) + EVT_EXEC(N(EVS_Flotsam_Bobbing)) + EVT_END_THREAD + EVT_CALL(TranslateModel, MODEL_ew_kousi, 0, 60, 0) + EVT_CALL(TranslateModel, MODEL_ee_kousi, 0, 60, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o58, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o59, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ClearAmbientSounds, 250) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_09/tik_09_3_drips.c b/src/world/area_tik/tik_09/tik_09_3_drips.c new file mode 100644 index 0000000000..e6843d2f6b --- /dev/null +++ b/src/world/area_tik/tik_09/tik_09_3_drips.c @@ -0,0 +1,24 @@ +#include "tik_09.h" + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 1, + .volumes = { + { + .minPos = { -223, -31 }, + .maxPos = { 550, 68 }, + .startY = 200, + .endY = -10, + .duration = 60, + .density = 3, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_09/tik_09_4_entity.c b/src/world/area_tik/tik_09/tik_09_4_entity.c new file mode 100644 index 0000000000..4d7915ae16 --- /dev/null +++ b/src/world/area_tik/tik_09/tik_09_4_entity.c @@ -0,0 +1,74 @@ +#include "tik_09.h" +#include "entity.h" + +#include "world/common/todo/SetEntityPosition.inc.c" + +EvtScript N(EVS_SpawnSwitch) = { + EVT_CALL(AwaitPlayerLeave, -10, 10, 50) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(GetCurrentPartner, LVar0) + EVT_IF_NE(LVar0, 8) + EVT_LOOP(0) + EVT_CALL(GetPlayerActionState, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, ACTION_STATE_IDLE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_IF + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(InterpCamTargetPos, 0, 1, -10, -10, 10, 20) + EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySoundAt, SOUND_301, 0, -10, 200, 10) + EVT_CALL(MakeLerp, 200, -10, 25, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetEntityPosition), MV_Unk_00, -10, LVar0, 10) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAt, SOUND_48, 0, -10, LVar0, 10) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(InterpCamTargetPos, 0, 1, LVar0, LVar1, LVar2, 20) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_mim_11_3) = { + EVT_CALL(GotoMap, EVT_PTR("mim_11"), mim_11_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayRisingPipeSound) = { + EVT_WAIT(10) + EVT_CALL(PlaySound, SOUND_208E) + EVT_SET(GF_TIK09_WarpPipe, TRUE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_TIK09_WarpPipe, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), NPC_DISPOSE_LOCATION, 0, MAKE_ENTITY_END) + EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_TIK_05)) + EVT_SET(MV_Unk_00, LVar0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_PlayRisingPipeSound)), TRIGGER_AREA_FLAG_SET, AF_TIK_05, 1, 0) + EVT_IF_EQ(GF_TIK09_Defeated_Ambush, TRUE) + EVT_CALL(N(SetEntityPosition), MV_Unk_00, -10, -10, 10) + EVT_END_IF + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueWarpPipe), -30, -10, -40, 0, tik_09_ENTRY_2, EVT_PTR(N(EVS_GotoMap_mim_11_3)), EVT_INDEX_OF_GAME_FLAG(GF_TIK09_WarpPipe), MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; + +MAP_RODATA_PAD(1,entity) diff --git a/src/world/area_tik/tik_09/tik_09_5_npc.c b/src/world/area_tik/tik_09/tik_09_5_npc.c new file mode 100644 index 0000000000..df62b61582 --- /dev/null +++ b/src/world/area_tik/tik_09/tik_09_5_npc.c @@ -0,0 +1,129 @@ +#include "tik_09.h" + +#include "world/common/enemy/complete/DarkTroopa_Wander.inc.c" + +#include "world/common/util/GetDefeatedEnemyCount.inc.c" + +EvtScript N(EVS_OpenGates) = { + EVT_CALL(MakeLerp, 0, 60, 25, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_ew_kousi, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_ee_kousi, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o58, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o59, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_DarkTroopa) = { + 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_TIK09_Defeated_Ambush, TRUE) + EVT_EXEC(N(EVS_SpawnSwitch)) + EVT_EXEC(N(EVS_OpenGates)) + EVT_END_IF + 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_DarkTroopa) = { + EVT_IF_EQ(GF_TIK09_Defeated_Ambush, FALSE) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_DarkTroopa))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_KoopaTroopa_01) = { + .id = NPC_KoopaTroopa_01, + .settings = &N(NpcSettings_DarkTroopa_Wander), + .pos = { -80.0f, -10.0f, 0.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .init = &N(EVS_NpcInit_DarkTroopa), + .drops = DARK_TROOPA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -80, -10, 0 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -80, -10, 0 }, + .detectSize = { 200 }, + } + }, + .animations = DARK_TROOPA_ANIMS, + .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, +}; + +StaticNpc N(NpcData_KoopaTroopa_02) = { + .id = NPC_KoopaTroopa_02, + .settings = &N(NpcSettings_DarkTroopa_Wander), + .pos = { 60.0f, -10.0f, 0.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .init = &N(EVS_NpcInit_DarkTroopa), + .drops = DARK_TROOPA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 60, -10, 0 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 60, -10, 0 }, + .detectSize = { 200 }, + } + }, + .animations = DARK_TROOPA_ANIMS, + .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, +}; + +StaticNpc N(NpcData_KoopaTroopa_03) = { + .id = NPC_KoopaTroopa_03, + .settings = &N(NpcSettings_DarkTroopa_Wander), + .pos = { 180.0f, -10.0f, 0.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_40000, + .init = &N(EVS_NpcInit_DarkTroopa), + .drops = DARK_TROOPA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 180, -10, 0 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 180, -10, 0 }, + .detectSize = { 200 }, + } + }, + .animations = DARK_TROOPA_ANIMS, + .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_KoopaTroopa_01), BTL_TIK_FORMATION_02, BTL_TIK_STAGE_03), + NPC_GROUP(N(NpcData_KoopaTroopa_02), BTL_TIK_FORMATION_01, BTL_TIK_STAGE_03), + NPC_GROUP(N(NpcData_KoopaTroopa_03), BTL_TIK_FORMATION_00, BTL_TIK_STAGE_03), + {} +}; diff --git a/src/world/area_tik/tik_10/8863C0.c b/src/world/area_tik/tik_10/8863C0.c deleted file mode 100644 index 248853e944..0000000000 --- a/src/world/area_tik/tik_10/8863C0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "tik_10.h" - -static char* N(exit_str_0) = "tik_09"; -static char* N(exit_str_1) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_tik/tik_10/8866D0.c b/src/world/area_tik/tik_10/8866D0.c deleted file mode 100644 index 5aa265632c..0000000000 --- a/src/world/area_tik/tik_10/8866D0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "tik_10.h" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" - -#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_10/tik_10.h b/src/world/area_tik/tik_10/tik_10.h index 6217cf915a..3eabb899bd 100644 --- a/src/world/area_tik/tik_10/tik_10.h +++ b/src/world/area_tik/tik_10/tik_10.h @@ -2,8 +2,20 @@ /// @brief Toad Town Tunnels - Block Puzzle Room (B2) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_10_shape.h" +#include "mapfs/tik_10_hit.h" + +enum { + MV_SuperBlock = MapVar(0), +}; + #define NAMESPACE tik_10 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupDrips); diff --git a/src/world/area_tik/tik_10/tik_10_0_header.c b/src/world/area_tik/tik_10/tik_10_0_header.c new file mode 100644 index 0000000000..47c0faa7ad --- /dev/null +++ b/src/world/area_tik/tik_10/tik_10_0_header.c @@ -0,0 +1,12 @@ +#include "tik_10.h" + +EntryList N(Entrances) = { + [tik_10_ENTRY_0] { 330.0, 20.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_10 }, +}; diff --git a/src/world/area_tik/tik_10/tik_10_1_music.c b/src/world/area_tik/tik_10/tik_10_1_music.c new file mode 100644 index 0000000000..b1562e76d2 --- /dev/null +++ b/src/world/area_tik/tik_10/tik_10_1_music.c @@ -0,0 +1,7 @@ +#include "tik_10.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_10/tik_10_2_main.c b/src/world/area_tik/tik_10/tik_10_2_main.c new file mode 100644 index 0000000000..f095063bbb --- /dev/null +++ b/src/world/area_tik/tik_10/tik_10_2_main.c @@ -0,0 +1,35 @@ +#include "tik_10.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_09_0) = EVT_EXIT_WALK(60, tik_10_ENTRY_0, "tik_09", tik_09_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_09_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_10) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(PlaySound, SOUND_80000039) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 50, 200, 110, 500) + 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_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_10/tik_10_3_drips.c b/src/world/area_tik/tik_10/tik_10_3_drips.c new file mode 100644 index 0000000000..69ac57d7aa --- /dev/null +++ b/src/world/area_tik/tik_10/tik_10_3_drips.c @@ -0,0 +1,32 @@ +#include "tik_10.h" + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 2, + .volumes = { + { + .minPos = { -220, 20 }, + .maxPos = { 110, 50 }, + .startY = 250, + .endY = 20, + .duration = 60, + .density = 3, + }, + { + .minPos = { 160, 10 }, + .maxPos = { 160, 60 }, + .startY = 250, + .endY = 20, + .duration = 60, + .density = 1, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_10/tik_10_4_entity.c b/src/world/area_tik/tik_10/tik_10_4_entity.c new file mode 100644 index 0000000000..67a0628663 --- /dev/null +++ b/src/world/area_tik/tik_10/tik_10_4_entity.c @@ -0,0 +1,24 @@ +#include "tik_10.h" +#include "entity.h" + +#define SUPER_BLOCK_MAPVAR MV_SuperBlock +#define SUPER_BLOCK_GAMEFLAG GF_TIK10_SuperBlock +#include "world/common/entity/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.data.inc.c" + +EvtScript N(EVS_MakeEntities) = { + EVT_MAKE_SUPER_BLOCK(-140, 160, -40, 0) + EVT_CALL(CreatePushBlockGrid, 0, 7, 6, -64, -15, -94, 0) + EVT_CALL(SetPushBlock, 0, 1, 4, 1) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), -52, 70, -32, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK10_HiddenItem_CoinA) + EVT_CALL(UseDynamicShadow, TRUE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 23, 70, -32, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK10_HiddenItem_CoinB) + EVT_CALL(UseDynamicShadow, TRUE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 98, 70, -32, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK10_HiddenItem_CoinC) + EVT_CALL(UseDynamicShadow, TRUE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_12/888BD0.c b/src/world/area_tik/tik_12/888BD0.c deleted file mode 100644 index 56f979ed1e..0000000000 --- a/src/world/area_tik/tik_12/888BD0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "tik_12.h" - -static char* N(exit_str_0) = "tik_04"; -static char* N(exit_str_1) = ""; - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c deleted file mode 100644 index 712be18304..0000000000 --- a/src/world/area_tik/tik_12/8891C0.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "tik_12.h" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" - -#include "world/common/todo/StashVars.inc.c" - -#include "world/common/todo/GetItemName.inc.c" - -#include "world/common/todo/SomeItemEntityFunc.inc.c" - -#include "world/common/todo/IsItemBadge.inc.c" - -#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_12/88A530.c b/src/world/area_tik/tik_12/88A530.c deleted file mode 100644 index a49d908c24..0000000000 --- a/src/world/area_tik/tik_12/88A530.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "tik_12.h" - -#include "world/common/enemy/ai/TackleAI.inc.c" - -#include "world/common/todo/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_tik/tik_12/tik_12.h b/src/world/area_tik/tik_12/tik_12.h index e4cdb3c356..9a3a672ccf 100644 --- a/src/world/area_tik/tik_12/tik_12.h +++ b/src/world/area_tik/tik_12/tik_12.h @@ -2,8 +2,27 @@ /// @brief Toad Town Tunnels - Metal Block Room (B3) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_12_shape.h" +#include "mapfs/tik_12_hit.h" + +#include "sprite/npc/BuzzyBeetle.h" + +enum { + NPC_BuzzyBeetle = 0, +}; + +enum { + MV_SuperBlock = MapVar(0), +}; + #define NAMESPACE tik_12 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupDrips); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_tik/tik_12/tik_12_0_header.c b/src/world/area_tik/tik_12/tik_12_0_header.c new file mode 100644 index 0000000000..97f8483600 --- /dev/null +++ b/src/world/area_tik/tik_12/tik_12_0_header.c @@ -0,0 +1,12 @@ +#include "tik_12.h" + +EntryList N(Entrances) = { + [tik_12_ENTRY_0] { -173.0, -135.0, -100.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_12 }, +}; diff --git a/src/world/area_tik/tik_12/tik_12_1_music.c b/src/world/area_tik/tik_12/tik_12_1_music.c new file mode 100644 index 0000000000..4e58d9c578 --- /dev/null +++ b/src/world/area_tik/tik_12/tik_12_1_music.c @@ -0,0 +1,7 @@ +#include "tik_12.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_12/tik_12_2_main.c b/src/world/area_tik/tik_12/tik_12_2_main.c new file mode 100644 index 0000000000..102401fb10 --- /dev/null +++ b/src/world/area_tik/tik_12/tik_12_2_main.c @@ -0,0 +1,46 @@ +#include "tik_12.h" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_GotoMap_tik_04_3) = { + EVT_CALL(GotoMap, EVT_PTR("tik_04"), tik_04_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_tik_04_3) = EVT_EXIT_PIPE_HORIZONTAL(tik_12_ENTRY_0, COLLIDER_o48, N(EVS_GotoMap_tik_04_3)); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o48, COLLIDER_FLAGS_UPPER_MASK) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_tik_04_3)), TRIGGER_WALL_PUSH, COLLIDER_o48, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_12) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_CALL(EnableTexPanning, MODEL_mizu, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 0, -200, -100, -500) + 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_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o48, COLLIDER_FLAGS_UPPER_MASK) + EVT_ENTER_PIPE_HORIZONTAL(COLLIDER_o48, N(EVS_BindExitTriggers)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_12/tik_12_3_drips.c b/src/world/area_tik/tik_12/tik_12_3_drips.c new file mode 100644 index 0000000000..d8a6032daa --- /dev/null +++ b/src/world/area_tik/tik_12/tik_12_3_drips.c @@ -0,0 +1,24 @@ +#include "tik_12.h" + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 1, + .volumes = { + { + .minPos = { -216, -56 }, + .maxPos = { 318, 193 }, + .startY = 200, + .endY = -135, + .duration = 100, + .density = 3, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_12/tik_12_4_entity.c b/src/world/area_tik/tik_12/tik_12_4_entity.c new file mode 100644 index 0000000000..0a1826d132 --- /dev/null +++ b/src/world/area_tik/tik_12/tik_12_4_entity.c @@ -0,0 +1,58 @@ +#include "tik_12.h" +#include "entity.h" + +// begin incomplete Chest include +//#include "world/common/atomic/Chest.inc.c" + +#include "world/common/todo/StashVars.inc.c" +#include "world/common/todo/GetItemName.inc.c" +#include "world/common/todo/SomeItemEntityFunc.inc.c" +#include "world/common/todo/IsItemBadge.inc.c" + +s32** N(varStash) = NULL; + +EvtScript N(EVS_Chest_ShowGotItem) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_FULL) + EVT_WAIT(40) + EVT_CALL(ShowGotItem, LVar0, FALSE, 0) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_RETURN + EVT_END +}; + +MAP_RODATA_PAD(1,unk) + +// end incomplete Chest include + +#define SUPER_BLOCK_MAPVAR MV_SuperBlock +#define SUPER_BLOCK_GAMEFLAG GF_TIK02_SuperBlock +#include "world/common/entity/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.data.inc.c" + +EvtScript N(EVS_SmashBlockA) = { + EVT_SET(GF_TIK12_Hammer3BlockA, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SmashBlockB) = { + EVT_SET(GF_TIK12_Hammer3BlockB, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_MAKE_SUPER_BLOCK(240, 0, -40, 0) + EVT_IF_EQ(GF_TIK12_Hammer3BlockA, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer3Block), 140, -135, 55, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_SmashBlockA))) + EVT_END_IF + EVT_IF_EQ(GF_TIK12_Hammer3BlockB, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer3Block), 140, -135, 105, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_SmashBlockB))) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_12/tik_12_5_npc.c b/src/world/area_tik/tik_12/tik_12_5_npc.c new file mode 100644 index 0000000000..b07a71a72e --- /dev/null +++ b/src/world/area_tik/tik_12/tik_12_5_npc.c @@ -0,0 +1,31 @@ +#include "tik_12.h" + +#include "world/common/enemy/complete/SpikeTop.inc.c" + +StaticNpc N(NpcData_BuzzyBeetle) = { + .id = NPC_BuzzyBeetle, + .settings = &N(NpcSettings_BuzzyBeetle), + .pos = { -6.0f, -135.0f, 75.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .drops = BUZZY_BEETLE_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -6, -135, 75 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 60, -135, 5 }, + .detectSize = { 150 }, + } + }, + .animations = BUZZY_BEETLE_ANIMS, + .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_BuzzyBeetle), BTL_TIK_FORMATION_15, BTL_TIK_STAGE_01), + {} +}; diff --git a/src/world/area_tik/tik_14/88D600.c b/src/world/area_tik/tik_14/88D600.c deleted file mode 100644 index 664458bba4..0000000000 --- a/src/world/area_tik/tik_14/88D600.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "tik_14.h" - -static char* N(exit_str_0) = "tik_15"; -static char* N(exit_str_1) = "tik_21"; - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_tik/tik_14/88DBF0.c b/src/world/area_tik/tik_14/88DBF0.c deleted file mode 100644 index 22904fe7fb..0000000000 --- a/src/world/area_tik/tik_14/88DBF0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "tik_14.h" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" diff --git a/src/world/area_tik/tik_14/tik_14.h b/src/world/area_tik/tik_14/tik_14.h index 6ad0ef04fd..8271e407b5 100644 --- a/src/world/area_tik/tik_14/tik_14.h +++ b/src/world/area_tik/tik_14/tik_14.h @@ -2,8 +2,16 @@ /// @brief Toad Town Tunnels - Rip Cheato Antechamber (B3) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_14_shape.h" +#include "mapfs/tik_14_hit.h" + #define NAMESPACE tik_14 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupDrips); diff --git a/src/world/area_tik/tik_14/tik_14_0_header.c b/src/world/area_tik/tik_14/tik_14_0_header.c new file mode 100644 index 0000000000..8df46c7c37 --- /dev/null +++ b/src/world/area_tik/tik_14/tik_14_0_header.c @@ -0,0 +1,13 @@ +#include "tik_14.h" + +EntryList N(Entrances) = { + [tik_14_ENTRY_0] { -173.0, 0.0, 0.0, 90.0 }, + [tik_14_ENTRY_1] { 30.0, 0.0, 45.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_14 }, +}; diff --git a/src/world/area_tik/tik_14/tik_14_1_music.c b/src/world/area_tik/tik_14/tik_14_1_music.c new file mode 100644 index 0000000000..bebe326242 --- /dev/null +++ b/src/world/area_tik/tik_14/tik_14_1_music.c @@ -0,0 +1,7 @@ +#include "tik_14.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_14/tik_14_2_main.c b/src/world/area_tik/tik_14/tik_14_2_main.c new file mode 100644 index 0000000000..acb53ccafd --- /dev/null +++ b/src/world/area_tik/tik_14/tik_14_2_main.c @@ -0,0 +1,61 @@ +#include "tik_14.h" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_15_0) = EVT_EXIT_WALK(60, tik_14_ENTRY_1, "tik_15", tik_15_ENTRY_0); + +EvtScript N(EVS_GotoMap_tik_21_2) = { + EVT_CALL(GotoMap, EVT_PTR("tik_21"), tik_21_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_tik_21_2) = EVT_EXIT_PIPE_HORIZONTAL(tik_14_ENTRY_0, COLLIDER_o47, N(EVS_GotoMap_tik_21_2)); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_tik_21_2)), TRIGGER_WALL_PUSH, COLLIDER_o47, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_15_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o47, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(tik_14_ENTRY_0) + EVT_ENTER_PIPE_HORIZONTAL(COLLIDER_o47, N(EVS_BindExitTriggers)) + EVT_CASE_EQ(tik_14_ENTRY_1) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_14) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(EnableTexPanning, MODEL_mizu, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 0, -200, -100, -500) + 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_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o47, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_14/tik_14_3_drips.c b/src/world/area_tik/tik_14/tik_14_3_drips.c new file mode 100644 index 0000000000..cbba8d5e59 --- /dev/null +++ b/src/world/area_tik/tik_14/tik_14_3_drips.c @@ -0,0 +1,24 @@ +#include "tik_14.h" + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 1, + .volumes = { + { + .minPos = { -215, 35 }, + .maxPos = { 228, 102 }, + .startY = 210, + .endY = 0, + .duration = 60, + .density = 2, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_14/tik_14_4_entity.c b/src/world/area_tik/tik_14/tik_14_4_entity.c new file mode 100644 index 0000000000..c01f986f5e --- /dev/null +++ b/src/world/area_tik/tik_14/tik_14_4_entity.c @@ -0,0 +1,34 @@ +#include "tik_14.h" +#include "entity.h" +#include "effects.h" + +BombTrigger N(BombPos_Wall) = { + .pos = { 35.0f, 0.0f, 45.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_OnBlast_Wall) = { + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 9, 0, 1, 10, 30) + EVT_LOOP(10) + EVT_CALL(EnableModel, MODEL_a_kabe, TRUE) + EVT_WAIT(1) + EVT_CALL(EnableModel, MODEL_a_kabe, FALSE) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_TIK14_BombedWall, TRUE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_TIK14_BombedWall, TRUE) + EVT_CALL(EnableModel, MODEL_a_kabe, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnBlast_Wall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Wall)), 1, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_15/88FBA0.c b/src/world/area_tik/tik_15/88FBA0.c deleted file mode 100644 index 755d6b89e1..0000000000 --- a/src/world/area_tik/tik_15/88FBA0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "tik_15.h" - -static char* N(exit_str_0) = "tik_14"; -static char* N(exit_str_1) = "mac_02"; - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_tik/tik_15/890190.c b/src/world/area_tik/tik_15/890190.c deleted file mode 100644 index 30cf377ff2..0000000000 --- a/src/world/area_tik/tik_15/890190.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "tik_15.h" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" - -#include "world/common/todo/StashVars.inc.c" - -#include "world/common/todo/GetItemName.inc.c" - -extern s32 D_802427BC_89235C[13][2]; - -ApiStatus func_80240A78_890618(Evt* script, s32 isInitialCall) { - s32* array = D_802427BC_89235C[script->varTable[0]]; - - script->varTable[0xA] = array[0]; - script->varTable[0xB] = array[1]; - return ApiStatus_DONE2; -} - -ApiStatus func_80240AA4_890644(Evt* script, s32 isInitialCall) { - script->varTable[0] = get_item_empty_count(); - return ApiStatus_DONE2; -} - -ApiStatus func_80240AD0_890670(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - evt_set_variable(script, *args++, gPlayerData.coins >= 64); - return ApiStatus_DONE2; -} diff --git a/src/world/area_tik/tik_15/tik_15.h b/src/world/area_tik/tik_15/tik_15.h index a4659a6215..c320d1f23d 100644 --- a/src/world/area_tik/tik_15/tik_15.h +++ b/src/world/area_tik/tik_15/tik_15.h @@ -2,8 +2,23 @@ /// @brief Toad Town Tunnels - Rip Cheato's Home (B3) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_15_shape.h" +#include "mapfs/tik_15_hit.h" + +#include "sprite/npc/RipCheato.h" + +enum { + NPC_RipCheato = 1, +}; + #define NAMESPACE tik_15 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupDrips); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_tik/tik_15/tik_15_0_header.c b/src/world/area_tik/tik_15/tik_15_0_header.c new file mode 100644 index 0000000000..3bb7069ed3 --- /dev/null +++ b/src/world/area_tik/tik_15/tik_15_0_header.c @@ -0,0 +1,13 @@ +#include "tik_15.h" + +EntryList N(Entrances) = { + [tik_15_ENTRY_0] { -230.0, -10.0, 0.0, 90.0 }, + [tik_15_ENTRY_1] { 75.0, -10.0, -15.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_15 }, +}; diff --git a/src/world/area_tik/tik_15/tik_15_1_music.c b/src/world/area_tik/tik_15/tik_15_1_music.c new file mode 100644 index 0000000000..7b8513cd04 --- /dev/null +++ b/src/world/area_tik/tik_15/tik_15_1_music.c @@ -0,0 +1,7 @@ +#include "tik_15.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_15/tik_15_2_main.c b/src/world/area_tik/tik_15/tik_15_2_main.c new file mode 100644 index 0000000000..4546d465c8 --- /dev/null +++ b/src/world/area_tik/tik_15/tik_15_2_main.c @@ -0,0 +1,53 @@ +#include "tik_15.h" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_14_1) = EVT_EXIT_WALK(60, tik_15_ENTRY_0, "tik_14", tik_14_ENTRY_1); + +EvtScript N(EVS_GotoMap_mac_02_5) = { + EVT_CALL(GotoMap, EVT_PTR("mac_02"), mac_02_ENTRY_5) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_mac_02_5) = EVT_EXIT_PIPE_HORIZONTAL(tik_15_ENTRY_1, COLLIDER_o59, N(EVS_GotoMap_mac_02_5)); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_14_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_mac_02_5)), TRIGGER_WALL_PUSH, COLLIDER_o59, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_15) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_CALL(EnableTexPanning, MODEL_mizu, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 0, -200, -100, -500) + 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_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, tik_15_ENTRY_1) + EVT_ENTER_PIPE_HORIZONTAL(COLLIDER_o59, N(EVS_BindExitTriggers)) + EVT_ELSE + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_IF + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_15/tik_15_3_entity.c b/src/world/area_tik/tik_15/tik_15_3_entity.c new file mode 100644 index 0000000000..718bed66d6 --- /dev/null +++ b/src/world/area_tik/tik_15/tik_15_3_entity.c @@ -0,0 +1,34 @@ +#include "tik_15.h" +#include "entity.h" +#include "effects.h" + +BombTrigger N(BombPos_Wall) = { + .pos = { -230.0f, -10.0f, 0.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_OnBlast_Wall) = { + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 18, 0, 1, 10, 30) + EVT_LOOP(10) + EVT_CALL(EnableModel, MODEL_a_kabe, TRUE) + EVT_WAIT(1) + EVT_CALL(EnableModel, MODEL_a_kabe, FALSE) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_TIK14_BombedWall, TRUE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_TIK14_BombedWall, TRUE) + EVT_CALL(EnableModel, MODEL_a_kabe, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnBlast_Wall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Wall)), 1, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_15/tik_15_4_drips.c b/src/world/area_tik/tik_15/tik_15_4_drips.c new file mode 100644 index 0000000000..b7b80aa217 --- /dev/null +++ b/src/world/area_tik/tik_15/tik_15_4_drips.c @@ -0,0 +1,24 @@ +#include "tik_15.h" + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 1, + .volumes = { + { + .minPos = { -220, -18 }, + .maxPos = { 243, 155 }, + .startY = 200, + .endY = -10, + .duration = 60, + .density = 2, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_15/tik_15_5_npc.c b/src/world/area_tik/tik_15/tik_15_5_npc.c new file mode 100644 index 0000000000..2287f9ce69 --- /dev/null +++ b/src/world/area_tik/tik_15/tik_15_5_npc.c @@ -0,0 +1,165 @@ +#include "tik_15.h" + +#define RIP_CHEATO_COST 64 + +enum { + CHEATO_TYPE_STAR_PIECE = 0, + CHEATO_TYPE_BADGE = 1, + CHEATO_TYPE_CONSUMABLE = 2, +}; + +NpcSettings N(NpcSettings_RipCheato) = { + .height = 30, + .radius = 24, + .level = 99, +}; + +NpcSettings N(NpcSettings_Unused1) = { + .height = 23, + .radius = 19, + .level = 99, +}; + +#include "world/common/complete/GiveReward.inc.c" + +s32 N(CheatoItems)[][2] = { + { CHEATO_TYPE_STAR_PIECE, ITEM_NONE }, + { CHEATO_TYPE_CONSUMABLE, ITEM_LIFE_SHROOM }, + { CHEATO_TYPE_BADGE, ITEM_BUMP_ATTACK }, + { CHEATO_TYPE_CONSUMABLE, ITEM_REPEL_GEL }, + { CHEATO_TYPE_STAR_PIECE, ITEM_NONE }, + { CHEATO_TYPE_CONSUMABLE, ITEM_SUPER_SHROOM }, + { CHEATO_TYPE_CONSUMABLE, ITEM_MUSHROOM }, + { CHEATO_TYPE_CONSUMABLE, ITEM_DRIED_SHROOM }, + { CHEATO_TYPE_CONSUMABLE, ITEM_DRIED_SHROOM }, + { CHEATO_TYPE_STAR_PIECE, ITEM_NONE }, + { CHEATO_TYPE_CONSUMABLE, ITEM_DRIED_SHROOM }, + { CHEATO_TYPE_CONSUMABLE, ITEM_DRIED_SHROOM }, + { CHEATO_TYPE_CONSUMABLE, ITEM_DRIED_SHROOM }, +}; + +API_CALLABLE(N(GetNextCheatoItem)) { + s32* purchase = N(CheatoItems)[script->varTable[0]]; + + script->varTable[10] = purchase[0]; + script->varTable[11] = purchase[1]; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(CheckPlayerHasEnoughRoom)) { + script->varTable[0] = get_item_empty_count(); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(CheckPlayerHasEnoughCoins)) { + Bytecode* args = script->ptrReadPos; + + evt_set_variable(script, *args++, gPlayerData.coins >= RIP_CHEATO_COST); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcInteract_RipCheato) = { + EVT_IF_EQ(AF_TIK_02, FALSE) + EVT_IF_EQ(GF_TIK15_Met_RipCheato, FALSE) + EVT_SET(LVar0, MSG_MGM_0001) + EVT_SET(GF_TIK15_Met_RipCheato, TRUE) + EVT_ELSE + EVT_SET(LVar0, MSG_MGM_0002) + EVT_END_IF + EVT_SET(AF_TIK_02, TRUE) + EVT_ELSE + EVT_SET(LVar0, MSG_MGM_0003) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_RipCheato, ANIM_RipCheato_Talk, ANIM_RipCheato_Idle, 0, LVar0) + EVT_LABEL(0) + EVT_CALL(ShowCoinCounter, TRUE) + EVT_CALL(ShowChoice, MSG_Choice_0001) + EVT_IF_NE(LVar0, 0) + EVT_CALL(ShowCoinCounter, FALSE) + EVT_CALL(ContinueSpeech, NPC_RipCheato, ANIM_RipCheato_Talk, ANIM_RipCheato_Idle, 0, MSG_MGM_0005) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(CheckPlayerHasEnoughCoins), LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowCoinCounter, FALSE) + EVT_CALL(ContinueSpeech, NPC_RipCheato, ANIM_RipCheato_Talk, ANIM_RipCheato_Idle, 0, MSG_MGM_0006) + EVT_RETURN + EVT_END_IF + EVT_SET(LVar0, GB_TIK15_RipCheato_PurchaseCount) + EVT_CALL(N(GetNextCheatoItem)) + EVT_SWITCH(LVarA) + EVT_CASE_EQ(CHEATO_TYPE_STAR_PIECE) + EVT_CALL(AddCoin, -RIP_CHEATO_COST) + EVT_CALL(ShowCoinCounter, FALSE) + EVT_CALL(EndSpeech, NPC_RipCheato, ANIM_RipCheato_Talk, ANIM_RipCheato_Idle, 0) + EVT_GIVE_STAR_PIECE() + EVT_CASE_EQ(CHEATO_TYPE_BADGE) + EVT_CALL(AddCoin, -RIP_CHEATO_COST) + EVT_CALL(ShowCoinCounter, FALSE) + EVT_CALL(EndSpeech, NPC_RipCheato, ANIM_RipCheato_Talk, ANIM_RipCheato_Idle, 0) + EVT_GIVE_BADGE_REWARD(ITEM_BUMP_ATTACK) + EVT_CASE_EQ(CHEATO_TYPE_CONSUMABLE) + EVT_CALL(N(CheckPlayerHasEnoughRoom)) + EVT_IF_LE(LVar0, 0) + EVT_CALL(ShowCoinCounter, FALSE) + EVT_CALL(ContinueSpeech, NPC_RipCheato, ANIM_RipCheato_Talk, ANIM_RipCheato_Idle, 0, MSG_MGM_0007) + EVT_RETURN + EVT_END_IF + EVT_CALL(AddCoin, -RIP_CHEATO_COST) + EVT_CALL(ShowCoinCounter, FALSE) + EVT_CALL(EndSpeech, NPC_RipCheato, ANIM_RipCheato_Talk, ANIM_RipCheato_Idle, 0) + EVT_GIVE_CONSUMABLE_REWARD_ALT(LVarB) + EVT_END_SWITCH + EVT_IF_LT(GB_TIK15_RipCheato_PurchaseCount, 10) + EVT_ADD(GB_TIK15_RipCheato_PurchaseCount, 1) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_RipCheato, ANIM_RipCheato_Talk, ANIM_RipCheato_Idle, 0, MSG_MGM_0004) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_RipCheato) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_RipCheato))) + EVT_SET(AF_TIK_02, FALSE) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_RipCheato) = { + .id = NPC_RipCheato, + .settings = &N(NpcSettings_RipCheato), + .pos = { -80.0f, -10.0f, 0.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_RipCheato), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_RipCheato_Idle, + .walk = ANIM_RipCheato_Idle, + .run = ANIM_RipCheato_Idle, + .chase = ANIM_RipCheato_Idle, + .anim_4 = ANIM_RipCheato_Idle, + .anim_5 = ANIM_RipCheato_Idle, + .death = ANIM_RipCheato_Idle, + .hit = ANIM_RipCheato_Idle, + .anim_8 = ANIM_RipCheato_Idle, + .anim_9 = ANIM_RipCheato_Idle, + .anim_A = ANIM_RipCheato_Idle, + .anim_B = ANIM_RipCheato_Idle, + .anim_C = ANIM_RipCheato_Idle, + .anim_D = ANIM_RipCheato_Idle, + .anim_E = ANIM_RipCheato_Idle, + .anim_F = ANIM_RipCheato_Idle, + }, + .tattle = MSG_NpcTattle_RipCheato, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_RipCheato), BTL_KMR_PART_1_FORMATION_06), + {} +}; diff --git a/src/world/area_tik/tik_17/892A20.c b/src/world/area_tik/tik_17/892A20.c deleted file mode 100644 index e62e4dde11..0000000000 --- a/src/world/area_tik/tik_17/892A20.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "tik_17.h" - -static char* N(exit_str_0) = "sam_02"; -static char* N(exit_str_1) = "kmr_22"; -static char* N(exit_str_2) = "tik_22"; -static char* N(exit_str_3) = ""; - -ApiStatus func_80240000_892A20(Evt* script, s32 isInitialCall) { - bgm_set_track_volumes(0, 2); - return ApiStatus_DONE2; -} - diff --git a/src/world/area_tik/tik_17/892A50.c b/src/world/area_tik/tik_17/892A50.c deleted file mode 100644 index c2ed3d4c51..0000000000 --- a/src/world/area_tik/tik_17/892A50.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "tik_17.h" - -#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_17/893790.c b/src/world/area_tik/tik_17/893790.c deleted file mode 100644 index e075667d3c..0000000000 --- a/src/world/area_tik/tik_17/893790.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "tik_17.h" - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_tik/tik_17/tik_17.h b/src/world/area_tik/tik_17/tik_17.h index ebadfaa1ee..828d245aed 100644 --- a/src/world/area_tik/tik_17/tik_17.h +++ b/src/world/area_tik/tik_17/tik_17.h @@ -2,8 +2,19 @@ /// @brief Toad Town Tunnels - Frozen Room (B3) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_17_shape.h" +#include "mapfs/tik_17_hit.h" + +enum { + MV_SuperBlock = MapVar(0), +}; + #define NAMESPACE tik_17 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_tik/tik_17/tik_17_0_header.c b/src/world/area_tik/tik_17/tik_17_0_header.c new file mode 100644 index 0000000000..3ac642aff3 --- /dev/null +++ b/src/world/area_tik/tik_17/tik_17_0_header.c @@ -0,0 +1,13 @@ +#include "tik_17.h" + +EntryList N(Entrances) = { + [tik_17_ENTRY_0] { 400.0, 20.0, 10.0, 180.0 }, + [tik_17_ENTRY_1] { 720.0, 65.0, 5.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_17 }, +}; diff --git a/src/world/area_tik/tik_17/tik_17_1_music.c b/src/world/area_tik/tik_17/tik_17_1_music.c new file mode 100644 index 0000000000..82aafa74cc --- /dev/null +++ b/src/world/area_tik/tik_17/tik_17_1_music.c @@ -0,0 +1,16 @@ +#include "tik_17.h" + +API_CALLABLE(N(AdjustTrackVolumes)) { + bgm_set_track_volumes(0, TRACK_VOLS_2); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(N(AdjustTrackVolumes)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_17/tik_17_2_entity.c b/src/world/area_tik/tik_17/tik_17_2_entity.c new file mode 100644 index 0000000000..32791377c1 --- /dev/null +++ b/src/world/area_tik/tik_17/tik_17_2_entity.c @@ -0,0 +1,13 @@ +#include "tik_17.h" +#include "entity.h" + +#define SUPER_BLOCK_MAPVAR MV_SuperBlock +#define SUPER_BLOCK_GAMEFLAG GF_TIK17_SuperBlock +#include "world/common/entity/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.data.inc.c" + +EvtScript N(EVS_MakeEntities) = { + EVT_MAKE_SUPER_BLOCK(-130, 50, 0, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_17/tik_17_3_main.c b/src/world/area_tik/tik_17/tik_17_3_main.c new file mode 100644 index 0000000000..6a8053a923 --- /dev/null +++ b/src/world/area_tik/tik_17/tik_17_3_main.c @@ -0,0 +1,65 @@ +#include "tik_17.h" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_GotoMap_sam_02_2) = { + EVT_IF_EQ(GF_StartedChapter7, FALSE) + EVT_SET(GF_StartedChapter7, TRUE) + EVT_CALL(FadeOutMusic, 0, 1500) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_7, TRANSITION_6) + EVT_WAIT(100) + EVT_RETURN + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("sam_02"), sam_02_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_sam_02_2) = EVT_EXIT_PIPE_HORIZONTAL(tik_17_ENTRY_1, COLLIDER_o105, N(EVS_GotoMap_sam_02_2)); + +EvtScript N(EVS_GotoMap_tik_22_1) = { + EVT_CALL(GotoMap, EVT_PTR("tik_22"), tik_22_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_tik_22_1) = EVT_EXIT_PIPE_VERTICAL(tik_17_ENTRY_0, COLLIDER_o58, N(EVS_GotoMap_tik_22_1)); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_sam_02_2)), TRIGGER_WALL_PUSH, COLLIDER_o105, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_tik_22_1)), TRIGGER_FLOOR_TOUCH, COLLIDER_o58, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_WAIT(1) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, tik_17_ENTRY_0) + EVT_ENTER_PIPE_HORIZONTAL(COLLIDER_o105, N(EVS_BindExitTriggers)) + EVT_ELSE + EVT_ENTER_PIPE_VERTICAL(N(EVS_BindExitTriggers)) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(SetTexPanner, MODEL_kiri, TEX_PANNER_1) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( -300, 0, 0, 0) + 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_tik/tik_18/8956E0.c b/src/world/area_tik/tik_18/8956E0.c deleted file mode 100644 index 005c47181e..0000000000 --- a/src/world/area_tik/tik_18/8956E0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "tik_18.h" - -static char* N(exit_str_0) = "tik_06"; -static char* N(exit_str_1) = "tik_02"; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_tik/tik_18/8959F0.c b/src/world/area_tik/tik_18/8959F0.c deleted file mode 100644 index 0c57431a8d..0000000000 --- a/src/world/area_tik/tik_18/8959F0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "tik_18.h" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" - -ApiStatus func_80240680_895D60(Evt* script, s32 isInitialCall) { - Enemy* enemy = get_enemy_safe(1); - - if (enemy != NULL) { - enemy->varTable[0] = 1; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_tik/tik_18/tik_18.h b/src/world/area_tik/tik_18/tik_18.h index 2395d97fce..34289f140c 100644 --- a/src/world/area_tik/tik_18/tik_18.h +++ b/src/world/area_tik/tik_18/tik_18.h @@ -2,8 +2,22 @@ /// @brief Toad Town Tunnels - Hall to Blooper 1 (B1) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_18_shape.h" +#include "mapfs/tik_18_hit.h" + +enum { + NPC_Gloomba = 0, + NPC_SpikedGloomba = 1, +}; + #define NAMESPACE tik_18 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupDrips); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_tik/tik_18/tik_18_0_header.c b/src/world/area_tik/tik_18/tik_18_0_header.c new file mode 100644 index 0000000000..3034a23898 --- /dev/null +++ b/src/world/area_tik/tik_18/tik_18_0_header.c @@ -0,0 +1,13 @@ +#include "tik_18.h" + +EntryList N(Entrances) = { + [tik_18_ENTRY_0] { -220.0, -10.0, 0.0, 90.0 }, + [tik_18_ENTRY_1] { 320.0, -10.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_18 }, +}; diff --git a/src/world/area_tik/tik_18/tik_18_1_music.c b/src/world/area_tik/tik_18/tik_18_1_music.c new file mode 100644 index 0000000000..a1d87e91f8 --- /dev/null +++ b/src/world/area_tik/tik_18/tik_18_1_music.c @@ -0,0 +1,7 @@ +#include "tik_18.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_18/tik_18_2_main.c b/src/world/area_tik/tik_18/tik_18_2_main.c new file mode 100644 index 0000000000..31230c2cb9 --- /dev/null +++ b/src/world/area_tik/tik_18/tik_18_2_main.c @@ -0,0 +1,56 @@ +#include "tik_18.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_06_1) = EVT_EXIT_WALK(60, tik_18_ENTRY_0, "tik_06", tik_06_ENTRY_1); +EvtScript N(EVS_ExitWalk_tik_02_0) = EVT_EXIT_WALK(60, tik_18_ENTRY_1, "tik_02", tik_02_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_06_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_02_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_18) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o44, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o45, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(PlaySound, SOUND_80000043) + EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 50, 200, 110, 500) + 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_CALL(EnableTexPanning, MODEL_mizu, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 0, -200, -100, -500) + 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_CALL(EnableTexPanning, MODEL_mizu2, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_3) + TEX_PAN_PARAMS_STEP( 0, -250, -100, -500) + 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_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_18/tik_18_3_drips.c b/src/world/area_tik/tik_18/tik_18_3_drips.c new file mode 100644 index 0000000000..7d28c365dc --- /dev/null +++ b/src/world/area_tik/tik_18/tik_18_3_drips.c @@ -0,0 +1,24 @@ +#include "tik_18.h" + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 1, + .volumes = { + { + .minPos = { -233, -117 }, + .maxPos = { 545, 187 }, + .startY = 200, + .endY = -10, + .duration = 60, + .density = 4, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_18/tik_18_4_npc.c b/src/world/area_tik/tik_18/tik_18_4_npc.c new file mode 100644 index 0000000000..b992d04f4f --- /dev/null +++ b/src/world/area_tik/tik_18/tik_18_4_npc.c @@ -0,0 +1,103 @@ +#include "tik_18.h" + +#include "world/common/enemy/complete/Gloomba_Wander.inc.c" +#include "world/common/enemy/complete/SpikedGloomba_Wander.inc.c" + +EvtScript N(EVS_NpcIdle_SpikedGloomba) = { + // wait for activation from block breaking + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_FALSE(LVar0) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_SpikedGoomba_Dark_Sleep) + EVT_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_3E1, 0) + EVT_CALL(MakeLerp, -90, 0, 10, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_SELF, LVar0, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(GetNpcPos, NPC_SELF, LVarA, LVarB, LVarC) + EVT_CALL(MakeLerp, 0, 360, 15, EASING_LINEAR) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) + EVT_END_THREAD + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.7)) + EVT_CALL(NpcJump0, NPC_SELF, 190, -10, -10, 25) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_SpikedGoomba_Dark_Laugh) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_SpikedGoomba_Dark_Idle) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_SpikedGloomba_Wander))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_SpikedGloomba) = { + EVT_CALL(SetNpcPos, NPC_SELF, 150, 76, -63) + EVT_CALL(SetNpcRotation, NPC_SELF, -85, 0, 0) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_SpikedGloomba))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Gloomba) = { + .id = NPC_Gloomba, + .settings = &N(NpcSettings_Gloomba_Wander), + .pos = { -60.0f, -10.0f, -30.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .drops = GLOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -60, -10, -30 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -60, -10, -30 }, + .detectSize = { 200 }, + } + }, + .animations = GLOOMBA_ANIMS, +}; + +StaticNpc N(NpcData_SpikedGloomba) = { + .id = NPC_SpikedGloomba, + .settings = &N(NpcSettings_SpikedGloomba_Wander), + .pos = { 30.0f, -10.0f, -20.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_SpikedGloomba), + .drops = SPIKED_GLOOMBA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 30, -10, -20 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 30, -10, -20 }, + .detectSize = { 200 }, + } + }, + .animations = SPIKED_GLOOMBA_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Gloomba), BTL_TIK_FORMATION_0A, BTL_TIK_STAGE_00), + NPC_GROUP(N(NpcData_SpikedGloomba), BTL_TIK_FORMATION_0E, BTL_TIK_STAGE_00), + {} +}; diff --git a/src/world/area_tik/tik_18/tik_18_5_entity.c b/src/world/area_tik/tik_18/tik_18_5_entity.c new file mode 100644 index 0000000000..83233aba58 --- /dev/null +++ b/src/world/area_tik/tik_18/tik_18_5_entity.c @@ -0,0 +1,33 @@ +#include "tik_18.h" +#include "entity.h" + +API_CALLABLE(N(WakeSpikedGoomba)) { + Enemy* enemy = get_enemy_safe(1); + + if (enemy != NULL) { + enemy->varTable[0] = TRUE; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_OnBreakBlock) = { + EVT_CALL(N(WakeSpikedGoomba)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 200, 50, -75, 0, ITEM_SUPER_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK18_HiddenItem_SuperShroom) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 0, 50, -75, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK18_MultiCoinBrick) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -100, 50, -75, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -50, 50, -75, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 50, 50, -75, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 100, 50, -75, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 250, 50, -75, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 150, 50, -75, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnBreakBlock))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_19/8975E0.c b/src/world/area_tik/tik_19/8975E0.c deleted file mode 100644 index 5c56a1ff88..0000000000 --- a/src/world/area_tik/tik_19/8975E0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "tik_19.h" - -static char* N(exit_str_0) = "mac_00"; -static char* N(exit_str_1) = ""; - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_tik/tik_19/897BD0.c b/src/world/area_tik/tik_19/897BD0.c deleted file mode 100644 index 0777437611..0000000000 --- a/src/world/area_tik/tik_19/897BD0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "tik_19.h" - -#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_tik/tik_19/tik_19.h b/src/world/area_tik/tik_19/tik_19.h index 063af4ff5f..4de68e101c 100644 --- a/src/world/area_tik/tik_19/tik_19.h +++ b/src/world/area_tik/tik_19/tik_19.h @@ -2,8 +2,19 @@ /// @brief Toad Town Tunnels - Under the Toad Town Pond #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_19_shape.h" +#include "mapfs/tik_19_hit.h" + +enum { + MV_SuperBlock = MapVar(0), +}; + #define NAMESPACE tik_19 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_tik/tik_19/tik_19_0_header.c b/src/world/area_tik/tik_19/tik_19_0_header.c new file mode 100644 index 0000000000..9b824be0e7 --- /dev/null +++ b/src/world/area_tik/tik_19/tik_19_0_header.c @@ -0,0 +1,12 @@ +#include "tik_19.h" + +EntryList N(Entrances) = { + [tik_19_ENTRY_0] { -170.0, -10.0, -90.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_19 }, +}; diff --git a/src/world/area_tik/tik_19/tik_19_1_music.c b/src/world/area_tik/tik_19/tik_19_1_music.c new file mode 100644 index 0000000000..ce8f4aeb38 --- /dev/null +++ b/src/world/area_tik/tik_19/tik_19_1_music.c @@ -0,0 +1,7 @@ +#include "tik_19.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_19/tik_19_2_main.c b/src/world/area_tik/tik_19/tik_19_2_main.c new file mode 100644 index 0000000000..370b6135cd --- /dev/null +++ b/src/world/area_tik/tik_19/tik_19_2_main.c @@ -0,0 +1,64 @@ +#include "tik_19.h" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_GotoMap_mac_00_3) = { + EVT_CALL(GotoMap, EVT_PTR("mac_00"), mac_00_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_mac_00_3) = EVT_EXIT_PIPE_HORIZONTAL(tik_19_ENTRY_0, COLLIDER_ttd, N(EVS_GotoMap_mac_00_3)); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ttd, COLLIDER_FLAGS_UPPER_MASK) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_mac_00_3)), TRIGGER_WALL_PUSH, COLLIDER_ttd, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(PlaySound, SOUND_80000044) + EVT_CALL(PlaySoundAtF, SOUND_80000045, 1, 0, -20, 30) + EVT_CALL(PlaySoundAtF, SOUND_80000046, 1, 270, -20, 30) + EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 70, 100, 100, 130) + 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_CALL(EnableTexPanning, MODEL_taki, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_4) + TEX_PAN_PARAMS_STEP( -50, -900, -70,-1200) + 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_CALL(EnableTexPanning, MODEL_takib, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_5) + TEX_PAN_PARAMS_STEP( 0,-1400,-2600, -60) + 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_CALL(SetRenderMode, MODEL_nagare, RENDER_MODE_SURFACE_XLU_LAYER2) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttd, COLLIDER_FLAGS_UPPER_MASK) + EVT_ENTER_PIPE_HORIZONTAL(COLLIDER_ttd, N(EVS_BindExitTriggers)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_19/tik_19_3_entity.c b/src/world/area_tik/tik_19/tik_19_3_entity.c new file mode 100644 index 0000000000..b056334cb1 --- /dev/null +++ b/src/world/area_tik/tik_19/tik_19_3_entity.c @@ -0,0 +1,13 @@ +#include "tik_19.h" +#include "entity.h" + +#define SUPER_BLOCK_MAPVAR MV_SuperBlock +#define SUPER_BLOCK_GAMEFLAG GF_TIK19_SuperBlock +#include "world/common/entity/SuperBlock.inc.c" +#include "world/common/entity/SuperBlock.data.inc.c" + +EvtScript N(EVS_MakeEntities) = { + EVT_MAKE_SUPER_BLOCK(760, 75, -10, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_20/89A350.c b/src/world/area_tik/tik_20/89A350.c deleted file mode 100644 index cb1d01ee84..0000000000 --- a/src/world/area_tik/tik_20/89A350.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "tik_20.h" - -static char* N(exit_str_0) = "tik_08"; -static char* N(exit_str_1) = "tik_21"; -static char* N(exit_str_2) = "tik_23"; -static char* N(exit_str_3) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" diff --git a/src/world/area_tik/tik_20/89ACB0.c b/src/world/area_tik/tik_20/89ACB0.c deleted file mode 100644 index 5931f2a3e6..0000000000 --- a/src/world/area_tik/tik_20/89ACB0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "tik_20.h" - -#include "world/common/enemy/ai/TackleAI.inc.c" diff --git a/src/world/area_tik/tik_20/tik_20.h b/src/world/area_tik/tik_20/tik_20.h index 4029974760..f122a93718 100644 --- a/src/world/area_tik/tik_20/tik_20.h +++ b/src/world/area_tik/tik_20/tik_20.h @@ -2,8 +2,21 @@ /// @brief Toad Town Tunnels - Room with Spikes (B2) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_20_shape.h" +#include "mapfs/tik_20_hit.h" + +enum { + NPC_DarkTroopa_01 = 0, + NPC_DarkTroopa_02 = 1, +}; + #define NAMESPACE tik_20 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern NpcGroupList N(DefaultNPCs); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_tik/tik_20/tik_20_0_header.c b/src/world/area_tik/tik_20/tik_20_0_header.c new file mode 100644 index 0000000000..385f696f39 --- /dev/null +++ b/src/world/area_tik/tik_20/tik_20_0_header.c @@ -0,0 +1,14 @@ +#include "tik_20.h" + +EntryList N(Entrances) = { + [tik_20_ENTRY_0] { -320.0, -20.0, 0.0, 90.0 }, + [tik_20_ENTRY_1] { 507.0, -20.0, 0.0, 270.0 }, + [tik_20_ENTRY_2] { 207.0, 60.0, -100.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_20 }, +}; diff --git a/src/world/area_tik/tik_20/tik_20_1_music.c b/src/world/area_tik/tik_20/tik_20_1_music.c new file mode 100644 index 0000000000..9b0feca3a4 --- /dev/null +++ b/src/world/area_tik/tik_20/tik_20_1_music.c @@ -0,0 +1,7 @@ +#include "tik_20.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_20/tik_20_2_main.c b/src/world/area_tik/tik_20/tik_20_2_main.c new file mode 100644 index 0000000000..1d58a33e9b --- /dev/null +++ b/src/world/area_tik/tik_20/tik_20_2_main.c @@ -0,0 +1,116 @@ +#include "tik_20.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_08_1) = EVT_EXIT_WALK(60, tik_20_ENTRY_0, "tik_08", tik_08_ENTRY_1); +EvtScript N(EVS_ExitWalk_tik_21_0) = EVT_EXIT_WALK(60, tik_20_ENTRY_1, "tik_21", tik_21_ENTRY_0); + +EvtScript N(EVS_GotoMap_tik_23_1) = { + EVT_CALL(GotoMap, EVT_PTR("tik_23"), tik_23_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_tik_23_1) = EVT_EXIT_PIPE_VERTICAL(tik_20_ENTRY_2, COLLIDER_o109, N(EVS_GotoMap_tik_23_1)); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_08_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_21_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_tik_23_1)), TRIGGER_FLOOR_TOUCH, COLLIDER_o109, 1, 0) + EVT_RETURN + EVT_END +}; + +LavaReset N(SafeFloorColliders)[] = { + { .colliderID = COLLIDER_yuka, .pos = { -190.0, 30.0, -85.0 }}, + { .colliderID = COLLIDER_yuka2, .pos = { 200.0, 30.0, -70.0 }}, + { .colliderID = -1 } +}; + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 2, + .volumes = { + { + .minPos = { -312, -19 }, + .maxPos = { 52, 46 }, + .startY = 200, + .endY = -20, + .duration = 60, + .density = 2, + }, + { + .minPos = { 460, -50 }, + .maxPos = { 40, 185 }, + .startY = 200, + .endY = -20, + .duration = 60, + .density = 1, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; + +MAP_RODATA_PAD(1,unk) + +#include "world/common/atomic/tik_Flotsam.inc.c" + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_20) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_toge, SURFACE_TYPE_SPIKES) + EVT_THREAD + EVT_CALL(ResetFromLava, EVT_PTR(N(SafeFloorColliders))) + EVT_END_THREAD + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(PlaySound, SOUND_80000047) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( 70, 100, 100, 130) + 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_CALL(SetTexPanner, MODEL_nagare, 0) + EVT_THREAD + EVT_SET(LVar2, MODEL_bin) + EVT_EXEC(N(EVS_Flotsam_Bobbing)) + EVT_WAIT(5) + EVT_SET(LVar2, MODEL_kan1) + EVT_EXEC(N(EVS_Flotsam_Bobbing)) + EVT_WAIT(5) + EVT_SET(LVar2, MODEL_kan2) + EVT_EXEC(N(EVS_Flotsam_Bobbing)) + EVT_END_THREAD + EVT_WAIT(1) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(tik_20_ENTRY_0) + EVT_CASE_OR_EQ(tik_20_ENTRY_1) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_CASE_GROUP + EVT_CASE_EQ(tik_20_ENTRY_2) + EVT_ENTER_PIPE_VERTICAL(N(EVS_BindExitTriggers)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_20/tik_20_3_npc.c b/src/world/area_tik/tik_20/tik_20_3_npc.c new file mode 100644 index 0000000000..14ec4c6a91 --- /dev/null +++ b/src/world/area_tik/tik_20/tik_20_3_npc.c @@ -0,0 +1,55 @@ +#include "tik_20.h" + +#include "world/common/enemy/complete/DarkTroopa_Wander.inc.c" + +StaticNpc N(NpcData_DarkTroopa_01) = { + .id = NPC_DarkTroopa_01, + .settings = &N(NpcSettings_DarkTroopa_Wander), + .pos = { -50.0f, -20.0f, 100.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = DARK_TROOPA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -50, -20, 100 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -50, -20, 100 }, + .detectSize = { 250 }, + } + }, + .animations = DARK_TROOPA_ANIMS, + .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, +}; + +StaticNpc N(NpcData_DarkTroopa_02) = { + .id = NPC_DarkTroopa_02, + .settings = &N(NpcSettings_DarkTroopa_Wander), + .pos = { 250.0f, -20.0f, 100.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = DARK_TROOPA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 250, -20, 100 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 250, -20, 100 }, + .detectSize = { 250 }, + } + }, + .animations = DARK_TROOPA_ANIMS, + .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_DarkTroopa_01), BTL_TIK_FORMATION_04, BTL_TIK_STAGE_03), + NPC_GROUP(N(NpcData_DarkTroopa_02), BTL_TIK_FORMATION_05, BTL_TIK_STAGE_03), + {} +}; diff --git a/src/world/area_tik/tik_20/tik_20_4_entity.c b/src/world/area_tik/tik_20/tik_20_4_entity.c new file mode 100644 index 0000000000..ecae9101cd --- /dev/null +++ b/src/world/area_tik/tik_20/tik_20_4_entity.c @@ -0,0 +1,9 @@ +#include "tik_20.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 475, 70, -100, 0, ITEM_SHOOTING_STAR, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK20_ItemBlock_ShootingStar) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_21/89D7A0.c b/src/world/area_tik/tik_21/89D7A0.c deleted file mode 100644 index 11c9a0f1bf..0000000000 --- a/src/world/area_tik/tik_21/89D7A0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "tik_21.h" - -static char* N(exit_str_0) = "tik_20"; -static char* N(exit_str_1) = "tik_22"; -static char* N(exit_str_2) = "tik_14"; -static char* N(exit_str_3) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" diff --git a/src/world/area_tik/tik_21/tik_21.h b/src/world/area_tik/tik_21/tik_21.h index 3b6b20e34c..ff8312d245 100644 --- a/src/world/area_tik/tik_21/tik_21.h +++ b/src/world/area_tik/tik_21/tik_21.h @@ -2,8 +2,15 @@ /// @brief Toad Town Tunnels - Hidden Blocks Room (B2) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_21_shape.h" +#include "mapfs/tik_21_hit.h" + #define NAMESPACE tik_21 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_tik/tik_21/tik_21_0_header.c b/src/world/area_tik/tik_21/tik_21_0_header.c new file mode 100644 index 0000000000..6ac4b75a36 --- /dev/null +++ b/src/world/area_tik/tik_21/tik_21_0_header.c @@ -0,0 +1,14 @@ +#include "tik_21.h" + +EntryList N(Entrances) = { + [tik_21_ENTRY_0] { -325.0, -20.0, 0.0, 90.0 }, + [tik_21_ENTRY_1] { 325.0, -20.0, 0.0, 270.0 }, + [tik_21_ENTRY_2] { 270.0, -105.0, 93.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_21 }, +}; diff --git a/src/world/area_tik/tik_21/tik_21_1_music.c b/src/world/area_tik/tik_21/tik_21_1_music.c new file mode 100644 index 0000000000..a3a792f00b --- /dev/null +++ b/src/world/area_tik/tik_21/tik_21_1_music.c @@ -0,0 +1,7 @@ +#include "tik_21.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_21/tik_21_2_main.c b/src/world/area_tik/tik_21/tik_21_2_main.c new file mode 100644 index 0000000000..7a8544dfe6 --- /dev/null +++ b/src/world/area_tik/tik_21/tik_21_2_main.c @@ -0,0 +1,126 @@ +#include "tik_21.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_20_1) = EVT_EXIT_WALK(60, tik_21_ENTRY_0, "tik_20", tik_20_ENTRY_1); + +EvtScript N(EVS_ExitDoors_tik_22_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, tik_21_ENTRY_1) + EVT_SET(LVar1, COLLIDER_tte) + EVT_SET(LVar2, MODEL_o46) + EVT_SET(LVar3, MODEL_o47) + EVT_EXEC(ExitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("tik_22"), tik_22_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_tik_14_0) = { + EVT_CALL(GotoMap, EVT_PTR("tik_14"), tik_14_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_tik_14_0) = EVT_EXIT_PIPE_VERTICAL(tik_21_ENTRY_2, COLLIDER_o49, N(EVS_GotoMap_tik_14_0)); + +EvtScript N(EVS_ShowMessage_DoorLocked) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0177, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_20_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_IF_GE(GB_StoryProgress, STORY_CH7_INVITED_TO_STARBORN_VALLEY) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_tik_22_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShowMessage_DoorLocked)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_END_IF + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_tik_14_0)), TRIGGER_FLOOR_TOUCH, COLLIDER_o49, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(tik_21_ENTRY_0) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(tik_21_ENTRY_1) + EVT_SET(LVar2, MODEL_o46) + EVT_SET(LVar3, MODEL_o47) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(tik_21_ENTRY_2) + EVT_ENTER_PIPE_VERTICAL(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 2, + .volumes = { + { + .minPos = { -320, -19 }, + .maxPos = { 60, 46 }, + .startY = 200, + .endY = -20, + .duration = 60, + .density = 2, + }, + { + .minPos = { 233, -100 }, + .maxPos = { 45, 235 }, + .startY = 200, + .endY = -20, + .duration = 60, + .density = 1, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_21) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_CALL(SetTexPanner, MODEL_mizu, 0) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( 0, -200, -100, -500) + TEX_PAN_PARAMS_FREQ( 0, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_WAIT(1) + EVT_EXEC(N(EVS_EnterMap)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_21/tik_21_3_entity.c b/src/world/area_tik/tik_21/tik_21_3_entity.c new file mode 100644 index 0000000000..df22321c36 --- /dev/null +++ b/src/world/area_tik/tik_21/tik_21_3_entity.c @@ -0,0 +1,17 @@ +#include "tik_21.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -157, -45, 0, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK21_ItemBlock_Coin) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), -82, -45, 0, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK21_HiddenItem_CoinA) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), -7, -45, 0, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK21_HiddenItem_CoinB) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 68, -45, 0, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK21_HiddenItem_CoinC) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 142, -45, 0, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK21_HiddenItem_CoinD) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_22/89FEC0.c b/src/world/area_tik/tik_22/89FEC0.c deleted file mode 100644 index ed68c89828..0000000000 --- a/src/world/area_tik/tik_22/89FEC0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "tik_22.h" - -static char* N(exit_str_0) = "tik_21"; -static char* N(exit_str_1) = "tik_17"; - -ApiStatus func_80240000_89FEC0(Evt* script, s32 isInitialCall) { - bgm_set_track_volumes(0, 2); - return ApiStatus_DONE2; -} diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c deleted file mode 100644 index 884771059b..0000000000 --- a/src/world/area_tik/tik_22/89FEF0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "tik_22.h" - -#include "world/common/atomic/TexturePan.inc.c" - -#include "world/common/entity/Pipe.inc.c" - -ApiStatus func_8024061C_8A04DC(Evt* script, s32 isInitialCall) { - bgm_clear_track_volumes(0, 2); - return ApiStatus_DONE2; -} - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" diff --git a/src/world/area_tik/tik_22/tik_22.h b/src/world/area_tik/tik_22/tik_22.h index a6876dd3b6..84c7446ad8 100644 --- a/src/world/area_tik/tik_22/tik_22.h +++ b/src/world/area_tik/tik_22/tik_22.h @@ -2,8 +2,14 @@ /// @brief Toad Town Tunnels - Path to Shiver City (B2) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_22_shape.h" +#include "mapfs/tik_22_hit.h" + #define NAMESPACE tik_22 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); diff --git a/src/world/area_tik/tik_22/tik_22_0_header.c b/src/world/area_tik/tik_22/tik_22_0_header.c new file mode 100644 index 0000000000..3c91d413bb --- /dev/null +++ b/src/world/area_tik/tik_22/tik_22_0_header.c @@ -0,0 +1,13 @@ +#include "tik_22.h" + +EntryList N(Entrances) = { + [tik_22_ENTRY_0] { -222.0, 0.0, 0.0, 90.0 }, + [tik_22_ENTRY_1] { -50.0, 50.0, 20.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_22 }, +}; diff --git a/src/world/area_tik/tik_22/tik_22_1_music.c b/src/world/area_tik/tik_22/tik_22_1_music.c new file mode 100644 index 0000000000..4ea4c7ebdf --- /dev/null +++ b/src/world/area_tik/tik_22/tik_22_1_music.c @@ -0,0 +1,16 @@ +#include "tik_22.h" + +API_CALLABLE(N(AdjustTrackVolumes)) { + bgm_set_track_volumes(0, TRACK_VOLS_2); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(N(AdjustTrackVolumes)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_22/tik_22_2_main.c b/src/world/area_tik/tik_22/tik_22_2_main.c new file mode 100644 index 0000000000..7e945432e4 --- /dev/null +++ b/src/world/area_tik/tik_22/tik_22_2_main.c @@ -0,0 +1,112 @@ +#include "tik_22.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +API_CALLABLE(N(ResetTrackVolumes)) { + bgm_clear_track_volumes(0, TRACK_VOLS_2); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ExitDoors_tik_21_1) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(ResetTrackVolumes)) + EVT_SET(LVar0, tik_22_ENTRY_0) + EVT_SET(LVar1, COLLIDER_tte) + EVT_SET(LVar2, MODEL_o46) + EVT_SET(LVar3, MODEL_o47) + EVT_EXEC(ExitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("tik_21"), tik_21_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_tik_17_0) = { + EVT_CALL(GotoMap, EVT_PTR("tik_17"), tik_17_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_tik_17_0) = EVT_EXIT_PIPE_VERTICAL(tik_22_ENTRY_1, COLLIDER_o61, N(EVS_GotoMap_tik_17_0)); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_tik_21_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_tik_17_0)), TRIGGER_FLOOR_TOUCH, COLLIDER_o61, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(tik_22_ENTRY_0) + EVT_SET(LVar2, MODEL_o46) + EVT_SET(LVar3, MODEL_o47) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(tik_22_ENTRY_1) + EVT_ENTER_PIPE_VERTICAL(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 2, + .volumes = { + { + .minPos = { -220, -19 }, + .maxPos = { 60, 46 }, + .startY = 200, + .endY = 0, + .duration = 60, + .density = 2, + }, + { + .minPos = { 63, -100 }, + .maxPos = { 47, 235 }, + .startY = 200, + .endY = 0, + .duration = 60, + .density = 1, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_22) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_BASIC) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_CALL(SetTexPanner, MODEL_mizu, 0) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( 0, -200, -100, -500) + TEX_PAN_PARAMS_FREQ( 0, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_WAIT(1) + EVT_EXEC(N(EVS_EnterMap)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_23/8A23D0.c b/src/world/area_tik/tik_23/8A23D0.c deleted file mode 100644 index fe407e4410..0000000000 --- a/src/world/area_tik/tik_23/8A23D0.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "tik_23.h" - -static char* N(exit_str_0) = "tik_24"; -static char* N(exit_str_1) = "tik_20"; - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" diff --git a/src/world/area_tik/tik_23/8A2D30.c b/src/world/area_tik/tik_23/8A2D30.c deleted file mode 100644 index d08ddd868e..0000000000 --- a/src/world/area_tik/tik_23/8A2D30.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "tik_23.h" - -#include "world/common/enemy/ai/TackleAI.inc.c" diff --git a/src/world/area_tik/tik_23/tik_23.h b/src/world/area_tik/tik_23/tik_23.h index 0f08cfe67c..0b73d36604 100644 --- a/src/world/area_tik/tik_23/tik_23.h +++ b/src/world/area_tik/tik_23/tik_23.h @@ -2,8 +2,22 @@ /// @brief Toad Town Tunnels - Windy Path (B3) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_23_shape.h" +#include "mapfs/tik_23_hit.h" + +enum { + NPC_Spiny_01 = 0, + NPC_Spiny_02 = 1, + NPC_Spiny_03 = 2, +}; + #define NAMESPACE tik_23 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_tik/tik_23/tik_23_0_header.c b/src/world/area_tik/tik_23/tik_23_0_header.c new file mode 100644 index 0000000000..07340a42dd --- /dev/null +++ b/src/world/area_tik/tik_23/tik_23_0_header.c @@ -0,0 +1,13 @@ +#include "tik_23.h" + +EntryList N(Entrances) = { + [tik_23_ENTRY_0] { -270.0, -20.0, -20.0, 90.0 }, + [tik_23_ENTRY_1] { 107.0, -20.0, -115.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_23 }, +}; diff --git a/src/world/area_tik/tik_23/tik_23_1_music.c b/src/world/area_tik/tik_23/tik_23_1_music.c new file mode 100644 index 0000000000..2701d8d8af --- /dev/null +++ b/src/world/area_tik/tik_23/tik_23_1_music.c @@ -0,0 +1,7 @@ +#include "tik_23.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_23/tik_23_2_main.c b/src/world/area_tik/tik_23/tik_23_2_main.c new file mode 100644 index 0000000000..451a222ad2 --- /dev/null +++ b/src/world/area_tik/tik_23/tik_23_2_main.c @@ -0,0 +1,100 @@ +#include "tik_23.h" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_24_1) = EVT_EXIT_WALK(60, tik_23_ENTRY_0, "tik_24", tik_24_ENTRY_1); + +EvtScript N(EVS_GotoMap_tik_20_2) = { + EVT_CALL(GotoMap, EVT_PTR("tik_20"), tik_20_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_tik_20_2) = EVT_EXIT_PIPE_HORIZONTAL(tik_23_ENTRY_1, COLLIDER_ttd, N(EVS_GotoMap_tik_20_2)); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_24_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_tik_20_2)), TRIGGER_WALL_PUSH, COLLIDER_ttd, 1, 0) + EVT_RETURN + EVT_END +}; + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 2, + .volumes = { + { + .minPos = { -180, 100 }, + .maxPos = { 160, 36 }, + .startY = 200, + .endY = -20, + .duration = 60, + .density = 2, + }, + { + .minPos = { 265, -120 }, + .maxPos = { 25, 250 }, + .startY = 200, + .endY = -20, + .duration = 60, + .density = 2, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; + +#include "world/common/atomic/tik_Flotsam.inc.c" + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_23) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, tik_23_ENTRY_1) + EVT_ENTER_PIPE_HORIZONTAL(COLLIDER_ttd, N(EVS_BindExitTriggers)) + EVT_ELSE + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_IF + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(PlaySound, SOUND_80000048) + EVT_EXEC_WAIT(N(EVS_SetupDrips)) + EVT_CALL(SetTexPanner, MODEL_nagare1, 0) + EVT_CALL(SetTexPanner, MODEL_o97, 0) + EVT_CALL(SetTexPanner, MODEL_o98, 0) + EVT_CALL(SetTexPanner, MODEL_o99, 0) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( 70, -100, 100, -130) + 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_THREAD + EVT_SET(LVar2, MODEL_bin) + EVT_EXEC(N(EVS_Flotsam_Bobbing)) + EVT_WAIT(5) + EVT_SET(LVar2, MODEL_kan1) + EVT_EXEC(N(EVS_Flotsam_Bobbing)) + EVT_WAIT(5) + EVT_SET(LVar2, MODEL_kan2) + EVT_EXEC(N(EVS_Flotsam_Bobbing)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_23/tik_23_3_entity.c b/src/world/area_tik/tik_23/tik_23_3_entity.c new file mode 100644 index 0000000000..95ec05233c --- /dev/null +++ b/src/world/area_tik/tik_23/tik_23_3_entity.c @@ -0,0 +1,28 @@ +#include "tik_23.h" +#include "entity.h" + +EvtScript N(EVS_OnSmashBlock) = { + EVT_SET(GF_TIK23_Hammer2Block, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o102, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_TIK23_Hammer2Block, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer2Block), -280, -20, -20, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnSmashBlock))) + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o102, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), -75, 40, -120, 0, ITEM_MAPLE_SYRUP, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK23_HiddenItem_MapleSyrup) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 175, 40, 0, 0, ITEM_STOP_WATCH, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK23_HiddenItem_StopWatch) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), -250, 40, -100, 0, ITEM_VOLT_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK23_HiddenItem_VoltShroom) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -200, 40, -100, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK23_ItemBlock_Coin) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_23/tik_23_4_npc.c b/src/world/area_tik/tik_23/tik_23_4_npc.c new file mode 100644 index 0000000000..ba3a8f43fc --- /dev/null +++ b/src/world/area_tik/tik_23/tik_23_4_npc.c @@ -0,0 +1,79 @@ +#include "tik_23.h" + +#include "world/common/enemy/complete/Spiny.inc.c" + +StaticNpc N(NpcData_Spiny_01) = { + .id = NPC_Spiny_01, + .settings = &N(NpcSettings_Spiny), + .pos = { 25.0f, -20.0f, 0.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = SPINY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 25, -20, 0 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 25, -20, 0 }, + .detectSize = { 200 }, + } + }, + .animations = SPINY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, +}; + +StaticNpc N(NpcData_Spiny_02) = { + .id = NPC_Spiny_02, + .settings = &N(NpcSettings_Spiny), + .pos = { 275.0f, -20.0f, 120.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = SPINY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 275, -20, 120 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 275, -20, 120 }, + .detectSize = { 200 }, + } + }, + .animations = SPINY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, +}; + +StaticNpc N(NpcData_Spiny_03) = { + .id = NPC_Spiny_03, + .settings = &N(NpcSettings_Spiny), + .pos = { -150.0f, -20.0f, 120.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = SPINY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -150, -20, 120 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -150, -20, 120 }, + .detectSize = { 200 }, + } + }, + .animations = SPINY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Spiny_01), BTL_TIK_FORMATION_16, BTL_TIK_STAGE_03), + NPC_GROUP(N(NpcData_Spiny_02), BTL_TIK_FORMATION_17, BTL_TIK_STAGE_03), + NPC_GROUP(N(NpcData_Spiny_03), BTL_TIK_FORMATION_16, BTL_TIK_STAGE_03), + {} +}; diff --git a/src/world/area_tik/tik_24/8A5A80.c b/src/world/area_tik/tik_24/8A5A80.c deleted file mode 100644 index 510f481fa4..0000000000 --- a/src/world/area_tik/tik_24/8A5A80.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "tik_24.h" - -s32 func_80240000_8A5A80(void) { - sprintf((s8*) &wMapShapeName, "tik_18_shape"); - sprintf((s8*) &wMapHitName, "tik_18_hit\0\0tik_25\0\0tik_23"); - return 0; -} diff --git a/src/world/area_tik/tik_24/8A5AD0.c b/src/world/area_tik/tik_24/8A5AD0.c deleted file mode 100644 index a9aed24f67..0000000000 --- a/src/world/area_tik/tik_24/8A5AD0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "tik_24.h" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_tik/tik_24/8A5DE0.c b/src/world/area_tik/tik_24/8A5DE0.c deleted file mode 100644 index e9c01270ce..0000000000 --- a/src/world/area_tik/tik_24/8A5DE0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "tik_24.h" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" - -#include "world/common/enemy/ai/TackleAI.inc.c" diff --git a/src/world/area_tik/tik_24/tik_24.h b/src/world/area_tik/tik_24/tik_24.h index 9acf5624d6..3007fe04ca 100644 --- a/src/world/area_tik/tik_24/tik_24.h +++ b/src/world/area_tik/tik_24/tik_24.h @@ -2,8 +2,22 @@ /// @brief Toad Town Tunnels - Hall to Ultra Boots (B3) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_18_shape.h" +#include "mapfs/tik_18_hit.h" + +enum { + NPC_DarkTroopa_01 = 0, + NPC_DarkTroopa_02 = 1, +}; + #define NAMESPACE tik_24 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupDrips); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_tik/tik_24/tik_24_0_header.c b/src/world/area_tik/tik_24/tik_24_0_header.c new file mode 100644 index 0000000000..bfddd4f1f5 --- /dev/null +++ b/src/world/area_tik/tik_24/tik_24_0_header.c @@ -0,0 +1,24 @@ +#include "tik_24.h" + +s32 N(map_init)(void) { + sprintf((s8*) &wMapShapeName, "tik_18_shape"); + sprintf((s8*) &wMapHitName, "tik_18_hit"); + return FALSE; +} + +//TODO these shouldnt need to be declared outside of tik_24_2_main +//however, doing so creates extra rodata padding (not OK) +const char STR_TIK_25[] = "tik_25"; +const char STR_TIK_23[] = "tik_23"; + +EntryList N(Entrances) = { + [tik_24_ENTRY_0] { -220.0, -10.0, 0.0, 90.0 }, + [tik_24_ENTRY_1] { 320.0, -10.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_24 }, +}; diff --git a/src/world/area_tik/tik_24/tik_24_1_music.c b/src/world/area_tik/tik_24/tik_24_1_music.c new file mode 100644 index 0000000000..0d38cdb97c --- /dev/null +++ b/src/world/area_tik/tik_24/tik_24_1_music.c @@ -0,0 +1,7 @@ +#include "tik_24.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_24/tik_24_2_main.c b/src/world/area_tik/tik_24/tik_24_2_main.c new file mode 100644 index 0000000000..616c36cf8f --- /dev/null +++ b/src/world/area_tik/tik_24/tik_24_2_main.c @@ -0,0 +1,57 @@ +#include "tik_24.h" + +extern char STR_TIK_25[]; +extern char STR_TIK_23[]; + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_25_0) = EVT_EXIT_WALK(60, tik_24_ENTRY_0, STR_TIK_25, tik_25_ENTRY_0); +EvtScript N(EVS_ExitWalk_tik_23_0) = EVT_EXIT_WALK(60, tik_24_ENTRY_1, STR_TIK_23, tik_23_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_25_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_23_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_24) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_CALL(EnableTexPanning, MODEL_nagare, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 50, 200, 110, 500) + 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_CALL(EnableTexPanning, MODEL_mizu, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 0, -200, -100, -500) + 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_CALL(EnableTexPanning, MODEL_mizu2, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_3) + TEX_PAN_PARAMS_STEP( 0, -250, -100, -500) + 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_EXEC(N(EVS_SetupMusic)) + EVT_CALL(PlaySound, SOUND_80000049) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_24/tik_24_3_drips.c b/src/world/area_tik/tik_24/tik_24_3_drips.c new file mode 100644 index 0000000000..a408ae4e1b --- /dev/null +++ b/src/world/area_tik/tik_24/tik_24_3_drips.c @@ -0,0 +1,24 @@ +#include "tik_24.h" + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 1, + .volumes = { + { + .minPos = { -233, -117 }, + .maxPos = { 545, 187 }, + .startY = 200, + .endY = -10, + .duration = 60, + .density = 4, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_24/tik_24_4_entity.c b/src/world/area_tik/tik_24/tik_24_4_entity.c new file mode 100644 index 0000000000..03dd75f05c --- /dev/null +++ b/src/world/area_tik/tik_24/tik_24_4_entity.c @@ -0,0 +1,31 @@ +#include "tik_24.h" +#include "entity.h" + +EvtScript N(EVS_OnSmashBlock) = { + EVT_SET(GF_TIK24_Hammer3Block, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o44, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_TIK24_Hammer3Block, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer3Block), -240, -10, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnSmashBlock))) + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o44, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o45, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 50, 80, -75, 0, ITEM_LIFE_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK24_HiddenItem_LifeShroom) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -50, 80, -75, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK24_ItemBlock_CoinA) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 150, 80, -75, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_TIK24_ItemBlock_CoinB) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -100, 80, -75, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 0, 80, -75, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 100, 80, -75, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 200, 80, -75, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_24/tik_24_5_npc.c b/src/world/area_tik/tik_24/tik_24_5_npc.c new file mode 100644 index 0000000000..18c4c2a2d1 --- /dev/null +++ b/src/world/area_tik/tik_24/tik_24_5_npc.c @@ -0,0 +1,55 @@ +#include "tik_24.h" + +#include "world/common/enemy/complete/DarkTroopa_Wander.inc.c" + +StaticNpc N(NpcData_DarkTroopa_01) = { + .id = NPC_DarkTroopa_01, + .settings = &N(NpcSettings_DarkTroopa_Wander), + .pos = { -75.0f, -10.0f, 50.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = DARK_TROOPA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -75, -10, 50 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -75, -10, 50 }, + .detectSize = { 250 }, + } + }, + .animations = DARK_TROOPA_ANIMS, + .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, +}; + +StaticNpc N(NpcData_DarkTroopa_02) = { + .id = NPC_DarkTroopa_02, + .settings = &N(NpcSettings_DarkTroopa_Wander), + .pos = { 175.0f, -10.0f, -50.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = DARK_TROOPA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 175, -10, -50 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 175, -10, -50 }, + .detectSize = { 250 }, + } + }, + .animations = DARK_TROOPA_ANIMS, + .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_DarkTroopa_01), BTL_TIK_FORMATION_06, BTL_TIK_STAGE_00), + NPC_GROUP(N(NpcData_DarkTroopa_02), BTL_TIK_FORMATION_07, BTL_TIK_STAGE_00), + {} +}; diff --git a/src/world/area_tik/tik_25/8A7F80.c b/src/world/area_tik/tik_25/8A7F80.c deleted file mode 100644 index 282579abf7..0000000000 --- a/src/world/area_tik/tik_25/8A7F80.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "tik_25.h" - -static char* N(exit_str_0) = "tik_24"; -static char* N(exit_str_1) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" diff --git a/src/world/area_tik/tik_25/8A8600.c b/src/world/area_tik/tik_25/8A8600.c deleted file mode 100644 index e63ae633ca..0000000000 --- a/src/world/area_tik/tik_25/8A8600.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "tik_25.h" -#include "entity.h" - -API_CALLABLE(N(func_80240680_8A8600)) { - get_entity_by_index(script->varTable[0])->dataBuf.chest->gotItemDone = TRUE; - return ApiStatus_DONE2; -} - -#include "world/common/todo/SetEntityPosition.inc.c" - -#include "world/common/util/PlaySpringReboundAnimation.inc.c" diff --git a/src/world/area_tik/tik_25/tik_25.h b/src/world/area_tik/tik_25/tik_25.h index a103e5cc78..a61609d55a 100644 --- a/src/world/area_tik/tik_25/tik_25.h +++ b/src/world/area_tik/tik_25/tik_25.h @@ -2,8 +2,22 @@ /// @brief Toad Town Tunnels - Ultra Boots Room (B3) #include "common.h" -#include "../tik.h" #include "message_ids.h" #include "map.h" +#include "../tik.h" +#include "mapfs/tik_25_shape.h" +#include "mapfs/tik_25_hit.h" + +enum { + MV_EntityID_SpringR = MapVar(0), + MV_EntityID_SpringL = MapVar(1), +}; + #define NAMESPACE tik_25 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_PlayUpgradeSong); +extern EvtScript N(EVS_SetupDrips); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_tik/tik_25/tik_25_0_header.c b/src/world/area_tik/tik_25/tik_25_0_header.c new file mode 100644 index 0000000000..058094dcc1 --- /dev/null +++ b/src/world/area_tik/tik_25/tik_25_0_header.c @@ -0,0 +1,12 @@ +#include "tik_25.h" + +EntryList N(Entrances) = { + [tik_25_ENTRY_0] { 325.0, -135.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_tik_25 }, +}; diff --git a/src/world/area_tik/tik_25/tik_25_1_music.c b/src/world/area_tik/tik_25/tik_25_1_music.c new file mode 100644 index 0000000000..b8a90797d4 --- /dev/null +++ b/src/world/area_tik/tik_25/tik_25_1_music.c @@ -0,0 +1,15 @@ +#include "tik_25.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_TOAD_TOWN_TUNNELS, 0, 8) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayUpgradeSong) = { + EVT_CALL(PushSong, SONG_ITEM_UPGRADE, 1) + EVT_WAIT(130) + EVT_CALL(PopSong) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_25/tik_25_2_main.c b/src/world/area_tik/tik_25/tik_25_2_main.c new file mode 100644 index 0000000000..7f415d1503 --- /dev/null +++ b/src/world/area_tik/tik_25/tik_25_2_main.c @@ -0,0 +1,65 @@ +#include "tik_25.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_tik_24_0) = EVT_EXIT_WALK(60, tik_25_ENTRY_0, "tik_24", tik_24_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_tik_24_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +#include "world/common/atomic/tik_DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 2, + .volumes = { + { + .minPos = { -140, -110 }, + .maxPos = { 120, 240 }, + .startY = 200, + .endY = -135, + .duration = 60, + .density = 2, + }, + { + .minPos = { 0, -100 }, + .maxPos = { 90, 235 }, + .startY = 200, + .endY = -10, + .duration = 60, + .density = 1, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN_TUNNELS) + EVT_CALL(SetSpriteShading, SHADING_TIK_25) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_SetupDrips)) + EVT_CALL(SetTexPanner, MODEL_mizu, 0) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( 0, -200, -100, -500) + TEX_PAN_PARAMS_FREQ( 0, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_tik/tik_25/tik_25_3_entity.c b/src/world/area_tik/tik_25/tik_25_3_entity.c new file mode 100644 index 0000000000..a9f29cb31b --- /dev/null +++ b/src/world/area_tik/tik_25/tik_25_3_entity.c @@ -0,0 +1,120 @@ +#include "tik_25.h" +#include "entity.h" + +API_CALLABLE(N(DismissGotItem)) { + get_entity_by_index(script->varTable[0])->dataBuf.chest->gotItemDone = TRUE; + return ApiStatus_DONE2; +} + +#include "world/common/todo/SetEntityPosition.inc.c" +#include "world/common/util/PlaySpringReboundAnimation.inc.c" + +EvtScript N(EVS_OpenGiantChest) = { + EVT_IF_EQ(GF_TIK25_GiantChest, FALSE) + EVT_LABEL(10) + EVT_IF_EQ(GF_TIK25_GiantChest, FALSE) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_WAIT(60) + EVT_EXEC(N(EVS_PlayUpgradeSong)) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0187, 160, 40) + EVT_CALL(N(DismissGotItem)) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnBreakBlock_SpringR) = { + EVT_IF_EQ(GF_TIK25_SpringBrickA, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_TIK25_SpringBrickA, TRUE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar5, 210) + EVT_CALL(MakeLerp, -50, -20, 8, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetEntityPosition), MV_EntityID_SpringR, LVar5, LVar0, 0) + EVT_WAIT(1) + EVT_SUB(LVar5, 2) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, LVar0, -135, 22, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetEntityPosition), MV_EntityID_SpringR, LVar5, LVar0, 0) + EVT_WAIT(1) + EVT_SUB(LVar5, 2) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAt, SOUND_48, 0, LVar5, LVar0, 0) + EVT_CALL(PlaySoundAt, SOUND_2086, 0, LVar5, LVar0, 0) + EVT_CALL(N(PlaySpringReboundAnimation), MV_EntityID_SpringR) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnBreakBlock_SpringL) = { + EVT_IF_EQ(GF_TIK25_SpringBrickB, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_TIK25_SpringBrickB, TRUE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar5, -120) + EVT_CALL(MakeLerp, -20, 10, 8, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetEntityPosition), MV_EntityID_SpringL, LVar5, LVar0, 0) + EVT_WAIT(1) + EVT_ADD(LVar5, 2) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, LVar0, -135, 22, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetEntityPosition), MV_EntityID_SpringL, LVar5, LVar0, 0) + EVT_WAIT(1) + EVT_ADD(LVar5, 2) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAt, SOUND_48, 0, LVar5, LVar0, 0) + EVT_CALL(PlaySoundAt, SOUND_2086, 0, LVar5, LVar0, 0) + EVT_CALL(N(PlaySpringReboundAnimation), MV_EntityID_SpringL) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_GiantChest), -270, -90, 0, 90, ITEM_ULTRA_BOOTS, MAKE_ENTITY_END) + EVT_CALL(AssignChestFlag, GF_TIK25_GiantChest) + EVT_EXEC(N(EVS_OpenGiantChest)) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 210, -75, -20, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnBreakBlock_SpringR))) + EVT_IF_EQ(GF_TIK25_SpringBrickA, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SimpleSpring), 210, -50, -20, 0, 100, MAKE_ENTITY_END) + EVT_SET(MV_EntityID_SpringR, LVar0) + EVT_ELSE + EVT_CALL(MakeEntity, EVT_PTR(Entity_SimpleSpring), 150, -135, -20, 0, 100, MAKE_ENTITY_END) + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -120, -45, -20, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnBreakBlock_SpringL))) + EVT_IF_EQ(GF_TIK25_SpringBrickB, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SimpleSpring), -120, -20, -20, 0, 100, MAKE_ENTITY_END) + EVT_SET(MV_EntityID_SpringL, LVar0) + EVT_ELSE + EVT_CALL(MakeEntity, EVT_PTR(Entity_SimpleSpring), -60, -135, -20, 0, 100, MAKE_ENTITY_END) + EVT_END_IF + 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 index 6355be7370..5546a904b3 100644 --- a/src/world/area_trd/trd_01/trd_01_1_main.c +++ b/src/world/area_trd/trd_01/trd_01_1_main.c @@ -129,9 +129,9 @@ EvtScript N(EVS_Scene_RaiseStairs) = { 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_CALL(SetNpcAnimation, NPC_KoopaTroopa_02, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(20) - EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_02, ANIM_KoopaTroopa_Anim17) + EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_02, ANIM_KoopaTroopa_Panic) 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) @@ -160,9 +160,9 @@ EvtScript N(EVS_Scene_RaiseStairs) = { 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_CALL(SetNpcAnimation, NPC_KoopaTroopa_03, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(20) - EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_03, ANIM_KoopaTroopa_Anim17) + EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_03, ANIM_KoopaTroopa_Panic) 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) 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 index 89768825e6..e1865de40e 100644 --- a/src/world/area_trd/trd_01/trd_01_3_npc.c +++ b/src/world/area_trd/trd_01/trd_01_3_npc.c @@ -103,7 +103,7 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa_02) = { 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_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaTroopa_Floating) EVT_ELSE EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) EVT_CALL(GetSelfNpcID, LVar0) 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 index a0b67651a5..0056248cf0 100644 --- a/src/world/area_trd/trd_03/trd_03_3_npc.c +++ b/src/world/area_trd/trd_03/trd_03_3_npc.c @@ -47,9 +47,9 @@ EvtScript N(EVS_Scene_GreenKoopaBros) = { 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_CALL(SetNpcAnimation, NPC_KoopaTroopa_01, ANIM_KoopaTroopa_Salute) EVT_WAIT(25) - EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_01, ANIM_KoopaTroopa_Anim01) + EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_01, ANIM_KoopaTroopa_Idle) EVT_THREAD EVT_CALL(PlaySoundAtCollider, COLLIDER_ori1, SOUND_26B, 0) EVT_CALL(MakeLerp, 100, 0, 40, EASING_QUADRATIC_IN) @@ -130,7 +130,7 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa_01) = { EVT_GOTO(0) EVT_END_IF EVT_WAIT(10) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaTroopa_Anim03) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaTroopa_Walk) EVT_WAIT(10) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_KoopaTroopa_Wander))) EVT_RETURN @@ -150,25 +150,25 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa_02) = { EVT_IF_LT(LVar0, -150) EVT_GOTO(0) EVT_END_IF - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaTroopa_Anim09) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaTroopa_Salute) 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_CALL(SetNpcAnimation, NPC_SELF, ANIM_KoopaTroopa_Walk) 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(SetNpcAnimation, NPC_SELF, ANIM_KoopaTroopa_Run) 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(SetNpcAnimation, NPC_SELF, ANIM_KoopaTroopa_Walk) EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_KoopaTroopa_Wander))) 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 index 11cf4c3266..ddbd27be16 100644 --- 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 @@ -155,7 +155,7 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa) = { 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_KoopaTroopa, ANIM_KoopaTroopa_Run) 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) @@ -177,7 +177,7 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa) = { 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(SpeakToPlayer, NPC_Jailer_KoopaTroopa, ANIM_KoopaTroopa_Run, ANIM_KoopaTroopa_Idle, 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) @@ -211,7 +211,7 @@ EvtScript N(EVS_NpcIdle_KoopaTroopa) = { 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(SpeakToPlayer, NPC_Jailer_KoopaTroopa, ANIM_KoopaTroopa_Run, ANIM_KoopaTroopa_Idle, 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) @@ -390,22 +390,22 @@ StaticNpc N(NpcData_Jailers)[] = { .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, + .idle = ANIM_KoopaTroopa_Idle, + .walk = ANIM_KoopaTroopa_Walk, + .run = ANIM_KoopaTroopa_Run, + .chase = ANIM_KoopaTroopa_Run, + .anim_4 = ANIM_KoopaTroopa_Idle, + .anim_5 = ANIM_KoopaTroopa_Idle, + .death = ANIM_KoopaTroopa_Hurt, + .hit = ANIM_KoopaTroopa_Hurt, + .anim_8 = ANIM_KoopaTroopa_ShellEnter, + .anim_9 = ANIM_KoopaTroopa_ShellSpin, + .anim_A = ANIM_KoopaTroopa_ShellExit, + .anim_B = ANIM_KoopaTroopa_Run, + .anim_C = ANIM_KoopaTroopa_Run, + .anim_D = ANIM_KoopaTroopa_Run, + .anim_E = ANIM_KoopaTroopa_Run, + .anim_F = ANIM_KoopaTroopa_Run, }, }, { diff --git a/src/world/common/atomic/Chest.inc.c b/src/world/common/atomic/Chest.inc.c index baa3d92eee..a12f0e3cb3 100644 --- a/src/world/common/atomic/Chest.inc.c +++ b/src/world/common/atomic/Chest.inc.c @@ -1,11 +1,8 @@ #include "common.h" #include "world/common/todo/StashVars.inc.c" - #include "world/common/todo/GetItemName.inc.c" - #include "world/common/todo/SomeItemEntityFunc.inc.c" - #include "world/common/todo/IsItemBadge.inc.c" s32** N(varStash) = NULL; diff --git a/src/world/common/atomic/tik_Flotsam.inc.c b/src/world/common/atomic/tik_Flotsam.inc.c new file mode 100644 index 0000000000..89affaf3d5 --- /dev/null +++ b/src/world/common/atomic/tik_Flotsam.inc.c @@ -0,0 +1,26 @@ +#include "common.h" + +EvtScript N(EVS_Flotsam_Bobbing) = { + EVT_LOOP(0) + EVT_CALL(MakeLerp, 0, -10, 25, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, LVar2, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, -10, 0, 30, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, LVar2, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_LOOP + EVT_RETURN + EVT_END +}; diff --git a/src/world/common/complete/GiveReward.inc.c b/src/world/common/complete/GiveReward.inc.c index f3b59799c8..1ee093cf0a 100644 --- a/src/world/common/complete/GiveReward.inc.c +++ b/src/world/common/complete/GiveReward.inc.c @@ -6,7 +6,7 @@ static s32** N(varStash) = NULL; // TODO extracted from world/common/todo/StashVars to reduce warnings (for now) -ApiStatus N(StashVars)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(StashVars)) { //static s32** varTable = NULL; s32 i; @@ -50,12 +50,24 @@ EvtScript N(GiveCoinReward) = { EVT_EXEC_WAIT(N(GiveKeyReward)) \ EVT_CALL(AddKeyItem, itemID) +#define EVT_GIVE_BADGE_REWARD(itemID) \ + EVT_SET(LVar0, itemID) \ + EVT_SET(LVar1, ITEM_TYPE_BADGE) \ + EVT_EXEC_WAIT(N(GiveKeyReward)) \ + EVT_CALL(AddBadge, itemID, LVar0) + #define EVT_GIVE_CONSUMABLE_REWARD(itemID) \ EVT_SET(LVar0, itemID) \ EVT_SET(LVar1, ITEM_TYPE_CONSUMABLE) \ EVT_EXEC_WAIT(N(GiveKeyReward)) \ EVT_CALL(AddItem, LVar0, LVar1) +#define EVT_GIVE_CONSUMABLE_REWARD_ALT(itemID) \ + EVT_SET(LVar0, itemID) \ + EVT_SET(LVar1, ITEM_TYPE_CONSUMABLE) \ + EVT_EXEC_WAIT(N(GiveKeyReward)) \ + EVT_CALL(AddItem, itemID, LVar0) + #define EVT_GIVE_STAR_PIECE() \ EVT_SET(LVar0, ITEM_STAR_PIECE) \ EVT_SET(LVar1, ITEM_TYPE_STAR_PIECE) \ diff --git a/src/world/common/enemy/complete/Blooper.h b/src/world/common/enemy/complete/Blooper.h new file mode 100644 index 0000000000..21d4e5f725 --- /dev/null +++ b/src/world/common/enemy/complete/Blooper.h @@ -0,0 +1,29 @@ +#include "common.h" +#include "sprite/npc/Blooper.h" + +#define BLOOPER_NO_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define BLOOPER_ANIMS \ +{ \ + .idle = ANIM_Blooper_Anim0C, \ + .walk = ANIM_Blooper_Anim0C, \ + .run = ANIM_Blooper_Anim0C, \ + .chase = ANIM_Blooper_Anim0C, \ + .anim_4 = ANIM_Blooper_Anim0C, \ + .anim_5 = ANIM_Blooper_Anim0C, \ + .death = ANIM_Blooper_Anim0C, \ + .hit = ANIM_Blooper_Anim0C, \ + .anim_8 = ANIM_Blooper_Anim0C, \ + .anim_9 = ANIM_Blooper_Anim0C, \ + .anim_A = ANIM_Blooper_Anim0C, \ + .anim_B = ANIM_Blooper_Anim0C, \ + .anim_C = ANIM_Blooper_Anim0C, \ + .anim_D = ANIM_Blooper_Anim0C, \ + .anim_E = ANIM_Blooper_Anim0C, \ + .anim_F = ANIM_Blooper_Anim0C, \ +} diff --git a/src/world/common/enemy/complete/Blooper.inc.c b/src/world/common/enemy/complete/Blooper.inc.c new file mode 100644 index 0000000000..1f516a800a --- /dev/null +++ b/src/world/common/enemy/complete/Blooper.inc.c @@ -0,0 +1,22 @@ +#include "Blooper.h" + +NpcSettings N(NpcSettings_Blooper) = { + .height = 24, + .radius = 24, + .level = 99, +}; + +s32 N(BlooperBattles)[] = { + BTL_TIK2_FORMATION_00, + BTL_TIK2_FORMATION_01, + BTL_TIK2_FORMATION_02, +}; + +API_CALLABLE(N(GetBlooperBattleID)) { + Bytecode* args = script->ptrReadPos; + Enemy* enemy = script->owner1.enemy; + s32 index = evt_get_variable(script, *args++); + + gCurrentEncounter.encounterList[enemy->encounterIndex]->battle = N(BlooperBattles)[index]; + return ApiStatus_DONE2; +} diff --git a/src/world/common/enemy/complete/DarkTroopa.h b/src/world/common/enemy/complete/DarkTroopa.h new file mode 100644 index 0000000000..2e41eb7d74 --- /dev/null +++ b/src/world/common/enemy/complete/DarkTroopa.h @@ -0,0 +1,35 @@ +#include "common.h" +#include "sprite/npc/KoopaTroopa.h" + +#define DARK_TROOPA_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 20, \ + .itemDrops = { \ + { ITEM_POW_BLOCK, 10, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(2), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 1, \ + .maxCoinBonus = 2, \ +} + +#define DARK_TROOPA_ANIMS \ +{ \ + .idle = ANIM_KoopaTroopa_Dark_Scramble, \ + .walk = ANIM_KoopaTroopa_Dark_Scramble, \ + .run = ANIM_KoopaTroopa_Dark_Scramble, \ + .chase = ANIM_KoopaTroopa_Dark_Scramble, \ + .anim_4 = ANIM_KoopaTroopa_Dark_Scramble, \ + .anim_5 = ANIM_KoopaTroopa_Dark_Scramble, \ + .death = ANIM_KoopaTroopa_Dark_Hurt, \ + .hit = ANIM_KoopaTroopa_Dark_Hurt, \ + .anim_8 = ANIM_KoopaTroopa_Dark_ShellEnter, \ + .anim_9 = ANIM_KoopaTroopa_Dark_ShellSpin, \ + .anim_A = ANIM_KoopaTroopa_Dark_ShellExit, \ + .anim_B = ANIM_KoopaTroopa_Dark_Still, \ + .anim_C = ANIM_KoopaTroopa_Dark_Run, \ + .anim_D = ANIM_KoopaTroopa_Dark_Run, \ + .anim_E = ANIM_KoopaTroopa_Dark_Run, \ + .anim_F = ANIM_KoopaTroopa_Dark_Run, \ +} diff --git a/src/world/common/enemy/complete/DarkTroopa_Wander.inc.c b/src/world/common/enemy/complete/DarkTroopa_Wander.inc.c new file mode 100644 index 0000000000..1a02f45b06 --- /dev/null +++ b/src/world/common/enemy/complete/DarkTroopa_Wander.inc.c @@ -0,0 +1,36 @@ +#include "common.h" +#include "DarkTroopa.h" + +#include "world/common/enemy/ai/TackleAI.inc.c" + +MobileAISettings N(AISettings_DarkTroopa_Wander) = { + .moveSpeed = 2.0f, + .moveTime = 60, + .waitTime = 5, + .alertRadius = 80.0f, + .alertOffsetDist = 60.0f, + .playerSearchInterval = 3, + .chaseSpeed = 9.0f, + .chaseRadius = 90.0f, + .chaseOffsetDist = 70.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_DarkTroopa_Wander) = { + EVT_CALL(SetSelfVar, 2, 6) + EVT_CALL(SetSelfVar, 3, 4) + EVT_CALL(SetSelfVar, 5, 13) + EVT_CALL(SetSelfVar, 7, 1) + EVT_CALL(N(TackleAI_Main), EVT_PTR(N(AISettings_DarkTroopa_Wander))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_DarkTroopa_Wander) = { + .height = 35, + .radius = 24, + .level = 18, + .ai = &N(EVS_NpcAI_DarkTroopa_Wander), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/ForestFuzzy.h b/src/world/common/enemy/complete/ForestFuzzy.h index fbeff05999..78ccc9605f 100644 --- a/src/world/common/enemy/complete/ForestFuzzy.h +++ b/src/world/common/enemy/complete/ForestFuzzy.h @@ -16,20 +16,20 @@ #define FOREST_FUZZY_ANIMS \ { \ - .idle = ANIM_Fuzzy_Forest_Anim02, \ - .walk = ANIM_Fuzzy_Forest_Anim02, \ - .run = ANIM_Fuzzy_Forest_Anim03, \ - .chase = ANIM_Fuzzy_Forest_Anim03, \ - .anim_4 = ANIM_Fuzzy_Forest_Anim01, \ - .anim_5 = ANIM_Fuzzy_Forest_Anim01, \ - .death = ANIM_Fuzzy_Forest_Anim08, \ - .hit = ANIM_Fuzzy_Forest_Anim08, \ - .anim_8 = ANIM_Fuzzy_Forest_Anim03, \ - .anim_9 = ANIM_Fuzzy_Forest_Anim03, \ - .anim_A = ANIM_Fuzzy_Forest_Anim03, \ - .anim_B = ANIM_Fuzzy_Forest_Anim03, \ - .anim_C = ANIM_Fuzzy_Forest_Anim03, \ - .anim_D = ANIM_Fuzzy_Forest_Anim03, \ - .anim_E = ANIM_Fuzzy_Forest_Anim03, \ - .anim_F = ANIM_Fuzzy_Forest_Anim03, \ + .idle = ANIM_Fuzzy_Forest_Walk, \ + .walk = ANIM_Fuzzy_Forest_Walk, \ + .run = ANIM_Fuzzy_Forest_Run, \ + .chase = ANIM_Fuzzy_Forest_Run, \ + .anim_4 = ANIM_Fuzzy_Forest_Idle, \ + .anim_5 = ANIM_Fuzzy_Forest_Idle, \ + .death = ANIM_Fuzzy_Forest_Hurt, \ + .hit = ANIM_Fuzzy_Forest_Hurt, \ + .anim_8 = ANIM_Fuzzy_Forest_Run, \ + .anim_9 = ANIM_Fuzzy_Forest_Run, \ + .anim_A = ANIM_Fuzzy_Forest_Run, \ + .anim_B = ANIM_Fuzzy_Forest_Run, \ + .anim_C = ANIM_Fuzzy_Forest_Run, \ + .anim_D = ANIM_Fuzzy_Forest_Run, \ + .anim_E = ANIM_Fuzzy_Forest_Run, \ + .anim_F = ANIM_Fuzzy_Forest_Run, \ } diff --git a/src/world/common/enemy/complete/Gloomba.h b/src/world/common/enemy/complete/Gloomba.h new file mode 100644 index 0000000000..a7a90d7fca --- /dev/null +++ b/src/world/common/enemy/complete/Gloomba.h @@ -0,0 +1,36 @@ +#include "common.h" +#include "sprite/npc/Goomba.h" + +#define GLOOMBA_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 20, \ + .itemDrops = { \ + { ITEM_DIZZY_DIAL, 5, 0 }, \ + { ITEM_SLEEPY_SHEEP, 5, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(2), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 1, \ + .maxCoinBonus = 2, \ +} + +#define GLOOMBA_ANIMS \ +{ \ + .idle = ANIM_Goomba_Dark_Idle, \ + .walk = ANIM_Goomba_Dark_Run, \ + .run = ANIM_Goomba_Dark_Run, \ + .chase = ANIM_Goomba_Dark_Run, \ + .anim_4 = ANIM_Goomba_Dark_Run, \ + .anim_5 = ANIM_Goomba_Dark_Idle, \ + .death = ANIM_Goomba_Dark_Hurt, \ + .hit = ANIM_Goomba_Dark_Hurt, \ + .anim_8 = ANIM_Goomba_Dark_Still, \ + .anim_9 = ANIM_Goomba_Dark_Still, \ + .anim_A = ANIM_Goomba_Dark_Still, \ + .anim_B = ANIM_Goomba_Dark_Still, \ + .anim_C = ANIM_Goomba_Dark_Still, \ + .anim_D = ANIM_Goomba_Dark_Still, \ + .anim_E = ANIM_Goomba_Dark_Still, \ + .anim_F = ANIM_Goomba_Dark_Still, \ +} diff --git a/src/world/common/enemy/complete/Gloomba_Wander.inc.c b/src/world/common/enemy/complete/Gloomba_Wander.inc.c new file mode 100644 index 0000000000..a86c8c78c2 --- /dev/null +++ b/src/world/common/enemy/complete/Gloomba_Wander.inc.c @@ -0,0 +1,27 @@ +#include "Gloomba.h" + +MobileAISettings N(AISettings_Gloomba_Wander) = { + .moveSpeed = 2.2f, + .alertRadius = 70.0f, + .playerSearchInterval = 1, + .chaseSpeed = 3.2f, + .chaseTurnRate = 15, + .chaseUpdateInterval = 1, + .chaseRadius = 90.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Gloomba_Wander) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_Gloomba_Wander))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Gloomba_Wander) = { + .height = 20, + .radius = 23, + .level = 11, + .ai = &N(EVS_NpcAI_Gloomba_Wander), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/KoopaTroopa.h b/src/world/common/enemy/complete/KoopaTroopa.h index db0971ca8c..b8a63f0358 100644 --- a/src/world/common/enemy/complete/KoopaTroopa.h +++ b/src/world/common/enemy/complete/KoopaTroopa.h @@ -17,20 +17,20 @@ #define KOOPA_TROOPA_ANIMS \ { \ - .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, \ + .idle = ANIM_KoopaTroopa_Idle, \ + .walk = ANIM_KoopaTroopa_Walk, \ + .run = ANIM_KoopaTroopa_Run, \ + .chase = ANIM_KoopaTroopa_Run, \ + .anim_4 = ANIM_KoopaTroopa_Idle, \ + .anim_5 = ANIM_KoopaTroopa_Idle, \ + .death = ANIM_KoopaTroopa_Hurt, \ + .hit = ANIM_KoopaTroopa_Hurt, \ + .anim_8 = ANIM_KoopaTroopa_ShellEnter, \ + .anim_9 = ANIM_KoopaTroopa_ShellSpin, \ + .anim_A = ANIM_KoopaTroopa_ShellExit, \ + .anim_B = ANIM_KoopaTroopa_Run, \ + .anim_C = ANIM_KoopaTroopa_Run, \ + .anim_D = ANIM_KoopaTroopa_Run, \ + .anim_E = ANIM_KoopaTroopa_Run, \ + .anim_F = ANIM_KoopaTroopa_Run, \ } diff --git a/src/world/common/enemy/complete/Paragloomba.h b/src/world/common/enemy/complete/Paragloomba.h new file mode 100644 index 0000000000..6db2bb2007 --- /dev/null +++ b/src/world/common/enemy/complete/Paragloomba.h @@ -0,0 +1,36 @@ +#include "common.h" +#include "sprite/npc/Paragoomba.h" + +#define PARAGLOOMBA_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 20, \ + .itemDrops = { \ + { ITEM_DIZZY_DIAL, 5, 0 }, \ + { ITEM_SLEEPY_SHEEP, 5, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(2), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 0, \ + .maxCoinBonus = 2, \ +} + +#define PARAGLOOMBA_ANIMS \ +{ \ + .idle = ANIM_Paragoomba_Dark_Idle, \ + .walk = ANIM_Paragoomba_Dark_Walk, \ + .run = ANIM_Paragoomba_Dark_Run, \ + .chase = ANIM_Paragoomba_Dark_Run, \ + .anim_4 = ANIM_Paragoomba_Dark_Idle, \ + .anim_5 = ANIM_Paragoomba_Dark_Idle, \ + .death = ANIM_Paragoomba_Dark_Hurt, \ + .hit = ANIM_Paragoomba_Dark_Hurt, \ + .anim_8 = ANIM_Paragoomba_Dark_Dive, \ + .anim_9 = ANIM_Paragoomba_Dark_Run, \ + .anim_A = ANIM_Paragoomba_Dark_Still, \ + .anim_B = ANIM_Paragoomba_Dark_Still, \ + .anim_C = ANIM_Paragoomba_Dark_Still, \ + .anim_D = ANIM_Paragoomba_Dark_Still, \ + .anim_E = ANIM_Paragoomba_Dark_Still, \ + .anim_F = ANIM_Paragoomba_Dark_Still, \ +} diff --git a/src/world/common/enemy/complete/Paragloomba_Wander.inc.c b/src/world/common/enemy/complete/Paragloomba_Wander.inc.c new file mode 100644 index 0000000000..e5828d0c75 --- /dev/null +++ b/src/world/common/enemy/complete/Paragloomba_Wander.inc.c @@ -0,0 +1,37 @@ +#include "Paragloomba.h" + +#include "world/common/enemy/ai/FlyingAI.inc.c" + +f32 N(FlyingAI_JumpVels)[] = { + 4.5, 3.5, 2.6, 2.0, 1.5, 20.0, +}; + +MobileAISettings N(AISettings_Paragloomba_Wander) = { + .moveSpeed = 2.0f, + .alertRadius = 80.0f, + .playerSearchInterval = 5, + .chaseSpeed = 3.0f, + .chaseTurnRate = 10, + .chaseUpdateInterval = 2, + .chaseRadius = 100.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Paragloomba_Wander) = { + EVT_CALL(SetSelfVar, 0, 1) + EVT_CALL(SetSelfVar, 5, -850) + EVT_CALL(SetSelfVar, 6, 60) + EVT_CALL(SetSelfVar, 1, 600) + EVT_CALL(N(FlyingAI_Main), EVT_PTR(N(AISettings_Paragloomba_Wander))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Paragloomba_Wander) = { + .height = 20, + .radius = 21, + .level = 11, + .ai = &N(EVS_NpcAI_Paragloomba_Wander), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/Paratroopa.h b/src/world/common/enemy/complete/Paratroopa.h index dfded6aa92..e01067e0f9 100644 --- a/src/world/common/enemy/complete/Paratroopa.h +++ b/src/world/common/enemy/complete/Paratroopa.h @@ -16,20 +16,20 @@ #define PARATROOPA_ANIMS \ { \ - .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, \ + .idle = ANIM_ParaTroopa_Idle, \ + .walk = ANIM_ParaTroopa_Walk, \ + .run = ANIM_ParaTroopa_Run, \ + .chase = ANIM_ParaTroopa_Run, \ + .anim_4 = ANIM_ParaTroopa_Idle, \ + .anim_5 = ANIM_ParaTroopa_Idle, \ + .death = ANIM_ParaTroopa_HurtStill, \ + .hit = ANIM_ParaTroopa_HurtStill, \ + .anim_8 = ANIM_ParaTroopa_Windup, \ + .anim_9 = ANIM_ParaTroopa_ShellDive, \ + .anim_A = ANIM_ParaTroopa_ShellIdle, \ + .anim_B = ANIM_ParaTroopa_ShellExit, \ + .anim_C = ANIM_ParaTroopa_Run, \ + .anim_D = ANIM_ParaTroopa_Run, \ + .anim_E = ANIM_ParaTroopa_Run, \ + .anim_F = ANIM_ParaTroopa_Run, \ } diff --git a/src/world/common/enemy/complete/SpikeTop.h b/src/world/common/enemy/complete/SpikeTop.h index 367eefd779..4c4c769df9 100644 --- a/src/world/common/enemy/complete/SpikeTop.h +++ b/src/world/common/enemy/complete/SpikeTop.h @@ -2,6 +2,40 @@ #include "sprite/npc/BuzzyBeetle.h" #include "sprite/npc/SpikeTop.h" +#define BUZZY_BEETLE_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 5, \ + .itemDrops = { \ + { ITEM_SUPER_SODA, 10, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(4), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 2, \ + .maxCoinBonus = 3, \ +} + +#define BUZZY_BEETLE_ANIMS \ +{ \ + .idle = ANIM_BuzzyBeetle_Anim01, \ + .walk = ANIM_BuzzyBeetle_Anim03, \ + .run = ANIM_BuzzyBeetle_Anim04, \ + .chase = ANIM_BuzzyBeetle_Anim04, \ + .anim_4 = ANIM_BuzzyBeetle_Anim00, \ + .anim_5 = ANIM_BuzzyBeetle_Anim00, \ + .death = ANIM_BuzzyBeetle_Anim07, \ + .hit = ANIM_BuzzyBeetle_Anim07, \ + .anim_8 = ANIM_BuzzyBeetle_Anim0C, \ + .anim_9 = ANIM_BuzzyBeetle_Anim05, \ + .anim_A = ANIM_BuzzyBeetle_Anim0D, \ + .anim_B = ANIM_BuzzyBeetle_Anim00, \ + .anim_C = ANIM_BuzzyBeetle_Anim00, \ + .anim_D = ANIM_BuzzyBeetle_Anim00, \ + .anim_E = ANIM_BuzzyBeetle_Anim00, \ + .anim_F = ANIM_BuzzyBeetle_Anim00, \ +} + + #define SPIKE_TOP_DROPS \ { \ .dropFlags = NPC_DROP_FLAGS_80, \ diff --git a/src/world/common/enemy/complete/SpikeTop.inc.c b/src/world/common/enemy/complete/SpikeTop.inc.c index 77d59d74fc..b10413f9ad 100644 --- a/src/world/common/enemy/complete/SpikeTop.inc.c +++ b/src/world/common/enemy/complete/SpikeTop.inc.c @@ -2,9 +2,7 @@ #include "world/common/enemy/ai/TackleAI.inc.c" -#include "world/common/todo/AwaitPlayerNearNpc.inc.c" - -MobileAISettings N(D_80243AA0_C647B0) = { +MobileAISettings N(AISettings_BuzzyBeetle) = { .moveSpeed = 1.0f, .moveTime = 60, .waitTime = 60, @@ -17,12 +15,12 @@ MobileAISettings N(D_80243AA0_C647B0) = { .unk_AI_2C = 1, }; -EvtScript N(D_80243AD0_C647E0) = { +EvtScript N(EVS_NpcAI_BuzzyBeetle) = { EVT_CALL(SetSelfVar, 2, 5) EVT_CALL(SetSelfVar, 3, 2) EVT_CALL(SetSelfVar, 5, 5) EVT_CALL(SetSelfVar, 7, 2) - EVT_CALL(N(TackleAI_Main), EVT_PTR(N(D_80243AA0_C647B0))) + EVT_CALL(N(TackleAI_Main), EVT_PTR(N(AISettings_BuzzyBeetle))) EVT_RETURN EVT_END }; @@ -71,6 +69,8 @@ EvtScript N(D_80243C10_C64920) = { EVT_END }; +#include "world/common/todo/AwaitPlayerNearNpc.inc.c" + EvtScript N(D_80243C80_C64990) = { EVT_CALL(N(func_80240814_97BE44)) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BuzzyBeetle_Anim0F) @@ -84,18 +84,18 @@ EvtScript N(D_80243C80_C64990) = { EVT_CALL(SetSelfVar, 3, 2) EVT_CALL(SetSelfVar, 5, 5) EVT_CALL(SetSelfVar, 7, 2) - EVT_CALL(N(TackleAI_Main), EVT_PTR(N(D_80243AA0_C647B0))) + EVT_CALL(N(TackleAI_Main), EVT_PTR(N(AISettings_BuzzyBeetle))) EVT_RETURN EVT_END }; -// different spike top varieties +// different buzzy beetle / spike top varieties -NpcSettings N(NpcSettings_Unused1) = { +NpcSettings N(NpcSettings_BuzzyBeetle) = { .height = 20, .radius = 22, .level = 10, - .ai = &N(D_80243AD0_C647E0), + .ai = &N(EVS_NpcAI_BuzzyBeetle), .onHit = &EnemyNpcHit, .onDefeat = &EnemyNpcDefeat, }; diff --git a/src/world/common/enemy/complete/SpikedGloomba.h b/src/world/common/enemy/complete/SpikedGloomba.h new file mode 100644 index 0000000000..5f39df0ca5 --- /dev/null +++ b/src/world/common/enemy/complete/SpikedGloomba.h @@ -0,0 +1,36 @@ +#include "common.h" +#include "sprite/npc/SpikedGoomba.h" + +#define SPIKED_GLOOMBA_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 20, \ + .itemDrops = { \ + { ITEM_DIZZY_DIAL, 5, 0 }, \ + { ITEM_SLEEPY_SHEEP, 5, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(2), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 1, \ + .maxCoinBonus = 2, \ +} + +#define SPIKED_GLOOMBA_ANIMS \ +{ \ + .idle = ANIM_SpikedGoomba_Dark_Idle, \ + .walk = ANIM_SpikedGoomba_Dark_Run, \ + .run = ANIM_SpikedGoomba_Dark_Run, \ + .chase = ANIM_SpikedGoomba_Dark_Run, \ + .anim_4 = ANIM_SpikedGoomba_Dark_Run, \ + .anim_5 = ANIM_SpikedGoomba_Dark_Idle, \ + .death = ANIM_SpikedGoomba_Dark_HurtStill, \ + .hit = ANIM_SpikedGoomba_Dark_HurtStill, \ + .anim_8 = ANIM_SpikedGoomba_Dark_Still, \ + .anim_9 = ANIM_SpikedGoomba_Dark_Still, \ + .anim_A = ANIM_SpikedGoomba_Dark_Still, \ + .anim_B = ANIM_SpikedGoomba_Dark_Still, \ + .anim_C = ANIM_SpikedGoomba_Dark_Still, \ + .anim_D = ANIM_SpikedGoomba_Dark_Still, \ + .anim_E = ANIM_SpikedGoomba_Dark_Still, \ + .anim_F = ANIM_SpikedGoomba_Dark_Still, \ +} diff --git a/src/world/common/enemy/complete/SpikedGloomba_Wander.inc.c b/src/world/common/enemy/complete/SpikedGloomba_Wander.inc.c new file mode 100644 index 0000000000..9793b4a181 --- /dev/null +++ b/src/world/common/enemy/complete/SpikedGloomba_Wander.inc.c @@ -0,0 +1,27 @@ +#include "SpikedGloomba.h" + +MobileAISettings N(AISettings_SpikedGloomba_Wander) = { + .moveSpeed = 2.2f, + .alertRadius = 70.0f, + .playerSearchInterval = 1, + .chaseSpeed = 3.2f, + .chaseTurnRate = 15, + .chaseUpdateInterval = 1, + .chaseRadius = 90.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_SpikedGloomba_Wander) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_SpikedGloomba_Wander))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_SpikedGloomba_Wander) = { + .height = 23, + .radius = 23, + .level = 12, + .ai = &N(EVS_NpcAI_SpikedGloomba_Wander), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/entity/Pipe.data.inc.c b/src/world/common/entity/Pipe.data.inc.c index 883b5031a6..c78b9058db 100644 --- a/src/world/common/entity/Pipe.data.inc.c +++ b/src/world/common/entity/Pipe.data.inc.c @@ -250,7 +250,6 @@ EvtScript N(EVS_Pipe_ExitHorizontal) = { EVT_END \ } - #define EVT_EXIT_PIPE_VERTICAL(entry, collider, script) \ { \ EVT_SET_GROUP(EVT_GROUP_1B) \ @@ -261,3 +260,12 @@ EvtScript N(EVS_Pipe_ExitHorizontal) = { EVT_RETURN \ EVT_END \ } + +#define EVT_ENTER_PIPE_HORIZONTAL(collider, bindExitsScript) \ + EVT_SET(LVarA, EVT_PTR(bindExitsScript)) \ + EVT_SET(LVarB, collider) \ + EVT_EXEC(N(EVS_Pipe_EnterHorizontal)) + +#define EVT_ENTER_PIPE_VERTICAL(bindExitsScript) \ + EVT_SET(LVarA, EVT_PTR(bindExitsScript)) \ + EVT_EXEC(N(EVS_Pipe_EnterVertical)) diff --git a/src/world/common/npc/Toad.h b/src/world/common/npc/Toad.h index bcbad5dcd8..dcb983de98 100644 --- a/src/world/common/npc/Toad.h +++ b/src/world/common/npc/Toad.h @@ -1,5 +1,6 @@ #include "common.h" #include "sprite/npc/Toad.h" +#include "sprite/npc/ToadKid.h" #include "sprite/npc/Toadette.h" #define TOAD_DROPS \ @@ -109,6 +110,93 @@ .anim_F = ANIM_Toad_Pink_Run, \ } +#define TOAD_KID_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define TOAD_KID_RED_ANIMS \ +{ \ + .idle = ANIM_ToadKid_Red_Idle, \ + .walk = ANIM_ToadKid_Red_Walk, \ + .run = ANIM_ToadKid_Red_Run, \ + .chase = ANIM_ToadKid_Red_Run, \ + .anim_4 = ANIM_ToadKid_Red_Idle, \ + .anim_5 = ANIM_ToadKid_Red_Idle, \ + .death = ANIM_ToadKid_Red_Still, \ + .hit = ANIM_ToadKid_Red_Still, \ + .anim_8 = ANIM_ToadKid_Red_Still, \ + .anim_9 = ANIM_ToadKid_Red_Still, \ + .anim_A = ANIM_ToadKid_Red_Still, \ + .anim_B = ANIM_ToadKid_Red_Still, \ + .anim_C = ANIM_ToadKid_Red_Still, \ + .anim_D = ANIM_ToadKid_Red_Still, \ + .anim_E = ANIM_ToadKid_Red_Still, \ + .anim_F = ANIM_ToadKid_Red_Still, \ +} + +#define TOAD_KID_GREEN_ANIMS \ +{ \ + .idle = ANIM_ToadKid_Green_Idle, \ + .walk = ANIM_ToadKid_Green_Walk, \ + .run = ANIM_ToadKid_Green_Run, \ + .chase = ANIM_ToadKid_Green_Run, \ + .anim_4 = ANIM_ToadKid_Green_Idle, \ + .anim_5 = ANIM_ToadKid_Green_Idle, \ + .death = ANIM_ToadKid_Green_Still, \ + .hit = ANIM_ToadKid_Green_Still, \ + .anim_8 = ANIM_ToadKid_Green_Still, \ + .anim_9 = ANIM_ToadKid_Green_Still, \ + .anim_A = ANIM_ToadKid_Green_Still, \ + .anim_B = ANIM_ToadKid_Green_Still, \ + .anim_C = ANIM_ToadKid_Green_Still, \ + .anim_D = ANIM_ToadKid_Green_Still, \ + .anim_E = ANIM_ToadKid_Green_Still, \ + .anim_F = ANIM_ToadKid_Green_Still, \ +} + +#define TOAD_KID_BLUE_ANIMS \ +{ \ + .idle = ANIM_ToadKid_Blue_Idle, \ + .walk = ANIM_ToadKid_Blue_Walk, \ + .run = ANIM_ToadKid_Blue_Run, \ + .chase = ANIM_ToadKid_Blue_Run, \ + .anim_4 = ANIM_ToadKid_Blue_Idle, \ + .anim_5 = ANIM_ToadKid_Blue_Idle, \ + .death = ANIM_ToadKid_Blue_Still, \ + .hit = ANIM_ToadKid_Blue_Still, \ + .anim_8 = ANIM_ToadKid_Blue_Still, \ + .anim_9 = ANIM_ToadKid_Blue_Still, \ + .anim_A = ANIM_ToadKid_Blue_Still, \ + .anim_B = ANIM_ToadKid_Blue_Still, \ + .anim_C = ANIM_ToadKid_Blue_Still, \ + .anim_D = ANIM_ToadKid_Blue_Still, \ + .anim_E = ANIM_ToadKid_Blue_Still, \ + .anim_F = ANIM_ToadKid_Blue_Still, \ +} + +#define TOAD_KID_YELLOW_ANIMS \ +{ \ + .idle = ANIM_ToadKid_Yellow_Idle, \ + .walk = ANIM_ToadKid_Yellow_Walk, \ + .run = ANIM_ToadKid_Yellow_Run, \ + .chase = ANIM_ToadKid_Yellow_Run, \ + .anim_4 = ANIM_ToadKid_Yellow_Idle, \ + .anim_5 = ANIM_ToadKid_Yellow_Idle, \ + .death = ANIM_ToadKid_Yellow_Still, \ + .hit = ANIM_ToadKid_Yellow_Still, \ + .anim_8 = ANIM_ToadKid_Yellow_Still, \ + .anim_9 = ANIM_ToadKid_Yellow_Still, \ + .anim_A = ANIM_ToadKid_Yellow_Still, \ + .anim_B = ANIM_ToadKid_Yellow_Still, \ + .anim_C = ANIM_ToadKid_Yellow_Still, \ + .anim_D = ANIM_ToadKid_Yellow_Still, \ + .anim_E = ANIM_ToadKid_Yellow_Still, \ + .anim_F = ANIM_ToadKid_Yellow_Still, \ +} + #define TOADETTE_DROPS \ { \ .dropFlags = NPC_DROP_FLAGS_80, \ diff --git a/src/world/common/npc/Toad_Wander.inc.c b/src/world/common/npc/Toad_Wander.inc.c new file mode 100644 index 0000000000..83696c0036 --- /dev/null +++ b/src/world/common/npc/Toad_Wander.inc.c @@ -0,0 +1,31 @@ +#include "Toad.h" + +MobileAISettings N(AISettings_Toad_Wander) = { + .moveSpeed = 1.5f, + .moveTime = 60, + .waitTime = 30, + .playerSearchInterval = -1, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Toad_Wander) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_Toad_Wander))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Toad_Wander) = { + .height = 30, + .radius = 24, + .level = 99, + .ai = &N(EVS_NpcAI_Toad_Wander), + .actionFlags = AI_ACTION_LOOK_AROUND_DURING_LOITER, +}; + +NpcSettings N(NpcSettings_ToadKid_Wander) = { + .height = 23, + .radius = 19, + .level = 99, + .ai = &N(EVS_NpcAI_Toad_Wander), + .actionFlags = AI_ACTION_LOOK_AROUND_DURING_LOITER, +}; diff --git a/src/world/common/todo/SetEntityPosition.inc.c b/src/world/common/todo/SetEntityPosition.inc.c index 07b012e9ae..b7d14d1939 100644 --- a/src/world/common/todo/SetEntityPosition.inc.c +++ b/src/world/common/todo/SetEntityPosition.inc.c @@ -1,6 +1,6 @@ #include "common.h" -ApiStatus N(SetEntityPosition)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(SetEntityPosition)) { Bytecode* args = script->ptrReadPos; s32 entityIndex = evt_get_variable(script, *args++); s32 x = evt_get_variable(script, *args++); diff --git a/src/world/world.c b/src/world/world.c index 3a24ccd961..cd74ac0b1b 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -283,12 +283,13 @@ f32 gEntityColliderNormals[] = { 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, -1.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f, 0.0f}; /// Toad Town +#include "area_mac/mac.h" MapConfig mac_maps[] = { { MAP_UNSPLIT(machi, 0x802407A0), .bgName = "nok_bg" }, { MAP_UNSPLIT(mac_00, 0x80243BE0), .bgName = "nok_bg" }, { MAP_UNSPLIT(mac_01, 0x80246730), .bgName = "nok_bg" }, { MAP_UNSPLIT(mac_02, 0x80243580), .bgName = "nok_bg" }, - { MAP_UNSPLIT(mac_03, 0x802428B0), .bgName = "nok_bg" }, + { MAP(mac_03), .bgName = "nok_bg" }, { MAP_UNSPLIT(mac_04, 0x80242080), .bgName = "nok_bg", .init = (MapInit)0x80240000 }, { MAP_UNSPLIT(mac_05, 0x802441A0), .bgName = "nok_bg" }, { MAP_UNSPLIT(mac_06, 0x802416A0), .bgName = "nok_bg" }, @@ -297,28 +298,28 @@ MapConfig mac_maps[] = { /// Toad Town Tunnels #include "area_tik/tik.h" MapConfig tik_maps[] = { - { MAP_UNSPLIT(tik_01, 0x80240AE0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_02, 0x802409B0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_03, 0x80240B00), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_04, 0x80240CB0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_05, 0x80240A90), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_01), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_02), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_03), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_04), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_05), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, { MAP(tik_06), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_07, 0x80242920), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_08, 0x80240B10), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_09, 0x802412D0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_10, 0x802413D0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_12, 0x80242260), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_14, 0x80240980), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_15, 0x80240B30), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_17, 0x80241380), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_18, 0x802406D0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_19, 0x80241340), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_20, 0x80241170), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_21, 0x80240990), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_22, 0x802409D0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_23, 0x80241160), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_24, 0x80240ED0), .init = (MapInit)0x80240000, .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, - { MAP_UNSPLIT(tik_25, 0x802407D0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_07), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_08), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_09), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_10), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_12), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_14), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_15), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_17), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_18), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_19), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_20), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_21), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_22), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_23), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP_WITH_INIT(tik_24), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, + { MAP(tik_25), .unk_1C = { .bytes = { .songVariation = 1, .flags = 2 } } }, }; /// Inside the Whale diff --git a/tools/splat_ext/npc.yaml b/tools/splat_ext/npc.yaml index 685874ff9e..65f05ea083 100644 --- a/tools/splat_ext/npc.yaml +++ b/tools/splat_ext/npc.yaml @@ -2174,48 +2174,48 @@ KoopaTroopa: - Default - FrostTroopa frames: - - Raster00 - - Raster01 - - Raster02 - - Raster03 - - Raster04 - - Raster05 - - Raster06 - - Raster07 - - Raster08 - - Raster09 - - Raster0A - - Raster0B - - Raster0C - - Raster0D - - Raster0E - - Raster0F - - Raster10 - - Raster11 - - Raster12 - - Raster13 - - Raster14 - - Raster15 - - Raster16 - - Raster17 - - Raster18 - - Raster19 - - Raster1A - - Raster1B - - Raster1C - - Raster1D - - Raster1E - - Raster1F - - Raster20 - - Raster21 - - Raster22 - - Raster23 - - Raster24 - - Raster25 - - Raster26 - - Raster27 - - Raster28 - - Raster29 + - Step1 + - Step2 + - Step3 + - Idle1 + - Idle2 + - Salute + - HurtStill + - Hurt1 + - Hurt2 + - BurnStill + - ToppleStruggle1 + - ToppleStruggle2 + - ShellSpin1 + - ShellSpin2 + - ShellSpin3 + - ShellSpin4 + - ShellSpin5 + - ShellSpin6 + - BurnHurt1 + - BurnHurt2 + - Sleep1 + - Sleep2 + - Sleep3 + - EnterShell1 + - EnterShell2 + - EnterShell3 + - Panic1 + - Panic2 + - Panic3 + - BeginPanic1 + - BeginPanic2 + - ToppleSleep1 + - ToppleSleep2 + - ToppleSleep3 + - ToppleStill + - Scramble1 + - Scramble2 + - Scramble3 + - ToppleStunned1 + - ToppleStunned2 + - ToppleStunned3 + - ToppleStunned4 palettes: - Dark - Default @@ -2231,72 +2231,72 @@ KoopaTroopa: - Frost_Shocked - Burnt animations: - - Anim00 - - Anim01 - - Anim02 - - Anim03 - - Anim04 - - Anim05 - - Anim06 - - Anim07 - - Anim08 - - Anim09 - - Anim0A - - Anim0B - - Anim0C - - Anim0D - - Anim0E - - Anim0F - - Anim10 - - Anim11 - - Anim12 - - Anim13 - - Anim14 - - Anim15 - - Anim16 - - Anim17 + - Still + - Idle + - Scramble + - Walk + - Run + - ShellStill + - ShellSpin + - ShellEnter + - ShellExit + - Salute + - HurtStill + - Hurt + - BurnHurt + - BurnStill + - Floating + - ToppleStruggle + - ToppleStill + - Sleep + - ToppleSleep + - Stunned + - ToppleStunned + - BeginPanic1 + - BeginPanic2 + - Panic ParaTroopa: variations: - DarkTroopa - Default frames: - - Raster00 - - Raster01 - - Raster02 - - Raster03 - - Raster04 - - Raster05 - - Raster06 - - Raster07 - - Raster08 - - Raster09 - - Raster0A - - Raster0B - - Raster0C - - Raster0D - - Raster0E - - Raster0F - - Raster10 - - Raster11 - - Raster12 - - Raster13 - - Raster14 - - Raster15 - - Raster16 - - Raster17 - - Raster18 - - Raster19 - - Raster1A - - Raster1B - - Raster1C - - Raster1D - - Raster1E - - Raster1F - - Raster20 - - Raster21 - - Raster22 - - Raster23 - - Raster24 + - LWingFlap1 + - RWingFlap1 + - LWingFlap2 + - RWingFlap2 + - LWingFlap3 + - RWingFlap3 + - LWingFlap4 + - RWingFlap4 + - WingsRecoil1 + - WingsRecoil2 + - WingsWindup1 + - WingsWindup2 + - WingStill + - Shell + - IdleLegsDown + - IdleLegsUp + - Recoil + - Windup + - BurnStill + - HurtStill + - Hurt1 + - Hurt2 + - BurnHurt1 + - BurnHurt2 + - Sleep + - Stun1 + - Stun2 + - Stun3 + - Stun4 + - EnterShell1 + - EnterShell2 + - EnterShell3 + - LWingDive1 + - RWingDive2 + - LWingDive2 + - WingsBurn1 + - WingsBurn2 palettes: - Dark - Default @@ -2308,26 +2308,26 @@ ParaTroopa: - Shocked - Burnt animations: - - Anim00 - - Anim01 - - Anim02 - - Anim03 - - Anim04 - - Anim05 - - Anim06 - - Anim07 - - Anim08 - - Anim09 - - Anim0A - - Anim0B - - Anim0C - - Anim0D - - Anim0E - - Anim0F - - Anim10 - - Anim11 - - Anim12 - - Anim13 + - Still + - Idle + - Walk + - Run + - Windup + - Recoil + - HurtStill + - Hurt + - BurnHurt + - BurnStill + - ShellIdle + - ShellEnter + - ShellDive + - ShellHit + - ShellExit + - WingsStill + - WingsBurn + - UnusedIdle + - Sleep + - Stunned Fuzzy: variations: - Default @@ -2335,21 +2335,21 @@ Fuzzy: - BlueFuzzy - JungleFuzzy frames: - - Raster00 - - Raster01 - - Raster02 + - Neutral + - Step1 + - Step2 - Raster03 - Raster04 - Raster05 - - Raster06 - - Raster07 - - Raster08 - - Raster09 - - Raster0A - - Raster0B + - Hurt1 + - Hurt2 + - Stunned1 + - Stunned2 + - Stunned3 + - Stunned4 - Raster0C - - Raster0D - - Raster0E + - Bite1 + - Bite2 - Raster0F - Raster10 - Raster11 @@ -2357,8 +2357,8 @@ Fuzzy: - Raster13 - Raster14 - Raster15 - - Raster16 - - Raster17 + - Cry1 + - Cry2 palettes: - Default - Forest @@ -2378,27 +2378,27 @@ Fuzzy: - Jungle_Shocked - Burnt animations: - - Anim00 - - Anim01 - - Anim02 - - Anim03 + - Still + - Idle + - Walk + - Run - Anim04 - - Anim05 + - Jump - Anim06 - - Anim07 - - Anim08 + - Bite + - Hurt - Anim09 - Anim0A - Anim0B - Anim0C - Anim0D - - Anim0E - - Anim0F - - Anim10 - - Anim11 - - Anim12 - - Anim13 - - Anim14 + - Sleep + - Stunned + - Burn + - HurtStill + - BurnStill + - HurtShock + - HurtShockLoop Bobomb: variations: - Variant00 @@ -9222,8 +9222,8 @@ TheMaster: - AscendedCrouch - AscendedMidair - AscendedDive - - WindUp1 - - WindUp2 + - Windup1 + - Windup2 - DownwardStrike1 - DownwardStrike2 palettes: @@ -9252,8 +9252,8 @@ TheMaster: - Cough - AscendedPunch - AscendedKick - - WindUpLoop - - WindUpStill + - WindupLoop + - WindupStill - DownwardStrike - AscendedPalmStance - AscendedUppercut diff --git a/ver/us/asm/data/world/area_mac/mac_03/834070.data.s b/ver/us/asm/data/world/area_mac/mac_03/834070.data.s deleted file mode 100644 index c8223e58c2..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_03/834070.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242870_834070 -.word 0x00000000, 0x00000000, 0xC4160000, 0x43340000, 0x44138000, 0x41F00000, 0x42C80000, 0x43870000, 0xC2FA0000, 0x42480000, 0xC40C8000, 0x42B40000, 0xC3CF8000, 0x41A00000, 0x42B80000, 0x43AF0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802438EC, D_80242870_834070, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190003, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0xFFFFFFF3, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004A, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_03/834170.data.s b/ver/us/asm/data/world/area_mac/mac_03/834170.data.s deleted file mode 100644 index 654a9a074d..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_03/834170.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242970_834170 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mac_03_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mac_03_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, mac_03_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mac_03_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430B4_8348B4 -.word 0x00000043, 0x00000001, mac_03_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243190_834990, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243190_834990 -.word 0x00000043, 0x00000001, mac_03_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_03_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_03_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mac_03_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, mac_03_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mac_03_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, mac_03_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802436A0_834EA0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802513B0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802436FC_834EFC -.word 0x00000043, 0x00000003, GotoMap, 0x802513B8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024372C_834F2C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8C, D_802436FC_834EFC, 0x00000046, 0x00000001, D_802430B4_8348B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243784_834F84 -.word 0x00000047, 0x00000005, D_802436A0_834EA0, 0x00080000, 0x00000002, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024372C_834F2C, 0x00000080, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802437CC_834FCC -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243784_834F84, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802455F0, 0x00000044, 0x00000001, D_80243784_834F84, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8A, D_80243784_834F84, 0x00000044, 0x00000001, D_80242970_834170, 0x00000016, 0x00000001, 0x00000003, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243880_835080 -.word 0x0000000A, 0x00000002, 0xF8405CEA, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000004, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000016, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000001, 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, 0xF97188A0, 0x00000000, 0x00000024, 0x00000002, 0xF97188A1, 0x00000000, 0x00000024, 0x00000002, 0xF97188A2, 0x00000000, 0x00000024, 0x00000002, 0xF97188A3, 0x00000000, 0x00000024, 0x00000002, 0xF97188A4, 0x00000000, 0x00000024, 0x00000002, 0xF97188A5, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024DCBC, 0x00000044, 0x00000001, 0x8024DDB0, 0x00000044, 0x00000001, 0x8024EBB0, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000044, 0x00000001, 0x80250918, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80246388, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000001, func_802402E0_831AE0, 0x00000043, 0x00000006, RotateModel, 0x0000001D, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000001F, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x0000000A, 0x00000004, 0x00000001, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, 0x8025136C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x802428F0, 0x00000044, 0x00000001, D_80243880_835080, 0x00000044, 0x00000001, D_802437CC_834FCC, 0x00000024, 0x00000002, 0xF8405C87, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_03/835370.data.s b/ver/us/asm/data/world/area_mac/mac_03/835370.data.s deleted file mode 100644 index 7d9a8a11ff..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_03/835370.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243B70_835370 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8F, 0x00000043, 0x00000008, mac_03_CosInterpMinMax, 0xFE363C81, 0xFE363C80, 0x00000000, 0x00000069, 0x00000028, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000046, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000047, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000048, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8F, 0x00000043, 0x00000008, mac_03_CosInterpMinMax, 0xFE363C81, 0xFE363C80, 0x00000000, 0x0000004B, 0x00000028, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004C, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243CF0_8354F0 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8F, 0x00000043, 0x00000008, mac_03_CosInterpMinMax, 0xFE363C81, 0xFE363C80, 0x00000069, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000046, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000047, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000048, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8F, 0x00000043, 0x00000008, mac_03_CosInterpMinMax, 0xFE363C81, 0xFE363C80, 0x0000004B, 0x00000000, 0x00000028, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004C, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243E70_835670 -.word 0x00000043, 0x00000004, PlaySoundAtModel, 0x0000005C, 0xB000001A, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F80, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xFFFFFECA, 0x00000012, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xFFFFFE3E, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A8680, 0x00000027, 0x00000002, 0xFE363C8B, 0x00002710, 0x00000043, 0x00000003, EnableModel, 0xFE363C8B, 0x00000001, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8B, 0xFE363C83, 0xFE363C83, 0x00000001, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C83, 0xF24A7AB0, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7E20, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8B, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243FE8_8357E8 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000005, TranslateModel, 0x0000005B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005C, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000060, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000062, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000064, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000066, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000050, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000052, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000055, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000069, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006D, 0xFE363C80, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000005, TranslateModel, 0x0000005B, 0xFFFFFFBB, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005C, 0xFFFFFFBB, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000060, 0x0000004B, 0x00000019, 0x00000002, 0x00000043, 0x00000005, TranslateModel, 0x00000062, 0x0000001E, 0x0000001E, 0x00000002, 0x00000043, 0x00000005, TranslateModel, 0x00000064, 0xFFFFFFF6, 0x0000001E, 0x00000002, 0x00000043, 0x00000005, TranslateModel, 0x00000066, 0xFFFFFFCE, 0x0000001E, 0x00000002, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0xFFFFFFFF, 0xFFFFFFC6, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000055, 0x00000052, 0xFFFFFFED, 0xFFFFFFDD, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0x00000052, 0xFFFFFFED, 0xFFFFFFDD, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0x00000052, 0xFFFFFFED, 0x00000023, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0x00000052, 0xFFFFFFED, 0x00000023, 0x00000043, 0x00000005, TranslateModel, 0x00000069, 0xFFFFFFEB, 0x0000001E, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0xFFFFFFE7, 0x0000001E, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006D, 0xFFFFFFC1, 0x0000000F, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005B, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005C, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000060, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000062, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000064, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000066, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004E, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000050, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000052, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000055, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000059, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000069, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006B, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005B, 0x00000045, 0x00000032, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000005C, 0x00000045, 0x00000032, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000060, 0xFFFFFFB5, 0xFFFFFFE7, 0xFFFFFFFE, 0x00000043, 0x00000005, TranslateModel, 0x00000062, 0xFFFFFFE2, 0xFFFFFFE2, 0xFFFFFFFE, 0x00000043, 0x00000005, TranslateModel, 0x00000064, 0x0000000A, 0xFFFFFFE2, 0xFFFFFFFE, 0x00000043, 0x00000005, TranslateModel, 0x00000066, 0x00000032, 0xFFFFFFE2, 0xFFFFFFFE, 0x00000043, 0x00000005, TranslateModel, 0x0000005E, 0x00000001, 0x0000003A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000055, 0xFFFFFFAE, 0x00000013, 0x00000023, 0x00000043, 0x00000005, TranslateModel, 0x00000056, 0xFFFFFFAE, 0x00000013, 0x00000023, 0x00000043, 0x00000005, TranslateModel, 0x00000058, 0xFFFFFFAE, 0x00000013, 0xFFFFFFDD, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFFFFFFAE, 0x00000013, 0xFFFFFFDD, 0x00000043, 0x00000005, TranslateModel, 0x00000069, 0x00000015, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0x00000019, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006D, 0x0000003F, 0xFFFFFFF1, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x000003E8, 0x00000028, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A70E0, 0x00000043, 0x00000006, RotateModel, 0x00000062, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000064, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000066, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7CE7, 0x00000043, 0x00000006, RotateModel, 0x00000060, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000008, mac_03_CosInterpMinMax, 0xFE363C82, 0xFE363C80, 0x00000000, 0xFFFFFFEC, 0x0000004B, 0x00000000, 0x00000000, 0x00000043, 0x00000008, mac_03_CosInterpMinMax, 0xFE363C82, 0xFE363C81, 0xFFFFFFF6, 0x0000000A, 0x0000004B, 0x00000000, 0xFFFFFFA6, 0x00000043, 0x00000005, TranslateModel, 0x00000069, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000008, mac_03_CosInterpMinMax, 0xFE363C82, 0xFE363C80, 0x00000000, 0xFFFFFFEC, 0x0000004B, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, TranslateModel, 0x0000006D, 0xFE363C80, 0xFFFFFFF2, 0x00000000, 0x00000043, 0x00000008, mac_03_CosInterpMinMax, 0xFE363C82, 0xFE363C80, 0x00000000, 0xFFFFFFEC, 0x0000004B, 0x00000000, 0x00000000, 0x00000043, 0x00000008, mac_03_CosInterpMinMax, 0xFE363C82, 0xFE363C81, 0xFFFFFFF6, 0x0000000A, 0x0000004B, 0x00000000, 0xFFFFFFA6, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000008, mac_03_CosInterpMinMax, 0xFE363C82, 0xFE363C80, 0xFFFFFFD8, 0x00000028, 0x0000004B, 0x00000000, 0x0000005A, 0x00000043, 0x00000006, RotateModel, 0x0000006B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000008, mac_03_CosInterpMinMax, 0xFE363C8C, 0xFE363C80, 0xF24A6E80, 0xF24A8680, 0x0000000A, 0x00000000, 0x00000000, 0x0000002E, 0x00000002, 0xFE363C80, 0xFD050F81, 0x00000043, 0x00000006, RotateModel, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x0000000B, 0x00000002, 0xFD050F81, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000044, 0x00000001, D_80243E70_835670, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C8D, 0x00000014, 0x00000043, 0x00000008, mac_03_CosInterpMinMax, 0xFE363C8D, 0xFE363C80, 0xF24A7D50, 0xF24A7E80, 0x0000000A, 0x00000000, 0x000000B4, 0x00000043, 0x00000008, mac_03_CosInterpMinMax, 0xFE363C8D, 0xFE363C82, 0xF24A7A80, 0xF24A7BB0, 0x0000000A, 0x00000000, 0x000000B4, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7BB0, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7E80, 0x00000043, 0x00000005, ScaleModel, 0x0000005C, 0xFE363C81, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x0000005B, 0xFE363C81, 0xFE363C80, 0xFE363C81, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7BB0, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7BB0, 0x0000002D, 0x00000002, 0xFE363C81, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A7E80, 0x00000043, 0x00000005, ScaleModel, 0x0000005C, 0xFE363C81, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, ScaleModel, 0x0000005B, 0xFE363C81, 0xFE363C80, 0xFE363C81, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000043, 0x00000006, PlaySoundAt, 0x000020A5, 0x00000000, 0xFFFFFE4D, 0x00000054, 0x00000025, 0x00000024, 0x00000002, 0xFE363C88, 0x0000000A, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFF6, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000043, 0x00000006, PlaySoundAt, 0x000020A5, 0x00000000, 0xFFFFFE63, 0x00000054, 0x00000026, 0x00000024, 0x00000002, 0xFE363C88, 0x0000000A, 0x00000024, 0x00000002, 0xFBD3E282, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B583, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFF6, 0x00000024, 0x00000002, 0xFBD3E282, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E281, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFE363C88, 0x0000000F, 0x00000002, 0xFE363C89, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C89, 0x0000005A, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E281, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000020A6, 0x00000000, 0xFFFFFE4D, 0x00000054, 0x00000025, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E282, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8A, 0xFE363C88, 0x0000000F, 0x00000002, 0xFE363C8A, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000005A, 0x00000024, 0x00000002, 0xFBD3E282, 0x00000000, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E282, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000020A6, 0x00000000, 0xFFFFFE63, 0x00000054, 0x00000026, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000056, 0xFE363C89, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000055, 0xFE363C89, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000059, 0xFE363C8A, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C8A, 0x00000000, 0x00000001, 0x00000000, 0x0000000D, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000C, 0x00000002, 0xFD050F80, 0x00000258, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000044, 0x00000001, D_80243B70_835370, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFD050F80, 0x00000064, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000044, 0x00000001, D_80243CF0_8354F0, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFD050F80, 0x00000258, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000044, 0x00000001, D_80243CF0_8354F0, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B584, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFE57, 0x00000027, 0x00000002, 0xFE363C81, 0x0000004B, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFEB1, 0x00000027, 0x00000002, 0xFE363C81, 0x0000004B, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFD050F80, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x0000002A, 0x00000002, 0xFE363C80, 0x0000004B, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8D, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C8B, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C8D, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8D, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C8D, 0x000003E8, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8C, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802452DC_836ADC -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFE57, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFEB1, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFC7, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0x00000039, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFE1, 0x00000027, 0x00000002, 0xFE363C85, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFA, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFD8, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802454B8_836CB8 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C82, 0x00000028, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C82, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000035, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000033, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000034, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000031, 0x7FFFFE00, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000045, 0x00000002, D_802454B8_836CB8, 0xFE363C89, 0x00000045, 0x00000002, D_802452DC_836ADC, 0xFE363C8E, 0x00000024, 0x00000002, 0xFAA2B584, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x000004B0, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B585, 0x00000001, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFD050F80, 0x000004B0, 0x00000024, 0x00000002, 0xFD050F81, 0xFFFFFFF6, 0x00000024, 0x00000002, 0xFAA2B585, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFD050F81, 0xFFFFFFA6, 0x0000002D, 0x00000002, 0xFD050F81, 0xFD050F80, 0x0000002D, 0x00000002, 0xFD050F81, 0xF24AA280, 0x0000002F, 0x00000002, 0xFD050F81, 0xF24AA280, 0x0000000C, 0x00000002, 0xFD050F81, 0xFFFFFFF6, 0x00000024, 0x00000002, 0xFD050F81, 0xFFFFFFF6, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFD050F80, 0xFFFFFFA6, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0xFFFFFFA6, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000001FD, 0x00000049, 0x00000001, 0xFE363C8E, 0x00000024, 0x00000002, 0xFAA2B584, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE57, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE66, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFE5C, 0x00000014, 0x00000061, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE5C, 0x00000014, 0x00000061, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFE5C, 0x00000014, 0x00000061, 0x0000000F, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFE6A, 0x00000014, 0x00000047, 0x0000000F, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000035, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000032, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000033, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000034, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000031, 0x7FFFFE00, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0504, 0x008C0501, 0x00000000, 0x00050005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000035, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000033, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000034, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000031, 0x7FFFFE00, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFE57, 0x00000046, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE57, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFE57, 0x00000046, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE57, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFCE, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE57, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B584, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFC7, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFE1, 0x00000027, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000044, 0x00000001, D_802452DC_836ADC, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E3A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF248EA80, 0xF249B280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A7080, 0xF24A6C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x008C0004, 0x008C0000, 0x00000005, 0x00050009, 0x00000043, 0x00000002, PlaySound, 0x00000082, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x000003E8, 0x0000002C, 0x00000002, 0xFD050F81, 0xF24A7AA0, 0x0000000D, 0x00000002, 0xFD050F81, 0x0000000A, 0x00000026, 0x00000002, 0xFD050F81, 0xF24AA280, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000045, 0x00000002, D_802454B8_836CB8, 0xFE363C89, 0x00000008, 0x00000001, 0x000000AA, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000003, GotoMap, 0x802513C0, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetModelFlags, 0x00000071, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000000, 0x00000043, 0x00000003, CloneModel, 0x00000071, 0x00002710, 0x00000043, 0x00000003, CloneModel, 0x00000071, 0x00002711, 0x00000043, 0x00000003, CloneModel, 0x00000071, 0x00002712, 0x00000043, 0x00000003, CloneModel, 0x00000071, 0x00002713, 0x00000043, 0x00000003, CloneModel, 0x00000071, 0x00002714, 0x00000043, 0x00000003, CloneModel, 0x00000071, 0x00002715, 0x00000043, 0x00000003, CloneModel, 0x00000071, 0x00002716, 0x00000043, 0x00000003, CloneModel, 0x00000071, 0x00002717, 0x00000043, 0x00000003, CloneModel, 0x00000071, 0x00002718, 0x00000043, 0x00000003, CloneModel, 0x00000071, 0x00002719, 0x00000044, 0x00000001, D_80243FE8_8357E8, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s b/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s deleted file mode 100644 index 9f36bc8635..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_03/837CB0.data.s +++ /dev/null @@ -1,222 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802464B0_837CB0 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802464C0_837CC0 -.word 0x00000000, 0x00200018, D_802464B0_837CB0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802464EC_837CEC -.word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_8024651C_837D1C -.word 0x00000043, 0x00000002, BasicAI_Main, D_802464EC_837CEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024653C_837D3C -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_8024651C_837D1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_80246568_837D68 -.word 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_8024651C_837D1C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_80246594_837D94 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802465EC_837DEC -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel D_80246618_837E18 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel mac_03_varStash -.word 0x00000000 - -dlabel D_80246648_837E48 -.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel mac_03_Quizmo_Answers -.byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01 - -dlabel mac_03_Quizmo_Requirements -.word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040 - -dlabel D_80246738_837F38 -.word 0x00000043, 0x00000001, mac_03_Quizmo_ShouldQuizmoLeave, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000012C, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00AF000C, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802467E8_837FE8 -.word 0x00000043, 0x00000003, mac_03_Quizmo_GetCamVfov, 0x00000000, 0xF4ACD480, 0x00000043, 0x00000003, mac_03_Quizmo_SetCamVfov, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetCamType, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000172, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFFFFFE8E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xF24AAE80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A5280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000017, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000011, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFFFFFFEF, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246A80_838280 -.word 0x00000043, 0x00000003, mac_03_Quizmo_SetCamVfov, 0x00000000, 0xF4ACD480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246ABC_8382BC -.word 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, mac_03_Quizmo_AddViewRelativeOffset, 0xF4ACD481, 0xF4ACD483, 0x00000053, 0xFE363C80, 0xFE363C81, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x0000003C, 0x0000002F, 0x00000002, 0xFE363C84, 0x0000003C, 0x0000002C, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C84, 0xF4ACD483, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C83, 0xF4ACD482, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002C, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C84, 0xF4ACD483, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C83, 0xF4ACD482, 0xFE363C84, 0x00000057, 0x00000000, 0x00000043, 0x00000001, mac_03_Quizmo_SpinPlayer, 0x00000043, 0x00000004, func_802D2884, 0xF4ACD481, 0xF4ACD483, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246C6C_83846C -.word 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000006, mac_03_Quizmo_AddViewRelativeOffset, 0xFE363C8A, 0xFE363C8C, 0x0000006C, 0xFE363C80, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xF4ACD482, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x00000056, 0x00000000, 0x00000043, 0x00000001, mac_03_Quizmo_UpdatePartnerPosition, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C8B, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C86, 0xFE363C84, 0x00000057, 0x00000000, 0x00000043, 0x00000001, mac_03_Quizmo_SpinPartner, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246DA4_8385A4 -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000017, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000006, mac_03_Quizmo_AddViewRelativeOffset, 0xFE363C8A, 0xFE363C8C, 0xFFFFFFBA, 0xFE363C80, 0xFE363C81, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x0000003C, 0x0000002F, 0x00000002, 0xFE363C84, 0x0000003C, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x00000043, 0x00000005, SetNpcPos, 0x00000017, 0xFE363C83, 0xF4ACD482, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000017, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246F10_838710 -.word 0x00000044, 0x00000001, D_80246ABC_8382BC, 0x00000044, 0x00000001, D_80246C6C_83846C, 0x00000046, 0x00000001, D_80246DA4_8385A4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246F84_838784 -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010016, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246FC0_8387C0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFE, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFE, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFE, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xF4ACD482, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247B08_839308 -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010023, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247B48_839348 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000006, mac_03_Quizmo_AddViewRelativeOffset, 0xF4ACD481, 0xF4ACD483, 0x00000019, 0xFE363C80, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C82, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C83, 0xF4ACD483, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xF4ACD481, 0xF4ACD483, 0x00000028, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247C24_839424 -.word 0x00000045, 0x00000002, D_80246FC0_8387C0, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000049, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80247B48_839348, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247CD4_8394D4 -.word 0x00000045, 0x00000002, D_80247B08_839308, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80247B48_839348, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247D84_839584 -.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_80246738_837F38, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, mac_03_Quizmo_HideEntities, 0x00000043, 0x00000001, mac_03_Quizmo_HideWorld, 0x00000044, 0x00000001, D_802467E8_837FE8, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000017, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000017, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80246F10_838710, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, mac_03_Quizmo_CreateStage, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80246F84_838784, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, mac_03_Quizmo_UnkStageEffectMode, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, mac_03_Quizmo_CreateWorker, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, mac_03_Quizmo_UpdateRecords, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, mac_03_Quizmo_SetStageLightsDelay, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, mac_03_Quizmo_SetStageLightsDelay, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, mac_03_Quizmo_SetVannaAnim_Clap, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, mac_03_Quizmo_AddViewRelativeOffset, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, mac_03_Quizmo_AddViewRelativeOffset, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, mac_03_Quizmo_AddViewRelativeOffset, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80247C24_839424, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, mac_03_Quizmo_SetStageLightsDelay, 0x0000000F, 0x00000043, 0x00000001, mac_03_Quizmo_SetVannaAnim_Idle, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, mac_03_Quizmo_SetStageLightsDelay, 0x0000000F, 0x00000043, 0x00000001, mac_03_Quizmo_SetVannaAnim_Idle, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80247CD4_8394D4, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000017, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, mac_03_Quizmo_UnkStageEffectMode, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, mac_03_Quizmo_SetVannaAnim_Wave, 0x00000043, 0x00000001, mac_03_Quizmo_DestroyEffects, 0x00000046, 0x00000001, D_80246738_837F38, 0x00000044, 0x00000001, D_80246A80_838280, 0x00000043, 0x00000001, mac_03_Quizmo_FadeInWorld, 0x00000043, 0x00000001, mac_03_Quizmo_ShowEntities, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248AB4_83A2B4 -.word 0x00000043, 0x00000001, mac_03_Quizmo_ShouldAppear, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, mac_03_Quizmo_RenderInit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248B28_83A328 -.word 0x0000003C, 0x00000001, 0x802513D8, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80247D84_839584, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248BA8_83A3A8 -.word 0x00000043, 0x00000001, mac_03_Quizmo_NPC_Aux_Impl, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248BC4_83A3C4 -.word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80248BF4_83A3F4 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80248BC4_83A3C4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00AF0001, 0x0023001C, D_80248AB4_83A2B4, D_80248B28_83A328, 0x00000000, 0x00000000, D_80248BA8_83A3A8, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80248AB4_83A2B4, D_80248B28_83A328, D_80248BF4_83A3F4, 0x00000000, D_80248BA8_83A3A8, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 - -dlabel mac_03_ItemChoice_HasSelectedItem -.word 0x00000000 - -dlabel mac_03_ItemChoice_SelectedItemID -.word 0x00000000 - -dlabel D_80248C74_83A474 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248C74_83A474, 0x00000010, 0x00000000, mac_03_D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248E08_83A608 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248E88_83A688 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, mac_03_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248E08_83A608, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, mac_03_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802491AC_83A9AC -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802417FC_832FFC, 0xFE363C80, 0x0000004E, 0x00000006, D_80248E88_83A688, 0x00000010, 0x00000000, mac_03_D_80251400, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241770_832F70, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024921C_83AA1C -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_03_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_802491AC_83A9AC, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_03_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249514_83AD14 -.word 0x0000004E, 0x00000000 - -dlabel D_8024951C_83AD1C -.word 0x00000043, 0x0000000B, mac_03_LetterDelivery_Init, 0x00000005, 0x00860004, 0x00860001, 0x0000004E, 0x00000000, 0x00050049, 0x0005004A, 0x0005004B, 0x0005004C, D_80249514_83AD14, 0x00000046, 0x00000001, D_8024921C_83AA1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024956C_83AD6C -.word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00860304, 0x00860301, 0x00000000, 0x0005004D, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddKeyItem, 0x0000004F, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802495F0_83ADF0 -.word 0x00000050, 0x00000000 - -dlabel D_802495F8_83ADF8 -.word 0x00000043, 0x0000000B, mac_03_LetterDelivery_Init, 0x00000005, 0x00860004, 0x00860001, 0x00000050, 0x00000000, 0x0005004E, 0x0005004F, 0x00050050, 0x00050051, D_802495F0_83ADF0, 0x00000046, 0x00000001, D_8024921C_83AA1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249648_83AE48 -.word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00860304, 0x00860301, 0x00000000, 0x00050052, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000051, 0x00000046, 0x00000001, D_80246648_837E48, 0x00000043, 0x00000002, AddKeyItem, 0x00000051, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802496CC_83AECC -.word 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0506, 0x008C0502, 0x00000000, 0x00050000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0xFFFFFFF3, 0x00000005, 0x0000000A, 0x00000002, 0xF8405C9F, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0506, 0x008C0502, 0x00000000, 0x00050007, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0504, 0x008C0501, 0x00000000, 0x00050006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9F, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9D, 0x00000000, 0x00000024, 0x00000002, 0xF8405C9D, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00050001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050002, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405CA0, 0x00000000, 0x00000024, 0x00000002, 0xF8405CA0, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00050008, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050002, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x008C0504, 0x008C0501, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, ShowChoice, 0x001E000C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0504, 0x008C0501, 0x00000000, 0x00050003, 0x00000044, 0x00000001, 0x80245C8C, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x008C0504, 0x008C0501, 0x00000000, 0x00050004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024992C_83B12C -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802496CC_83AECC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249950_83B150 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0005000A, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0005000B, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x0005000C, 0x00000018, 0x00000001, 0x00000007, 0x0000000A, 0x00000002, 0xF8405C9E, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0005000D, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0005000E, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0005000F, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00050010, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x00050011, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x00050012, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00050013, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00050014, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00050015, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00050016, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00830204, 0x00830201, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249B3C_83B33C -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80249950_83B150, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249B60_83B360 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050017, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050018, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00050019, 0x00000018, 0x00000001, 0x00000007, 0x0000000A, 0x00000002, 0xF8405C9E, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0005001A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0005001B, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0005001C, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0005001D, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0005001E, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x0005001F, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00050020, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00050021, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00050022, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00050023, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00840304, 0x00840301, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249D4C_83B54C -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80249B60_83B360, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249D70_83B570 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050024, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050025, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00050026, 0x00000018, 0x00000001, 0x00000007, 0x0000000A, 0x00000002, 0xF8405C9E, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050027, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050028, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050029, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0005002A, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0005002B, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x0005002C, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x0005002D, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x0005002E, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x0005002F, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00050030, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00830104, 0x00830101, 0x00000000, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249F5C_83B75C -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80249D70_83B570, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249F80_83B780 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000006, 0x00000000, 0x00000043, 0x00000003, GetNpcAnimation, 0x00000005, 0xFE363C82, 0x00000043, 0x00000003, GetNpcAnimation, 0x00000006, 0xFE363C83, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00860001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00860301, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050031, 0x00000024, 0x00000002, 0xFE363C81, 0x00050032, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050033, 0x00000024, 0x00000002, 0xFE363C81, 0x00050034, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x00050035, 0x00000024, 0x00000002, 0xFE363C81, 0x00050036, 0x00000018, 0x00000001, 0x00000007, 0x0000000A, 0x00000002, 0xF8405C9E, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050037, 0x00000024, 0x00000002, 0xFE363C81, 0x00050038, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050039, 0x00000024, 0x00000002, 0xFE363C81, 0x0005003A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0005003B, 0x00000024, 0x00000002, 0xFE363C81, 0x0005003C, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x0005003D, 0x00000024, 0x00000002, 0xFE363C81, 0x0005003E, 0x00000018, 0x00000001, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C80, 0x0005003F, 0x00000024, 0x00000002, 0xFE363C81, 0x00050040, 0x00000018, 0x00000001, 0x00000039, 0x00000024, 0x00000002, 0xFE363C80, 0x00050041, 0x00000024, 0x00000002, 0xFE363C81, 0x00050042, 0x00000018, 0x00000001, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C80, 0x00050043, 0x00000024, 0x00000002, 0xFE363C81, 0x00050044, 0x00000018, 0x00000001, 0x00000059, 0x00000024, 0x00000002, 0xFE363C80, 0x00050045, 0x00000024, 0x00000002, 0xFE363C81, 0x00050046, 0x00000018, 0x00000001, 0x00000060, 0x00000024, 0x00000002, 0xFE363C80, 0x00050047, 0x00000024, 0x00000002, 0xFE363C81, 0x00050048, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00860004, 0x00860001, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00860304, 0x00860301, 0x00000000, 0xFE363C81, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0xFE363C82, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0xFE363C83, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000006, 0x00000001, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A33C_83BB3C -.word 0x00000046, 0x00000001, D_80249F80_83B780, 0x00000046, 0x00000001, D_8024951C_83AD1C, 0x00000046, 0x00000001, D_8024956C_83AD6C, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802495F8_83ADF8, 0x00000046, 0x00000001, D_80249648_83AE48, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A3C8_83BBC8 -.word 0x00000043, 0x00000003, BindNpcInteract, 0x00000005, D_8024A33C_83BB3C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A3EC_83BBEC -.word 0x00000043, 0x00000003, BindNpcInteract, 0x00000006, D_80249F80_83B780, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A410_83BC10 -.word 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050061, 0x00000024, 0x00000002, 0xFE363C81, 0x00050062, 0x00000024, 0x00000002, 0xFE363C82, 0x00050063, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050064, 0x00000024, 0x00000002, 0xFE363C81, 0x00050065, 0x00000024, 0x00000002, 0xFE363C82, 0x00050066, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00840104, 0x00840101, 0x00000000, 0xFE363C80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000008, 0x00840104, 0x00840101, 0x00000000, 0xFE363C81, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000009, 0x00840104, 0x00840101, 0x00000000, 0xFE363C82, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A500_83BD00 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBC, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024A410_83BC10, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A554_83BD54 -.word 0x0000000A, 0x00000002, 0xF5DE019D, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0x00050053, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050056, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050055, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B588, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B587, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050054, 0x00000012, 0x00000000, 0x00000043, 0x00000001, func_80241B84_833384, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000009, 0x00000024, 0x00000002, 0xFE363C80, 0x00050058, 0x00000016, 0x00000001, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, 0x00050057, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050059, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x0005005A, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0005005B, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x0005005C, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x0005005D, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0x0005005E, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0005005F, 0x00000016, 0x00000001, 0x00000007, 0x00000024, 0x00000002, 0xFE363C80, 0x00050060, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000010, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A7D0_83BFD0 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024A554_83BD54, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A7F4_83BFF4 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0xB0000021, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A83C_83C03C -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000000, 0xFFFFFFE7, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0003, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF06, 0xFFFFFFE7, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFF06, 0x00000000, 0x0000001E, 0x0000000F, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF9C, 0x0000001E, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000000, 0xFFFFFFE7, 0x0000000F, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A994_83C194 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B000C, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9A80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0003, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000001, 0x00000045, 0x00000002, D_8024A7F4_83BFF4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFFE2, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000203F, 0x00000000, 0x00000045, 0x00000002, D_8024A7F4_83BFF4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A9A80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000001E, 0xFFFFFF38, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFFE2, 0xFFFFFE70, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000001E, 0xFFFFFDA8, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0xFFFFFFFF, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000000, 0xFFFFFD76, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x000000C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024AC94_83C494 -.word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000000E1, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000203E, 0x00000000, 0x00000024, 0x00000002, 0xF8405C9F, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_8024A994_83C194, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x1F000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024ADBC_83C5BC -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0xFFFFFFF3, 0x00000005, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xF8405C9E, 0x00000001, 0x00000024, 0x00000002, 0xF8405C9F, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9F, 0x00000000, 0x00000024, 0x00000002, 0xF8405C9E, 0x00000001, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024A83C_83C03C, 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_8024AC94_83C494, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024AEA0_83C6A0 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE01AD, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000082, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C83, 0x00000043, 0x00000006, func_80241BD8_8333D8, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024AF84_83C784 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024AEA0_83C6A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024AFD4_83C7D4 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000001A4, 0x00000014, 0xFFFFFF56, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B02C_83C82C -.word 0x00000000, D_802464C0_837CC0, 0xC3B90000, 0x41A00000, 0x42B40000, 0x00002D09, D_8024992C_83B12C, 0x00000000, 0x00000000, 0x0000005A, 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, 0x008C0501, 0x008C0501, 0x008C0501, 0x008C0501, 0x008C0501, 0x008C0501, 0x008C0501, 0x008C0501, 0x008C0501, 0x008C0501, 0x008C0501, 0x008C0501, 0x008C0501, 0x008C0501, 0x008C0501, 0x008C0501, 0x00000000, 0x00000000, 0x00000000, 0x001A003D, 0x00000001, D_802464C0_837CC0, 0xC3D40000, 0x42940000, 0x40000000, 0x00002D09, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 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, 0x008C0001, 0x008C0003, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x008C0001, 0x00000000, 0x00000000, 0x00000000, 0x001A003D, 0x00000002, D_80246594_837D94, 0xC3680000, 0x41200000, 0x42940000, 0x00002D09, D_80249B3C_83B33C, 0x00000000, 0x00000000, 0x0000004B, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x001A003E, 0x00000003, D_80246594_837D94, 0x42AA0000, 0x00000000, 0x436B0000, 0x00002D09, D_80249D4C_83B54C, 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, 0x00840301, 0x00840302, 0x00840303, 0x00840303, 0x00840301, 0x00840301, 0x00840306, 0x00840306, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00840303, 0x00000000, 0x00000000, 0x00000000, 0x001A003F, 0x00000004, D_80246594_837D94, 0xC37F0000, 0x41A00000, 0x43C80000, 0x00002D09, D_80249F5C_83B75C, 0x00000000, 0x00000000, 0x0000005A, 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, 0x00830101, 0x00830102, 0x00830103, 0x00830103, 0x00830101, 0x00830101, 0x00830106, 0x00830106, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00830103, 0x00000000, 0x00000000, 0x00000000, 0x001A0040, 0x00000005, D_80246568_837D68, 0x43820000, 0x41A00000, 0x43CD0000, 0x00002D09, D_8024A3C8_83BBC8, 0x00000000, 0x00000000, 0x0000005A, 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, 0x00000014, 0x0000019A, 0x00000028, 0x00000014, 0xFFFF8001, 0x00000001, 0x00000104, 0x00000014, 0x0000019A, 0x0000000A, 0x0000000A, 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, 0x00860001, 0x00860002, 0x00860003, 0x00860003, 0x00860001, 0x00860001, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00860000, 0x00000000, 0x00000000, 0x00000000, 0x001A0041, 0x00000006, D_80246568_837D68, 0x43A00000, 0x41A00000, 0x43CD0000, 0x00002D09, D_8024A3EC_83BBEC, 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, 0x00000140, 0x00000014, 0x0000019A, 0x00000028, 0x00000014, 0xFFFF8001, 0x00000001, 0x00000140, 0x00000014, 0x0000019A, 0x0000000A, 0x0000000A, 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, 0x00860301, 0x00860302, 0x00860303, 0x00860303, 0x00860301, 0x00860301, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00860300, 0x00000000, 0x00000000, 0x00000000, 0x001A0042, 0x0000000A, D_80246594_837D94, 0x435C0000, 0x41A00000, 0xC3200000, 0x00402D09, D_8024A7D0_83BFD0, 0x00000000, 0x00000000, 0x0000005A, 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, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A0043 - -dlabel D_8024BFAC_83D7AC -.word 0x00000007, D_80246594_837D94, 0xC3020000, 0x00000000, 0x435C0000, 0x00002D01, D_8024A500_83BD00, 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, 0x00840101, 0x00840102, 0x00840103, 0x00840103, 0x00840101, 0x00840101, 0x00840106, 0x00840106, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00000000, 0x00000000, 0x00000000, 0x001A0003, 0x00000008, D_80246594_837D94, 0xC2C80000, 0x00000000, 0x435C0000, 0x00002D01, D_8024A500_83BD00, 0x00000000, 0x00000000, 0x0000005A, 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, 0x00840101, 0x00840102, 0x00840103, 0x00840103, 0x00840101, 0x00840101, 0x00840106, 0x00840106, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00000000, 0x00000000, 0x00000000, 0x001A0004, 0x00000009, D_80246594_837D94, 0xC28C0000, 0x00000000, 0x435C0000, 0x00002D01, D_8024A500_83BD00, 0x00000000, 0x00000000, 0x000000B4, 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, 0x00840101, 0x00840102, 0x00840103, 0x00840103, 0x00840101, 0x00840101, 0x00840106, 0x00840106, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00840103, 0x00000000, 0x00000000, 0x00000000, 0x001A0005 - -dlabel D_8024C57C_83DD7C -.word 0x0000000B, D_802465EC_837DEC, 0x00000000, 0xC47A0000, 0x00000000, 0x01700F08, D_8024ADBC_83C5BC, 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, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024C76C_83DF6C -.word 0x0000000C, D_8024653C_837D3C, 0x00000000, 0xC47A0000, 0x00000000, 0x00402F09, D_8024AFD4_83C7D4, 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, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 0xFFFF8001, 0x00000001, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000D, D_8024653C_837D3C, 0x00000000, 0xC47A0000, 0x00000000, 0x00402F09, D_8024AFD4_83C7D4, 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, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 0xFFFF8001, 0x00000001, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000E, D_8024653C_837D3C, 0x00000000, 0xC47A0000, 0x00000000, 0x00402F09, D_8024AFD4_83C7D4, 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, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 0xFFFF8001, 0x00000001, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, D_8024653C_837D3C, 0x00000000, 0xC47A0000, 0x00000000, 0x00402F09, D_8024AFD4_83C7D4, 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, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 0xFFFF8001, 0x00000001, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, D_8024653C_837D3C, 0x00000000, 0xC47A0000, 0x00000000, 0x00402F09, D_8024AFD4_83C7D4, 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, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 0xFFFF8001, 0x00000001, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000011, D_8024653C_837D3C, 0x00000000, 0xC47A0000, 0x00000000, 0x00402F09, D_8024AFD4_83C7D4, 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, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 0xFFFF8001, 0x00000001, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000012, D_8024653C_837D3C, 0x00000000, 0xC47A0000, 0x00000000, 0x00402F09, D_8024AFD4_83C7D4, 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, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 0xFFFF8001, 0x00000001, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, D_8024653C_837D3C, 0x00000000, 0xC47A0000, 0x00000000, 0x00402F09, D_8024AFD4_83C7D4, 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, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 0xFFFF8001, 0x00000001, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, D_8024653C_837D3C, 0x00000000, 0xC47A0000, 0x00000000, 0x00402F09, D_8024AFD4_83C7D4, 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, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 0xFFFF8001, 0x00000001, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000015, D_8024653C_837D3C, 0x00000000, 0xC47A0000, 0x00000000, 0x00402F09, D_8024AFD4_83C7D4, 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, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 0xFFFF8001, 0x00000001, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000016, D_80246618_837E18, 0x00000000, 0xC47A0000, 0x00000000, 0x00402F09, D_8024AF84_83C784, 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, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 0xFFFF8001, 0x00000001, 0x000001AE, 0x00000014, 0xFFFFFF4C, 0x00000096, 0x00000046, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, D_8024B02C_83C82C, 0x00000000, 0x00000003, D_8024BFAC_83D7AC, 0x00000000, 0x00000001, D_8024C57C_83DD7C, 0x00000000, 0x0000000B, D_8024C76C_83DF6C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_03/83F500.data.s b/ver/us/asm/data/world/area_mac/mac_03/83F500.data.s deleted file mode 100644 index f355e87762..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_03/83F500.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_8024DD00_83F500 -.word 0x00000024, 0x00000002, 0xF8405C9C, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024DD20_83F520 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0175, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024DD68_83F568 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0172, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF8405C9C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BombableRock, 0xFFFFFF38, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024DD00_83F500, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x0000020D, 0x00000000, 0x000000AF, 0x00000000, 0x00000003, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405CAA, 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0x000000B9, 0x00000014, 0xFFFFFEA2, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024DD20_83F520, 0x00000047, 0x00000005, D_8024DD68_83F568, 0x00000100, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_03/83F6C0.data.s b/ver/us/asm/data/world/area_mac/mac_03/83F6C0.data.s deleted file mode 100644 index a57e63c4ba..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_03/83F6C0.data.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_8024DEC0_83F6C0 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, mac_03_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, mac_03_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E220_83FA20 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, mac_03_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, mac_03_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, mac_03_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, mac_03_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E824_840024 -.word 0x0000000A, 0x00000002, 0xF8405CEA, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF8405CEA, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF80, 0x00000014, 0xFFFFFDD5, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF80, 0x00000014, 0xFFFFFDD5, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FA280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x0000208E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000016, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000016, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000016, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000004, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000005, 0x7FFFFE00, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 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, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024EAC0_8402C0 -.word 0x00000001, 0x00000044 - -dlabel D_8024EAC8_8402C8 -.word 0x00000001, 0x0000003F - -dlabel D_8024EAD0_8402D0 -.word 0x00000002, 0x0000003F, 0x00000064, 0xFFFFFE04, 0x00000067, 0x00000064, 0xFFFFFDFA - -dlabel D_8024EAEC_8402EC -.word D_8024EAC0_8402C0, D_8024EAC8_8402C8, 0x00000000, D_8024EAD0_8402D0, 0x00000000 - -dlabel D_8024EB00_840300 -.word 0x429E0000, 0x41A00000, 0xC3FC0000, 0x00000000 - -dlabel D_8024EB10_840310 -.word 0x00000001, 0x00000042 - -dlabel D_8024EB18_840318 -.word 0x00000001, 0x00000040 - -dlabel D_8024EB20_840320 -.word 0x00000002, 0x0000021A, 0x00000064, 0xFFFFFEDB, 0x00000242, 0x00000064, 0xFFFFFED1 - -dlabel D_8024EB3C_84033C -.word D_8024EB10_840310, D_8024EB18_840318, 0x00000000, D_8024EB20_840320, 0x00000000 - -dlabel D_8024EB50_840350 -.word 0x440A8000, 0x41A00000, 0xC3908000, 0x00000000 - -dlabel D_8024EB60_840360 -.word 0x00000001, 0x00000043 - -dlabel D_8024EB68_840368 -.word 0x00000001, 0x0000003E - -dlabel D_8024EB70_840370 -.word 0x00000002, 0xFFFFFEE3, 0x00000064, 0xFFFFFDCB, 0xFFFFFF0B, 0x00000050, 0xFFFFFDD5 - -dlabel D_8024EB8C_84038C -.word D_8024EB60_840360, D_8024EB68_840368, 0x00000000, D_8024EB70_840370, D_8024E824_840024 - -dlabel D_8024EBA0_8403A0 -.word 0x43848000, 0x41A00000, 0xC405C000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024EAEC_8402EC, 0x00000047, 0x00000005, D_8024E220_83FA20, 0x00001000, 0x00000029, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024E220_83FA20, 0x00100000, D_8024EB00_840300, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024EB3C_84033C, 0x00000047, 0x00000005, D_8024E220_83FA20, 0x00001000, 0x00000028, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024E220_83FA20, 0x00100000, D_8024EB50_840350, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024EB8C_84038C, 0x00000047, 0x00000005, D_8024E220_83FA20, 0x00001000, 0x0000002B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024E220_83FA20, 0x00100000, D_8024EBA0_8403A0, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mac/mac_03/8404A0.data.s b/ver/us/asm/data/world/area_mac/mac_03/8404A0.data.s deleted file mode 100644 index 2e02abf00a..0000000000 --- a/ver/us/asm/data/world/area_mac/mac_03/8404A0.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_8024ECA0_8404A0 -.word 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000008, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000007E, 0x00000003, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000007E, 0xFFFFFFFD, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE01AD, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mac_03_GetPlayerCoins, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000208B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, AddCoin, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, func_80241F80_833780, 0x00000024, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000008A, 0x00000019, 0xFFFFFE6A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000008A, 0x00000019, 0xFFFFFE6A, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000F, 0xFFFFFFF3, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000020A7, 0x00000000, 0x0000006F, 0x00000059, 0xFFFFFE9A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000006, 0x00000043, 0x00000006, RotateModel, 0x0000007E, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, RotateModel, 0x0000007E, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000006, 0x00000043, 0x00000006, RotateModel, 0x0000007E, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7B4D, 0x00000043, 0x00000005, ScaleModel, 0x00000080, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7B4D, 0x00000043, 0x00000005, ScaleModel, 0x00000080, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000005, 0x00000001, 0x0000000A, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7AA9, 0x00000043, 0x00000005, ScaleModel, 0x00000080, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000005, 0x00000001, 0x0000000A, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7AD2, 0x00000043, 0x00000005, ScaleModel, 0x00000080, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000020A8, 0x00000000, 0x00000086, 0x00000084, 0xFFFFFE71, 0x00000005, 0x00000001, 0x00000005, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7AD2, 0x00000043, 0x00000005, ScaleModel, 0x00000080, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00002095, 0x00000000, 0x000000AA, 0x00000049, 0xFFFFFE3E, 0x00000024, 0x00000002, 0xF5DE01AD, 0x00000001, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000E6, 0x00000014, 0xFFFFFEF2, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000F, 0xFFFFFFFA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000384, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000001, func_80241FA0_8337A0, 0x00000043, 0x00000005, SetNpcPos, 0x00000016, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C84, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000016, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000016, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0x00000016, 0xFE363C82, 0xF24B7680, 0xFFFFFEEF, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000016, 0x00002095, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000016, 0x00002095, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000016, 0x00002095, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000045, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024F4F8_840CF8 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000A, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00830003, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0x0000009D, 0xFFFFFECA, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00830001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00830004, 0x00830001, 0x00000000, 0x00050053, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050056, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00050055, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x0000000A, 0x00830004, 0x00830001, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFAA2B588, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00830003, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0x000000DC, 0xFFFFFF60, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00830001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024F668_840E68 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B588, 0x00000000, 0x00000044, 0x00000001, D_8024F4F8_840CF8, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000005F, 0xFFFFFE93, 0x0000000A, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xFAA2B588, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B586, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, mac_03_GetFloorCollider, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000003B, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80241F80_833780, 0x00000024, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024F800_841000 -.word 0x0000008D, 0x00000001, 0x00000064, 0x0000008C, 0x00000001, 0x00000064, 0x00000080, 0x00000001, 0x00000064, 0x00000082, 0x00000001, 0x00000064, 0x00000095, 0x00000001, 0x00000064, 0x000000A3, 0x00000001, 0x00000064, 0x00000083, 0x00000001, 0x00000064, 0x00000097, 0x00000001, 0x00000064, 0x000000A2, 0x00000001, 0x00000064, 0x0000008E, 0x00000001, 0x00000064 - -dlabel D_8024F878_841078 -.word 0x00000043, 0x00000004, func_802427D0_833FD0, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C87, 0x0000000D, 0x00000002, 0xFE363C87, 0xFE363C86, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C84, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000003, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024F934_841134 -.word 0x00000043, 0x00000002, mac_03_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000001, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000005, 0x00000001, 0x00000005, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7A9F, 0x00000043, 0x00000005, ScaleModel, 0x00000082, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7A9F, 0x00000043, 0x00000005, ScaleModel, 0x00000082, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000045, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE01AD, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcYaw, 0x00000016, 0x0000005A, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000016, 0x00000001, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C83, 0x00000014, 0x00000001, 0xFE363C83, 0x00000018, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C83, 0x00000009, 0x00000018, 0x00000001, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000008, 0x00000018, 0x00000001, 0x00000013, 0x00000024, 0x00000002, 0xFE363C83, 0x00000004, 0x00000018, 0x00000001, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000005, 0x00000018, 0x00000001, 0x00000021, 0x00000024, 0x00000002, 0xFE363C83, 0x00000006, 0x00000018, 0x00000001, 0x00000028, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000018, 0x00000001, 0x00000037, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000018, 0x00000001, 0x00000046, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000018, 0x00000001, 0x00000055, 0x00000024, 0x00000002, 0xFE363C83, 0x00000002, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000003, 0x00000023, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000016, 0x00000147, 0x00000000, 0x00000043, 0x00000007, func_802421E8_8339E8, 0x0000000A, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000005A, 0x00000008, 0x00000001, 0x0000000A, 0x0000000F, 0x00000002, 0xF5DE019D, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C83, 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 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, 0x0000000A, 0x00000043, 0x00000003, EnableNpcAI, 0x0000000C, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x0000000C, 0x00000016, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, NpcJump0, 0x0000000C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000044, 0x00000001, D_8024F878_841078, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000C, 0x0000015E, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000C, 0x00000004, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000C, 0x00000244, 0xFFFFFF56, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x0000000C, 0x0000026C, 0x00000014, 0xFFFFFF56, 0x0000000F, 0x00000043, 0x00000003, EnableNpcShadow, 0x0000000C, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x0000000C, 0x00000001, 0x00000043, 0x00000001, func_80242694_833E94, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C86, 0xF5DE019D, 0x00000005, 0x00000001, 0xFE363C86, 0x00000043, 0x00000006, func_802424A0_833CA0, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetNpcYaw, 0xFE363C81, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000168, 0x00000014, 0xFFFFFF5B, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000168, 0x00000014, 0xFFFFFF5B, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, func_80242608_833E08, 0x0000000A, 0x00000002, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000016, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000016, 0x0000014A, 0x00000014, 0xFFFFFF24, 0x00000014, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000016, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000016, 0x00000168, 0xFFFFFF4C, 0x00000000, 0x00000024, 0x00000002, 0xF5DE01AD, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000016, 0x00000000, 0x00000043, 0x00000006, func_802424A0_833CA0, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C84, 0x00000043, 0x00000002, func_802425A8_833DA8, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C85, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C85, 0xF5DE019D, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C85, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcYaw, 0xFE363C85, 0xFE363C84, 0x00000043, 0x00000003, EnableNpcShadow, 0xFE363C85, 0x00000001, 0x00000043, 0x00000007, func_802421E8_8339E8, 0xF5DE019D, 0xFE363C83, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C84, 0x00000027, 0x00000002, 0xF5DE019D, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802501D4_8419D4 -.word 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000003, EnableNpcAI, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000006, NpcJump0, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFE363C81, 0x0000015E, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C81, 0x00000008, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C81, 0x00000244, 0xFE363C84, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFE363C81, 0x0000026C, 0x00000014, 0xFE363C84, 0x0000000F, 0x00000043, 0x00000003, EnableNpcShadow, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0xFE363C81, 0x00000001, 0x00000043, 0x00000002, func_802425A8_833DA8, 0xFE363C80, 0x00000028, 0x00000002, 0xF5DE019D, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250338_841B38 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000049, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000049, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000084, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000172, 0xFFFFFF30, 0x0000000F, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000084, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000049, 0x000001C2, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000049, 0x7FFFFE00, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE019D, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE019D, 0x00000024, 0x00000002, 0xFE363C86, 0xF5DE019D, 0x00000005, 0x00000001, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000044, 0x00000001, D_802501D4_8419D4, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE019D, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250638_841E38 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000048, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000048, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000084, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000172, 0xFFFFFEB8, 0x0000000F, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000084, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000048, 0x000001C2, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000048, 0x7FFFFE00, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8025081C_84201C -.word 0x00000005, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE019D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C86, 0xF5DE019D, 0x00000005, 0x00000001, 0xFE363C86, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, GetNpcYaw, 0xFE363C81, 0xFE363C85, 0x00000043, 0x00000006, func_80242384_833B84, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE01AD, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000016, 0x00000115, 0xF24B7680, 0xFFFFFEEF, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000045, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B586, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B587, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE019D, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B588, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B588, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024206C_83386C, 0x0000000B, 0x00000002, 0xF5DE019D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C86, 0xF5DE019D, 0x00000005, 0x00000001, 0xFE363C86, 0x00000043, 0x00000006, func_802424A0_833CA0, 0xFE363C80, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetNpcYaw, 0xFE363C81, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_8025081C_84201C, 0x00000047, 0x00000005, D_8024F668_840E68, 0x00000080, 0x0000003B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024ECA0_8404A0, 0x00040000, 0x0000003A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024F934_841134, 0x00001000, 0x00000045, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80250338_841B38, 0x00000100, 0x00000049, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80250638_841E38, 0x00000100, 0x00000048, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250B60_842360 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C82, 0x00000028, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C82, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250C98_842498 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFE57, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFEB1, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFC7, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0x00000039, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFE1, 0x00000027, 0x00000002, 0xFE363C85, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000A, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFA, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFD8, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250E74_842674 -.word 0x00000043, 0x00000002, EnableStatusMenu, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B585, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000035, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000032, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000033, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000034, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000031, 0x7FFFFE00, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFE57, 0x0000002D, 0x00000014, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE66, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B584, 0x00000001, 0x00000044, 0x00000001, D_80250C98_842498, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E3A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF248EA80, 0xF249B280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A7080, 0xF24A6C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x000003E8, 0x0000002C, 0x00000002, 0xFD050F81, 0xF24A7AA0, 0x0000000D, 0x00000002, 0xFD050F81, 0x0000000A, 0x00000026, 0x00000002, 0xFD050F81, 0xF24AA280, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000045, 0x00000002, D_80250B60_842360, 0xFE363C89, 0x00000008, 0x00000001, 0x000000B4, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802513C8, 0x00000002, 0x00000002, 0x00000008, 0x00000001, 0x0000006E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802512AC_842AAC -.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, 0x802513C8, 0x00000002, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000000, 0x00000044, 0x00000001, D_802512AC_842AAC, 0x00000044, 0x00000001, D_80250E74_842674, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_01/869F40.data.s b/ver/us/asm/data/world/area_tik/tik_01/869F40.data.s deleted file mode 100644 index bf8e35c01c..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_01/869F40.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240A90_869F40 -.word 0x43A00000, 0xC1200000, 0x00000000, 0x43870000, 0xC35C0000, 0xC1200000, 0x00000000, 0x42B40000, 0x43160000, 0x41C80000, 0xC2A40000, 0x43340000, 0x42480000, 0x41C80000, 0xC2A40000, 0x43340000, 0xC2480000, 0x41C80000, 0xC2A40000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241A4C, D_80240A90_869F40, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190023, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000005A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_01/86A030.data.s b/ver/us/asm/data/world/area_tik/tik_01/86A030.data.s deleted file mode 100644 index 8eb927c033..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_01/86A030.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240B80_86A030 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_01_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_01_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C1C_86A0CC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_01_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_01_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_01_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_01_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_01_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024143C_86A8EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024143C_86A8EC -.word 0x00000043, 0x00000001, tik_01_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_01_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_01_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_01_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_01_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_01_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_01_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024194C_86ADFC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243260, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419A8_86AE58 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243268, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A04_86AEB4 -.word 0x00000047, 0x00000005, D_802419A8_86AE58, 0x00080000, 0x00000008, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024194C_86ADFC, 0x00080000, 0x0000000E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x00000000, 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, 0x8024323C, 0x00000046, 0x00000001, 0x80242980, 0x00000044, 0x00000001, 0x80240B20, 0x00000043, 0x00000002, PlaySound, 0x80000027, 0x00000043, 0x00000003, EnableTexPanning, 0x00000007, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000032, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C83, 0x0000006E, 0x00000024, 0x00000002, 0xFE363C84, 0x000001F4, 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_80240B80_86A030, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000009, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 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_80240B80_86A030, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000A, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF06, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 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_80240B80_86A030, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80242718, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_80241A04_86AEB4, 0x00000044, 0x00000001, EnterWalk, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_80241A04_86AEB4, 0x00000044, 0x00000001, D_80240C1C_86A0CC, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_01/86B350.data.s b/ver/us/asm/data/world/area_tik/tik_01/86B350.data.s deleted file mode 100644 index 91175ac8e6..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_01/86B350.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241EA0_86B350 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242370_86B820 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000012, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_01_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241EA0_86B350, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242548_86B9F8 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242370_86B820, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426F4_86BBA4 -.word 0x00000001, 0xFFFFFF51, 0xFFFFFFBF, 0x000001E5, 0x0000008C, 0x000000C8, 0xFFFFFFF6, 0x0000003C, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, D_802426F4_86BBA4, 0x00000044, 0x00000001, D_80242548_86B9F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_01/86BC00.data.s b/ver/us/asm/data/world/area_tik/tik_01/86BC00.data.s deleted file mode 100644 index 935f48e568..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_01/86BC00.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242750_86BC00 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFB5, 0x00000043, 0x00000006, PlaySoundAt, 0x00000301, 0x00000000, 0xFE363C82, 0x000000C8, 0x00000019, 0x00000043, 0x00000005, MakeLerp, 0x000000C8, 0xFFFFFFF6, 0x00000019, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_01_SetEntityPosition, 0xFD050F81, 0xFE363C82, 0xFE363C80, 0x00000019, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFE363C82, 0xFE363C80, 0x00000019, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242874_86BD24 -.word 0x00000024, 0x00000002, 0xF8405D0A, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428AC_86BD5C -.word 0x00000043, 0x00000003, GotoMap, 0x80243270, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428DC_86BD8C -.word 0x00000043, 0x00000003, GotoMap, 0x80243278, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024290C_86BDBC -.word 0x00000043, 0x00000003, GotoMap, 0x80243280, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024293C_86BDEC -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF840630D, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D0A, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block, 0xFFFFFF10, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242874_86BD24, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000011, 0x7FFFFE00, 0x0000000A, 0x00000002, 0xF840630D, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000003, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000047, 0x00000005, D_8024293C_86BDEC, 0x00020000, 0xF9718883, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D2D, 0x00000001, 0x00000043, 0x00000005, tik_01_SetEntityPosition, 0xFD050F81, 0x0000007D, 0xFFFFFFF6, 0x00000019, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0x00000096, 0xFFFFFFF6, 0xFFFFFFAE, 0x00000000, 0x00000002, D_802428AC_86BD5C, 0x0000078D, 0x80000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0x00000032, 0xFFFFFFF6, 0xFFFFFFAE, 0x00000000, 0x00000003, D_802428DC_86BD8C, 0x0000078D, 0x80000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0xFFFFFFCE, 0xFFFFFFF6, 0xFFFFFFAE, 0x00000000, 0x00000004, D_8024290C_86BDBC, 0x0000078D, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B50_86C000 -.short 0x0000, 0x0000, 0x0018, 0x0018, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0063, 0x0000, 0x0000 - -dlabel D_80242B7E_86C02E -.short 0x1B00, 0x0000, 0x1B01, 0x0000, 0x1B02 - -dlabel D_80242B88_86C038 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000C8, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000044, 0x00000001, 0x80240B4C, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00080000, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00500001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFB5, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0x00000096, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003DC, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003E7, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000000, 0x0000000A, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0050000C, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D2C_86C1DC -.word 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00500004, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000870, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003DD, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003E7, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFF, 0xFE363C80, 0x00000096, 0x00000000, 0x0000000F, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000046, 0x00000001, D_80242750_86BC00, 0x0000000A, 0x00000002, 0xF8405D2B, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2B, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2C, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2D, 0x00000001, 0x00000044, 0x00000001, 0x80240B20, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F20_86C3D0 -.word 0x0000000A, 0x00000002, 0xF8405D2D, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242B88_86C038, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80242D2C_86C1DC, 0x0000000A, 0x00000002, 0xF8405D2B, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A7D80, 0xF24A7D80, 0xF24A7D80, 0x00000043, 0x00000002, func_80240A30_869EE0, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D2C, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A7F80, 0xF24A7F80, 0xF24A7F80, 0x00000043, 0x00000002, func_80240A30_869EE0, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A8280, 0xF24A8280, 0xF24A8280, 0x00000043, 0x00000002, func_80240A30_869EE0, 0x00000002, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024304C_86C4FC -.word 0x00000000, D_80242B50_86C000, 0x00000000, 0xC47A0000, 0x00000000, 0x00840D0D, D_80242F20_86C3D0, 0x00000000, 0x00000000, 0x0000005A, 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, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024304C_86C4FC, 0x1B000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_02/86D0E0.data.s b/ver/us/asm/data/world/area_tik/tik_02/86D0E0.data.s deleted file mode 100644 index 26c7dd662c..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_02/86D0E0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802409A0_86D0E0 -.word 0xC3B40000, 0xC1200000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240B74, D_802409A0_86D0E0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190024, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000005A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_02/86D190.data.s b/ver/us/asm/data/world/area_tik/tik_02/86D190.data.s deleted file mode 100644 index 57ed807a55..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_02/86D190.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240A50_86D190 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_02_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_02_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240AEC_86D22C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802423B0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B48_86D288 -.word 0x00000047, 0x00000005, D_80240AEC_86D22C, 0x00080000, 0x00000008, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x00000001, 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, 0x80242398, 0x00000046, 0x00000001, 0x80241258, 0x00000044, 0x00000001, 0x802409F0, 0x00000043, 0x00000002, PlaySound, 0x80000028, 0x00000043, 0x00000006, PlaySoundAtF, 0x80000029, 0x00000001, 0xFFFFFF1A, 0xFFFFFF4C, 0x00000078, 0x00000043, 0x00000006, PlaySoundAtF, 0x8000002A, 0x00000001, 0x00000014, 0xFFFFFF4C, 0x00000078, 0x00000044, 0x00000001, 0x80241B48, 0x00000043, 0x00000003, EnableTexPanning, 0x00000007, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000032, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C83, 0x0000006E, 0x00000024, 0x00000002, 0xFE363C84, 0x000001F4, 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_80240A50_86D190, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000009, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 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_80240A50_86D190, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000A, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF06, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 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_80240A50_86D190, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000B, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFC7C, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFB50, 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_80240A50_86D190, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240B48_86D288, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s b/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s deleted file mode 100644 index bbff88add5..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_02/86D800.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel tik_02_varStash -.word 0x00000000 - -dlabel D_802410C4_86D804 -.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_8024112C_86D86C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_802410C4_86D804, 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_8024120C_86D94C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000012F, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405D0F, 0x00000001, 0x00000046, 0x00000001, D_8024112C_86D86C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x00000118, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D0F, 0x00000043, 0x00000002, AssignScript, D_8024120C_86D94C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412B0_86D9F0 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241780_86DEC0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000011, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_02_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802412B0_86D9F0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241958_86E098 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80241780_86DEC0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000011, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B04_86E244 -.word 0x00000002, 0xFFFFFE8A, 0xFFFFFF9E, 0x00000066, 0x0000009E, 0x000000C8, 0xFFFFFFF6, 0x0000003C, 0x00000002, 0x00000042, 0xFFFFFF96, 0x000000B6, 0x00000098, 0x000000C8, 0xFFFFFFF6, 0x0000003C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_80241B04_86E244, 0x00000044, 0x00000001, D_80241958_86E098, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_02/86E2C0.data.s b/ver/us/asm/data/world/area_tik/tik_02/86E2C0.data.s deleted file mode 100644 index c4efb3b8e0..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_02/86E2C0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241B80_86E2C0 -.short 0x0000, 0x0000, 0x0018, 0x0018, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0063, 0x0000, 0x0000 - -dlabel D_80241BAE_86E2EE -.short 0x1B00, 0x0000, 0x1B01, 0x0000, 0x1B02 - -dlabel D_80241BB8_86E2F8 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000041, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000044, 0x00000001, 0x80240A1C, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00080000, 0x000000A0, 0x00000028, 0x00000056, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000013B, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000002D, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFE7, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFE7, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000008C, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003DC, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003E7, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF9C, 0xFFFFFED4, 0xFFFFFF88, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00500001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000000AF, 0x00000000, 0x00000000, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0050000C, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E48_86E588 -.word 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00500004, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000870, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003DD, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003E7, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFF9C, 0xFFFFFED4, 0xFFFFFF88, 0x00000028, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405D2B, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2B, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2C, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2E, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0x802409F0, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024207C_86E7BC -.word 0x0000000A, 0x00000002, 0xF8405D2E, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241BB8_86E2F8, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80241E48_86E588, 0x0000000A, 0x00000002, 0xF8405D2B, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A7D80, 0xF24A7D80, 0xF24A7D80, 0x00000043, 0x00000002, func_80240940_86D080, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D2C, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A7F80, 0xF24A7F80, 0xF24A7F80, 0x00000043, 0x00000002, func_80240940_86D080, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A8280, 0xF24A8280, 0xF24A8280, 0x00000043, 0x00000002, func_80240940_86D080, 0x00000002, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421A8_86E8E8 -.word 0x00000000, D_80241B80_86E2C0, 0x00000000, 0xC47A0000, 0x00000000, 0x00840D0D, D_8024207C_86E7BC, 0x00000000, 0x00000000, 0x0000005A, 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, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802421A8_86E8E8, 0x1B000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_03/86F5D0.data.s b/ver/us/asm/data/world/area_tik/tik_03/86F5D0.data.s deleted file mode 100644 index ea3b946672..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_03/86F5D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240AD0_86F5D0 -.word 0x43A00000, 0xC1200000, 0x00000000, 0x43870000, 0xC3570000, 0x42700000, 0x00000000, 0x42B40000, 0x43820000, 0xC1200000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241AF8, D_80240AD0_86F5D0, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190025, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_03/86F670.data.s b/ver/us/asm/data/world/area_tik/tik_03/86F670.data.s deleted file mode 100644 index 47078bb150..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_03/86F670.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240B70_86F670 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_03_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_03_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EC4_86F9C4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_03_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_03_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_03_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241390_86FE90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241390_86FE90 -.word 0x00000043, 0x00000001, tik_03_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_03_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_03_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_03_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024156C_87006C -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_03_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_03_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_03_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802418A0_8703A0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_03_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_03_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024193C_87043C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242F10, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241998_870498 -.word 0x00000043, 0x00000003, GotoMap, 0x80242F18, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419C8_8704C8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000006, 0x00000024, 0x00000002, 0xFE363C8C, D_80241998_870498, 0x00000046, 0x00000001, D_8024156C_87006C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A20_870520 -.word 0x00000047, 0x00000005, D_8024193C_87043C, 0x00080000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802419C8_8704C8, 0x00000040, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A68_870568 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, D_80241A20_870520, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000006, 0x00000044, 0x00000001, D_80240EC4_86F9C4, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241A20_870520, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x00000002, 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, 0x00000046, 0x00000001, 0x80242C30, 0x00000044, 0x00000001, 0x802428F8, 0x00000043, 0x00000003, EnableTexPanning, 0x00000007, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000032, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C83, 0x0000006E, 0x00000024, 0x00000002, 0xFE363C84, 0x000001F4, 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_802418A0_8703A0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000009, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 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_802418A0_8703A0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000A, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF06, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 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_802418A0_8703A0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000B, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFC7C, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFB50, 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_802418A0_8703A0, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80242BE4, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000047, 0x00000005, D_802419C8_8704C8, 0x00000040, 0x00000006, 0x00000001, 0x00000000, 0x00000046, 0x00000001, 0x80242EC0, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80240B40, 0x00000043, 0x00000002, PlaySound, 0x8000002B, 0x00000043, 0x00000006, PlaySoundAtF, 0x8000002C, 0x00000001, 0xFFFFFFF6, 0xFFFFFFEC, 0x00000078, 0x00000044, 0x00000001, D_80241A68_870568, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_03/870B60.data.s b/ver/us/asm/data/world/area_tik/tik_03/870B60.data.s deleted file mode 100644 index 0476ac9064..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_03/870B60.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242060_870B60 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242530_871030 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000014, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_03_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80242060_870B60, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242708_871208 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242530_871030, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000014, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428B4_8713B4 -.word 0x00000002, 0x0000006B, 0xFFFFFFA1, 0x000000D0, 0x0000009B, 0x000000C8, 0xFFFFFFF6, 0x0000003C, 0x00000002, 0xFFFFFF28, 0xFFFFFFA6, 0x00000052, 0x0000009B, 0x0000010E, 0x0000003C, 0x0000003C, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_802428B4_8713B4, 0x00000044, 0x00000001, D_80242708_871208, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_03/871430.data.s b/ver/us/asm/data/world/area_tik/tik_03/871430.data.s deleted file mode 100644 index ce1381df00..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_03/871430.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242930_871430 -.word 0x0000000A, 0x0000000B, 0x0000000C, 0x0000000D - -dlabel D_80242940_871440 -.word 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000003, ParentColliderToModel, 0xFE363C8B, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C8D, 0xF245CA80, 0x0000002D, 0x00000002, 0xFE363C8D, 0xFE363C8C, 0x00000003, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C8C, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24BBA80, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80240960_86F460, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8080, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A8080, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C8B, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C81, 0xF24C0A80, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0xFE363C8D, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8D, 0x00000026, 0x00000002, 0xFE363C8C, 0xF245CA80, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242AB4_8715B4 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000014, 0x00000046, 0x00000001, D_80242940_871440, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B00_871600 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C8C, 0xFFFFFFB0, 0x00000046, 0x00000001, D_80242940_871440, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B4C_87164C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C8C, 0xFFFFFF56, 0x00000046, 0x00000001, D_80242940_871440, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B98_871698 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8C, 0xFFFFFEF2, 0x00000046, 0x00000001, D_80242940_871440, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80242AB4_8715B4, 0x00000044, 0x00000001, D_80242B00_871600, 0x00000044, 0x00000001, D_80242B4C_87164C, 0x00000044, 0x00000001, D_80242B98_871698, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_03/871730.data.s b/ver/us/asm/data/world/area_tik/tik_03/871730.data.s deleted file mode 100644 index 2989b7c66b..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_03/871730.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242C30_871730 -.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000C8, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x00000081, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D10, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x0000008C, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D11, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000104, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D12, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_03/8717F0.data.s b/ver/us/asm/data/world/area_tik/tik_03/8717F0.data.s deleted file mode 100644 index 60347d21f8..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_03/8717F0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242CF0_8717F0 -.word 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFAB, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000020, 0x00000043, 0x00000002, DemoSetButtons, 0x00008000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DemoSetButtons, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DemoSetButtons, 0x00008000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, DemoSetButtons, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802409C0_86F4C0, 0x00000008, 0x00000001, 0x0000000F, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242F20, 0x00000002, 0x00000002, 0x00000008, 0x00000001, 0x0000006E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242DFC_8718FC -.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, 0x80242F20, 0x00000002, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242EBC_8719BC -.word 0x00000000, 0x00000043, 0x00000001, func_802409E0_86F4E0, 0x00000024, 0x00000002, 0xF8405B89, 0x00000000, 0x00000044, 0x00000001, D_80242DFC_8718FC, 0x00000044, 0x00000001, D_80242CF0_8717F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_04/8726A0.data.s b/ver/us/asm/data/world/area_tik/tik_04/8726A0.data.s deleted file mode 100644 index 1fd9f4b133..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_04/8726A0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240C70_8726A0 -.word 0xC35C0000, 0xC1200000, 0x00000000, 0x42B40000, 0x43A00000, 0xC1200000, 0x00000000, 0x43870000, 0xC2DC0000, 0xC1200000, 0xC2A00000, 0x43870000, 0x43860000, 0xC2D20000, 0x42BC0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241D34, D_80240C70_8726A0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190026, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_04/872750.data.s b/ver/us/asm/data/world/area_tik/tik_04/872750.data.s deleted file mode 100644 index dd04fc16eb..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_04/872750.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240D20_872750 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_04_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_04_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DBC_8727EC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_04_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_04_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241110_872B40 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_04_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_04_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241500_872F30 -.word 0x00000043, 0x00000001, tik_04_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802415DC_87300C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415DC_87300C -.word 0x00000043, 0x00000001, tik_04_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_04_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_04_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_04_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417B8_8731E8 -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_04_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_04_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_04_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241AEC_87351C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243370, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B48_873578 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243378, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BA4_8735D4 -.word 0x00000043, 0x00000003, GotoMap, 0x80243380, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BD4_873604 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000018, 0x00000024, 0x00000002, 0xFE363C8C, D_80241BA4_8735D4, 0x00000046, 0x00000001, D_802417B8_8731E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C2C_87365C -.word 0x00000043, 0x00000003, GotoMap, 0x80243388, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C5C_87368C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8C, D_80241C2C_87365C, 0x00000046, 0x00000001, D_80241500_872F30, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CB4_8736E4 -.word 0x00000047, 0x00000005, D_80241AEC_87351C, 0x00080000, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241B48_873578, 0x00080000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241BD4_873604, 0x00000040, 0x00000018, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241C5C_87368C, 0x00000080, 0x0000001B, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x00000003, 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, 0x8024334C, 0x00000044, 0x00000001, 0x80240CF0, 0x00000044, 0x00000001, 0x80242858, 0x00000043, 0x00000003, EnableTexPanning, 0x00000008, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 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_80240D20_872750, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80242BC8, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8A, D_80241CB4_8736E4, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000018, 0x00000044, 0x00000001, D_80241110_872B40, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8A, D_80241CB4_8736E4, 0x00000044, 0x00000001, D_80240DBC_8727EC, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241CB4_8736E4, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_04/8739F0.data.s b/ver/us/asm/data/world/area_tik/tik_04/8739F0.data.s deleted file mode 100644 index a24897c6a3..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_04/8739F0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241FC0_8739F0 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242490_873EC0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000010, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_04_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241FC0_8739F0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242668_874098 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242490_873EC0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000010, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242814_874244 -.word 0x00000002, 0xFFFFFF1A, 0xFFFFFFD8, 0x00000096, 0x00000050, 0x000000C8, 0xFFFFFFF6, 0x00000032, 0x00000001, 0xFFFFFFCE, 0x00000064, 0x00000163, 0x00000025, 0x000000C8, 0xFFFFFF79, 0x00000050, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_80242814_874244, 0x00000044, 0x00000001, D_80242668_874098, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_04/8742C0.data.s b/ver/us/asm/data/world/area_tik/tik_04/8742C0.data.s deleted file mode 100644 index 2680ddc3df..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_04/8742C0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242890_8742C0 -.word 0x00000043, 0x00000002, tik_04_GetFloorCollider, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240C20_872650, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x0000000A, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7680, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24AF280, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0xFFFFFFF6, 0xFE363C85, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C84, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7C80, 0x0000000C, 0x00000002, 0xFE363C80, 0xF2489A80, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7C80, 0x00000013, 0x00000000, 0x0000003C, 0x00000001, 0xFD050F80, 0x00000043, 0x00000001, func_80240A00_872430, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_04_GetFloorCollider, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80240C20_872650, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7C80, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x0000000A, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C83, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7680, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24AF280, 0x00000043, 0x00000005, TranslateModel, 0xFE363C82, 0xFFFFFFF6, 0xFE363C85, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C84, 0x0000003C, 0x00000001, 0xFD050F80, 0x00000043, 0x00000001, func_80240A00_872430, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_04_GetFloorCollider, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B6C_87459C -.word 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000009, 0x00000024, 0x00000002, 0xFE363C84, 0x0000000B, 0x00000046, 0x00000001, D_80242890_8742C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000009, 0x00000012, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000000B, 0x00000014, 0x00000043, 0x00000005, TranslateModel, 0x00000012, 0x0000000A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000014, 0xFFFFFFF6, 0x0000001E, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000009, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000B, 0x00000047, 0x00000005, D_80242B6C_87459C, 0x00000080, 0x00000009, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000002, 0xFD050F80, 0x0000003C, 0x00000001, 0xFD050F80, 0x00000043, 0x00000001, func_80240960_872390, 0x00000043, 0x00000001, func_80240A00_872430, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_04/8746E0.data.s b/ver/us/asm/data/world/area_tik/tik_04/8746E0.data.s deleted file mode 100644 index 73314319b6..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_04/8746E0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242CB0_8746E0 -.word 0x400CCCCD, 0x00000000, 0x00000000, 0x428C0000, 0x00000000, 0x00000001, 0x404CCCCD, 0x0000000F, 0x00000001, 0x42B40000, 0x00000000, 0x00000001 - -dlabel D_80242CE0_874710 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80242CB0_8746E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D00_874730 -.word 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_80242CE0_874710, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000C0000 - -dlabel D_80242D2C_87475C -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000118, 0xFFFFFFF6, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80242CE0_874710, 0x00000002, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000118, 0xFFFFFFF6, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000168, 0xFFFFFFF6, 0x00000000, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFE2, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00270103, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000028, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0x00000002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000037, 0x00000000, 0x00000000, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000000E, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000003C, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00270101, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80242CE0_874710, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F48_874978 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242D2C_87475C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F6C_87499C -.word 0x00000000, D_80242D00_874730, 0x42200000, 0xC3070000, 0x41200000, 0x00000400, D_80242F48_874978, 0x00000000, 0x00000000, 0x0000010E, 0x8014009A, 0x00050000, 0x008F0005, 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, 0x00020000, 0x00000028, 0xFFFFFF79, 0x0000000A, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000028, 0xFFFFFF79, 0x0000000A, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00270101, 0x00270103, 0x00270103, 0x00270103, 0x00270103, 0x00270101, 0x00270105, 0x00270105, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024315C_874B8C -.word 0x00000001, D_80242D00_874730, 0x430D0000, 0xC3070000, 0x42AA0000, 0x00000400, D_80242F48_874978, 0x00000000, 0x00000000, 0x0000010E, 0x8014009A, 0x00050000, 0x008F0005, 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, 0x00020000, 0x0000008D, 0xFFFFFF79, 0x00000055, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000008D, 0xFFFFFF79, 0x00000055, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00270101, 0x00270103, 0x00270103, 0x00270103, 0x00270103, 0x00270101, 0x00270105, 0x00270105, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242F6C_87499C, 0x1A0F0002, 0x00000001, D_8024315C_874B8C, 0x1A0E0002, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_05/875810.data.s b/ver/us/asm/data/world/area_tik/tik_05/875810.data.s deleted file mode 100644 index 65f012c229..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_05/875810.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240A50_875810 -.word 0x43A00000, 0xC1200000, 0x00000000, 0x43870000, 0x42C80000, 0x41C80000, 0xC2A40000, 0x43340000, 0x43390000, 0x41C80000, 0xC2A40000, 0x43340000, 0x43870000, 0x41C80000, 0xC2A40000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240C24, D_80240A50_875810, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190027, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_05/8758C0.data.s b/ver/us/asm/data/world/area_tik/tik_05/8758C0.data.s deleted file mode 100644 index f7309a45c0..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_05/8758C0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240B00_8758C0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_05_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_05_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B9C_87595C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242110, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BF8_8759B8 -.word 0x00000047, 0x00000005, D_80240B9C_87595C, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x00000004, 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, 0x802420EC, 0x00000046, 0x00000001, 0x80241B80, 0x00000044, 0x00000001, 0x80240AD0, 0x00000043, 0x00000002, PlaySound, 0x8000002D, 0x00000043, 0x00000006, PlaySoundAtF, 0x8000002E, 0x00000001, 0xFFFFFFAB, 0xFFFFFFEC, 0x00000078, 0x00000044, 0x00000001, 0x802417C8, 0x00000043, 0x00000003, EnableTexPanning, 0x00000007, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000032, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C83, 0x0000006E, 0x00000024, 0x00000002, 0xFE363C84, 0x000001F4, 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_80240B00_8758C0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000009, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFC7C, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFB50, 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_80240B00_8758C0, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240BF8_8759B8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_05/875D10.data.s b/ver/us/asm/data/world/area_tik/tik_05/875D10.data.s deleted file mode 100644 index 9fe64bd829..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_05/875D10.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240F50_875D10 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241420_8761E0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x0000000F, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_05_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80240F50_875D10, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415F8_8763B8 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80241420_8761E0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000F, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417A4_876564 -.word 0x00000001, 0xFFFFFFEB, 0xFFFFFFA6, 0x00000056, 0x0000009C, 0x0000012C, 0xFFFFFFF6, 0x0000005A, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_802417A4_876564, 0x00000044, 0x00000001, D_802415F8_8763B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s b/ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s deleted file mode 100644 index 9e19dcf917..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_05/8765C0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel tik_05_varStash -.word 0x00000000 - -dlabel D_80241804_8765C4 -.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_8024186C_87662C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241804_8765C4, 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_8024194C_87670C -.word 0x0000000A, 0x00000002, 0xF8405D28, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D28, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C85, 0x00000019, 0x00000043, 0x00000005, MakeLerp, 0x0000004B, 0x00000069, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_05_SetEntityPosition, 0xFD050F80, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFFF6, 0x00000016, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_05_SetEntityPosition, 0xFD050F80, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00002086, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_8024093C_8756FC, 0xFD050F80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B34_8768F4 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000124, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000002, 0x00000024, 0x00000002, 0xF8405D13, 0x00000001, 0x00000046, 0x00000001, D_8024186C_87662C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0xFFFFFF47, 0x0000003C, 0xFFFFFFE7, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D13, 0x00000043, 0x00000002, AssignScript, D_80241B34_8768F4, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000019, 0x00000032, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024194C_87670C, 0x0000000A, 0x00000002, 0xF8405D28, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0x00000019, 0x0000004B, 0x00000000, 0x00000000, 0x00000064, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0xFFFFFFDD, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x00000064, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_05/876A50.data.s b/ver/us/asm/data/world/area_tik/tik_05/876A50.data.s deleted file mode 100644 index b8927b3b38..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_05/876A50.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241C90_876A50 -.word 0x400CCCCD, 0x00000000, 0x00000000, 0x428C0000, 0x00000000, 0x00000001, 0x404CCCCD, 0x0000000F, 0x00000001, 0x42B40000, 0x00000000, 0x00000001 - -dlabel D_80241CC0_876A80 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80241C90_876A50, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CE0_876AA0 -.word 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_80241CC0_876A80, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000C0000 - -dlabel D_80241D0C_876ACC -.word 0x00000000, D_80241CE0_876AA0, 0x435C0000, 0xC1200000, 0xC2A00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8014009A, 0x00050000, 0x008F0005, 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, 0x00020000, 0x000000DC, 0xFFFFFFF6, 0xFFFFFFB0, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000A0, 0x00000000, 0xFFFFFFEC, 0x000000B4, 0x00000064, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00270101, 0x00270103, 0x00270103, 0x00270103, 0x00270103, 0x00270101, 0x00270105, 0x00270105, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241EFC_876CBC -.word 0x00000001, D_80241CE0_876AA0, 0x43020000, 0xC1200000, 0x42340000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8014009A, 0x00050000, 0x008F0005, 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, 0x00020000, 0x00000082, 0xFFFFFFF6, 0x0000002D, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000A0, 0x00000000, 0xFFFFFFEC, 0x000000B4, 0x00000064, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00270101, 0x00270103, 0x00270103, 0x00270103, 0x00270103, 0x00270101, 0x00270105, 0x00270105, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241D0C_876ACC, 0x1A100001, 0x00000001, D_80241EFC_876CBC, 0x1A120001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_07/87C4D0.data.s b/ver/us/asm/data/world/area_tik/tik_07/87C4D0.data.s deleted file mode 100644 index ad5caca677..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_07/87C4D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802428F0_87C4D0 -.word 0xC3870000, 0xC1200000, 0x00000000, 0x42B40000, 0xC3898000, 0x42B40000, 0xC2DC0000, 0x43340000, 0x44034000, 0x41C80000, 0xC2C80000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243890, D_802428F0_87C4D0, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190029, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_07/87C570.data.s b/ver/us/asm/data/world/area_tik/tik_07/87C570.data.s deleted file mode 100644 index 41c6c8d8b5..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_07/87C570.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242990_87C570 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_07_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_07_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_07_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_07_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430D4_87CCB4 -.word 0x00000043, 0x00000001, tik_07_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802431B0_87CD90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802431B0_87CD90 -.word 0x00000043, 0x00000001, tik_07_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_07_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_07_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_07_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_07_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_07_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_07_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802436C0_87D2A0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802451A0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024371C_87D2FC -.word 0x00000043, 0x00000003, GotoMap, 0x802451A8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024374C_87D32C -.word 0x00000043, 0x00000003, GotoMap, 0x802451A8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024377C_87D35C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C8C, D_8024371C_87D2FC, 0x00000046, 0x00000001, D_802430D4_87CCB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802437D4_87D3B4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000016, 0x00000024, 0x00000002, 0xFE363C8C, D_8024374C_87D32C, 0x00000046, 0x00000001, D_802430D4_87CCB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024382C_87D40C -.word 0x00000047, 0x00000005, D_802436C0_87D2A0, 0x00080000, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024377C_87D35C, 0x00000080, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802437D4_87D3B4, 0x00000080, 0x00000016, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x00000006, 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, 0x80245174, 0x00000046, 0x00000001, 0x80244038, 0x00000044, 0x00000001, 0x80242960, 0x00000044, 0x00000001, 0x80244978, 0x00000044, 0x00000001, 0x80244C54, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024382C_87D40C, 0x00000044, 0x00000001, EnterWalk, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_8024382C_87D40C, 0x00000044, 0x00000001, D_80242990_87C570, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s b/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s deleted file mode 100644 index 97d7db7bc2..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_07/87D5D0.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel tik_07_SuperBlock_CantUpgradeMessages -.word 0x001D00F0, 0x001D00F1 - -dlabel tik_07_SuperBlock_PartnerIDs -.word 0x00010002, 0x00030004, 0x00090006, 0x00070008 - -dlabel tik_07_SuperBlock_UpgradeDescMessages -.word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF - -dlabel tik_07_SuperBlock_UpgradeOrbAngles -.word 0x430C0000, 0x43340000, 0x435C0000 - -dlabel D_80243A54_87D634 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_07_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_07_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_07_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_07_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_07_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, tik_07_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_07_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_07_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243BB8_87D798 -.word 0x0000000A, 0x00000002, 0xF8405D31, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_07_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_07_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_07_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_07_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_07_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243A54_87D634, 0x00000043, 0x00000003, tik_07_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D31, 0x00000001, 0x00000043, 0x00000002, tik_07_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_07_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_07_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x00000132, 0x0000005A, 0xFFFFFF98, 0x00000011, 0xF8405D14, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0x00000334, 0x00000046, 0xFFFFFFFB, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D31, 0x00000043, 0x00000002, AssignScript, D_80243BB8_87D798, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802440C0_87DCA0 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244590_87E170 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000010, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_07_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802440C0_87DCA0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244768_87E348 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80244590_87E170, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000010, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244914_87E4F4 -.word 0x00000003, 0xFFFFFEF8, 0xFFFFFFC3, 0x00000096, 0x000000BC, 0x000000E6, 0xFFFFFFF6, 0x0000003C, 0x00000002, 0x0000001F, 0xFFFFFFEC, 0x00000129, 0x0000009C, 0x000000E6, 0xFFFFFFF6, 0x0000003C, 0x00000002, 0x0000006C, 0xFFFFFF8B, 0x00000038, 0x0000002B, 0x000000E6, 0x0000005A, 0x00000028, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80244914_87E4F4, 0x00000044, 0x00000001, D_80244768_87E348, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_07/87E590.data.s b/ver/us/asm/data/world/area_tik/tik_07/87E590.data.s deleted file mode 100644 index 1be6de55b3..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_07/87E590.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802449B0_87E590 -.word 0x00000010, 0x00000011, 0x00000012, 0x00000013 - -dlabel D_802449C0_87E5A0 -.word 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000003, ParentColliderToModel, 0xFE363C8B, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C8D, 0xF2491280, 0x0000002D, 0x00000002, 0xFE363C8D, 0xFE363C8C, 0x00000003, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C8C, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, func_80241390_87AF70, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A8080, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A8080, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C8B, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFE363C81, 0xF24F5280, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0xFE363C8D, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8D, 0x00000026, 0x00000002, 0xFE363C8C, 0xF2491280, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244B24_87E704 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000013, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000011, 0x00000024, 0x00000002, 0xFE363C8C, 0x0000006E, 0x00000046, 0x00000001, D_802449C0_87E5A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244B70_87E750 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000012, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000010, 0x00000024, 0x00000002, 0xFE363C8C, 0x0000000A, 0x00000046, 0x00000001, D_802449C0_87E5A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244BBC_87E79C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000014, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000012, 0x00000024, 0x00000002, 0xFE363C8C, 0xFFFFFFA6, 0x00000046, 0x00000001, D_802449C0_87E5A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244C08_87E7E8 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x00000015, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000013, 0x00000024, 0x00000002, 0xFE363C8C, 0xFFFFFF42, 0x00000046, 0x00000001, D_802449C0_87E5A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000044, 0x00000001, D_80244B24_87E704, 0x00000044, 0x00000001, D_80244B70_87E750, 0x00000044, 0x00000001, D_80244BBC_87E79C, 0x00000044, 0x00000001, D_80244C08_87E7E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_07/87E890.data.s b/ver/us/asm/data/world/area_tik/tik_07/87E890.data.s deleted file mode 100644 index 914b600309..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_07/87E890.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel tik_07_FlyingAI_JumpVels -.float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 - -dlabel D_80244CC8_87E8A8 -.word 0x40000000, 0x00000000, 0x00000000, 0x42A00000, 0x00000000, 0x00000005, 0x40400000, 0x0000000A, 0x00000002, 0x42C80000, 0x00000000, 0x00000001 - -dlabel D_80244CF8_87E8D8 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFCAE, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000003C, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, tik_07_FlyingAI_Main, D_80244CC8_87E8A8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244D68_87E948 -.word 0x00000000, 0x00140015, 0x00000000, 0x00000000, D_80244CF8_87E8D8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 - -dlabel D_80244D94_87E974 -.word 0x00000000, D_80244D68_87E948, 0x43660000, 0x42480000, 0x42480000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8014009A, 0x00050000, 0x008F0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x000000E6, 0x00000032, 0x00000032, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000E6, 0x00000032, 0x00000032, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00280301, 0x00280303, 0x00280304, 0x00280304, 0x00280301, 0x00280301, 0x00280306, 0x00280306, 0x00280305, 0x00280304, 0x00280300, 0x00280300, 0x00280300, 0x00280300, 0x00280300, 0x00280300, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244F84_87EB64 -.word 0x00000001, D_80244D68_87E948, 0x4405C000, 0x42480000, 0x41A00000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8014009A, 0x00050000, 0x008F0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000217, 0x00000032, 0x00000014, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000217, 0x00000032, 0x00000014, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00280301, 0x00280303, 0x00280304, 0x00280304, 0x00280301, 0x00280301, 0x00280306, 0x00280306, 0x00280305, 0x00280304, 0x00280300, 0x00280300, 0x00280300, 0x00280300, 0x00280300, 0x00280300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80244D94_87E974, 0x1A0C0002, 0x00000001, D_80244F84_87EB64, 0x1A0D0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_08/87F8B0.data.s b/ver/us/asm/data/world/area_tik/tik_08/87F8B0.data.s deleted file mode 100644 index d845412ee4..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_08/87F8B0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240AC0_87F8B0 -.word 0xC4020000, 0xC1200000, 0x00000000, 0x42B40000, 0x432A0000, 0xC1200000, 0x00000000, 0x43870000, 0xC3BB8000, 0x43480000, 0x00000000, 0x42B40000, 0xC3E98000, 0xC1200000, 0xC2DC0000, 0x42B40000, 0x42BE0000, 0x41C80000, 0xC2B00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241B38, D_80240AC0_87F8B0, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019002A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000005A, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s b/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s deleted file mode 100644 index 5833508318..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_08/87F9A0.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240BB0_87F9A0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_08_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_08_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F04_87FCF4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_08_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_08_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_08_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802413D0_8801C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413D0_8801C0 -.word 0x00000043, 0x00000001, tik_08_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_08_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_08_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_08_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415AC_88039C -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_08_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_08_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_08_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802418E0_8806D0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_08_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_08_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024197C_88076C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802433B0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419D8_8807C8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802433B8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A34_880824 -.word 0x00000043, 0x00000003, GotoMap, 0x802433C0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A64_880854 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C8C, D_80241A34_880824, 0x00000046, 0x00000001, D_802415AC_88039C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241ABC_8808AC -.word 0x00000047, 0x00000005, D_8024197C_88076C, 0x00080000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802419D8_8807C8, 0x00080000, 0x00000018, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000001D, 0x7FFFFE00, 0x00000047, 0x00000005, D_80241A64_880854, 0x00000040, 0x0000001D, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x00000007, 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, 0x80243394, 0x00000046, 0x00000001, 0x80242AF0, 0x00000044, 0x00000001, 0x80240B50, 0x00000043, 0x00000002, PlaySound, 0x80000033, 0x00000043, 0x00000006, PlaySoundAtF, 0x80000034, 0x00000001, 0xFFFFFFE2, 0xFFFFFFE2, 0xFFFFFFAB, 0x00000044, 0x00000001, D_80242948_881738, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000001E, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000046, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000064, 0x00000024, 0x00000002, 0xFE363C84, 0x00000082, 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_802418E0_8806D0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000023, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFC7C, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFB50, 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_802418E0_8806D0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000022, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFA88, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFF5D8, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFC4, 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_802418E0_8806D0, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000D, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000A, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000A, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000007, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001D, 0x7FFFFE00, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000046, 0x00000001, D_80241ABC_8808AC, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8A, D_80241ABC_8808AC, 0x00000044, 0x00000001, D_80240BB0_87F9A0, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8A, D_80241ABC_8808AC, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000001D, 0x00000044, 0x00000001, D_80240F04_87FCF4, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241ABC_8808AC, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420B0_880EA0 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242580_881370 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x0000000D, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_08_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802420B0_880EA0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242758_881548 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242580_881370, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000D, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242904_8816F4 -.word 0x00000002, 0xFFFFFDF9, 0xFFFFFFED, 0x00000103, 0x0000002E, 0x000000C8, 0xFFFFFFF6, 0x0000003C, 0x00000002, 0x00000085, 0xFFFFFF9C, 0x0000002D, 0x000000EB, 0x000000C8, 0xFFFFFFF6, 0x0000003C, 0x00000001 - -dlabel D_80242948_881738 -.word 0x00000024, 0x00000002, 0xFE363C80, D_80242904_8816F4, 0x00000044, 0x00000001, D_80242758_881548, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_08/881770.data.s b/ver/us/asm/data/world/area_tik/tik_08/881770.data.s deleted file mode 100644 index 3e1b7810fc..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_08/881770.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242980_881770 -.word 0x00000043, 0x00000006, PlaySoundAt, 0x00000301, 0x00000000, 0x0000005A, 0x000000C8, 0x00000064, 0x00000043, 0x00000005, MakeLerp, 0x000000C8, 0xFFFFFFF6, 0x00000019, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_08_SetEntityPosition, 0xFD050F80, 0x0000005A, 0xFE363C80, 0x00000064, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0x0000005A, 0xFE363C80, 0x00000064, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A7C_88186C -.word 0x00000043, 0x00000003, GotoMap, 0x802433C8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242AAC_88189C -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF840630E, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840630E, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, D_80242AAC_88189C, 0x00020000, 0xF9718884, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D2F, 0x00000001, 0x00000043, 0x00000005, tik_08_SetEntityPosition, 0xFD050F80, 0x0000005A, 0xFFFFFFF6, 0x00000064, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0x0000005F, 0xFFFFFFF6, 0xFFFFFFA8, 0x00000000, 0x00000004, D_80242A7C_88186C, 0x0000078E, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_08/8819D0.data.s b/ver/us/asm/data/world/area_tik/tik_08/8819D0.data.s deleted file mode 100644 index 779935c38e..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_08/8819D0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242BE0_8819D0 -.short 0x0000, 0x0000, 0x0018, 0x0018, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0063, 0x0000, 0x0000 - -dlabel D_80242C0E_8819FE -.short 0x1B00, 0x0000, 0x1B01, 0x0000, 0x1B02 - -dlabel D_80242C18_881A08 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_08_GetFloorCollider, 0xFE363C80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000B, 0x0000000F, 0x00000002, 0xFE363C82, 0xFFFFFFEC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000044, 0x00000001, 0x80240B7C, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x00080000, 0x000000A0, 0x00000028, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFE7, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFE7, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003DC, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003E7, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF06, 0xFFFFFFC4, 0x0000000F, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFD8, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFD8, 0xFFFFFFC7, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFD8, 0xFFFFFFC4, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242EC0_881CB0 -.word 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00500004, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000870, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003DD, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003E7, 0x00000000, 0x00000043, 0x00000008, NpcFlyTo, 0xFFFFFFFF, 0xFFFFFFD8, 0xFFFFFF06, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, D_80242980_881770, 0x0000000A, 0x00000002, 0xF8405D2B, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2B, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2C, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2F, 0x00000001, 0x00000044, 0x00000001, 0x80240B50, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243078_881E68 -.word 0x0000000A, 0x00000002, 0xF8405D2F, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80242C18_881A08, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80242EC0_881CB0, 0x0000000A, 0x00000002, 0xF8405D2B, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A7D80, 0xF24A7D80, 0xF24A7D80, 0x00000043, 0x00000002, func_80240A5C_87F84C, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D2C, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A7F80, 0xF24A7F80, 0xF24A7F80, 0x00000043, 0x00000002, func_80240A5C_87F84C, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A8280, 0xF24A8280, 0xF24A8280, 0x00000043, 0x00000002, func_80240A5C_87F84C, 0x00000002, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802431A4_881F94 -.word 0x00000000, D_80242BE0_8819D0, 0x00000000, 0xC47A0000, 0x00000000, 0x00840D0D, D_80243078_881E68, 0x00000000, 0x00000000, 0x0000005A, 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, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x0050000C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802431A4_881F94, 0x1B000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_09/883460.data.s b/ver/us/asm/data/world/area_tik/tik_09/883460.data.s deleted file mode 100644 index f76546774b..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_09/883460.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802412A0_883460 -.word 0xC3610000, 0xC1200000, 0x00000000, 0x42B40000, 0x43A28000, 0xC1200000, 0x00000000, 0x43870000, 0xC1F00000, 0x41C80000, 0xC2200000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242588, D_802412A0_883460, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019002B, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_09/883500.data.s b/ver/us/asm/data/world/area_tik/tik_09/883500.data.s deleted file mode 100644 index 109e421e78..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_09/883500.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241340_883500 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_09_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_09_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_09_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_09_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_09_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241B60_883D20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B60_883D20 -.word 0x00000043, 0x00000001, tik_09_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_09_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_09_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_09_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_09_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_09_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_09_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242070_884230 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_09_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_09_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024210C_8842CC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000D, 0x0000026B, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000003C, 0x00000000, 0x00000019, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000D, 0x0000026C, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422A0_884460 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244180, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422FC_8844BC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244188, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242358_884518 -.word 0x00000047, 0x00000005, D_802422A0_884460, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802422FC_8844BC, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423A0_884560 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8A, D_80242358_884518, 0x00000044, 0x00000001, D_80241340_883500, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242358_884518, 0x00000046, 0x00000001, EnterWalk, 0x0000000A, 0x00000002, 0xF8405D30, 0x00000000, 0x00000046, 0x00000001, D_8024210C_8842CC, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024245C_88461C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF6, 0x00000019, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x00000000, 0x0000001E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x00000008, 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, 0x80244144, 0x00000046, 0x00000001, 0x802437D0, 0x00000044, 0x00000001, 0x80241310, 0x00000043, 0x00000002, PlaySound, 0x80000035, 0x00000043, 0x00000006, PlaySoundAtF, 0x80000036, 0x00000001, 0xFFFFFF42, 0xFFFFFFEC, 0xFFFFFF88, 0x00000043, 0x00000006, PlaySoundAtF, 0x80000037, 0x00000001, 0x00000032, 0xFFFFFFEC, 0xFFFFFF88, 0x00000043, 0x00000006, PlaySoundAtF, 0x80000038, 0x00000001, 0x00000122, 0xFFFFFFEC, 0xFFFFFF88, 0x00000044, 0x00000001, D_802434E8_8856A8, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000013, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000015, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000046, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000064, 0x00000024, 0x00000002, 0xFE363C84, 0x00000082, 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_80242070_884230, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000019, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFC7C, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFB50, 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_80242070_884230, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000017, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFA88, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFF5D8, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFC4, 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_80242070_884230, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000016, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000012, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000010, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000D, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C82, 0x00000190, 0x00000024, 0x00000002, 0xFE363C83, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 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_80242070_884230, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetRenderMode, 0x00000011, 0x00000016, 0x00000043, 0x00000003, SetRenderMode, 0x00000014, 0x00000016, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002A, 0x00000044, 0x00000001, D_8024245C_88461C, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002C, 0x00000044, 0x00000001, D_8024245C_88461C, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002E, 0x00000044, 0x00000001, D_8024245C_88461C, 0x00000057, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0x00000000, 0x0000003C, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0x00000000, 0x0000003C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000044, 0x00000001, D_802423A0_884560, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C70_884E30 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243140_885300 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000023, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_09_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80242C70_884E30, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243318_8854D8 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80243140_885300, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802434C4_885684 -.word 0x00000001, 0xFFFFFF21, 0xFFFFFFE1, 0x00000226, 0x00000044, 0x000000C8, 0xFFFFFFF6, 0x0000003C, 0x00000003 - -dlabel D_802434E8_8856A8 -.word 0x00000024, 0x00000002, 0xFE363C80, D_802434C4_885684, 0x00000044, 0x00000001, D_80243318_8854D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_09/8856E0.data.s b/ver/us/asm/data/world/area_tik/tik_09/8856E0.data.s deleted file mode 100644 index e5aeaea26d..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_09/8856E0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243520_8856E0 -.word 0x00000043, 0x00000004, AwaitPlayerLeave, 0xFFFFFFF6, 0x0000000A, 0x00000032, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000007, InterpCamTargetPos, 0x00000000, 0x00000001, 0xFFFFFFF6, 0xFFFFFFF6, 0x0000000A, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00000301, 0x00000000, 0xFFFFFFF6, 0x000000C8, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0x000000C8, 0xFFFFFFF6, 0x00000019, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_09_SetEntityPosition, 0xFD050F80, 0xFFFFFFF6, 0xFE363C80, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFFFFFFF6, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, InterpCamTargetPos, 0x00000000, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024375C_88591C -.word 0x00000043, 0x00000003, GotoMap, 0x80244190, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024378C_88594C -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF840630F, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF840630F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000005, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000047, 0x00000005, D_8024378C_88594C, 0x00020000, 0xF9718885, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D30, 0x00000001, 0x00000043, 0x00000005, tik_09_SetEntityPosition, 0xFD050F80, 0xFFFFFFF6, 0xFFFFFFF6, 0x0000000A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0xFFFFFFE2, 0xFFFFFFF6, 0xFFFFFFD8, 0x00000000, 0x00000002, D_8024375C_88591C, 0x0000078F, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_09/885A80.data.s b/ver/us/asm/data/world/area_tik/tik_09/885A80.data.s deleted file mode 100644 index 84f0ee6c09..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_09/885A80.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802438C0_885A80 -.word 0x40000000, 0x0000003C, 0x00000005, 0x42A00000, 0x42700000, 0x00000003, 0x41100000, 0x00000000, 0x00000000, 0x42B40000, 0x428C0000, 0x00000001 - -dlabel D_802438F0_885AB0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000002, tik_09_TackleAI_Main, D_802438C0_885A80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243960_885B20 -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_802438F0_885AB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00120000 - -dlabel D_8024398C_885B4C -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000003C, 0x00000019, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000021, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243A6C_885C2C -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, tik_09_GetDefeatedEnemyCount, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xF8405D30, 0x00000001, 0x00000044, 0x00000001, D_80243520_8856E0, 0x00000044, 0x00000001, D_8024398C_885B4C, 0x00000013, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243B20_885CE0 -.word 0x0000000A, 0x00000002, 0xF8405D30, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80243A6C_885C2C, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243B74_885D34 -.word 0x00000000, D_80243960_885B20, 0xC2A00000, 0xC1200000, 0x00000000, 0x00040C00, D_80243B20_885CE0, 0x00000000, 0x00000000, 0x0000005A, 0x80140090, 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, 0x00020000, 0xFFFFFFB0, 0xFFFFFFF6, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFB0, 0xFFFFFFF6, 0x00000000, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x0029000B, 0x0029000B, 0x00290007, 0x00290006, 0x00290008, 0x00290000, 0x00290004, 0x00290004, 0x00290004, 0x00290004, 0x00000002, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243D64_885F24 -.word 0x00000001, D_80243960_885B20, 0x42700000, 0xC1200000, 0x00000000, 0x00040C00, D_80243B20_885CE0, 0x00000000, 0x00000000, 0x0000005A, 0x80140090, 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, 0x00020000, 0x0000003C, 0xFFFFFFF6, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000003C, 0xFFFFFFF6, 0x00000000, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x0029000B, 0x0029000B, 0x00290007, 0x00290006, 0x00290008, 0x00290000, 0x00290004, 0x00290004, 0x00290004, 0x00290004, 0x00000002, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243F54_886114 -.word 0x00000002, D_80243960_885B20, 0x43340000, 0xC1200000, 0x00000000, 0x00040C00, D_80243B20_885CE0, 0x00000000, 0x00000000, 0x0000010E, 0x80140090, 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, 0x00020000, 0x000000B4, 0xFFFFFFF6, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000B4, 0xFFFFFFF6, 0x00000000, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x0029000B, 0x0029000B, 0x00290007, 0x00290006, 0x00290008, 0x00290000, 0x00290004, 0x00290004, 0x00290004, 0x00290004, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80243B74_885D34, 0x1A020004, 0x00000001, D_80243D64_885F24, 0x1A010004, 0x00000001, D_80243F54_886114, 0x1A000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_10/887780.data.s b/ver/us/asm/data/world/area_tik/tik_10/887780.data.s deleted file mode 100644 index c7259b2028..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_10/887780.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802413C0_887780 -.word 0x43A50000, 0x41A00000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241564, D_802413C0_887780, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019002C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_10/887800.data.s b/ver/us/asm/data/world/area_tik/tik_10/887800.data.s deleted file mode 100644 index f15e1357d3..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_10/887800.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241440_887800 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_10_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414DC_88789C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242800, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241538_8878F8 -.word 0x00000047, 0x00000005, D_802414DC_88789C, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x00000009, 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, 0x00000046, 0x00000001, 0x80242678, 0x00000044, 0x00000001, 0x80241410, 0x00000043, 0x00000002, PlaySound, 0x80000039, 0x00000044, 0x00000001, 0x80241FF8, 0x00000043, 0x00000003, EnableTexPanning, 0x00000008, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000032, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C83, 0x0000006E, 0x00000024, 0x00000002, 0xFE363C84, 0x000001F4, 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_80241440_887800, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241538_8878F8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_10/887B20.data.s b/ver/us/asm/data/world/area_tik/tik_10/887B20.data.s deleted file mode 100644 index 1deafe4b2b..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_10/887B20.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241760_887B20 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C30_887FF0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x0000000E, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_10_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241760_887B20, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E08_8881C8 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80241C30_887FF0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FB4_888374 -.word 0x00000002, 0xFFFFFF24, 0x00000014, 0x0000006E, 0x00000032, 0x000000FA, 0x00000014, 0x0000003C, 0x00000003, 0x000000A0, 0x0000000A, 0x000000A0, 0x0000003C, 0x000000FA, 0x00000014, 0x0000003C, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80241FB4_888374, 0x00000044, 0x00000001, D_80241E08_8881C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s b/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s deleted file mode 100644 index 39743691a8..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_10/8883F0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel tik_10_SuperBlock_CantUpgradeMessages -.word 0x001D00F0, 0x001D00F1 - -dlabel tik_10_SuperBlock_PartnerIDs -.word 0x00010002, 0x00030004, 0x00090006, 0x00070008 - -dlabel tik_10_SuperBlock_UpgradeDescMessages -.word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF - -dlabel tik_10_SuperBlock_UpgradeOrbAngles -.word 0x430C0000, 0x43340000, 0x435C0000 - -dlabel D_80242094_888454 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_10_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_10_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_10_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_10_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_10_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, tik_10_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_10_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_10_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421F8_8885B8 -.word 0x0000000A, 0x00000002, 0xF8405D32, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_10_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_10_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_10_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_10_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242094_888454, 0x00000043, 0x00000003, tik_10_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D32, 0x00000001, 0x00000043, 0x00000002, tik_10_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_10_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_10_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0xFFFFFF74, 0x000000A0, 0xFFFFFFD8, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D32, 0x00000043, 0x00000002, AssignScript, D_802421F8_8885B8, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x00000007, 0x00000006, 0xFFFFFFC0, 0xFFFFFFF1, 0xFFFFFFA2, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000001, 0x00000004, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFFCC, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D15, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000017, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D16, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000062, 0x00000046, 0xFFFFFFE0, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D17, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_12/88AE20.data.s b/ver/us/asm/data/world/area_tik/tik_12/88AE20.data.s deleted file mode 100644 index e7536d1feb..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_12/88AE20.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242250_88AE20 -.word 0xC32D0000, 0xC3070000, 0xC2C80000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243168, D_80242250_88AE20, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019002D, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s b/ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s deleted file mode 100644 index 194702f37d..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_12/88AEA0.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802422D0_88AEA0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_12_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_12_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242624_88B1F4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_12_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_12_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_12_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242AF0_88B6C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242AF0_88B6C0 -.word 0x00000043, 0x00000001, tik_12_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_12_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_12_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_12_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242CCC_88B89C -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_12_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_12_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_12_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243000_88BBD0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_12_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_12_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024309C_88BC6C -.word 0x00000043, 0x00000003, GotoMap, 0x802449C0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430CC_88BC9C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000006, 0x00000024, 0x00000002, 0xFE363C8C, D_8024309C_88BC6C, 0x00000046, 0x00000001, D_80242CCC_88B89C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243124_88BCF4 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000006, 0x7FFFFE00, 0x00000047, 0x00000005, D_802430CC_88BC9C, 0x00000040, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x0000000A, 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, 0x802449A4, 0x00000046, 0x00000001, 0x80244334, 0x00000044, 0x00000001, 0x802422A0, 0x00000044, 0x00000001, 0x80243C08, 0x00000043, 0x00000003, EnableTexPanning, 0x00000007, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 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_80243000_88BBD0, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C8A, D_80243124_88BCF4, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000006, 0x00000044, 0x00000001, D_80242624_88B1F4, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_12/88BF60.data.s b/ver/us/asm/data/world/area_tik/tik_12/88BF60.data.s deleted file mode 100644 index 28ee2a5692..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_12/88BF60.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243390_88BF60 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243860_88C430 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000009, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_12_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80243390_88BF60, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243A38_88C608 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80243860_88C430, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000009, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243BE4_88C7B4 -.word 0x00000001, 0xFFFFFF28, 0xFFFFFFC8, 0x0000013E, 0x000000C1, 0x000000C8, 0xFFFFFF79, 0x00000064, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, D_80243BE4_88C7B4, 0x00000044, 0x00000001, D_80243A38_88C608, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s b/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s deleted file mode 100644 index 3821781654..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_12/88C810.data.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel tik_12_varStash -.word 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel tik_12_SuperBlock_CantUpgradeMessages -.word 0x001D00F0, 0x001D00F1 - -dlabel tik_12_SuperBlock_PartnerIDs -.word 0x00010002, 0x00030004, 0x00090006, 0x00070008 - -dlabel tik_12_SuperBlock_UpgradeDescMessages -.word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF - -dlabel tik_12_SuperBlock_UpgradeOrbAngles -.word 0x430C0000, 0x43340000, 0x435C0000 - -dlabel D_80243D10_88C8E0 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_12_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_12_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_12_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_12_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_12_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, tik_12_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_12_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_12_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243E74_88CA44 -.word 0x0000000A, 0x00000002, 0xF8405D33, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_12_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_12_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_12_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_12_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_12_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_12_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_12_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_12_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_12_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243D10_88C8E0, 0x00000043, 0x00000003, tik_12_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D33, 0x00000001, 0x00000043, 0x00000002, tik_12_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_12_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_12_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802442F4_88CEC4 -.word 0x00000024, 0x00000002, 0xF8405D0B, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244314_88CEE4 -.word 0x00000024, 0x00000002, 0xF8405D0C, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0x000000F0, 0x00000000, 0xFFFFFFD8, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D33, 0x00000043, 0x00000002, AssignScript, D_80243E74_88CA44, 0x0000000A, 0x00000002, 0xF8405D0B, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0x0000008C, 0xFFFFFF79, 0x00000037, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802442F4_88CEC4, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D0C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0x0000008C, 0xFFFFFF79, 0x00000069, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80244314_88CEE4, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244430_88D000 -.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_80244460_88D030 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, tik_12_TackleAI_Main, D_80244430_88D000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802444D0_88D0A0 -.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_80244500_88D0D0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, tik_12_TackleAI_Main, D_802444D0_88D0A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244570_88D140 -.word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 - -dlabel D_802445A0_88D170 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, tik_12_TackleAI_Main, D_80244570_88D140, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244610_88D1E0 -.word 0x00000043, 0x00000001, tik_12_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, tik_12_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, tik_12_func_802408B4_97BEE4, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, tik_12_TackleAI_Main, D_80244430_88D000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244704_88D2D4 -.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244460_88D030, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244610_88D1E0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244500_88D0D0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_802445A0_88D170, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_802447B4_88D384 -.word 0x00000000, D_80244704_88D2D4, 0xC0C00000, 0xC3070000, 0x42960000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005009B, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00030000, 0xFFFFFFFA, 0xFFFFFF79, 0x0000004B, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000003C, 0xFFFFFF79, 0x00000005, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00330001, 0x00330003, 0x00330004, 0x00330004, 0x00330000, 0x00330000, 0x00330007, 0x00330007, 0x0033000C, 0x00330005, 0x0033000D, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00330000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802447B4_88D384, 0x1A150002, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_14/88DF60.data.s b/ver/us/asm/data/world/area_tik/tik_14/88DF60.data.s deleted file mode 100644 index 52d217fd21..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_14/88DF60.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240960_88DF60 -.word 0xC32D0000, 0x00000000, 0x00000000, 0x42B40000, 0x41F00000, 0x00000000, 0x42340000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241994, D_80240960_88DF60, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019002E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s b/ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s deleted file mode 100644 index da1808a2ae..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_14/88DFF0.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802409F0_88DFF0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_14_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_14_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D44_88E344 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_14_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_14_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_14_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241210_88E810, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241210_88E810 -.word 0x00000043, 0x00000001, tik_14_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_14_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_14_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_14_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413EC_88E9EC -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_14_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_14_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_14_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241720_88ED20 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_14_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_14_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417BC_88EDBC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242590, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241818_88EE18 -.word 0x00000043, 0x00000003, GotoMap, 0x80242598, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241848_88EE48 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C8C, D_80241818_88EE18, 0x00000046, 0x00000001, D_802413EC_88E9EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802418A0_88EEA0 -.word 0x00000047, 0x00000005, D_80241848_88EE48, 0x00000040, 0x0000000A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802417BC_88EDBC, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000A, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241900_88EF00 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_802418A0_88EEA0, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000000A, 0x00000044, 0x00000001, D_80240D44_88E344, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_802418A0_88EEA0, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x0000000B, 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, 0x00000044, 0x00000001, 0x802409C0, 0x00000044, 0x00000001, 0x802423F8, 0x00000046, 0x00000001, 0x80242518, 0x00000043, 0x00000003, EnableTexPanning, 0x00000007, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 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_80241720_88ED20, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000A, 0x7FFFFE00, 0x00000044, 0x00000001, D_80241900_88EF00, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_14/88F180.data.s b/ver/us/asm/data/world/area_tik/tik_14/88F180.data.s deleted file mode 100644 index 90f950ad16..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_14/88F180.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241B80_88F180 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242050_88F650 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x0000000D, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_14_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241B80_88F180, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242228_88F828 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242050_88F650, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000D, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423D4_88F9D4 -.word 0x00000001, 0xFFFFFF29, 0x00000023, 0x000000E4, 0x00000066, 0x000000D2, 0x00000000, 0x0000003C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_802423D4_88F9D4, 0x00000044, 0x00000001, D_80242228_88F828, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_14/88FA30.data.s b/ver/us/asm/data/world/area_tik/tik_14/88FA30.data.s deleted file mode 100644 index 214588dea6..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_14/88FA30.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242430_88FA30 -.word 0x420C0000, 0x00000000, 0x42340000, 0x00000000 - -dlabel D_80242440_88FA40 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x00000009, 0x00000000, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000009, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000009, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8405D09, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D09, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000009, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80242440_88FA40, 0x00100000, D_80242430_88FA30, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_15/8906B0.data.s b/ver/us/asm/data/world/area_tik/tik_15/8906B0.data.s deleted file mode 100644 index 604ca28e67..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_15/8906B0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240B10_8906B0 -.word 0xC3660000, 0xC1200000, 0x00000000, 0x42B40000, 0x42960000, 0xC1200000, 0xC1700000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241A98, D_80240B10_8906B0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019002F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_15/890740.data.s b/ver/us/asm/data/world/area_tik/tik_15/890740.data.s deleted file mode 100644 index 70aac0ac80..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_15/890740.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240BA0_890740 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_15_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_15_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EF4_890A94 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_15_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_15_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_15_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802413C0_890F60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413C0_890F60 -.word 0x00000043, 0x00000001, tik_15_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_15_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_15_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_15_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024159C_89113C -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_15_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_15_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_15_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802418D0_891470 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_15_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_15_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024196C_89150C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242E70, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419C8_891568 -.word 0x00000043, 0x00000003, GotoMap, 0x80242E78, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419F8_891598 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000009, 0x00000024, 0x00000002, 0xFE363C8C, D_802419C8_891568, 0x00000046, 0x00000001, D_8024159C_89113C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A50_8915F0 -.word 0x00000047, 0x00000005, D_8024196C_89150C, 0x00080000, 0x0000000C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802419F8_891598, 0x00000040, 0x00000009, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x0000000C, 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, 0x80242E58, 0x00000044, 0x00000001, 0x80240B70, 0x00000044, 0x00000001, 0x802426C8, 0x00000043, 0x00000003, EnableTexPanning, 0x00000010, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 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_802418D0_891470, 0x00000057, 0x00000000, 0x00000046, 0x00000001, 0x80241DD8, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, D_80241A50_8915F0, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000009, 0x00000044, 0x00000001, D_80240EF4_890A94, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241A50_8915F0, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_15/891890.data.s b/ver/us/asm/data/world/area_tik/tik_15/891890.data.s deleted file mode 100644 index fc8aabe922..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_15/891890.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241CF0_891890 -.word 0xC3660000, 0xC1200000, 0x00000000, 0x00000000 - -dlabel D_80241D00_8918A0 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x00000012, 0x00000000, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8405D09, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D09, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80241D00_8918A0, 0x00100000, D_80241CF0_891890, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E50_8919F0 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242320_891EC0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000016, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_15_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241E50_8919F0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802424F8_892098 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242320_891EC0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000016, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426A4_892244 -.word 0x00000001, 0xFFFFFF24, 0xFFFFFFEE, 0x000000F3, 0x0000009B, 0x000000C8, 0xFFFFFFF6, 0x0000003C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_802426A4_892244, 0x00000044, 0x00000001, D_802424F8_892098, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_15/8922A0.data.s b/ver/us/asm/data/world/area_tik/tik_15/8922A0.data.s deleted file mode 100644 index 579ec9e552..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_15/8922A0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242700_8922A0 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel tik_15_varStash -.word 0x00000000 - -dlabel D_8024275C_8922FC -.word 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802427BC_89235C -.word 0x00000000, 0x00000000, 0x00000002, 0x00000095, 0x00000001, 0x00000120, 0x00000002, 0x00000097, 0x00000000, 0x00000000, 0x00000002, 0x0000008C, 0x00000002, 0x0000008A, 0x00000002, 0x0000008D, 0x00000002, 0x0000008D, 0x00000000, 0x00000000, 0x00000002, 0x0000008D, 0x00000002, 0x0000008D, 0x00000002, 0x0000008D - -dlabel D_80242824_8923C4 -.word 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D05, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00080001, 0x00000024, 0x00000002, 0xF8405D05, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00080002, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00080003, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00AE0004, 0x00AE0001, 0x00000000, 0xFE363C80, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000001, 0x00000043, 0x00000002, ShowChoice, 0x001E0001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00AE0004, 0x00AE0001, 0x00000000, 0x00080005, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240AD0_890670, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00AE0004, 0x00AE0001, 0x00000000, 0x00080006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xF5DE01B8, 0x00000043, 0x00000001, func_80240A78_890618, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, AddCoin, 0xFFFFFFC0, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00AE0004, 0x00AE0001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_8024275C_8922FC, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddCoin, 0xFFFFFFC0, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00AE0004, 0x00AE0001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000120, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000046, 0x00000001, D_8024275C_8922FC, 0x00000043, 0x00000003, AddBadge, 0x00000120, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, func_80240AA4_890644, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x00AE0004, 0x00AE0001, 0x00000000, 0x00080007, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, AddCoin, 0xFFFFFFC0, 0x00000043, 0x00000002, ShowCoinCounter, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0x00000001, 0x00AE0004, 0x00AE0001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000046, 0x00000001, D_8024275C_8922FC, 0x00000043, 0x00000003, AddItem, 0xFE363C8B, 0xFE363C80, 0x00000023, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE01B8, 0x0000000A, 0x00000027, 0x00000002, 0xF5DE01B8, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00AE0004, 0x00AE0001, 0x00000000, 0x00080004, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C34_8927D4 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242824_8923C4, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C68_892808 -.word 0x00000001, D_80242700_8922A0, 0xC2A00000, 0xC1200000, 0x00000000, 0x00000D01, D_80242C34_8927D4, 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, 0x00AE0001, 0x00AE0001, 0x00AE0001, 0x00AE0001, 0x00AE0001, 0x00AE0001, 0x00AE0001, 0x00AE0001, 0x00AE0001, 0x00AE0001, 0x00AE0001, 0x00AE0001, 0x00AE0001, 0x00AE0001, 0x00AE0001, 0x00AE0001, 0x00000000, 0x00000000, 0x00000000, 0x001A000D, 0x00000001, D_80242C68_892808, 0x00060000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_17/893D80.data.s b/ver/us/asm/data/world/area_tik/tik_17/893D80.data.s deleted file mode 100644 index 61d625939b..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_17/893D80.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241360_893D80 -.word 0x43C80000, 0x41A00000, 0x41200000, 0x43340000, 0x44340000, 0x42820000, 0x40A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242A5C, D_80241360_893D80, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190030, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_80240000_892A20, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s b/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s deleted file mode 100644 index 169230349d..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_17/893E40.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel tik_17_SuperBlock_CantUpgradeMessages -.word 0x001D00F0, 0x001D00F1 - -dlabel tik_17_SuperBlock_PartnerIDs -.word 0x00010002, 0x00030004, 0x00090006, 0x00070008 - -dlabel tik_17_SuperBlock_UpgradeDescMessages -.word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF - -dlabel tik_17_SuperBlock_UpgradeOrbAngles -.word 0x430C0000, 0x43340000, 0x435C0000 - -dlabel D_80241484_893EA4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_17_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_17_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_17_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_17_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_17_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, tik_17_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_17_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_17_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415E8_894008 -.word 0x0000000A, 0x00000002, 0xF8405D34, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_17_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_17_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_17_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241484_893EA4, 0x00000043, 0x00000003, tik_17_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D34, 0x00000001, 0x00000043, 0x00000002, tik_17_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_17_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_17_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0xFFFFFF7E, 0x00000032, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D34, 0x00000043, 0x00000002, AssignScript, D_802415E8_894008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s b/ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s deleted file mode 100644 index d0b3bfbf59..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_17/8944F0.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241AD0_8944F0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_17_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_17_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E24_894844 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_17_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_17_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242214_894C34 -.word 0x00000043, 0x00000001, tik_17_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802422F0_894D10, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422F0_894D10 -.word 0x00000043, 0x00000001, tik_17_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_17_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_17_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_17_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802424CC_894EEC -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_17_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_17_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_17_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242800_895220 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_17_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_17_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024289C_8952BC -.word 0x0000000A, 0x00000002, 0xF8405B87, 0x00000000, 0x00000024, 0x00000002, 0xF8405B87, 0x00000001, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000005DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80242CA8, 0x00000007, 0x00000006, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80242CA0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242934_895354 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000008, 0x00000024, 0x00000002, 0xFE363C8C, D_8024289C_8952BC, 0x00000046, 0x00000001, D_802424CC_894EEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024298C_8953AC -.word 0x00000043, 0x00000003, GotoMap, 0x80242CB0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802429BC_8953DC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8C, D_8024298C_8953AC, 0x00000046, 0x00000001, D_80242214_894C34, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A14_895434 -.word 0x00000047, 0x00000005, D_80242934_895354, 0x00000040, 0x00000008, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802429BC_8953DC, 0x00000080, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 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, 0x00000046, 0x00000001, 0x80241A68, 0x00000044, 0x00000001, 0x802413C0, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_80242A14_895434, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000008, 0x00000044, 0x00000001, D_80241E24_894844, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_80242A14_895434, 0x00000044, 0x00000001, D_80241AD0_8944F0, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000017, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFED4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 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_80242800_895220, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_18/895D90.data.s b/ver/us/asm/data/world/area_tik/tik_18/895D90.data.s deleted file mode 100644 index 2d9e0e66f2..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_18/895D90.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802406B0_895D90 -.word 0xC35C0000, 0xC1200000, 0x00000000, 0x42B40000, 0x43A00000, 0xC1200000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802408DC, D_802406B0_895D90, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190031, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_18/895E20.data.s b/ver/us/asm/data/world/area_tik/tik_18/895E20.data.s deleted file mode 100644 index 1ad0ecb861..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_18/895E20.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240740_895E20 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_18_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_18_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407DC_895EBC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241EF0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240838_895F18 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241EF8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240894_895F74 -.word 0x00000047, 0x00000005, D_802407DC_895EBC, 0x00080000, 0x00000008, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240838_895F18, 0x00080000, 0x0000000E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x0000000D, 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, 0x80241D44, 0x00000046, 0x00000001, 0x80241D8C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000011, 0x7FFFFE00, 0x00000044, 0x00000001, D_80241588_896C68, 0x00000044, 0x00000001, 0x80240710, 0x00000043, 0x00000002, PlaySound, 0x80000043, 0x00000043, 0x00000003, EnableTexPanning, 0x00000007, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000032, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C83, 0x0000006E, 0x00000024, 0x00000002, 0xFE363C84, 0x000001F4, 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_80240740_895E20, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000009, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 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_80240740_895E20, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000A, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF06, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 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_80240740_895E20, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240894_895F74, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D10_8963F0 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411E0_8968C0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000012, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_18_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80240D10_8963F0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413B8_896A98 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_802411E0_8968C0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241564_896C44 -.word 0x00000001, 0xFFFFFF17, 0xFFFFFF8B, 0x00000221, 0x000000BB, 0x000000C8, 0xFFFFFFF6, 0x0000003C, 0x00000004 - -dlabel D_80241588_896C68 -.word 0x00000024, 0x00000002, 0xFE363C80, D_80241564_896C44, 0x00000044, 0x00000001, D_802413B8_896A98, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_18/896CA0.data.s b/ver/us/asm/data/world/area_tik/tik_18/896CA0.data.s deleted file mode 100644 index 02c471b9b1..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_18/896CA0.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802415C0_896CA0 -.word 0x400CCCCD, 0x00000000, 0x00000000, 0x428C0000, 0x00000000, 0x00000001, 0x404CCCCD, 0x0000000F, 0x00000001, 0x42B40000, 0x00000000, 0x00000001 - -dlabel D_802415F0_896CD0 -.word 0x00000043, 0x00000002, BasicAI_Main, D_802415C0_896CA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241610_896CF0 -.word 0x00000000, 0x00140017, 0x00000000, 0x00000000, D_802415F0_896CD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 - -dlabel D_8024163C_896D1C -.word 0x400CCCCD, 0x00000000, 0x00000000, 0x428C0000, 0x00000000, 0x00000001, 0x404CCCCD, 0x0000000F, 0x00000001, 0x42B40000, 0x00000000, 0x00000001 - -dlabel D_8024166C_896D4C -.word 0x00000043, 0x00000002, BasicAI_Main, D_8024163C_896D1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024168C_896D6C -.word 0x00000000, 0x00170017, 0x00000000, 0x00000000, D_8024166C_896D4C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000C0000 - -dlabel D_802416B8_896D98 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0027010A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x000003E1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFA6, 0x00000000, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000F, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7D4D, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000000BE, 0xFFFFFFF6, 0xFFFFFFF6, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0027010B, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00270101, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_8024166C_896D4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241908_896FE8 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000096, 0x0000004C, 0xFFFFFFC1, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0xFFFFFFAB, 0x00000000, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802416B8_896D98, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241964_897044 -.word 0x00000000, D_80241610_896CF0, 0xC2700000, 0xC1200000, 0xC1F00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8014009A, 0x00050000, 0x008F0005, 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, 0x00020000, 0xFFFFFFC4, 0xFFFFFFF6, 0xFFFFFFE2, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFC4, 0xFFFFFFF6, 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, 0x00260401, 0x00260403, 0x00260403, 0x00260403, 0x00260403, 0x00260401, 0x00260405, 0x00260405, 0x00260400, 0x00260400, 0x00260400, 0x00260400, 0x00260400, 0x00260400, 0x00260400, 0x00260400, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241B54_897234 -.word 0x00000001, D_8024168C_896D6C, 0x41F00000, 0xC1200000, 0xC1A00000, 0x00002C00, D_80241908_896FE8, 0x00000000, 0x00000000, 0x0000010E, 0x8014009A, 0x00050000, 0x008F0005, 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, 0x00020000, 0x0000001E, 0xFFFFFFF6, 0xFFFFFFEC, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000001E, 0xFFFFFFF6, 0xFFFFFFEC, 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, 0x00270101, 0x00270103, 0x00270103, 0x00270103, 0x00270103, 0x00270101, 0x00270105, 0x00270105, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00270100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241964_897044, 0x1A0A0001, 0x00000001, D_80241B54_897234, 0x1A0E0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_18/897450.data.s b/ver/us/asm/data/world/area_tik/tik_18/897450.data.s deleted file mode 100644 index 897b1bd590..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_18/897450.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241D70_897450 -.word 0x00000043, 0x00000001, func_80240680_895D60, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000000C8, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D18, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000000, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D19, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF9C, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFFCE, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000032, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000064, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000000FA, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000096, 0x00000032, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241D70_897450, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_19/898910.data.s b/ver/us/asm/data/world/area_tik/tik_19/898910.data.s deleted file mode 100644 index 51b530ba4c..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_19/898910.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241330_898910 -.word 0xC32A0000, 0xC1200000, 0xC2B40000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242248, D_80241330_898910, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190032, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_19/898990.data.s b/ver/us/asm/data/world/area_tik/tik_19/898990.data.s deleted file mode 100644 index ec2373cdaa..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_19/898990.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802413B0_898990 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_19_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_19_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241704_898CE4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_19_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_19_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_19_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241BD0_8991B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BD0_8991B0 -.word 0x00000043, 0x00000001, tik_19_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_19_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_19_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_19_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DAC_89938C -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_19_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_19_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_19_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420E0_8996C0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_19_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024217C_89975C -.word 0x00000043, 0x00000003, GotoMap, 0x80242D60, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421AC_89978C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8C, D_8024217C_89975C, 0x00000046, 0x00000001, D_80241DAC_89938C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242204_8997E4 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000005, 0x7FFFFE00, 0x00000047, 0x00000005, D_802421AC_89978C, 0x00000040, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 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, 0x00000046, 0x00000001, 0x80242CF8, 0x00000044, 0x00000001, 0x80241380, 0x00000043, 0x00000002, PlaySound, 0x80000044, 0x00000043, 0x00000006, PlaySoundAtF, 0x80000045, 0x00000001, 0x00000000, 0xFFFFFFEC, 0x0000001E, 0x00000043, 0x00000006, PlaySoundAtF, 0x80000046, 0x00000001, 0x0000010E, 0xFFFFFFEC, 0x0000001E, 0x00000043, 0x00000003, EnableTexPanning, 0x00000008, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000046, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000064, 0x00000024, 0x00000002, 0xFE363C84, 0x00000082, 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_802420E0_8996C0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000A, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFC7C, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFB50, 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_802420E0_8996C0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000B, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFA88, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFF5D8, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFC4, 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_802420E0_8996C0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetRenderMode, 0x00000008, 0x00000016, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C8A, D_80242204_8997E4, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000005, 0x00000044, 0x00000001, D_80241704_898CE4, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s b/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s deleted file mode 100644 index 36a7fa0337..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_19/899C90.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel tik_19_SuperBlock_CantUpgradeMessages -.word 0x001D00F0, 0x001D00F1 - -dlabel tik_19_SuperBlock_PartnerIDs -.word 0x00010002, 0x00030004, 0x00090006, 0x00070008 - -dlabel tik_19_SuperBlock_UpgradeDescMessages -.word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF - -dlabel tik_19_SuperBlock_UpgradeOrbAngles -.word 0x430C0000, 0x43340000, 0x435C0000 - -dlabel D_80242714_899CF4 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, tik_19_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, tik_19_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, tik_19_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_19_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, tik_19_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, tik_19_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, tik_19_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, tik_19_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242878_899E58 -.word 0x0000000A, 0x00000002, 0xF8405D35, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, tik_19_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, tik_19_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_19_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, tik_19_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242714_899CF4, 0x00000043, 0x00000003, tik_19_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405D35, 0x00000001, 0x00000043, 0x00000002, tik_19_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, tik_19_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, tik_19_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0x000002F8, 0x0000004B, 0xFFFFFFF6, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D35, 0x00000043, 0x00000002, AssignScript, D_80242878_899E58, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_20/89B490.data.s b/ver/us/asm/data/world/area_tik/tik_20/89B490.data.s deleted file mode 100644 index 510df6dd3c..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_20/89B490.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241140_89B490 -.word 0xC3A00000, 0xC1A00000, 0x00000000, 0x42B40000, 0x43FD8000, 0xC1A00000, 0x00000000, 0x43870000, 0x434F0000, 0x42700000, 0xC2C80000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242B70, D_80241140_89B490, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190033, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s b/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s deleted file mode 100644 index f7f9056d2b..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_20/89B530.data.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802411E0_89B530 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_20_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_20_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024127C_89B5CC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_20_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_20_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_20_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_20_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419C0_89BD10 -.word 0x00000043, 0x00000001, tik_20_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241A9C_89BDEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A9C_89BDEC -.word 0x00000043, 0x00000001, tik_20_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_20_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_20_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_20_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_20_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FAC_89C2FC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802433D0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242008_89C358 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802433D8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242064_89C3B4 -.word 0x00000043, 0x00000003, GotoMap, 0x802433E0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242094_89C3E4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000011, 0x00000024, 0x00000002, 0xFE363C8C, D_80242064_89C3B4, 0x00000046, 0x00000001, D_802419C0_89BD10, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420EC_89C43C -.word 0x00000047, 0x00000005, D_80241FAC_89C2FC, 0x00080000, 0x00000008, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242008_89C358, 0x00080000, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242094_89C3E4, 0x00000080, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242150_89C4A0 -.word 0x00000000, 0xC33E0000, 0x41F00000, 0xC2AA0000, 0x00000001, 0x43480000, 0x41F00000, 0xC28C0000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242180_89C4D0 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242650_89C9A0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000013, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_20_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80242180_89C4D0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242828_89CB78 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242650_89C9A0, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802429D4_89CD24 -.word 0x00000002, 0xFFFFFEC8, 0xFFFFFFED, 0x00000034, 0x0000002E, 0x000000C8, 0xFFFFFFEC, 0x0000003C, 0x00000002, 0x000001CC, 0xFFFFFFCE, 0x00000028, 0x000000B9, 0x000000C8, 0xFFFFFFEC, 0x0000003C, 0x00000001 - -dlabel D_80242A18_89CD68 -.word 0x00000024, 0x00000002, 0xFE363C80, D_802429D4_89CD24, 0x00000044, 0x00000001, D_80242828_89CB78, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A44_89CD94 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF6, 0x00000019, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x00000000, 0x0000001E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x0000000E, 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, 0x8024335C, 0x00000046, 0x00000001, 0x80243380, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000003, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_80242150_89C4A0, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x802411B0, 0x00000043, 0x00000002, PlaySound, 0x80000047, 0x00000044, 0x00000001, D_80242A18_89CD68, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000046, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000064, 0x00000024, 0x00000002, 0xFE363C84, 0x00000082, 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_802411E0_89B530, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000008, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001C, 0x00000044, 0x00000001, D_80242A44_89CD94, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000044, 0x00000001, D_80242A44_89CD94, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x00000020, 0x00000044, 0x00000001, D_80242A44_89CD94, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_802420EC_89C43C, 0x00000044, 0x00000001, EnterWalk, 0x00000020, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8A, D_802420EC_89C43C, 0x00000044, 0x00000001, D_8024127C_89B5CC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_20/89D200.data.s b/ver/us/asm/data/world/area_tik/tik_20/89D200.data.s deleted file mode 100644 index 27a0baf14b..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_20/89D200.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242EB0_89D200 -.word 0x40000000, 0x0000003C, 0x00000005, 0x42A00000, 0x42700000, 0x00000003, 0x41100000, 0x00000000, 0x00000000, 0x42B40000, 0x428C0000, 0x00000001 - -dlabel D_80242EE0_89D230 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000002, tik_20_TackleAI_Main, D_80242EB0_89D200, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F50_89D2A0 -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80242EE0_89D230, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00120000 - -dlabel D_80242F7C_89D2CC -.word 0x00000000, D_80242F50_89D2A0, 0xC2480000, 0xC1A00000, 0x42C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80140090, 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, 0x00020000, 0xFFFFFFCE, 0xFFFFFFEC, 0x00000064, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFCE, 0xFFFFFFEC, 0x00000064, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x0029000B, 0x0029000B, 0x00290007, 0x00290006, 0x00290008, 0x00290000, 0x00290004, 0x00290004, 0x00290004, 0x00290004, 0x00000002, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024316C_89D4BC -.word 0x00000001, D_80242F50_89D2A0, 0x437A0000, 0xC1A00000, 0x42C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80140090, 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, 0x00020000, 0x000000FA, 0xFFFFFFEC, 0x00000064, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000FA, 0xFFFFFFEC, 0x00000064, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x0029000B, 0x0029000B, 0x00290007, 0x00290006, 0x00290008, 0x00290000, 0x00290004, 0x00290004, 0x00290004, 0x00290004, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242F7C_89D2CC, 0x1A040004, 0x00000001, D_8024316C_89D4BC, 0x1A050004, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000001DB, 0x00000046, 0xFFFFFF9C, 0x00000000, 0x00000083, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_21/89E100.data.s b/ver/us/asm/data/world/area_tik/tik_21/89E100.data.s deleted file mode 100644 index 1a87811e00..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_21/89E100.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240960_89E100 -.word 0xC3A28000, 0xC1A00000, 0x00000000, 0x42B40000, 0x43A28000, 0xC1A00000, 0x00000000, 0x43870000, 0x43870000, 0xC2D20000, 0x42BA0000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802423E4, D_80240960_89E100, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190034, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s b/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s deleted file mode 100644 index e7f578fb3d..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_21/89E1A0.data.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240A00_89E1A0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_21_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_21_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A9C_89E23C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_21_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_21_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_21_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_21_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411E0_89E980 -.word 0x00000043, 0x00000001, tik_21_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802412BC_89EA5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412BC_89EA5C -.word 0x00000043, 0x00000001, tik_21_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_21_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_21_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_21_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_21_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_21_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_21_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417CC_89EF6C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242700, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241828_89EFC8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C82, 0x00000009, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000B, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242708, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802418DC_89F07C -.word 0x00000043, 0x00000003, GotoMap, 0x80242710, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024190C_89F0AC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000010, 0x00000024, 0x00000002, 0xFE363C8C, D_802418DC_89F07C, 0x00000046, 0x00000001, D_802411E0_89E980, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241964_89F104 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0177, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419AC_89F14C -.word 0x00000047, 0x00000005, D_802417CC_89EF6C, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000003D, 0x00000047, 0x00000005, D_80241828_89EFC8, 0x00000100, 0x0000000E, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80241964_89F104, 0x00000100, 0x0000000E, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_8024190C_89F0AC, 0x00000080, 0x00000010, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A4C_89F1EC -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802419AC_89F14C, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000009, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000B, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_802419AC_89F14C, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8A, D_802419AC_89F14C, 0x00000044, 0x00000001, D_80240A9C_89E23C, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B20_89F2C0 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FF0_89F790 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000013, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_21_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241B20_89F2C0, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421C8_89F968 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80241FF0_89F790, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242374_89FB14 -.word 0x00000002, 0xFFFFFEC0, 0xFFFFFFED, 0x0000003C, 0x0000002E, 0x000000C8, 0xFFFFFFEC, 0x0000003C, 0x00000002, 0x000000E9, 0xFFFFFF9C, 0x0000002D, 0x000000EB, 0x000000C8, 0xFFFFFFEC, 0x0000003C, 0x00000001 - -dlabel D_802423B8_89FB58 -.word 0x00000024, 0x00000002, 0xFE363C80, D_80242374_89FB14, 0x00000044, 0x00000001, D_802421C8_89F968, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x0000000F, 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, 0x00000046, 0x00000001, 0x802425D0, 0x00000044, 0x00000001, 0x802409D0, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000044, 0x00000001, D_802423B8_89FB58, 0x00000043, 0x00000003, SetTexPanner, 0x00000011, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 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_80240A00_89E1A0, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80241A4C_89F1EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_21/89FD70.data.s b/ver/us/asm/data/world/area_tik/tik_21/89FD70.data.s deleted file mode 100644 index a71bc47a10..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_21/89FD70.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802425D0_89FD70 -.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF63, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1B, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFFAE, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1C, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFFF9, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1D, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000044, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1E, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x0000008E, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D1F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_22/8A0870.data.s b/ver/us/asm/data/world/area_tik/tik_22/8A0870.data.s deleted file mode 100644 index 143ce9b31f..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_22/8A0870.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802409B0_8A0870 -.word 0xC35E0000, 0x00000000, 0x00000000, 0x42B40000, 0xC2480000, 0x42480000, 0x41A00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024232C, D_802409B0_8A0870, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190035, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_80240000_89FEC0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s b/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s deleted file mode 100644 index 9a857c2ce6..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_22/8A0930.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240A70_8A0930 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_22_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_22_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B0C_8A09CC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_22_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_22_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_22_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_22_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241250_8A1110 -.word 0x00000043, 0x00000001, tik_22_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024132C_8A11EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024132C_8A11EC -.word 0x00000043, 0x00000001, tik_22_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_22_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_22_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_22_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_22_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_22_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_22_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024183C_8A16FC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_8024061C_8A04DC, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000006, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000D, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242500, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802418EC_8A17AC -.word 0x00000043, 0x00000003, GotoMap, 0x80242508, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024191C_8A17DC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000009, 0x00000024, 0x00000002, 0xFE363C8C, D_802418EC_8A17AC, 0x00000046, 0x00000001, D_80241250_8A1110, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241974_8A1834 -.word 0x00000047, 0x00000005, D_8024183C_8A16FC, 0x00000100, 0x00000006, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024191C_8A17DC, 0x00000080, 0x00000009, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419BC_8A187C -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000D, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80241974_8A1834, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, D_80241974_8A1834, 0x00000044, 0x00000001, D_80240B0C_8A09CC, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A68_8A1928 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F38_8A1DF8 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000012, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_22_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_80241A68_8A1928, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242110_8A1FD0 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80241F38_8A1DF8, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422BC_8A217C -.word 0x00000002, 0xFFFFFF24, 0xFFFFFFED, 0x0000003C, 0x0000002E, 0x000000C8, 0x00000000, 0x0000003C, 0x00000002, 0x0000003F, 0xFFFFFF9C, 0x0000002F, 0x000000EB, 0x000000C8, 0x00000000, 0x0000003C, 0x00000001 - -dlabel D_80242300_8A21C0 -.word 0x00000024, 0x00000002, 0xFE363C80, D_802422BC_8A217C, 0x00000044, 0x00000001, D_80242110_8A1FD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x00000010, 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, 0x00000044, 0x00000001, 0x80240A10, 0x00000043, 0x00000002, UseDoorSounds, 0x00000000, 0x00000044, 0x00000001, D_80242300_8A21C0, 0x00000043, 0x00000003, SetTexPanner, 0x00000010, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 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_80240A70_8A0930, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_802419BC_8A187C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_23/8A3510.data.s b/ver/us/asm/data/world/area_tik/tik_23/8A3510.data.s deleted file mode 100644 index 64299811c3..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_23/8A3510.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241140_8A3510 -.word 0xC3870000, 0xC1A00000, 0xC1A00000, 0x42B40000, 0x42D60000, 0xC1A00000, 0xC2E60000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242AB8, D_80241140_8A3510, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190036, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s b/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s deleted file mode 100644 index a2c56883c9..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_23/8A35A0.data.s +++ /dev/null @@ -1,54 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802411D0_8A35A0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_23_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_23_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241524_8A38F4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, tik_23_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_23_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, tik_23_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802419F0_8A3DC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419F0_8A3DC0 -.word 0x00000043, 0x00000001, tik_23_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_23_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_23_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, tik_23_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BCC_8A3F9C -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, tik_23_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, tik_23_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, tik_23_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F00_8A42D0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_23_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_23_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F9C_8A436C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243640, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FF8_8A43C8 -.word 0x00000043, 0x00000003, GotoMap, 0x80243648, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242028_8A43F8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C8C, D_80241FF8_8A43C8, 0x00000046, 0x00000001, D_80241BCC_8A3F9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242080_8A4450 -.word 0x00000047, 0x00000005, D_80241F9C_8A436C, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242028_8A43F8, 0x00000040, 0x0000000C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420C8_8A4498 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242598_8A4968 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000016, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_23_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802420C8_8A4498, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242770_8A4B40 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80242598_8A4968, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000016, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024291C_8A4CEC -.word 0x00000002, 0xFFFFFF4C, 0x00000064, 0x000000A0, 0x00000024, 0x000000C8, 0xFFFFFFEC, 0x0000003C, 0x00000002, 0x00000109, 0xFFFFFF88, 0x00000019, 0x000000FA, 0x000000C8, 0xFFFFFFEC, 0x0000003C, 0x00000002 - -dlabel D_80242960_8A4D30 -.word 0x00000024, 0x00000002, 0xFE363C80, D_8024291C_8A4CEC, 0x00000044, 0x00000001, D_80242770_8A4B40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024298C_8A4D5C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFF6, 0x00000019, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x00000000, 0x0000001E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x00000011, 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, 0x8024360C, 0x00000046, 0x00000001, D_80242E08_8A51D8, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, D_80242080_8A4450, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000000C, 0x00000044, 0x00000001, D_80241524_8A38F4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242080_8A4450, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802411A0, 0x00000043, 0x00000002, PlaySound, 0x80000048, 0x00000046, 0x00000001, D_80242960_8A4D30, 0x00000043, 0x00000003, SetTexPanner, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000000D, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000046, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000064, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF7E, 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_80241F00_8A42D0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001F, 0x00000044, 0x00000001, D_8024298C_8A4D5C, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x00000021, 0x00000044, 0x00000001, D_8024298C_8A4D5C, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x00000023, 0x00000044, 0x00000001, D_8024298C_8A4D5C, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242DD0_8A51A0 -.word 0x00000024, 0x00000002, 0xF8405D0D, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E08_8A51D8 -.word 0x0000000A, 0x00000002, 0xF8405D0D, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer2Block, 0xFFFFFEE8, 0xFFFFFFEC, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80242DD0_8A51A0, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFFB5, 0x00000028, 0xFFFFFF88, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D20, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000000AF, 0x00000028, 0x00000000, 0x00000000, 0x00000092, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D21, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFF06, 0x00000028, 0xFFFFFF9C, 0x00000000, 0x0000008B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D22, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF38, 0x00000028, 0xFFFFFF9C, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D23, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_23/8A5340.data.s b/ver/us/asm/data/world/area_tik/tik_23/8A5340.data.s deleted file mode 100644 index cf8e1c7fb0..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_23/8A5340.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242F70_8A5340 -.word 0x3FC00000, 0x0000001E, 0x00000032, 0x42700000, 0x41F00000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x42C80000, 0x41F00000, 0x00000003 - -dlabel D_80242FA0_8A5370 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000004, 0x00000043, 0x00000002, tik_23_TackleAI_Main, D_80242F70_8A5340, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243010_8A53E0 -.word 0x00000000, 0x00150016, 0x00000000, 0x00000000, D_80242FA0_8A5370, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000 - -dlabel D_8024303C_8A540C -.word 0x00000000, D_80243010_8A53E0, 0x41C80000, 0xC1A00000, 0x00000000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000019, 0xFFFFFFEC, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000019, 0xFFFFFFEC, 0x00000000, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004A0001, 0x004A0003, 0x004A0004, 0x004A0004, 0x004A0001, 0x004A0001, 0x004A0009, 0x004A0009, 0x004A0006, 0x004A0008, 0x004A0007, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024322C_8A55FC -.word 0x00000001, D_80243010_8A53E0, 0x43898000, 0xC1A00000, 0x42F00000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000113, 0xFFFFFFEC, 0x00000078, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000113, 0xFFFFFFEC, 0x00000078, 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, 0x004A0001, 0x004A0003, 0x004A0004, 0x004A0004, 0x004A0001, 0x004A0001, 0x004A0009, 0x004A0009, 0x004A0006, 0x004A0008, 0x004A0007, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024341C_8A57EC -.word 0x00000002, D_80243010_8A53E0, 0xC3160000, 0xC1A00000, 0x42F00000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF6A, 0xFFFFFFEC, 0x00000078, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF6A, 0xFFFFFFEC, 0x00000078, 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, 0x004A0001, 0x004A0003, 0x004A0004, 0x004A0004, 0x004A0001, 0x004A0001, 0x004A0009, 0x004A0009, 0x004A0006, 0x004A0008, 0x004A0007, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024303C_8A540C, 0x1A160004, 0x00000001, D_8024322C_8A55FC, 0x1A170004, 0x00000001, D_8024341C_8A57EC, 0x1A160004, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_24/8A6930.data.s b/ver/us/asm/data/world/area_tik/tik_24/8A6930.data.s deleted file mode 100644 index 4a85d200d6..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_24/8A6930.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240EB0_8A6930 -.word 0xC35C0000, 0xC1200000, 0x00000000, 0x42B40000, 0x43A00000, 0xC1200000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802410DC, D_80240EB0_8A6930, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190037, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_24/8A69C0.data.s b/ver/us/asm/data/world/area_tik/tik_24/8A69C0.data.s deleted file mode 100644 index f68e55aa0a..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_24/8A69C0.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240F40_8A69C0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_24_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_24_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FDC_8A6A5C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024248C, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241038_8A6AB8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242494, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241094_8A6B14 -.word 0x00000047, 0x00000005, D_80240FDC_8A6A5C, 0x00080000, 0x00000008, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241038_8A6AB8, 0x00080000, 0x0000000E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x00000012, 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, 0x8024244C, 0x00000046, 0x00000001, 0x80241DC8, 0x00000044, 0x00000001, D_80241D58_8A77D8, 0x00000043, 0x00000003, EnableTexPanning, 0x00000007, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000032, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C83, 0x0000006E, 0x00000024, 0x00000002, 0xFE363C84, 0x000001F4, 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_80240F40_8A69C0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000009, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 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_80240F40_8A69C0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000A, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF06, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 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_80240F40_8A69C0, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80240F10, 0x00000043, 0x00000002, PlaySound, 0x80000049, 0x00000024, 0x00000002, 0xFE363C80, D_80241094_8A6B14, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414E0_8A6F60 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419B0_8A7430 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000012, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_24_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802414E0_8A6F60, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B88_8A7608 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_802419B0_8A7430, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000012, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D34_8A77B4 -.word 0x00000001, 0xFFFFFF17, 0xFFFFFF8B, 0x00000221, 0x000000BB, 0x000000C8, 0xFFFFFFF6, 0x0000003C, 0x00000004 - -dlabel D_80241D58_8A77D8 -.word 0x00000024, 0x00000002, 0xFE363C80, D_80241D34_8A77B4, 0x00000044, 0x00000001, D_80241B88_8A7608, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_24/8A7810.data.s b/ver/us/asm/data/world/area_tik/tik_24/8A7810.data.s deleted file mode 100644 index 01a2ba4002..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_24/8A7810.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241D90_8A7810 -.word 0x00000024, 0x00000002, 0xF8405D0E, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D0E, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0xFFFFFF10, 0xFFFFFFF6, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241D90_8A7810, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000B, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000011, 0x7FFFFE00, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000032, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D24, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFFCE, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D25, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000096, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405D26, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF9C, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000000, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000064, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000000C8, 0x00000050, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_24/8A7A20.data.s b/ver/us/asm/data/world/area_tik/tik_24/8A7A20.data.s deleted file mode 100644 index 099ddaca9b..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_24/8A7A20.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241FA0_8A7A20 -.word 0x40000000, 0x0000003C, 0x00000005, 0x42A00000, 0x42700000, 0x00000003, 0x41100000, 0x00000000, 0x00000000, 0x42B40000, 0x428C0000, 0x00000001 - -dlabel D_80241FD0_8A7A50 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000D, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000001, 0x00000043, 0x00000002, tik_24_TackleAI_Main, D_80241FA0_8A7A20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242040_8A7AC0 -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_80241FD0_8A7A50, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00120000 - -dlabel D_8024206C_8A7AEC -.word 0x00000000, D_80242040_8A7AC0, 0xC2960000, 0xC1200000, 0x42480000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80140090, 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, 0x00020000, 0xFFFFFFB5, 0xFFFFFFF6, 0x00000032, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFB5, 0xFFFFFFF6, 0x00000032, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x0029000B, 0x0029000B, 0x00290007, 0x00290006, 0x00290008, 0x00290000, 0x00290004, 0x00290004, 0x00290004, 0x00290004, 0x00000002, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024225C_8A7CDC -.word 0x00000001, D_80242040_8A7AC0, 0x432F0000, 0xC1200000, 0xC2480000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80140090, 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, 0x00020000, 0x000000AF, 0xFFFFFFF6, 0xFFFFFFCE, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000AF, 0xFFFFFFF6, 0xFFFFFFCE, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x00290002, 0x0029000B, 0x0029000B, 0x00290007, 0x00290006, 0x00290008, 0x00290000, 0x00290004, 0x00290004, 0x00290004, 0x00290004, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024206C_8A7AEC, 0x1A060001, 0x00000001, D_8024225C_8A7CDC, 0x1A070001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_25/8A8740.data.s b/ver/us/asm/data/world/area_tik/tik_25/8A8740.data.s deleted file mode 100644 index 49057685a6..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_25/8A8740.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802407C0_8A8740 -.word 0x43A28000, 0xC3070000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241268, D_802407C0_8A8740, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190038, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004B, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000042, 0x00000001, 0x00000008, 0x00000001, 0x00000082, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_25/8A8800.data.s b/ver/us/asm/data/world/area_tik/tik_25/8A8800.data.s deleted file mode 100644 index b9a9aed8de..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_25/8A8800.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240880_8A8800 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, tik_25_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, tik_25_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024091C_8A889C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241A80, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240978_8A88F8 -.word 0x00000047, 0x00000005, D_8024091C_8A889C, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409A4_8A8924 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E74_8A8DF4 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x0000000E, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, tik_25_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802409A4_8A8924, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024104C_8A8FCC -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80240E74_8A8DF4, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000000E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411F8_8A9178 -.word 0x00000002, 0xFFFFFF74, 0xFFFFFF92, 0x00000078, 0x000000F0, 0x000000C8, 0xFFFFFF79, 0x0000003C, 0x00000002, 0x00000000, 0xFFFFFF9C, 0x0000005A, 0x000000EB, 0x000000C8, 0xFFFFFFF6, 0x0000003C, 0x00000001 - -dlabel D_8024123C_8A91BC -.word 0x00000024, 0x00000002, 0xFE363C80, D_802411F8_8A9178, 0x00000044, 0x00000001, D_8024104C_8A8FCC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000002, 0x00000043, 0x00000002, SetSpriteShading, 0x00000013, 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, 0x00000046, 0x00000001, 0x802418C0, 0x00000044, 0x00000001, 0x80240810, 0x00000044, 0x00000001, D_8024123C_8A91BC, 0x00000043, 0x00000003, SetTexPanner, 0x0000000C, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE0C, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 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_80240880_8A8800, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240978_8A88F8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_tik/tik_25/8A93D0.data.s b/ver/us/asm/data/world/area_tik/tik_25/8A93D0.data.s deleted file mode 100644 index 439058ec11..0000000000 --- a/ver/us/asm/data/world/area_tik/tik_25/8A93D0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241450_8A93D0 -.word 0x0000000A, 0x00000002, 0xF8405D27, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8405D27, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000044, 0x00000001, 0x8024083C, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0187, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, tik_25_func_80240680_8A8600, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414F0_8A9470 -.word 0x0000000A, 0x00000002, 0xF8405D29, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D29, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C85, 0x000000D2, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0xFFFFFFEC, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F80, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF79, 0x00000016, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F80, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00002086, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_25_PlaySpringReboundAnimation, 0xFD050F80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802416D8_8A9658 -.word 0x0000000A, 0x00000002, 0xF8405D2A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405D2A, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFF88, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFEC, 0x0000000A, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F81, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF79, 0x00000016, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, tik_25_SetEntityPosition, 0xFD050F81, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00002086, 0x00000000, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, tik_25_PlaySpringReboundAnimation, 0xFD050F81, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_GiantChest, 0xFFFFFEF2, 0xFFFFFFA6, 0x00000000, 0x0000005A, 0x00000003, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF8405D27, 0x00000044, 0x00000001, D_80241450_8A93D0, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000000D2, 0xFFFFFFB5, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802414F0_8A9470, 0x0000000A, 0x00000002, 0xF8405D29, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0x000000D2, 0xFFFFFFCE, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0x00000096, 0xFFFFFF79, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF88, 0xFFFFFFD3, 0xFFFFFFEC, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802416D8_8A9658, 0x0000000A, 0x00000002, 0xF8405D2A, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0xFFFFFF88, 0xFFFFFFEC, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0xFFFFFFC4, 0xFFFFFF79, 0xFFFFFFEC, 0x00000000, 0x00000064, 0x80000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s deleted file mode 100644 index 1db87fe61e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241770_832F70 -/* 832F70 80241770 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 832F74 80241774 AFBF0010 */ sw $ra, 0x10($sp) -/* 832F78 80241778 10A00003 */ beqz $a1, .L80241788 -/* 832F7C 8024177C 8C86000C */ lw $a2, 0xc($a0) -/* 832F80 80241780 3C018025 */ lui $at, %hi(mac_03_ItemChoice_HasSelectedItem) -/* 832F84 80241784 AC208C6C */ sw $zero, %lo(mac_03_ItemChoice_HasSelectedItem)($at) -.L80241788: -/* 832F88 80241788 3C038025 */ lui $v1, %hi(mac_03_ItemChoice_HasSelectedItem) -/* 832F8C 8024178C 24638C6C */ addiu $v1, $v1, %lo(mac_03_ItemChoice_HasSelectedItem) -/* 832F90 80241790 8C620000 */ lw $v0, ($v1) -/* 832F94 80241794 54400003 */ bnel $v0, $zero, .L802417A4 -/* 832F98 80241798 AC600000 */ sw $zero, ($v1) -/* 832F9C 8024179C 080905EE */ j .L802417B8 -/* 832FA0 802417A0 0000102D */ daddu $v0, $zero, $zero -.L802417A4: -/* 832FA4 802417A4 8CC50000 */ lw $a1, ($a2) -/* 832FA8 802417A8 3C068025 */ lui $a2, %hi(mac_03_ItemChoice_SelectedItemID) -/* 832FAC 802417AC 0C0B2026 */ jal evt_set_variable -/* 832FB0 802417B0 8CC68C70 */ lw $a2, %lo(mac_03_ItemChoice_SelectedItemID)($a2) -/* 832FB4 802417B4 24020002 */ addiu $v0, $zero, 2 -.L802417B8: -/* 832FB8 802417B8 8FBF0010 */ lw $ra, 0x10($sp) -/* 832FBC 802417BC 03E00008 */ jr $ra -/* 832FC0 802417C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241BD8_8333D8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241BD8_8333D8.s deleted file mode 100644 index 79b7445c1d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241BD8_8333D8.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BD8_8333D8 -/* 8333D8 80241BD8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 8333DC 80241BDC AFB10014 */ sw $s1, 0x14($sp) -/* 8333E0 80241BE0 0080882D */ daddu $s1, $a0, $zero -/* 8333E4 80241BE4 3C05FD05 */ lui $a1, 0xfd05 -/* 8333E8 80241BE8 AFBF0020 */ sw $ra, 0x20($sp) -/* 8333EC 80241BEC AFB3001C */ sw $s3, 0x1c($sp) -/* 8333F0 80241BF0 AFB20018 */ sw $s2, 0x18($sp) -/* 8333F4 80241BF4 AFB00010 */ sw $s0, 0x10($sp) -/* 8333F8 80241BF8 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8333FC 80241BFC F7B60030 */ sdc1 $f22, 0x30($sp) -/* 833400 80241C00 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 833404 80241C04 0C0B1EAF */ jal evt_get_variable -/* 833408 80241C08 34A50F82 */ ori $a1, $a1, 0xf82 -/* 83340C 80241C0C 0220202D */ daddu $a0, $s1, $zero -/* 833410 80241C10 8E30000C */ lw $s0, 0xc($s1) -/* 833414 80241C14 0040982D */ daddu $s3, $v0, $zero -/* 833418 80241C18 8E050000 */ lw $a1, ($s0) -/* 83341C 80241C1C 0C0B1EAF */ jal evt_get_variable -/* 833420 80241C20 26100004 */ addiu $s0, $s0, 4 -/* 833424 80241C24 8E050000 */ lw $a1, ($s0) -/* 833428 80241C28 26100004 */ addiu $s0, $s0, 4 -/* 83342C 80241C2C 0220202D */ daddu $a0, $s1, $zero -/* 833430 80241C30 0C0B1EAF */ jal evt_get_variable -/* 833434 80241C34 0040902D */ daddu $s2, $v0, $zero -/* 833438 80241C38 8E050000 */ lw $a1, ($s0) -/* 83343C 80241C3C 26100004 */ addiu $s0, $s0, 4 -/* 833440 80241C40 4482C000 */ mtc1 $v0, $f24 -/* 833444 80241C44 00000000 */ nop -/* 833448 80241C48 4680C620 */ cvt.s.w $f24, $f24 -/* 83344C 80241C4C 0C0B1EAF */ jal evt_get_variable -/* 833450 80241C50 0220202D */ daddu $a0, $s1, $zero -/* 833454 80241C54 8E050000 */ lw $a1, ($s0) -/* 833458 80241C58 26100004 */ addiu $s0, $s0, 4 -/* 83345C 80241C5C 4482B000 */ mtc1 $v0, $f22 -/* 833460 80241C60 00000000 */ nop -/* 833464 80241C64 4680B5A0 */ cvt.s.w $f22, $f22 -/* 833468 80241C68 0C0B1EAF */ jal evt_get_variable -/* 83346C 80241C6C 0220202D */ daddu $a0, $s1, $zero -/* 833470 80241C70 8E050000 */ lw $a1, ($s0) -/* 833474 80241C74 4482A000 */ mtc1 $v0, $f20 -/* 833478 80241C78 00000000 */ nop -/* 83347C 80241C7C 4680A520 */ cvt.s.w $f20, $f20 -/* 833480 80241C80 0C0B1EAF */ jal evt_get_variable -/* 833484 80241C84 0220202D */ daddu $a0, $s1, $zero -/* 833488 80241C88 8E63000C */ lw $v1, 0xc($s3) -/* 83348C 80241C8C 00129080 */ sll $s2, $s2, 2 -/* 833490 80241C90 00721821 */ addu $v1, $v1, $s2 -/* 833494 80241C94 E4780034 */ swc1 $f24, 0x34($v1) -/* 833498 80241C98 8E63000C */ lw $v1, 0xc($s3) -/* 83349C 80241C9C 00721821 */ addu $v1, $v1, $s2 -/* 8334A0 80241CA0 E4760060 */ swc1 $f22, 0x60($v1) -/* 8334A4 80241CA4 8E63000C */ lw $v1, 0xc($s3) -/* 8334A8 80241CA8 00721821 */ addu $v1, $v1, $s2 -/* 8334AC 80241CAC E474008C */ swc1 $f20, 0x8c($v1) -/* 8334B0 80241CB0 8E63000C */ lw $v1, 0xc($s3) -/* 8334B4 80241CB4 44820000 */ mtc1 $v0, $f0 -/* 8334B8 80241CB8 00000000 */ nop -/* 8334BC 80241CBC 46800020 */ cvt.s.w $f0, $f0 -/* 8334C0 80241CC0 00721821 */ addu $v1, $v1, $s2 -/* 8334C4 80241CC4 E46000B8 */ swc1 $f0, 0xb8($v1) -/* 8334C8 80241CC8 8FBF0020 */ lw $ra, 0x20($sp) -/* 8334CC 80241CCC 8FB3001C */ lw $s3, 0x1c($sp) -/* 8334D0 80241CD0 8FB20018 */ lw $s2, 0x18($sp) -/* 8334D4 80241CD4 8FB10014 */ lw $s1, 0x14($sp) -/* 8334D8 80241CD8 8FB00010 */ lw $s0, 0x10($sp) -/* 8334DC 80241CDC D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8334E0 80241CE0 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8334E4 80241CE4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8334E8 80241CE8 24020002 */ addiu $v0, $zero, 2 -/* 8334EC 80241CEC 03E00008 */ jr $ra -/* 8334F0 80241CF0 27BD0040 */ addiu $sp, $sp, 0x40 -/* 8334F4 80241CF4 00000000 */ nop -/* 8334F8 80241CF8 00000000 */ nop -/* 8334FC 80241CFC 00000000 */ nop diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index c09eec2dd4..1b5cd20595 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -8981,18 +8981,16 @@ segments: start: 0x831800 vram: 0x80240000 subsegments: - - [0x831800, c] - - [0x831B20, c] - - [0x833500, c] - - [0x833740, c] - - [0x834070, data] - - [0x834170, data] - - [0x835370, data] - - [0x837CB0, data] - - [0x83F500, data] - - [0x83F6C0, data] - - [0x8404A0, data] - - [0x842BB0] + - [0x831800, c, mac_03_0_header] + - [0x831800, c, mac_03_1_music] + - [0x831800, c, mac_03_2_main] + - [0x831B20, c, mac_03_3_train] + - [0x831CB0, c, mac_03_4_npc] + - [0x833500, c, mac_03_5_entity] + - [0x833500, c, mac_03_6_foliage] + - [0x833740, c, mac_03_7_oinks] + - [0x834070, c, mac_03_8_demo] + - [0x834070] - name: mac_04 dir: world/area_mac/mac_04 type: code @@ -9048,71 +9046,66 @@ segments: start: 0x8694B0 vram: 0x80240000 subsegments: - - [0x8694B0, c] - - [0x869AA0, c] - - [0x869EE0, c] - - [0x869F40, data] - - [0x86A030, data] - - [0x86B350, data] - - [0x86BC00, data] - - [0x86C710] + - [0x8694B0, c, tik_01_0_header] + - [0x8694B0, c, tik_01_1_music] + - [0x8694B0, c, tik_01_2_main] + - [0x869AA0, c, tik_01_3_drips] + - [0x869EE0, c, tik_01_4_entity] + - [0x869EE0, c, tik_01_5_npc] + - [0x869F40] - name: tik_02 dir: world/area_tik/tik_02 type: code start: 0x86C740 vram: 0x80240000 subsegments: - - [0x86C740, c] - - [0x86CA50, c] - - [0x86CD10, c] - - [0x86D0E0, data] - - [0x86D190, data] - - [0x86D800, data] - - [0x86E2C0, data] - - [0x86EAF0] + - [0x86C740, c, tik_02_0_header] + - [0x86C740, c, tik_02_1_music] + - [0x86C740, c, tik_02_2_main] + - [0x86CA50, c, tik_02_3_entity] + - [0x86CD10, c, tik_02_4_drips] + - [0x86D0E0, c, tik_02_5_npc] + - [0x86D0E0] - name: tik_03 dir: world/area_tik/tik_03 type: code start: 0x86EB00 vram: 0x80240000 subsegments: - - [0x86EB00, c] - - [0x86F0F0, c] - - [0x86F5D0, data] - - [0x86F670, data] - - [0x870B60, data] - - [0x871430, data] - - [0x871730, data] - - [0x8717F0, data] - - [0x871A10] + - [0x86EB00, c, tik_03_0_header] + - [0x86EB00, c, tik_03_1_music] + - [0x86EB00, c, tik_03_2_main] + - [0x86F0F0, c, tik_03_3_drips] + - [0x86F460, c, tik_03_4_platforms] + - [0x86F4C0, c, tik_03_5_entity] + - [0x86F4C0, c, tik_03_6_demo] + - [0x86F5D0] - name: tik_04 dir: world/area_tik/tik_04 type: code start: 0x871A30 vram: 0x80240000 subsegments: - - [0x871A30, c] - - [0x872020, c] - - [0x8726A0, data] - - [0x872750, data] - - [0x8739F0, data] - - [0x8742C0, data] - - [0x8746E0, data] - - [0x874DA0] + - [0x871A30, c, tik_04_0_header] + - [0x871A30, c, tik_04_1_music] + - [0x871A30, c, tik_04_2_main] + - [0x872020, c, tik_04_3_drips] + - [0x872390, c, tik_04_4_platforms] + - [0x8726A0, c, tik_04_5_npc] + - [0x8726A0] - name: tik_05 dir: world/area_tik/tik_05 type: code start: 0x874DC0 vram: 0x80240000 subsegments: - - [0x874DC0, c] - - [0x8750D0, c] - - [0x875810, data] - - [0x8758C0, data] - - [0x875D10, data] - - [0x8765C0, data] - - [0x876A50, data] - - [0x876ED0] + - [0x874DC0, c, tik_05_0_header] + - [0x874DC0, c, tik_05_1_music] + - [0x874DC0, c, tik_05_2_main] + - [0x8750D0, c, tik_05_3_drips] + - [0x875440, c, tik_05_4_entity] + - [0x875810, c, tik_05_5_npc] + - [0x875810] - name: tik_06 dir: world/area_tik/tik_06 type: code @@ -9131,205 +9124,194 @@ segments: start: 0x879BE0 vram: 0x80240000 subsegments: - - [0x879BE0, c] - - [0x87AC00, c] - - [0x87C4D0, data] - - [0x87C570, data] - - [0x87D5D0, data] - - [0x87E590, data] - - [0x87E890, data] - - [0x87ED80] + - [0x879BE0, c, tik_07_0_header] + - [0x879BE0, c, tik_07_1_music] + - [0x879BE0, c, tik_07_2_main] + - [0x879EC0, c, tik_07_3_entity] + - [0x87AC00, c, tik_07_4_drips] + - [0x87AF70, c, tik_07_5_platforms] + - [0x87AFD0, c, tik_07_6_npc] + - [0x87C4D0] - name: tik_08 dir: world/area_tik/tik_08 type: code start: 0x87EDF0 vram: 0x80240000 subsegments: - - [0x87EDF0, c] - - [0x87F3E0, c] - - [0x87F820, c] - - [0x87F8B0, data] - - [0x87F9A0, data] - - [0x881770, data] - - [0x8819D0, data] - - [0x8821A0] + - [0x87EDF0, c, tik_08_0_header] + - [0x87EDF0, c, tik_08_1_music] + - [0x87EDF0, c, tik_08_2_main] + - [0x87F3E0, c, tik_08_3_drips] + - [0x87F750, c, tik_08_4_entity] + - [0x87F820, c, tik_08_5_npc] + - [0x87F8B0] - name: tik_09 dir: world/area_tik/tik_09 type: code start: 0x8821C0 vram: 0x80240000 subsegments: - - [0x8821C0, c] - - [0x8827B0, c] - - [0x882BF0, c] - - [0x883460, data] - - [0x883500, data] - - [0x8856E0, data] - - [0x885A80, data] - - [0x886340] + - [0x8821C0, c, tik_09_0_header] + - [0x8821C0, c, tik_09_1_music] + - [0x8821C0, c, tik_09_2_main] + - [0x8827B0, c, tik_09_3_drips] + - [0x882B20, c, tik_09_4_entity] + - [0x882BF0, c, tik_09_5_npc] + - [0x883460] - name: tik_10 dir: world/area_tik/tik_10 type: code start: 0x8863C0 vram: 0x80240000 subsegments: - - [0x8863C0, c] - - [0x8866D0, c] - - [0x887780, data] - - [0x887800, data] - - [0x887B20, data] - - [0x8883F0, data] - - [0x888BC0] + - [0x8863C0, c, tik_10_0_header] + - [0x8863C0, c, tik_10_1_music] + - [0x8863C0, c, tik_10_2_main] + - [0x8866D0, c, tik_10_3_drips] + - [0x886A40, c, tik_10_4_entity] + - [0x887780] - name: tik_12 dir: world/area_tik/tik_12 type: code start: 0x888BD0 vram: 0x80240000 subsegments: - - [0x888BD0, c] - - [0x8891C0, c] - - [0x88A530, c] - - [0x88AE20, data] - - [0x88AEA0, data] - - [0x88BF60, data] - - [0x88C810, data] - - [0x88D590] + - [0x888BD0, c, tik_12_0_header] + - [0x888BD0, c, tik_12_1_music] + - [0x888BD0, c, tik_12_2_main] + - [0x8891C0, c, tik_12_3_drips] + - [0x889530, c, tik_12_4_entity] + - [0x88A530, c, tik_12_5_npc] + - [0x88AE20] - name: tik_14 dir: world/area_tik/tik_14 type: code start: 0x88D600 vram: 0x80240000 subsegments: - - [0x88D600, c] - - [0x88DBF0, c] - - [0x88DF60, data] - - [0x88DFF0, data] - - [0x88F180, data] - - [0x88FA30, data] - - [0x88FB90] + - [0x88D600, c, tik_14_0_header] + - [0x88D600, c, tik_14_1_music] + - [0x88D600, c, tik_14_2_main] + - [0x88DBF0, c, tik_14_3_drips] + - [0x88DF60, c, tik_14_4_entity] + - [0x88DF60] - name: tik_15 dir: world/area_tik/tik_15 type: code start: 0x88FBA0 vram: 0x80240000 subsegments: - - [0x88FBA0, c] - - [0x890190, c] - - [0x8906B0, data] - - [0x890740, data] - - [0x891890, data] - - [0x8922A0, data] - - [0x892A10] + - [0x88FBA0, c, tik_15_0_header] + - [0x88FBA0, c, tik_15_1_music] + - [0x88FBA0, c, tik_15_2_main] + - [0x890190, c, tik_15_3_entity] + - [0x890190, c, tik_15_4_drips] + - [0x890500, c, tik_15_5_npc] + - [0x8906B0] - name: tik_17 dir: world/area_tik/tik_17 type: code start: 0x892A20 vram: 0x80240000 subsegments: - - [0x892A20, c] - - [0x892A50, c] - - [0x893790, c] - - [0x893D80, data] - - [0x893E40, data] - - [0x8944F0, data] - - [0x8956C0] + - [0x892A20, c, tik_17_0_header] + - [0x892A20, c, tik_17_1_music] + - [0x892A50, c, tik_17_2_entity] + - [0x893790, c, tik_17_3_main] + - [0x893D80] - name: tik_18 dir: world/area_tik/tik_18 type: code start: 0x8956E0 vram: 0x80240000 subsegments: - - [0x8956E0, c] - - [0x8959F0, c] - - [0x895D90, data] - - [0x895E20, data] - - [0x896CA0, data] - - [0x897450, data] - - [0x8975D0] + - [0x8956E0, c, tik_18_0_header] + - [0x8956E0, c, tik_18_1_music] + - [0x8956E0, c, tik_18_2_main] + - [0x8959F0, c, tik_18_3_drips] + - [0x895D60, c, tik_18_4_npc] + - [0x895D60, c, tik_18_5_entity] + - [0x895D90] - name: tik_19 dir: world/area_tik/tik_19 type: code start: 0x8975E0 vram: 0x80240000 subsegments: - - [0x8975E0, c] - - [0x897BD0, c] - - [0x898910, data] - - [0x898990, data] - - [0x899C90, data] - - [0x89A340] + - [0x8975E0, c, tik_19_0_header] + - [0x8975E0, c, tik_19_1_music] + - [0x8975E0, c, tik_19_2_main] + - [0x897BD0, c, tik_19_3_entity] + - [0x898910] - name: tik_20 dir: world/area_tik/tik_20 type: code start: 0x89A350 vram: 0x80240000 subsegments: - - [0x89A350, c] - - [0x89ACB0, c] - - [0x89B490, data] - - [0x89B530, data] - - [0x89D200, data] - - [0x89D720] + - [0x89A350, c, tik_20_0_header] + - [0x89A350, c, tik_20_1_music] + - [0x89A350, c, tik_20_2_main] + - [0x89ACB0, c, tik_20_3_npc] + - [0x89B490, c, tik_20_4_entity] + - [0x89B490] - name: tik_21 dir: world/area_tik/tik_21 type: code start: 0x89D7A0 vram: 0x80240000 subsegments: - - [0x89D7A0, c] - - [0x89E100, data] - - [0x89E1A0, data] - - [0x89FD70, data] - - [0x89FEA0] + - [0x89D7A0, c, tik_21_0_header] + - [0x89D7A0, c, tik_21_1_music] + - [0x89D7A0, c, tik_21_2_main] + - [0x89E100, c, tik_21_3_entity] + - [0x89E100] - name: tik_22 dir: world/area_tik/tik_22 type: code start: 0x89FEC0 vram: 0x80240000 subsegments: - - [0x89FEC0, c] - - [0x89FEF0, c] - - [0x8A0870, data] - - [0x8A0930, data] - - [0x8A23C0] + - [0x89FEC0, c, tik_22_0_header] + - [0x89FEC0, c, tik_22_1_music] + - [0x89FEF0, c, tik_22_2_main] + - [0x8A0870] - name: tik_23 dir: world/area_tik/tik_23 type: code start: 0x8A23D0 vram: 0x80240000 subsegments: - - [0x8A23D0, c] - - [0x8A2D30, c] - - [0x8A3510, data] - - [0x8A35A0, data] - - [0x8A5340, data] - - [0x8A5A10] + - [0x8A23D0, c, tik_23_0_header] + - [0x8A23D0, c, tik_23_1_music] + - [0x8A23D0, c, tik_23_2_main] + - [0x8A2D30, c, tik_23_3_entity] + - [0x8A2D30, c, tik_23_4_npc] + - [0x8A3510] - name: tik_24 dir: world/area_tik/tik_24 type: code start: 0x8A5A80 vram: 0x80240000 subsegments: - - [0x8A5A80, c] - - [0x8A5AD0, c] - - [0x8A5DE0, c] - - [0x8A6930, data] - - [0x8A69C0, data] - - [0x8A7810, data] - - [0x8A7A20, data] - - [0x8A7EF0] + - [0x8A5A80, c, tik_24_0_header] + - [0x8A5AD0, c, tik_24_1_music] + - [0x8A5AD0, c, tik_24_2_main] + - [0x8A5DE0, c, tik_24_3_drips] + - [0x8A6150, c, tik_24_4_entity] + - [0x8A6150, c, tik_24_5_npc] + - [0x8A6930] - name: tik_25 dir: world/area_tik/tik_25 type: code start: 0x8A7F80 vram: 0x80240000 subsegments: - - [0x8A7F80, c] - - [0x8A8600, c] - - [0x8A8740, data] - - [0x8A8800, data] - - [0x8A93D0, data] - - [0x8A9A00] + - [0x8A7F80, c, tik_25_0_header] + - [0x8A7F80, c, tik_25_1_music] + - [0x8A7F80, c, tik_25_2_main] + - [0x8A8600, c, tik_25_3_entity] + - [0x8A8740] - name: kgr_01 dir: world/area_kgr/kgr_01 type: code diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 76e6df4b61..e4b939946a 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -5098,7 +5098,7 @@ evt_handle_thread = 0x802C6C78; // type:func rom:0xEB628 evt_handle_end_thread = 0x802C6D4C; // type:func rom:0xEB6FC evt_handle_child_thread = 0x802C6D6C; // type:func rom:0xEB71C evt_handle_end_child_thread = 0x802C6DF4; // type:func rom:0xEB7A4 -func_802C6E14 = 0x802C6E14; // type:func rom:0xEB7C4 +evt_handle_debug_log = 0x802C6E14; // type:func rom:0xEB7C4 evt_handle_print_debug_var = 0x802C6E1C; // type:func rom:0xEB7CC func_802C739C = 0x802C739C; // type:func rom:0xEBD4C func_802C73B0 = 0x802C73B0; // type:func rom:0xEBD60 @@ -15399,7 +15399,7 @@ mac_03_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x831834 mac_03_Pipe_GetEntryPos = 0x802400F0; // type:func rom:0x8318F0 mac_03_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0x8319D0 mac_03_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x831A3C -func_802402E0_831AE0 = 0x802402E0; // type:func rom:0x831AE0 +mac_03_GetClockHandAngles = 0x802402E0; // type:func rom:0x831AE0 mac_03_CosInterpMinMax = 0x80240320; // type:func rom:0x831B20 mac_03_StashVars = 0x802404B0; // type:func rom:0x831CB0 mac_03_GetItemName = 0x80240564; // type:func rom:0x831D64 @@ -15430,29 +15430,29 @@ mac_03_Quizmo_CreateReactionEffect = 0x802414A8; // type:func rom:0x832CA8 mac_03_Quizmo_CreateWorker = 0x80241514; // type:func rom:0x832D14 mac_03_GetNpcCollisionHeight = 0x80241544; // type:func rom:0x832D44 mac_03_AddPlayerHandsOffset = 0x802415A0; // type:func rom:0x832DA0 -func_80241770_832F70 = 0x80241770; // type:func rom:0x832F70 -func_802417C4_832FC4 = 0x802417C4; // type:func rom:0x832FC4 -func_802417FC_832FFC = 0x802417FC; // type:func rom:0x832FFC +mac_03_func_80241770_832F70 = 0x80241770; // type:func rom:0x832F70 +mac_03_func_802417C4_832FC4 = 0x802417C4; // type:func rom:0x832FC4 +mac_03_func_802417FC_832FFC = 0x802417FC; // type:func rom:0x832FFC mac_03_LetterDelivery_Init = 0x80241898; // type:func rom:0x833098 mac_03_LetterDelivery_CalcLetterPos = 0x80241988; // type:func rom:0x833188 mac_03_LetterDelivery_SaveNpcAnim = 0x80241B14; // type:func rom:0x833314 mac_03_LetterDelivery_RestoreNpcAnim = 0x80241B58; // type:func rom:0x833358 -func_80241B84_833384 = 0x80241B84; // type:func rom:0x833384 -func_80241BD8_8333D8 = 0x80241BD8; // type:func rom:0x8333D8 +mac_03_GetOinkCount = 0x80241B84; // type:func rom:0x833384 +mac_03_func_80241BD8_8333D8 = 0x80241BD8; // type:func rom:0x8333D8 mac_03_foliage_setup_shear_mtx = 0x80241D00; // type:func rom:0x833500 mac_03_TransformFoliage = 0x80241D70; // type:func rom:0x833570 mac_03_GetFloorCollider = 0x80241F40; // type:func rom:0x833740 mac_03_GetPlayerCoins = 0x80241F6C; // type:func rom:0x83376C -func_80241F80_833780 = 0x80241F80; // type:func rom:0x833780 -func_80241FA0_8337A0 = 0x80241FA0; // type:func rom:0x8337A0 -func_8024206C_83386C = 0x8024206C; // type:func rom:0x83386C -func_802421E8_8339E8 = 0x802421E8; // type:func rom:0x8339E8 -func_80242384_833B84 = 0x80242384; // type:func rom:0x833B84 -func_802424A0_833CA0 = 0x802424A0; // type:func rom:0x833CA0 -func_802425A8_833DA8 = 0x802425A8; // type:func rom:0x833DA8 -func_80242608_833E08 = 0x80242608; // type:func rom:0x833E08 -func_80242694_833E94 = 0x80242694; // type:func rom:0x833E94 -func_802427D0_833FD0 = 0x802427D0; // type:func rom:0x833FD0 +mac_03_DismissCoinCounter = 0x80241F80; // type:func rom:0x833780 +mac_03_func_80241FA0_8337A0 = 0x80241FA0; // type:func rom:0x8337A0 +mac_03_LoadLilOinks = 0x8024206C; // type:func rom:0x83386C +mac_03_CreateLilOink = 0x802421E8; // type:func rom:0x8339E8 +mac_03_SetLilOinkPosition = 0x80242384; // type:func rom:0x833B84 +mac_03_GetLilOinkPosition = 0x802424A0; // type:func rom:0x833CA0 +mac_03_HideLilOink = 0x802425A8; // type:func rom:0x833DA8 +mac_03_SetLilOinkAnim = 0x80242608; // type:func rom:0x833E08 +mac_03_PopLilOinkList = 0x80242694; // type:func rom:0x833E94 +mac_03_GetLilOinkPrize = 0x802427D0; // type:func rom:0x833FD0 mac_03_varStash = 0x80246644; // type:data rom:0x837E44 mac_03_Quizmo_Answers = 0x802466A8; // type:data rom:0x837EA8 D_802466E8_837EE8 = 0x802466E8; // type:data rom:0x837EE8 @@ -15648,7 +15648,7 @@ tik_01_Pipe_GetCameraYaw = 0x802404DC; // type:func rom:0x86998C tik_01_Pipe_GetPointAheadOfPlayer = 0x80240548; // type:func rom:0x8699F8 tik_01_CheckDripCollisionWithNPC = 0x802405F0; // type:func rom:0x869AA0 tik_01_SetEntityPosition = 0x80240960; // type:func rom:0x869E10 -func_80240A30_869EE0 = 0x80240A30; // type:func rom:0x869EE0 +tik_01_GetBlooperBattleID = 0x80240A30; // type:func rom:0x869EE0 D_80242B7E_86C02E = 0x80242B7E; // type:data rom:0x86C02E tik_02_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x86C740 tik_02_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x86C864 @@ -15657,7 +15657,7 @@ tik_02_GetItemName = 0x802403C4; // type:func rom:0x86CB04 tik_02_SomeItemEntityFunc = 0x80240428; // type:func rom:0x86CB68 tik_02_IsItemBadge = 0x80240578; // type:func rom:0x86CCB8 tik_02_CheckDripCollisionWithNPC = 0x802405D0; // type:func rom:0x86CD10 -func_80240940_86D080 = 0x80240940; // type:func rom:0x86D080 +tik_02_GetBlooperBattleID = 0x80240940; // type:func rom:0x86D080 tik_02_varStash = 0x802410C0; // type:data rom:0x86D800 D_80241BAE_86E2EE = 0x80241BAE; // type:data rom:0x86E2EE tik_03_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x86EB00 @@ -15669,11 +15669,11 @@ tik_03_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0x86ED3C tik_03_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0x86EDE0 tik_03_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x86EF04 tik_03_CheckDripCollisionWithNPC = 0x802405F0; // type:func rom:0x86F0F0 -func_80240960_86F460 = 0x80240960; // type:func rom:0x86F460 -func_802409C0_86F4C0 = 0x802409C0; // type:func rom:0x86F4C0 -func_802409E0_86F4E0 = 0x802409E0; // type:func rom:0x86F4E0 -D_80242930_871430 = 0x80242930; // type:data rom:0x871430 -D_80242EBC_8719BC = 0x80242EBC; // type:data rom:0x8719BC +tik_03_PausePlatformsDuringPound = 0x80240960; // type:func rom:0x86F460 +tik_03_ChangePartnerFollowState = 0x802409C0; // type:func rom:0x86F4C0 +tik_03_SetupDemoScene = 0x802409E0; // type:func rom:0x86F4E0 +tik_03_PlatformColliders = 0x80242930; // type:data rom:0x871430 +tik_03_D_80242EBC_8719BC = 0x80242EBC; // type:data rom:0x8719BC tik_04_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x871A30 tik_04_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x871B54 tik_04_Pipe_SetAnimFlag = 0x8024030C; // type:func rom:0x871D3C @@ -15683,10 +15683,10 @@ tik_04_Pipe_GetEntryPos = 0x802403FC; // type:func rom:0x871E2C tik_04_Pipe_GetCameraYaw = 0x802404DC; // type:func rom:0x871F0C tik_04_Pipe_GetPointAheadOfPlayer = 0x80240548; // type:func rom:0x871F78 tik_04_CheckDripCollisionWithNPC = 0x802405F0; // type:func rom:0x872020 -func_80240960_872390 = 0x80240960; // type:func rom:0x872390 -func_80240A00_872430 = 0x80240A00; // type:func rom:0x872430 +tik_04_CreatePlatformShadows = 0x80240960; // type:func rom:0x872390 +tik_04_UpdatePlatformShadows = 0x80240A00; // type:func rom:0x872430 tik_04_GetFloorCollider = 0x80240BF4; // type:func rom:0x872624 -func_80240C20_872650 = 0x80240C20; // type:func rom:0x872650 +tik_04_PausePlatformsDuringPound = 0x80240C20; // type:func rom:0x872650 tik_05_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x874DC0 tik_05_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x874EE4 tik_05_CheckDripCollisionWithNPC = 0x80240310; // type:func rom:0x8750D0 @@ -15694,7 +15694,7 @@ 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_IsItemBadge = 0x802408E8; // type:func rom:0x8756A8 -func_8024093C_8756FC = 0x8024093C; // type:func rom:0x8756FC +tik_05_PlaySpringAnimation = 0x8024093C; // type:func rom:0x8756FC tik_05_SetEntityPosition = 0x80240984; // type:func rom:0x875744 D_80241800_8765C0 = 0x80241800; // type:data rom:0x8765C0 tik_06_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x876EE0 @@ -15731,7 +15731,7 @@ tik_07_SuperBlock_PartnerSparkles2 = 0x80240F58; // type:func rom:0x87AB38 tik_07_SuperBlock_PartnerSparkles4 = 0x80240FA0; // type:func rom:0x87AB80 tik_07_SuperBlock_WaitForPlayerToLand = 0x80240FE8; // type:func rom:0x87ABC8 tik_07_CheckDripCollisionWithNPC = 0x80241020; // type:func rom:0x87AC00 -func_80241390_87AF70 = 0x80241390; // type:func rom:0x87AF70 +tik_07_PausePlatformsDuringPound = 0x80241390; // type:func rom:0x87AF70 tik_07_FlyingAI_WanderInit = 0x802413F0; // type:func rom:0x87AFD0 tik_07_FlyingAI_Wander = 0x802415A0; // type:func rom:0x87B180 tik_07_FlyingAI_LoiterInit = 0x80241BC8; // type:func rom:0x87B7A8 @@ -15747,7 +15747,7 @@ tik_07_SuperBlock_CantUpgradeMessages = 0x802439F0; // type:data rom:0x87D5D0 tik_07_SuperBlock_PartnerIDs = 0x802439F8; // type:data rom:0x87D5D8 tik_07_SuperBlock_UpgradeDescMessages = 0x80243A08; // type:data rom:0x87D5E8 tik_07_SuperBlock_UpgradeOrbAngles = 0x80243A48; // type:data rom:0x87D628 -D_802449B0_87E590 = 0x802449B0; // type:data rom:0x87E590 +tik_07_PlatformColliders = 0x802449B0; // type:data rom:0x87E590 tik_07_FlyingAI_JumpVels = 0x80244CB0; // type:data rom:0x87E890 D_802451B0_87ED90 = 0x802451B0; // type:data rom:0x87ED90 D_802451B8_87ED98 = 0x802451B8; // type:data rom:0x87ED98 @@ -15763,7 +15763,7 @@ tik_08_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x87F1F4 tik_08_CheckDripCollisionWithNPC = 0x802405F0; // type:func rom:0x87F3E0 tik_08_SetEntityPosition = 0x80240960; // type:func rom:0x87F750 tik_08_GetFloorCollider = 0x80240A30; // type:func rom:0x87F820 -func_80240A5C_87F84C = 0x80240A5C; // type:func rom:0x87F84C +tik_08_GetBlooperBattleID = 0x80240A5C; // type:func rom:0x87F84C D_80242C0E_8819FE = 0x80242C0E; // type:data rom:0x8819FE tik_09_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x8821C0 tik_09_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x8821E0 @@ -15872,12 +15872,12 @@ tik_15_UpdateTexturePanStepped = 0x80240404; // type:func rom:0x88FFA4 tik_15_CheckDripCollisionWithNPC = 0x802405F0; // type:func rom:0x890190 tik_15_StashVars = 0x80240960; // type:func rom:0x890500 tik_15_GetItemName = 0x80240A14; // type:func rom:0x8905B4 -func_80240A78_890618 = 0x80240A78; // type:func rom:0x890618 -func_80240AA4_890644 = 0x80240AA4; // type:func rom:0x890644 -func_80240AD0_890670 = 0x80240AD0; // type:func rom:0x890670 +tik_15_GetNextCheatoItem = 0x80240A78; // type:func rom:0x890618 +tik_15_CheckPlayerHasEnoughRoom = 0x80240AA4; // type:func rom:0x890644 +tik_15_CheckPlayerHasEnoughCoins = 0x80240AD0; // type:func rom:0x890670 tik_15_varStash = 0x80242758; // type:data rom:0x8922F8 D_802427BC_89235C = 0x802427BC; // type:data rom:0x89235C -func_80240000_892A20 = 0x80240000; // type:func rom:0x892A20 +tik_17_AdjustTrackVolumes = 0x80240000; // type:func rom:0x892A20 tik_17_SuperBlock_SetOverride40 = 0x80240030; // type:func rom:0x892A50 tik_17_SuperBlock_ClearOverride40 = 0x8024004C; // type:func rom:0x892A6C tik_17_SuperBlock_HideBlockContent = 0x8024006C; // type:func rom:0x892A8C @@ -15911,7 +15911,7 @@ tik_17_SuperBlock_UpgradeOrbAngles = 0x80241478; // type:data rom:0x893E98 tik_18_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x8956E0 tik_18_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x895804 tik_18_CheckDripCollisionWithNPC = 0x80240310; // type:func rom:0x8959F0 -func_80240680_895D60 = 0x80240680; // type:func rom:0x895D60 +tik_18_WakeSpikedGoomba = 0x80240680; // type:func rom:0x895D60 tik_19_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x8975E0 tik_19_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x897600 tik_19_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0x897614 @@ -15966,7 +15966,7 @@ tik_21_Pipe_GetEntryPos = 0x802403FC; // type:func rom:0x89DB9C tik_21_Pipe_GetCameraYaw = 0x802404DC; // type:func rom:0x89DC7C tik_21_Pipe_GetPointAheadOfPlayer = 0x80240548; // type:func rom:0x89DCE8 tik_21_CheckDripCollisionWithNPC = 0x802405EC; // type:func rom:0x89DD8C -func_80240000_89FEC0 = 0x80240000; // type:func rom:0x89FEC0 +tik_22_AdjustTrackVolumes = 0x80240000; // type:func rom:0x89FEC0 tik_22_UpdateTexturePanSmooth = 0x80240030; // type:func rom:0x89FEF0 tik_22_UpdateTexturePanStepped = 0x80240154; // type:func rom:0x8A0014 tik_22_Pipe_SetAnimFlag = 0x8024033C; // type:func rom:0x8A01FC @@ -15975,7 +15975,7 @@ tik_22_Pipe_AwaitDownInput = 0x80240370; // type:func rom:0x8A0230 tik_22_Pipe_GetEntryPos = 0x8024042C; // type:func rom:0x8A02EC tik_22_Pipe_GetCameraYaw = 0x8024050C; // type:func rom:0x8A03CC tik_22_Pipe_GetPointAheadOfPlayer = 0x80240578; // type:func rom:0x8A0438 -func_8024061C_8A04DC = 0x8024061C; // type:func rom:0x8A04DC +tik_22_ResetTrackVolumes = 0x8024061C; // type:func rom:0x8A04DC tik_22_CheckDripCollisionWithNPC = 0x80240640; // type:func rom:0x8A0500 tik_23_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0x8A23D0 tik_23_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0x8A23F0 @@ -15991,8 +15991,8 @@ tik_23_UnkDistFunc = 0x802409DC; // type:func rom:0x8A2DAC tik_23_UnkNpcAIFunc12 = 0x80240B10; // type:func rom:0x8A2EE0 tik_23_set_script_owner_npc_col_height = 0x80240C74; // type:func rom:0x8A3044 tik_23_TackleAI_Main = 0x80240CF4; // type:func rom:0x8A30C4 -D_80243650_8A5A20 = 0x80243650; // type:data rom:0x8A5A20 -func_80240000_8A5A80 = 0x80240000; // type:func rom:0x8A5A80 +tik_23_D_80243650_8A5A20 = 0x80243650; // type:data rom:0x8A5A20 +tik_24_map_init = 0x80240000; // type:func rom:0x8A5A80 tik_24_UpdateTexturePanSmooth = 0x80240050; // type:func rom:0x8A5AD0 tik_24_UpdateTexturePanStepped = 0x80240174; // type:func rom:0x8A5BF4 tik_24_CheckDripCollisionWithNPC = 0x80240360; // type:func rom:0x8A5DE0 @@ -16007,7 +16007,7 @@ D_802424A0_8A7F20 = 0x802424A0; // type:data rom:0x8A7F20 tik_25_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0x8A7F80 tik_25_UpdateTexturePanStepped = 0x80240124; // type:func rom:0x8A80A4 tik_25_CheckDripCollisionWithNPC = 0x8024030C; // type:func rom:0x8A828C -tik_25_func_80240680_8A8600 = 0x80240680; // type:func rom:0x8A8600 +tik_25_DismissGotItem = 0x80240680; // type:func rom:0x8A8600 tik_25_SetEntityPosition = 0x802406AC; // type:func rom:0x8A862C tik_25_PlaySpringReboundAnimation = 0x80240770; // type:func rom:0x8A86F0 kgr_01_DarkRoomUpdate = 0x80240000; // type:func rom:0x8A9A10