From 2e8a4efa30c9168c36a2dcea296d7349240f359f Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Mon, 10 Oct 2022 18:02:54 -0400 Subject: [PATCH] area_mim (#813) * area_mim * fixes * mim is FINISHED, you hear me? FINISHED * slight improvement * and this Co-authored-by: HailSanta --- include/common_structs.h | 8 +- include/enums.h | 13 + include/map.h | 3 + src/1a1f0_len_5390.c | 2 - src/38F00.c | 2 +- src/common/foliage.inc.c | 3 +- src/dc470_len_14c0.c | 2 +- src/evt/msg_api.c | 144 +++--- src/evt/script_list.c | 4 +- src/state_pause.c | 4 +- src/world/area_arn/arn_03/arn_03_2_npc.c | 4 +- src/world/area_iwa/iwa_04/iwa_04_2_entity.c | 2 +- src/world/area_iwa/iwa_10/91F5A0.c | 32 -- .../area_iwa/iwa_10/iwa_10_5_parakarry.c | 5 +- src/world/area_mim/gates/animate.inc.c | 109 +++++ src/world/area_mim/gates/setup.inc.c | 30 ++ src/world/area_mim/gates/support.inc.c | 71 +++ src/world/area_mim/gates/use.inc.c | 49 ++ src/world/area_mim/mim.h | 39 +- src/world/area_mim/mim_01/B93440.c | 8 - src/world/area_mim/mim_01/B934B0.c | 5 - src/world/area_mim/mim_01/B93940.c | 3 - src/world/area_mim/mim_01/mim_01.h | 20 +- src/world/area_mim/mim_01/mim_01_0_header.c | 16 + src/world/area_mim/mim_01/mim_01_1_music.c | 8 + src/world/area_mim/mim_01/mim_01_2_main.c | 43 ++ src/world/area_mim/mim_01/mim_01_3_entity.c | 25 ++ src/world/area_mim/mim_01/mim_01_4_hint.c | 131 ++++++ src/world/area_mim/mim_01/mim_01_5_gate.c | 293 ++++++++++++ src/world/area_mim/mim_01/mim_01_6_npc.c | 34 ++ src/world/area_mim/mim_02/B97C00.c | 6 - src/world/area_mim/mim_02/B97C70.c | 13 - src/world/area_mim/mim_02/mim_02.h | 21 +- src/world/area_mim/mim_02/mim_02_0_header.c | 16 + src/world/area_mim/mim_02/mim_02_1_music.c | 8 + src/world/area_mim/mim_02/mim_02_2_main.c | 39 ++ src/world/area_mim/mim_02/mim_02_3_npc.c | 222 ++++++++++ src/world/area_mim/mim_02/mim_02_4_gate.c | 90 ++++ src/world/area_mim/mim_02/mim_02_5_hint.c | 32 ++ src/world/area_mim/mim_03/B9B480.c | 14 - src/world/area_mim/mim_03/mim_03.h | 16 +- src/world/area_mim/mim_03/mim_03_0_header.c | 16 + src/world/area_mim/mim_03/mim_03_1_music.c | 8 + src/world/area_mim/mim_03/mim_03_2_main.c | 56 +++ src/world/area_mim/mim_03/mim_03_3_entity.c | 6 + src/world/area_mim/mim_03/mim_03_4_hint.c | 182 ++++++++ src/world/area_mim/mim_03/mim_03_5_gate.c | 6 + src/world/area_mim/mim_03/mim_03_6_npc.c | 59 +++ src/world/area_mim/mim_04/B9D960.c | 8 - src/world/area_mim/mim_04/B9D9D0.c | 43 -- src/world/area_mim/mim_04/B9DB60.c | 7 - src/world/area_mim/mim_04/mim_04.h | 19 +- src/world/area_mim/mim_04/mim_04_0_header.c | 16 + src/world/area_mim/mim_04/mim_04_1_music.c | 8 + src/world/area_mim/mim_04/mim_04_2_main.c | 41 ++ src/world/area_mim/mim_04/mim_04_3_entity.c | 6 + src/world/area_mim/mim_04/mim_04_4_hint.c | 86 ++++ src/world/area_mim/mim_04/mim_04_5_gate.c | 6 + src/world/area_mim/mim_04/mim_04_6_npc.c | 96 ++++ src/world/area_mim/mim_05/BA0730.c | 8 - src/world/area_mim/mim_05/BA07A0.c | 3 - src/world/area_mim/mim_05/mim_05.h | 20 +- src/world/area_mim/mim_05/mim_05_0_header.c | 16 + src/world/area_mim/mim_05/mim_05_1_music.c | 8 + src/world/area_mim/mim_05/mim_05_2_main.c | 39 ++ src/world/area_mim/mim_05/mim_05_3_entity.c | 6 + src/world/area_mim/mim_05/mim_05_4_hint.c | 128 ++++++ src/world/area_mim/mim_05/mim_05_5_gate.c | 6 + src/world/area_mim/mim_05/mim_05_6_npc.c | 61 +++ src/world/area_mim/mim_06/BA4780.c | 8 - src/world/area_mim/mim_06/BA47F0.c | 7 - src/world/area_mim/mim_06/BA4CF0.c | 5 - src/world/area_mim/mim_06/mim_06.h | 23 +- src/world/area_mim/mim_06/mim_06_0_header.c | 16 + src/world/area_mim/mim_06/mim_06_1_music.c | 8 + src/world/area_mim/mim_06/mim_06_2_main.c | 41 ++ src/world/area_mim/mim_06/mim_06_3_entity.c | 6 + src/world/area_mim/mim_06/mim_06_4_hint.c | 212 +++++++++ src/world/area_mim/mim_06/mim_06_5_gate.c | 6 + src/world/area_mim/mim_06/mim_06_6_npc.c | 86 ++++ src/world/area_mim/mim_07/BAA140.c | 10 - src/world/area_mim/mim_07/BAA1B0.c | 45 -- src/world/area_mim/mim_07/BAA3B0.c | 3 - src/world/area_mim/mim_07/mim_07.h | 27 +- src/world/area_mim/mim_07/mim_07_0_header.c | 16 + src/world/area_mim/mim_07/mim_07_1_music.c | 14 + src/world/area_mim/mim_07/mim_07_2_main.c | 53 +++ src/world/area_mim/mim_07/mim_07_3_entity.c | 24 + src/world/area_mim/mim_07/mim_07_4_hint.c | 121 +++++ src/world/area_mim/mim_07/mim_07_5_gate.c | 264 +++++++++++ src/world/area_mim/mim_07/mim_07_6_npc.c | 270 +++++++++++ src/world/area_mim/mim_08/BAD940.c | 15 - src/world/area_mim/mim_08/mim_08.h | 26 +- src/world/area_mim/mim_08/mim_08_0_header.c | 16 + src/world/area_mim/mim_08/mim_08_1_music.c | 8 + src/world/area_mim/mim_08/mim_08_2_main.c | 75 ++++ src/world/area_mim/mim_08/mim_08_3_entity.c | 9 + src/world/area_mim/mim_08/mim_08_4_gate.c | 6 + src/world/area_mim/mim_08/mim_08_5_npc.c | 108 +++++ src/world/area_mim/mim_09/BB2E00.c | 10 - src/world/area_mim/mim_09/mim_09.h | 22 +- src/world/area_mim/mim_09/mim_09_0_header.c | 16 + src/world/area_mim/mim_09/mim_09_1_music.c | 8 + src/world/area_mim/mim_09/mim_09_2_main.c | 55 +++ src/world/area_mim/mim_09/mim_09_3_entity.c | 9 + src/world/area_mim/mim_09/mim_09_4_hint.c | 95 ++++ src/world/area_mim/mim_09/mim_09_5_gate.c | 6 + src/world/area_mim/mim_09/mim_09_6_npc.c | 37 ++ src/world/area_mim/mim_10/BB59E0.c | 22 - src/world/area_mim/mim_10/mim_10.h | 23 +- src/world/area_mim/mim_10/mim_10_0_header.c | 14 + src/world/area_mim/mim_10/mim_10_1_music.c | 60 +++ src/world/area_mim/mim_10/mim_10_2_entity.c | 8 + src/world/area_mim/mim_10/mim_10_3_main.c | 57 +++ src/world/area_mim/mim_10/mim_10_4_npc.c | 317 +++++++++++++ src/world/area_mim/mim_11/BB7070.c | 18 - src/world/area_mim/mim_11/BB7940.c | 5 - src/world/area_mim/mim_11/BB79F0.c | 4 - src/world/area_mim/mim_11/mim_11.h | 29 +- src/world/area_mim/mim_11/mim_11_0_header.c | 18 + src/world/area_mim/mim_11/mim_11_1_music.c | 13 + src/world/area_mim/mim_11/mim_11_2_main.c | 258 +++++++++++ src/world/area_mim/mim_11/mim_11_3_gate.c | 186 ++++++++ src/world/area_mim/mim_11/mim_11_4_entity.c | 27 ++ src/world/area_mim/mim_11/mim_11_5_npc.c | 145 ++++++ src/world/area_mim/mim_11/mim_11_6_foliage.c | 73 +++ src/world/area_mim/mim_12/BBB380.c | 16 - src/world/area_mim/mim_12/mim_12.h | 21 +- src/world/area_mim/mim_12/mim_12_0_header.c | 14 + src/world/area_mim/mim_12/mim_12_1_music.c | 38 ++ src/world/area_mim/mim_12/mim_12_2_entity.c | 9 + src/world/area_mim/mim_12/mim_12_3_main.c | 44 ++ src/world/area_mim/mim_12/mim_12_4_npc.c | 49 ++ src/world/area_mim/mim_12/mim_12_5_gate.c | 419 ++++++++++++++++++ src/world/area_trd/trd_09/trd_09_3_npcs.c | 5 +- .../{KeyItems.inc.c => KeyItemChoice.inc.c} | 8 +- src/world/common/enemy/complete/Bzzap.h | 29 ++ src/world/common/enemy/complete/Bzzap.inc.c | 41 ++ src/world/common/enemy/complete/ForestFuzzy.h | 35 ++ .../enemy/complete/ForestFuzzy.inc copy.c | 32 ++ .../common/enemy/complete/ForestFuzzy.inc.c | 32 ++ .../common/enemy/complete/PiranhaPlant.h | 67 +++ .../common/enemy/complete/PiranhaPlant.inc.c | 85 ++++ .../common/enemy/complete/PutridPiranha.inc.c | 2 - src/world/common/npc/Bulbulb.h | 29 ++ src/world/common/npc/Bulbulb.inc.c | 14 + src/world/common/npc/Oaklie.h | 29 ++ src/world/common/npc/Oaklie.inc.c | 9 + .../common/util/GetFirstTriangleNormal.inc.c | 101 +++++ .../data/world/area_iwa/iwa_10/9247B0.data.s | 81 ---- .../data/world/area_mim/mim_01/B952F0.data.s | 6 - .../data/world/area_mim/mim_01/B953B0.data.s | 24 - .../data/world/area_mim/mim_01/B957E0.data.s | 9 - .../data/world/area_mim/mim_01/B960E0.data.s | 51 --- .../data/world/area_mim/mim_02/B98DE0.data.s | 6 - .../data/world/area_mim/mim_02/B98EA0.data.s | 60 --- .../data/world/area_mim/mim_02/B9A390.data.s | 27 -- .../data/world/area_mim/mim_02/B9B250.data.s | 6 - .../data/world/area_mim/mim_03/B9B9B0.data.s | 6 - .../data/world/area_mim/mim_03/B9BA70.data.s | 18 - .../data/world/area_mim/mim_03/B9BE30.data.s | 60 --- .../data/world/area_mim/mim_03/B9D500.data.s | 15 - .../data/world/area_mim/mim_04/B9EA90.data.s | 6 - .../data/world/area_mim/mim_04/B9EB50.data.s | 36 -- .../data/world/area_mim/mim_04/B9F020.data.s | 27 -- .../data/world/area_mim/mim_04/B9FEA0.data.s | 36 -- .../data/world/area_mim/mim_05/BA2150.data.s | 6 - .../data/world/area_mim/mim_05/BA2210.data.s | 66 --- .../data/world/area_mim/mim_05/BA3A80.data.s | 27 -- .../data/world/area_mim/mim_06/BA74B0.data.s | 6 - .../data/world/area_mim/mim_06/BA7570.data.s | 48 -- .../data/world/area_mim/mim_06/BA82F0.data.s | 27 -- .../data/world/area_mim/mim_06/BA9170.data.s | 39 -- .../data/world/area_mim/mim_07/BAB1D0.data.s | 6 - .../data/world/area_mim/mim_07/BAB2C0.data.s | 18 - .../data/world/area_mim/mim_07/BAB6D0.data.s | 6 - .../data/world/area_mim/mim_07/BAB7C0.data.s | 21 - .../data/world/area_mim/mim_07/BABAD0.data.s | 27 -- .../data/world/area_mim/mim_07/BAC9C0.data.s | 63 --- .../data/world/area_mim/mim_08/BB0880.data.s | 6 - .../data/world/area_mim/mim_08/BB0940.data.s | 21 - .../data/world/area_mim/mim_08/BB0E30.data.s | 6 - .../data/world/area_mim/mim_08/BB0E80.data.s | 27 -- .../data/world/area_mim/mim_08/BB1D00.data.s | 48 -- .../data/world/area_mim/mim_09/BB3CC0.data.s | 6 - .../data/world/area_mim/mim_09/BB3D80.data.s | 18 - .../data/world/area_mim/mim_09/BB4130.data.s | 6 - .../data/world/area_mim/mim_09/BB4180.data.s | 9 - .../data/world/area_mim/mim_09/BB4830.data.s | 39 -- .../data/world/area_mim/mim_10/BB5B70.data.s | 9 - .../data/world/area_mim/mim_10/BB5EB0.data.s | 6 - .../data/world/area_mim/mim_10/BB5EF0.data.s | 15 - .../data/world/area_mim/mim_10/BB61D0.data.s | 30 -- .../data/world/area_mim/mim_11/BB7C30.data.s | 51 --- .../data/world/area_mim/mim_11/BBA180.data.s | 6 - .../data/world/area_mim/mim_11/BBA2E0.data.s | 51 --- .../data/world/area_mim/mim_12/BBB960.data.s | 12 - .../data/world/area_mim/mim_12/BBBB90.data.s | 15 - .../data/world/area_mim/mim_12/BBBE60.data.s | 15 - .../data/world/area_mim/mim_12/BBC2B0.data.s | 39 -- .../mim_01/B934B0/func_80240070_B934B0.s | 239 ---------- .../mim_01/B934B0/func_802403F0_B93830.s | 72 --- .../mim_02/B97C70/func_802410B0_B98CB0.s | 28 -- .../mim_02/B97C70/func_80241104_B98D04.s | 18 - .../mim_02/B97C70/func_8024113C_B98D3C.s | 50 --- .../mim_03/B9B480/func_80240068_B9B4E8.s | 18 - .../mim_03/B9B480/func_802400A0_B9B520.s | 239 ---------- .../mim_03/B9B480/func_80240420_B9B8A0.s | 72 --- .../mim_04/B9D9D0/func_802401DC_B9DB3C.s | 14 - .../mim_06/BA47F0/func_80240070_BA47F0.s | 239 ---------- .../mim_06/BA47F0/func_802403F0_BA4B70.s | 70 --- .../mim_06/BA47F0/func_802404F8_BA4C78.s | 34 -- .../mim_07/BAA1B0/func_80240244_BAA384.s | 16 - .../mim_09/BB2E00/func_80240068_BB2E68.s | 18 - .../mim_10/BB59E0/func_80240030_BB5A10.s | 24 - .../mim_10/BB59E0/func_80240080_BB5A60.s | 31 -- .../mim_10/BB59E0/func_802400EC_BB5ACC.s | 29 -- .../mim_10/BB59E0/func_80240148_BB5B28.s | 24 - .../mim_11/BB7070/func_802405EC_BB765C.s | 36 -- .../mim_11/BB7070/func_8024066C_BB76DC.s | 81 ---- .../mim_11/BB7070/func_80240790_BB7800.s | 85 ---- .../mim_11/BB7940/func_802408D0_BB7940.s | 12 - .../mim_11/BB7940/func_802408F0_BB7960.s | 41 -- .../mim_12/BBB380/func_80240000_BBB380.s | 29 -- .../mim_12/BBB380/func_80240064_BBB3E4.s | 30 -- .../mim_12/BBB380/func_802400CC_BBB44C.s | 60 --- .../mim_12/BBB380/func_8024019C_BBB51C.s | 56 --- .../mim_12/BBB380/func_8024025C_BBB5DC.s | 159 ------- .../mim_12/BBB380/func_802404A8_BBB828.s | 85 ---- ver/us/splat.yaml | 177 ++++---- ver/us/symbol_addrs.txt | 72 +-- 231 files changed, 6428 insertions(+), 3743 deletions(-) delete mode 100644 src/world/area_iwa/iwa_10/91F5A0.c create mode 100644 src/world/area_mim/gates/animate.inc.c create mode 100644 src/world/area_mim/gates/setup.inc.c create mode 100644 src/world/area_mim/gates/support.inc.c create mode 100644 src/world/area_mim/gates/use.inc.c delete mode 100644 src/world/area_mim/mim_01/B93440.c delete mode 100644 src/world/area_mim/mim_01/B934B0.c delete mode 100644 src/world/area_mim/mim_01/B93940.c create mode 100644 src/world/area_mim/mim_01/mim_01_0_header.c create mode 100644 src/world/area_mim/mim_01/mim_01_1_music.c create mode 100644 src/world/area_mim/mim_01/mim_01_2_main.c create mode 100644 src/world/area_mim/mim_01/mim_01_3_entity.c create mode 100644 src/world/area_mim/mim_01/mim_01_4_hint.c create mode 100644 src/world/area_mim/mim_01/mim_01_5_gate.c create mode 100644 src/world/area_mim/mim_01/mim_01_6_npc.c delete mode 100644 src/world/area_mim/mim_02/B97C00.c delete mode 100644 src/world/area_mim/mim_02/B97C70.c create mode 100644 src/world/area_mim/mim_02/mim_02_0_header.c create mode 100644 src/world/area_mim/mim_02/mim_02_1_music.c create mode 100644 src/world/area_mim/mim_02/mim_02_2_main.c create mode 100644 src/world/area_mim/mim_02/mim_02_3_npc.c create mode 100644 src/world/area_mim/mim_02/mim_02_4_gate.c create mode 100644 src/world/area_mim/mim_02/mim_02_5_hint.c delete mode 100644 src/world/area_mim/mim_03/B9B480.c create mode 100644 src/world/area_mim/mim_03/mim_03_0_header.c create mode 100644 src/world/area_mim/mim_03/mim_03_1_music.c create mode 100644 src/world/area_mim/mim_03/mim_03_2_main.c create mode 100644 src/world/area_mim/mim_03/mim_03_3_entity.c create mode 100644 src/world/area_mim/mim_03/mim_03_4_hint.c create mode 100644 src/world/area_mim/mim_03/mim_03_5_gate.c create mode 100644 src/world/area_mim/mim_03/mim_03_6_npc.c delete mode 100644 src/world/area_mim/mim_04/B9D960.c delete mode 100644 src/world/area_mim/mim_04/B9D9D0.c delete mode 100644 src/world/area_mim/mim_04/B9DB60.c create mode 100644 src/world/area_mim/mim_04/mim_04_0_header.c create mode 100644 src/world/area_mim/mim_04/mim_04_1_music.c create mode 100644 src/world/area_mim/mim_04/mim_04_2_main.c create mode 100644 src/world/area_mim/mim_04/mim_04_3_entity.c create mode 100644 src/world/area_mim/mim_04/mim_04_4_hint.c create mode 100644 src/world/area_mim/mim_04/mim_04_5_gate.c create mode 100644 src/world/area_mim/mim_04/mim_04_6_npc.c delete mode 100644 src/world/area_mim/mim_05/BA0730.c delete mode 100644 src/world/area_mim/mim_05/BA07A0.c create mode 100644 src/world/area_mim/mim_05/mim_05_0_header.c create mode 100644 src/world/area_mim/mim_05/mim_05_1_music.c create mode 100644 src/world/area_mim/mim_05/mim_05_2_main.c create mode 100644 src/world/area_mim/mim_05/mim_05_3_entity.c create mode 100644 src/world/area_mim/mim_05/mim_05_4_hint.c create mode 100644 src/world/area_mim/mim_05/mim_05_5_gate.c create mode 100644 src/world/area_mim/mim_05/mim_05_6_npc.c delete mode 100644 src/world/area_mim/mim_06/BA4780.c delete mode 100644 src/world/area_mim/mim_06/BA47F0.c delete mode 100644 src/world/area_mim/mim_06/BA4CF0.c create mode 100644 src/world/area_mim/mim_06/mim_06_0_header.c create mode 100644 src/world/area_mim/mim_06/mim_06_1_music.c create mode 100644 src/world/area_mim/mim_06/mim_06_2_main.c create mode 100644 src/world/area_mim/mim_06/mim_06_3_entity.c create mode 100644 src/world/area_mim/mim_06/mim_06_4_hint.c create mode 100644 src/world/area_mim/mim_06/mim_06_5_gate.c create mode 100644 src/world/area_mim/mim_06/mim_06_6_npc.c delete mode 100644 src/world/area_mim/mim_07/BAA140.c delete mode 100644 src/world/area_mim/mim_07/BAA1B0.c delete mode 100644 src/world/area_mim/mim_07/BAA3B0.c create mode 100644 src/world/area_mim/mim_07/mim_07_0_header.c create mode 100644 src/world/area_mim/mim_07/mim_07_1_music.c create mode 100644 src/world/area_mim/mim_07/mim_07_2_main.c create mode 100644 src/world/area_mim/mim_07/mim_07_3_entity.c create mode 100644 src/world/area_mim/mim_07/mim_07_4_hint.c create mode 100644 src/world/area_mim/mim_07/mim_07_5_gate.c create mode 100644 src/world/area_mim/mim_07/mim_07_6_npc.c delete mode 100644 src/world/area_mim/mim_08/BAD940.c create mode 100644 src/world/area_mim/mim_08/mim_08_0_header.c create mode 100644 src/world/area_mim/mim_08/mim_08_1_music.c create mode 100644 src/world/area_mim/mim_08/mim_08_2_main.c create mode 100644 src/world/area_mim/mim_08/mim_08_3_entity.c create mode 100644 src/world/area_mim/mim_08/mim_08_4_gate.c create mode 100644 src/world/area_mim/mim_08/mim_08_5_npc.c delete mode 100644 src/world/area_mim/mim_09/BB2E00.c create mode 100644 src/world/area_mim/mim_09/mim_09_0_header.c create mode 100644 src/world/area_mim/mim_09/mim_09_1_music.c create mode 100644 src/world/area_mim/mim_09/mim_09_2_main.c create mode 100644 src/world/area_mim/mim_09/mim_09_3_entity.c create mode 100644 src/world/area_mim/mim_09/mim_09_4_hint.c create mode 100644 src/world/area_mim/mim_09/mim_09_5_gate.c create mode 100644 src/world/area_mim/mim_09/mim_09_6_npc.c delete mode 100644 src/world/area_mim/mim_10/BB59E0.c create mode 100644 src/world/area_mim/mim_10/mim_10_0_header.c create mode 100644 src/world/area_mim/mim_10/mim_10_1_music.c create mode 100644 src/world/area_mim/mim_10/mim_10_2_entity.c create mode 100644 src/world/area_mim/mim_10/mim_10_3_main.c create mode 100644 src/world/area_mim/mim_10/mim_10_4_npc.c delete mode 100644 src/world/area_mim/mim_11/BB7070.c delete mode 100644 src/world/area_mim/mim_11/BB7940.c delete mode 100644 src/world/area_mim/mim_11/BB79F0.c create mode 100644 src/world/area_mim/mim_11/mim_11_0_header.c create mode 100644 src/world/area_mim/mim_11/mim_11_1_music.c create mode 100644 src/world/area_mim/mim_11/mim_11_2_main.c create mode 100644 src/world/area_mim/mim_11/mim_11_3_gate.c create mode 100644 src/world/area_mim/mim_11/mim_11_4_entity.c create mode 100644 src/world/area_mim/mim_11/mim_11_5_npc.c create mode 100644 src/world/area_mim/mim_11/mim_11_6_foliage.c delete mode 100644 src/world/area_mim/mim_12/BBB380.c create mode 100644 src/world/area_mim/mim_12/mim_12_0_header.c create mode 100644 src/world/area_mim/mim_12/mim_12_1_music.c create mode 100644 src/world/area_mim/mim_12/mim_12_2_entity.c create mode 100644 src/world/area_mim/mim_12/mim_12_3_main.c create mode 100644 src/world/area_mim/mim_12/mim_12_4_npc.c create mode 100644 src/world/area_mim/mim_12/mim_12_5_gate.c rename src/world/common/complete/{KeyItems.inc.c => KeyItemChoice.inc.c} (91%) create mode 100644 src/world/common/enemy/complete/Bzzap.h create mode 100644 src/world/common/enemy/complete/Bzzap.inc.c create mode 100644 src/world/common/enemy/complete/ForestFuzzy.h create mode 100644 src/world/common/enemy/complete/ForestFuzzy.inc copy.c create mode 100644 src/world/common/enemy/complete/ForestFuzzy.inc.c create mode 100644 src/world/common/enemy/complete/PiranhaPlant.h create mode 100644 src/world/common/enemy/complete/PiranhaPlant.inc.c create mode 100644 src/world/common/npc/Bulbulb.h create mode 100644 src/world/common/npc/Bulbulb.inc.c create mode 100644 src/world/common/npc/Oaklie.h create mode 100644 src/world/common/npc/Oaklie.inc.c create mode 100644 src/world/common/util/GetFirstTriangleNormal.inc.c delete mode 100644 ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_01/B952F0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_01/B953B0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_01/B957E0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_01/B960E0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_02/B98DE0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_02/B9A390.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_02/B9B250.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_03/B9B9B0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_03/B9BA70.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_03/B9BE30.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_03/B9D500.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_04/B9EA90.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_04/B9EB50.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_04/B9F020.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_05/BA2150.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_05/BA2210.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_05/BA3A80.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_06/BA74B0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_06/BA7570.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_06/BA82F0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_06/BA9170.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_07/BAB1D0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_07/BAB2C0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_07/BAB6D0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_07/BAB7C0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_07/BABAD0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_07/BAC9C0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_08/BB0880.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_08/BB0940.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_08/BB0E30.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_08/BB0E80.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_08/BB1D00.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_09/BB3CC0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_09/BB3D80.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_09/BB4130.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_09/BB4180.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_09/BB4830.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_10/BB5B70.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_10/BB5EB0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_10/BB5EF0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_10/BB61D0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_11/BBA180.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_11/BBA2E0.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_12/BBB960.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_12/BBBB90.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_12/BBBE60.data.s delete mode 100644 ver/us/asm/data/world/area_mim/mim_12/BBC2B0.data.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80241104_B98D04.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240068_B9B4E8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802404F8_BA4C78.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240068_BB2E68.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240030_BB5A10.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240080_BB5A60.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_802400EC_BB5ACC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240148_BB5B28.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802405EC_BB765C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024066C_BB76DC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240790_BB7800.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408D0_BB7940.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408F0_BB7960.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240000_BBB380.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240064_BBB3E4.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802400CC_BBB44C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024019C_BBB51C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024025C_BBB5DC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802404A8_BBB828.s diff --git a/include/common_structs.h b/include/common_structs.h index ab5d33ce0d..1fc481de86 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1431,10 +1431,10 @@ typedef struct GameStatus { /* 0x14E */ s16 backgroundMaxX; /* 0x150 */ s16 backgroundMaxY; /* 0x152 */ s16 backgroundXOffset; /* (used for parallax scroll) */ - /* 0x154 */ UNK_PTR backgroundRaster; - /* 0x158 */ u16* backgroundPalette; - /* 0x15C */ s16 unk_15C; - /* 0x15E */ u16 unk_15E; + /* 0x154 */ IMG_PTR backgroundRaster; + /* 0x158 */ PAL_PTR backgroundPalette; + /* 0x15C */ s16 backgroundDarkness; // 255 = fully black + /* 0x15E */ s16 savedBackgroundDarkness; // used during pause/unpause /* 0x160 */ Vec3s savedPos; /* 0x166 */ u8 saveSlot; /* 0x167 */ u8 loadType; /* (0 = from map, 1 = from main menu) */ diff --git a/include/enums.h b/include/enums.h index 3f0d6a06be..d791a1af6d 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2379,6 +2379,19 @@ enum NpcDecorationIDs { NPC_DECORATION_CHARGED = 0x00000006, }; +enum SpeechFlags { + SPEECH_FLAG_10 = 0x010, + SPEECH_FLAG_HAS_OFFSET = 0x100, + SPEECH_FLAG_200 = 0x200, + // different facing orientations for speaker and listener + SPEECH_ORIENTATION_MASK = 0xF, + SPEECH_FACE_SPEAKER_ONLY = 4, + SPEECH_FACE_AWAY_FROM = 3, + SPEECH_FACE_LIKE_SPEAKER = 2, + SPEECH_FACE_LIKE_LISTENER = 1, + SPEECH_FACE_EACH_OTHER = 0, +}; + enum HitResults { HIT_RESULT_TRIGGERED_EXPLODE = -1, HIT_RESULT_HIT = 0, diff --git a/include/map.h b/include/map.h index c160b4814a..532a9287a1 100644 --- a/include/map.h +++ b/include/map.h @@ -75,4 +75,7 @@ MapSettings* get_current_map_settings(void); /// Zero-terminated. extern AreaConfig gAreas[29]; +extern EvtScript EVS_NpcHitRecoil; +extern EvtScript EVS_800936C0; + #endif diff --git a/src/1a1f0_len_5390.c b/src/1a1f0_len_5390.c index 703a8c0e48..520dc5ae0b 100644 --- a/src/1a1f0_len_5390.c +++ b/src/1a1f0_len_5390.c @@ -21,8 +21,6 @@ void spawn_drops(Enemy* enemy); s32 D_80077C40 = 0; -extern EvtScript EVS_NpcHitRecoil; - EvtScript D_80077C44 = { EVT_WAIT(10) EVT_CALL(FadeBackgroundToBlack) diff --git a/src/38F00.c b/src/38F00.c index c1657166f6..46c63925a2 100644 --- a/src/38F00.c +++ b/src/38F00.c @@ -4,7 +4,7 @@ ApiStatus func_8005DB00(Evt* script, s32 isInitialCall); ApiStatus func_8005DD54(Evt* script, s32 isInitialCall); ApiStatus func_8005DDF0(Evt* script, s32 isInitialCall); -EvtScript D_800936C0 = { +EvtScript EVS_800936C0 = { EVT_CALL(func_8005DB00) EVT_RETURN EVT_END diff --git a/src/common/foliage.inc.c b/src/common/foliage.inc.c index 084afd22b3..41331489df 100644 --- a/src/common/foliage.inc.c +++ b/src/common/foliage.inc.c @@ -1,4 +1,5 @@ #include "common.h" +#include "effects.h" #include "FoliageTransform.inc.c" @@ -165,7 +166,7 @@ EvtScript N(shakeTree) = { EVT_BUF_READ1(LVar5) EVT_LOOP(LVar5) EVT_BUF_READ3(LVar6, LVar7, LVar8) - EVT_CALL(PlayEffect, 0x14, 0, LVar6, LVar7, LVar8, 100, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, LVar6, LVar7, LVar8, 100) EVT_END_LOOP EVT_END_IF EVT_END_THREAD diff --git a/src/dc470_len_14c0.c b/src/dc470_len_14c0.c index 81885cc97e..1ab1cadf67 100644 --- a/src/dc470_len_14c0.c +++ b/src/dc470_len_14c0.c @@ -28,7 +28,7 @@ void load_map_bg(char* optAssetName) { void reset_background_settings(void) { D_801595A0 = 0; D_8014F12F = 0; - gGameStatusPtr->unk_15C = 180; + gGameStatusPtr->backgroundDarkness = 180; gGameStatusPtr->backgroundFlags &= 0xF0; } diff --git a/src/evt/msg_api.c b/src/evt/msg_api.c index 14009299c9..5ae82e60fd 100644 --- a/src/evt/msg_api.c +++ b/src/evt/msg_api.c @@ -1,7 +1,7 @@ #include "common.h" -extern s32 D_802DAE50; -extern s32 D_802DAE54; +extern s32 ShowMessageScreenOffsetX; +extern s32 ShowMessageScreenOffsetY; extern s32 D_802DAE58[2]; // unused? extern char D_802DAE60[0x400]; // unused? extern MessagePrintState* gCurrentPrintContext; @@ -10,121 +10,129 @@ extern MessagePrintState* D_802DB268; ApiStatus _show_message(Evt* script, s32 isInitialCall, s32 arg2); +enum { + SHOW_MESSAGE_SPEAK_TO_PLAYER = 0, + SHOW_MESSAGE_END_SPEECH = 1, + SHOW_MESSAGE_CONTINUE_SPEECH = 2, + SHOW_MESSAGE_SPEAK_TO_NPC = 3, +}; + ApiStatus SpeakToPlayer(Evt* script, s32 isInitialCall) { - return _show_message(script, isInitialCall, 0); + return _show_message(script, isInitialCall, SHOW_MESSAGE_SPEAK_TO_PLAYER); } ApiStatus EndSpeech(Evt* script, s32 isInitialCall) { - return _show_message(script, isInitialCall, 1); + return _show_message(script, isInitialCall, SHOW_MESSAGE_END_SPEECH); } ApiStatus ContinueSpeech(Evt* script, s32 isInitialCall) { - return _show_message(script, isInitialCall, 2); + return _show_message(script, isInitialCall, SHOW_MESSAGE_CONTINUE_SPEECH); } ApiStatus SpeakToNpc(Evt* script, s32 isInitialCall) { - return _show_message(script, isInitialCall, 3); + return _show_message(script, isInitialCall, SHOW_MESSAGE_SPEAK_TO_NPC); } -s32 _show_message(Evt* script, s32 isInitialCall, s32 arg2) { +s32 _show_message(Evt* script, s32 isInitialCall, s32 mode) { PlayerStatus* playerStatus = &gPlayerStatus; Bytecode* args = script->ptrReadPos; s32 screenX, screenY, screenZ; - Npc* npc; - Npc* npc2; - f32 yaw; + Npc* speakerNpc; + Npc* targetNpc; + f32 reverseAngle; f32 angle; - f32 x, z; - f32* yawPtr; - s32 temp_fp; - s32 npcID; + f32* listenerYaw; + s32 speakerNpcID; + s32 targetNpcID; s32 msgID; s32 animID; s32 ret; - npc2 = NULL; + targetNpc = NULL; if (isInitialCall) { D_802DB264 = 0; - temp_fp = evt_get_variable(script, *args++); + speakerNpcID = evt_get_variable(script, *args++); script->varTable[13] = evt_get_variable(script, *args++); script->varTable[14] = evt_get_variable(script, *args++); script->functionTemp[1] = evt_get_variable(script, *args++); - D_802DAE54 = 0; - D_802DAE50 = 0; + ShowMessageScreenOffsetY = 0; + ShowMessageScreenOffsetX = 0; - if (script->functionTemp[1] & 0x100) { - D_802DAE50 = evt_get_variable(script, *args++); - D_802DAE54 = evt_get_variable(script, *args++); + if (script->functionTemp[1] & SPEECH_FLAG_HAS_OFFSET) { + ShowMessageScreenOffsetX = evt_get_variable(script, *args++); + ShowMessageScreenOffsetY = evt_get_variable(script, *args++); } - switch (arg2) { - case 0: + switch (mode) { + case SHOW_MESSAGE_SPEAK_TO_PLAYER: msgID = evt_get_variable(script, *args++); gCurrentPrintContext = msg_get_printer_for_msg(msgID, &D_802DB264); break; - case 1: + case SHOW_MESSAGE_END_SPEECH: close_message(gCurrentPrintContext); break; - case 2: + case SHOW_MESSAGE_CONTINUE_SPEECH: msgID = evt_get_variable(script, *args++); msg_printer_load_msg(msgID, gCurrentPrintContext); break; - case 3: - npcID = evt_get_variable(script, *args++); + case SHOW_MESSAGE_SPEAK_TO_NPC: + targetNpcID = evt_get_variable(script, *args++); msgID = evt_get_variable(script, *args++); - npc2 = resolve_npc(script, npcID); + targetNpc = resolve_npc(script, targetNpcID); gCurrentPrintContext = msg_get_printer_for_msg(msgID, &D_802DB264); break; } - if (temp_fp == NPC_PLAYER) { + if (speakerNpcID == NPC_PLAYER) { get_screen_coords(gCurrentCameraID, playerStatus->position.x, playerStatus->position.y + playerStatus->colliderHeight, playerStatus->position.z, &screenX, &screenY, &screenZ); script->functionTemp[3] = playerStatus->anim; - npc = (Npc*) NPC_PLAYER; + speakerNpc = (Npc*) NPC_PLAYER; script->varTable[15] = playerStatus->targetYaw; } else { - npc = resolve_npc(script, temp_fp); - get_screen_coords(gCurrentCameraID, npc->pos.x, npc->pos.y + npc->collisionHeight, npc->pos.z, + speakerNpc = resolve_npc(script, speakerNpcID); + get_screen_coords(gCurrentCameraID, speakerNpc->pos.x, speakerNpc->pos.y + speakerNpc->collisionHeight, speakerNpc->pos.z, &screenX, &screenY, &screenZ); - script->functionTemp[3] = npc->currentAnim; - script->varTable[15] = npc->yaw; + script->functionTemp[3] = speakerNpc->currentAnim; + script->varTable[15] = speakerNpc->yaw; } - msg_printer_set_origin_pos(gCurrentPrintContext, screenX + D_802DAE50, screenY + D_802DAE54); - script->varTablePtr[12] = npc; + msg_printer_set_origin_pos(gCurrentPrintContext, + screenX + ShowMessageScreenOffsetX, + screenY + ShowMessageScreenOffsetY); + script->varTablePtr[12] = speakerNpc; - if (npc != (Npc*) NPC_PLAYER) { - if (arg2 == 3) { - yawPtr = &npc2->yaw; - angle = atan2(npc->pos.x, npc->pos.z, npc2->pos.x, npc2->pos.z); + if (speakerNpc != (Npc*) NPC_PLAYER) { + if (mode == SHOW_MESSAGE_SPEAK_TO_NPC) { + listenerYaw = &targetNpc->yaw; + angle = atan2(speakerNpc->pos.x, speakerNpc->pos.z, targetNpc->pos.x, targetNpc->pos.z); } else { - yawPtr = &playerStatus->targetYaw; - angle = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z); + listenerYaw = &playerStatus->targetYaw; + angle = atan2(speakerNpc->pos.x, speakerNpc->pos.z, playerStatus->position.x, playerStatus->position.z); } - yaw = clamp_angle(angle + 180.0f); - switch (script->functionTemp[1] & 0xF) { - case 0: - npc->yaw = angle; - *yawPtr = yaw; + reverseAngle = clamp_angle(angle + 180.0f); + switch (script->functionTemp[1] & SPEECH_ORIENTATION_MASK) { + case SPEECH_FACE_EACH_OTHER: + speakerNpc->yaw = angle; + *listenerYaw = reverseAngle; break; - case 1: - npc->yaw = yaw; - *yawPtr = yaw; + case SPEECH_FACE_LIKE_LISTENER: + speakerNpc->yaw = reverseAngle; + *listenerYaw = reverseAngle; break; - case 2: - npc->yaw = angle; - *yawPtr = angle; + case SPEECH_FACE_LIKE_SPEAKER: + speakerNpc->yaw = angle; + *listenerYaw = angle; break; - case 3: - npc->yaw = yaw; - *yawPtr = angle; + case SPEECH_FACE_AWAY_FROM: + speakerNpc->yaw = reverseAngle; + *listenerYaw = angle; break; - case 4: - npc->yaw = angle; + case SPEECH_FACE_SPEAKER_ONLY: + speakerNpc->yaw = angle; break; case 5: break; @@ -132,15 +140,15 @@ s32 _show_message(Evt* script, s32 isInitialCall, s32 arg2) { } } - npc = script->varTablePtr[12]; - if (npc != (Npc*) NPC_PLAYER) { - get_screen_coords(gCurrentCameraID, npc->pos.x, npc->pos.y + npc->collisionHeight, npc->pos.z, &screenX, &screenY, &screenZ); + speakerNpc = script->varTablePtr[12]; + if (speakerNpc != (Npc*) NPC_PLAYER) { + get_screen_coords(gCurrentCameraID, speakerNpc->pos.x, speakerNpc->pos.y + speakerNpc->collisionHeight, speakerNpc->pos.z, &screenX, &screenY, &screenZ); animID = script->varTable[13]; if (animID != -1) { if (!(gCurrentPrintContext->stateFlags & 0x80)) { animID = script->varTable[14]; } - set_npc_animation(npc, animID); + set_npc_animation(speakerNpc, animID); } } else { get_screen_coords(gCurrentCameraID, playerStatus->position.x, playerStatus->position.y + playerStatus->colliderHeight, playerStatus->position.z, &screenX, &screenY, &screenZ); @@ -153,8 +161,8 @@ s32 _show_message(Evt* script, s32 isInitialCall, s32 arg2) { } } - if (!(script->functionTemp[1] & 0x200)) { - msg_printer_set_origin_pos(gCurrentPrintContext, screenX + D_802DAE50, screenY + D_802DAE54); + if (!(script->functionTemp[1] & SPEECH_FLAG_200)) { + msg_printer_set_origin_pos(gCurrentPrintContext, screenX + ShowMessageScreenOffsetX, screenY + ShowMessageScreenOffsetY); } if (gCurrentPrintContext->stateFlags & 0x40) { @@ -166,14 +174,14 @@ s32 _show_message(Evt* script, s32 isInitialCall, s32 arg2) { } if (script->varTable[13] != -1) { - if (npc != (Npc*) NPC_PLAYER) { - set_npc_animation(npc, script->functionTemp[3]); + if (speakerNpc != (Npc*) NPC_PLAYER) { + set_npc_animation(speakerNpc, script->functionTemp[3]); } else { playerStatus->anim = script->functionTemp[3]; } } - if (script->functionTemp[1] & 0x10) { - npc->yaw = script->varTable[0xF]; + if (script->functionTemp[1] & SPEECH_FLAG_10) { + speakerNpc->yaw = script->varTable[0xF]; } return TRUE; } diff --git a/src/evt/script_list.c b/src/evt/script_list.c index 24ee06b7fd..49485f6120 100644 --- a/src/evt/script_list.c +++ b/src/evt/script_list.c @@ -39,8 +39,8 @@ BSS s32 wExtraPartnerNpcID; BSS s32 D_802DAE4C[2]; // unused? // msg_api -BSS s32 D_802DAE50; -BSS s32 D_802DAE54; +BSS s32 ShowMessageScreenOffsetX; +BSS s32 ShowMessageScreenOffsetY; BSS s32 D_802DAE58[2]; // unused? BSS char D_802DAE60[0x400]; // unused? BSS MessagePrintState* gCurrentPrintContext; diff --git a/src/state_pause.c b/src/state_pause.c index d8336c3501..781193005c 100644 --- a/src/state_pause.c +++ b/src/state_pause.c @@ -54,7 +54,7 @@ void state_step_pause(void) { if (D_800A0920 == 0) { D_800A0920 = -1; nuGfxSetCfb(&D_80077950, 2); - gGameStatusPtr->unk_15E = gGameStatusPtr->unk_15C; + gGameStatusPtr->savedBackgroundDarkness = gGameStatusPtr->backgroundDarkness; sfx_stop_env_sounds(); func_8003B1A8(); gGameStatusPtr->isBattle = oldIsBattle; @@ -178,7 +178,7 @@ void state_step_unpause(void) { set_background_size(296, 200, 12, 20); } - gGameStatusPtr->unk_15C = gGameStatusPtr->unk_15E; + gGameStatusPtr->backgroundDarkness = gGameStatusPtr->savedBackgroundDarkness; calculate_model_sizes(); npc_reload_all(); set_windows_visible(WINDOW_GROUP_ALL); diff --git a/src/world/area_arn/arn_03/arn_03_2_npc.c b/src/world/area_arn/arn_03/arn_03_2_npc.c index ce2b3aeac0..768e92dc92 100644 --- a/src/world/area_arn/arn_03/arn_03_2_npc.c +++ b/src/world/area_arn/arn_03/arn_03_2_npc.c @@ -4,8 +4,8 @@ #include "world/common/npc/Boo_Patrol.inc.c" #include "world/common/npc/Boo.inc.c" -//TODO understand this key item support -#include "world/common/complete/KeyItems.inc.c" +#include "world/common/complete/GiveReward.inc.c" +#include "world/common/complete/KeyItemChoice.inc.c" EvtScript N(EVS_PlayerReact) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) diff --git a/src/world/area_iwa/iwa_04/iwa_04_2_entity.c b/src/world/area_iwa/iwa_04/iwa_04_2_entity.c index 05908c2a3b..6d60599624 100644 --- a/src/world/area_iwa/iwa_04/iwa_04_2_entity.c +++ b/src/world/area_iwa/iwa_04/iwa_04_2_entity.c @@ -1,7 +1,7 @@ #include "iwa_04.h" #include "entity.h" -ApiStatus N(MonitorPlayerAltitude)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(MonitorPlayerAltitude)) { s32 status = -1; if (gPlayerStatus.lastGoodPosition.y > -100.0) { diff --git a/src/world/area_iwa/iwa_10/91F5A0.c b/src/world/area_iwa/iwa_10/91F5A0.c deleted file mode 100644 index 0205d0ee58..0000000000 --- a/src/world/area_iwa/iwa_10/91F5A0.c +++ /dev/null @@ -1,32 +0,0 @@ -#include "iwa_10.h" - -#include "world/common/util/ChangeNpcToPartner.inc.c" - -#include "world/common/GetNpcCollisionHeight.inc.c" - -#include "world/common/AddPlayerHandsOffset.inc.c" - -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_802413E0_91F950); - -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241434_91F9A4); - -extern s32 iwa_10_D_80248480[]; - -ApiStatus func_8024146C_91F9DC(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* ptr = (s32*) evt_get_variable(script, *args++); - s32 i; - - if (ptr != NULL) { - for (i = 0; ptr[i] != 0; i++) { - iwa_10_D_80248480[i] = ptr[i]; - } - iwa_10_D_80248480[i] = 0; - } else { - for (i = 0; i < 112; i++) { - iwa_10_D_80248480[i] = i + 16; - iwa_10_D_80248480[112] = 0; - } - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_iwa/iwa_10/iwa_10_5_parakarry.c b/src/world/area_iwa/iwa_10/iwa_10_5_parakarry.c index 98d2ed8ab0..c7eb77abe1 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_5_parakarry.c +++ b/src/world/area_iwa/iwa_10/iwa_10_5_parakarry.c @@ -15,8 +15,7 @@ NpcSettings N(NpcSettings_Parakarry) = { #include "world/common/util/ChangeNpcToPartner.inc.c" -#define _COMMON_GIVE_REWARD_H_ // not great! -#include "world/common/complete/KeyItems.inc.c" +#include "world/common/complete/KeyItemChoice.inc.c" MAP_STATIC_PAD(4,unk); EvtScript N(EVS_Scene_MeetParakarry) = { @@ -205,7 +204,7 @@ EvtScript N(EVS_NpcInteract_Parakarry) = { EVT_END_IF EVT_SET(LVar0, EVT_PTR(N(LetterList))) EVT_SET(LVar1, 4) - EVT_EXEC_WAIT(N(ChooseKeyItem)) + EVT_EXEC_WAIT(N(EVS_ChooseKeyItem)) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_SWITCH(GB_IWA10_ReturnedLetterCount) diff --git a/src/world/area_mim/gates/animate.inc.c b/src/world/area_mim/gates/animate.inc.c new file mode 100644 index 0000000000..aaf1b96320 --- /dev/null +++ b/src/world/area_mim/gates/animate.inc.c @@ -0,0 +1,109 @@ +#include "common.h" + +EvtScript N(EVS_UseGate) = { + EVT_THREAD + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D4, 0) + EVT_WAIT(19) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D5, 0) + EVT_END_THREAD + EVT_SWITCH(AB_MIM_1) + EVT_CASE_EQ(0) + EVT_THREAD + EVT_CALL(MakeLerp, 10, 90, 10, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, LVar7) + EVT_ADD(LVar2, LVar8) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 15) + EVT_END_THREAD + EVT_SET(LVar1, 1) + EVT_EXEC(N(EVS_SetGateCameraZones)) + EVT_CALL(MakeLerp, 90, 360, 30, EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_EXEC(N(EVS_ResetGates)) + EVT_SET(AB_MIM_1, 1) + EVT_SET(GF_MIM_ChoosingPath, TRUE) + EVT_CASE_EQ(1) + EVT_THREAD + EVT_CALL(MakeLerp, 360, 270, 10, EASING_QUADRATIC_IN) + EVT_LABEL(30) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(30) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, LVar7) + EVT_SUB(LVar2, LVar8) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 15) + EVT_END_THREAD + EVT_SET(LVar1, 2) + EVT_EXEC(N(EVS_SetGateCameraZones)) + EVT_CALL(MakeLerp, 270, -10, 30, EASING_LINEAR) + EVT_LABEL(40) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(40) + EVT_END_IF + EVT_SET(AB_MIM_1, 2) + EVT_CASE_EQ(2) + EVT_THREAD + EVT_CALL(MakeLerp, -10, 90, 10, EASING_QUADRATIC_IN) + EVT_LABEL(50) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(50) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, LVar7) + EVT_ADD(LVar2, LVar8) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 15) + EVT_END_THREAD + EVT_SET(LVar1, 1) + EVT_EXEC(N(EVS_SetGateCameraZones)) + EVT_CALL(MakeLerp, 90, 360, 30, EASING_LINEAR) + EVT_LABEL(60) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(60) + EVT_END_IF + EVT_EXEC(N(EVS_ResetGates)) + EVT_SET(AB_MIM_1, 1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/gates/setup.inc.c b/src/world/area_mim/gates/setup.inc.c new file mode 100644 index 0000000000..1155aab463 --- /dev/null +++ b/src/world/area_mim/gates/setup.inc.c @@ -0,0 +1,30 @@ +#include "common.h" + +EvtScript N(EVS_SetupGates) = { + EVT_IF_EQ(GF_MIM_ChoosingPath, FALSE) + EVT_SET(GF_MIM_ChoosingPath, TRUE) + EVT_SET(AB_MIM_1, 2) + EVT_SET(LVar1, 2) + EVT_SET(LVar2, -10) + EVT_ELSE + EVT_SET(GF_MIM_ChoosingPath, FALSE) + EVT_SET(AB_MIM_1, 0) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 10) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_SetGateCameraZones)) + EVT_EXEC(N(EVS_InitializeGates)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseGate_North)), TRIGGER_WALL_PRESS_A, COLLIDER_monn, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseGate_South)), TRIGGER_WALL_PRESS_A, COLLIDER_mons, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseGate_West)), TRIGGER_WALL_PRESS_A, COLLIDER_monw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseGate_East)), TRIGGER_WALL_PRESS_A, COLLIDER_mone, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/gates/support.inc.c b/src/world/area_mim/gates/support.inc.c new file mode 100644 index 0000000000..240ed3906a --- /dev/null +++ b/src/world/area_mim/gates/support.inc.c @@ -0,0 +1,71 @@ +#include "common.h" + +EvtScript N(EVS_SetGateCameraZones) = { + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(SetZoneEnabled, ZONE_north, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_west, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_south, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_east, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_higashi, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_nishi, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_minami, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_kita, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_stage, FALSE) + EVT_SET(LVar1, 0) + EVT_CASE_EQ(1) + EVT_CALL(SetZoneEnabled, ZONE_north, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_west, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_south, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_east, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_higashi, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_nishi, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_minami, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_kita, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_stage, TRUE) + EVT_SET(LVar1, 1) + EVT_CASE_EQ(2) + EVT_CALL(SetZoneEnabled, ZONE_north, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_west, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_south, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_east, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_higashi, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_nishi, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_minami, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_kita, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_stage, FALSE) + EVT_SET(LVar1, 2) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InitializeGates) = { + EVT_CALL(ParentColliderToModel, COLLIDER_monn, MODEL_n1) + EVT_CALL(RotateGroup, MODEL_monn, LVar2, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monn) + EVT_CALL(ParentColliderToModel, COLLIDER_mons, MODEL_s1) + EVT_CALL(RotateGroup, MODEL_mons, LVar2, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_mons) + EVT_CALL(ParentColliderToModel, COLLIDER_mone, MODEL_e1) + EVT_CALL(RotateGroup, MODEL_mone, LVar2, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_mone) + EVT_CALL(ParentColliderToModel, COLLIDER_monw, MODEL_w1) + EVT_CALL(RotateGroup, MODEL_monw, LVar2, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monw) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ResetGates) = { + EVT_CALL(RotateGroup, MODEL_monn, 0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monn) + EVT_CALL(RotateGroup, MODEL_mons, 0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_mons) + EVT_CALL(RotateGroup, MODEL_mone, 0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_mone) + EVT_CALL(RotateGroup, MODEL_monw, 0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monw) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/gates/use.inc.c b/src/world/area_mim/gates/use.inc.c new file mode 100644 index 0000000000..5ab6f24a0e --- /dev/null +++ b/src/world/area_mim/gates/use.inc.c @@ -0,0 +1,49 @@ +#include "common.h" + +EvtScript N(EVS_UseGate_North) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar7, 0) + EVT_SET(LVar8, 70) + EVT_SET(LVar9, COLLIDER_monn) + EVT_SET(LVarA, MODEL_monn) + EVT_EXEC_WAIT(N(EVS_UseGate)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate_South) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar7, 0) + EVT_SET(LVar8, -70) + EVT_SET(LVar9, COLLIDER_mons) + EVT_SET(LVarA, MODEL_mons) + EVT_EXEC_WAIT(N(EVS_UseGate)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate_East) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar7, -70) + EVT_SET(LVar8, 0) + EVT_SET(LVar9, COLLIDER_mone) + EVT_SET(LVarA, MODEL_mone) + EVT_EXEC_WAIT(N(EVS_UseGate)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate_West) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar7, 70) + EVT_SET(LVar8, 0) + EVT_SET(LVar9, COLLIDER_monw) + EVT_SET(LVarA, MODEL_monw) + EVT_EXEC_WAIT(N(EVS_UseGate)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim.h b/src/world/area_mim/mim.h index f3b84d4182..d98052a427 100644 --- a/src/world/area_mim/mim.h +++ b/src/world/area_mim/mim.h @@ -2,24 +2,29 @@ #define _WORLD_AREA_MIM_MIM_H_ enum { - AB_MIM_0 = AreaByte(0), - AB_MIM_1 = AreaByte(1), - AB_MIM_2 = AreaByte(2), - AB_MIM_3 = AreaByte(3), - AB_MIM_4 = AreaByte(4), - AB_MIM_5 = AreaByte(5), - AB_MIM_6 = AreaByte(6), - AB_MIM_7 = AreaByte(7), - AB_MIM_8 = AreaByte(8), - AB_MIM_9 = AreaByte(9), - AB_MIM_A = AreaByte(10), - AB_MIM_B = AreaByte(11), - AB_MIM_C = AreaByte(12), - AB_MIM_D = AreaByte(13), - AB_MIM_E = AreaByte(14), - AB_MIM_F = AreaByte(15), + AB_MIM_0 = AreaByte(0), + AB_MIM_1 = AreaByte(1), + AB_MIM_2 = AreaByte(2), + AB_MIM_3 = AreaByte(3), + AB_MIM_4 = AreaByte(4), + AB_MIM_5 = AreaByte(5), + AB_MIM_6 = AreaByte(6), + AB_MIM_7 = AreaByte(7), + AB_MIM_8 = AreaByte(8), + AB_MIM_9 = AreaByte(9), + AB_MIM_A = AreaByte(10), + AB_MIM_B = AreaByte(11), + AB_MIM_C = AreaByte(12), + AB_MIM_D = AreaByte(13), + AB_MIM_E = AreaByte(14), + AB_MIM_F = AreaByte(15), }; -#define AF_MIM(index) AreaFlag(index) +enum { + AF_MIM_01 = AreaFlag(1), + AF_MIM03_Oaklie_DialogueToggle = AreaFlag(2), + AF_MIM04_Bulbulb_DialogueToggle = AreaFlag(4), + AF_MIM12_BackgroundLitUp = AreaFlag(3), +}; #endif diff --git a/src/world/area_mim/mim_01/B93440.c b/src/world/area_mim/mim_01/B93440.c deleted file mode 100644 index 6fed0bff9a..0000000000 --- a/src/world/area_mim/mim_01/B93440.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "mim_01.h" - -static char* N(exit_str_0) = "mim_01"; -static char* N(exit_str_1) = "mim_10"; -static char* N(exit_str_2) = "mim_02"; -static char* N(exit_str_3) = ""; - -#include "world/common/SetForeverForestFog.inc.c" diff --git a/src/world/area_mim/mim_01/B934B0.c b/src/world/area_mim/mim_01/B934B0.c deleted file mode 100644 index 32eb111aac..0000000000 --- a/src/world/area_mim/mim_01/B934B0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "mim_01.h" - -INCLUDE_ASM(s32, "world/area_mim/mim_01/B934B0", func_80240070_B934B0); - -INCLUDE_ASM(s32, "world/area_mim/mim_01/B934B0", func_802403F0_B93830); diff --git a/src/world/area_mim/mim_01/B93940.c b/src/world/area_mim/mim_01/B93940.c deleted file mode 100644 index 1fb6e83c2f..0000000000 --- a/src/world/area_mim/mim_01/B93940.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "mim_01.h" - -#include "world/common/enemy/PiranhaPlantAI.inc.c" diff --git a/src/world/area_mim/mim_01/mim_01.h b/src/world/area_mim/mim_01/mim_01.h index b4986d4a4d..c6bb8503b2 100644 --- a/src/world/area_mim/mim_01/mim_01.h +++ b/src/world/area_mim/mim_01/mim_01.h @@ -2,8 +2,26 @@ /// @brief Forever Forest - Flower Sounds #include "common.h" -#include "../mim.h" #include "message_ids.h" #include "map.h" +#include "../mim.h" +#include "mapfs/mim_01_shape.h" +#include "mapfs/mim_01_hit.h" + +#include "sprite/npc/SmallPiranha.h" + +enum { + NPC_PiranhaPlant = 1, + NPC_PiranhaPlant_Hitbox = 2, +}; + #define NAMESPACE mim_01 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupExitHint); +extern EvtScript N(EVS_SetupGates); +extern EvtScript N(EVS_BindExitTriggers); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_mim/mim_01/mim_01_0_header.c b/src/world/area_mim/mim_01/mim_01_0_header.c new file mode 100644 index 0000000000..bd7e26c0c2 --- /dev/null +++ b/src/world/area_mim/mim_01/mim_01_0_header.c @@ -0,0 +1,16 @@ +#include "mim_01.h" + +EntryList N(Entrances) = { + [mim_01_ENTRY_0] { 0.0, 0.0, -530.0, 180.0 }, + [mim_01_ENTRY_1] { -530.0, 0.0, 0.0, 90.0 }, + [mim_01_ENTRY_2] { 0.0, 0.0, 530.0, 0.0 }, + [mim_01_ENTRY_3] { 530.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mim_01 }, +}; diff --git a/src/world/area_mim/mim_01/mim_01_1_music.c b/src/world/area_mim/mim_01/mim_01_1_music.c new file mode 100644 index 0000000000..280b521309 --- /dev/null +++ b/src/world/area_mim/mim_01/mim_01_1_music.c @@ -0,0 +1,8 @@ +#include "mim_01.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_FOREVER_FOREST, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_SPOOKY) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_01/mim_01_2_main.c b/src/world/area_mim/mim_01/mim_01_2_main.c new file mode 100644 index 0000000000..a5fb48c5c6 --- /dev/null +++ b/src/world/area_mim/mim_01/mim_01_2_main.c @@ -0,0 +1,43 @@ +#include "mim_01.h" + +#include "world/common/SetForeverForestFog.inc.c" + +EvtScript N(EVS_ExitWalk_n) = EVT_EXIT_WALK(60, mim_01_ENTRY_0, "mim_01", mim_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_w) = EVT_EXIT_WALK(60, mim_01_ENTRY_1, "mim_10", mim_10_ENTRY_1); +EvtScript N(EVS_ExitWalk_s) = EVT_EXIT_WALK(60, mim_01_ENTRY_2, "mim_01", mim_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_e) = EVT_EXIT_WALK(60, mim_01_ENTRY_3, "mim_02", mim_02_ENTRY_1); + +MAP_RODATA_PAD(1,main); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_n)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_w)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_s)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_e)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) + EVT_CALL(SetSpriteShading, SHADING_MIM_01) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SET(GF_MAP_ForeverForest, TRUE) + EVT_SET(AB_MIM_2, GB_MIM_CurrentMapID) + EVT_CALL(GetMapID, GB_MIM_CurrentMapID) + EVT_EXEC_WAIT(N(EVS_SetupGates)) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC_WAIT(N(EVS_SetupExitHint)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_CALL(N(SetForeverForestFog)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_01/mim_01_3_entity.c b/src/world/area_mim/mim_01/mim_01_3_entity.c new file mode 100644 index 0000000000..f0e01558e9 --- /dev/null +++ b/src/world/area_mim/mim_01/mim_01_3_entity.c @@ -0,0 +1,25 @@ + +#include "mim_01.h" +#include "entity.h" + +EvtScript N(EVS_ReadSign) = { + EVT_CALL(IsStartingConversation, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_017E, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_Signpost), -300, 0, 0, 270, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_ReadSign))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_01/mim_01_4_hint.c b/src/world/area_mim/mim_01/mim_01_4_hint.c new file mode 100644 index 0000000000..07fdce7013 --- /dev/null +++ b/src/world/area_mim/mim_01/mim_01_4_hint.c @@ -0,0 +1,131 @@ +#include "mim_01.h" +#include "model.h" + +#include "world/common/util/GetFirstTriangleNormal.inc.c" + +API_CALLABLE(N(GetFlowerNormal)) { + Bytecode* args = script->ptrReadPos; + s32 modelID = evt_get_variable(script, *args++); + s32 treeIndex = get_model_list_index_from_tree_index(modelID); + Model* mdl = get_model_from_list_index(treeIndex); + f32 x, y, z; + + N(GetFirstTriangleNormal)(mdl->modelNode->displayData->displayList, &x, &y, &z); + + evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(x)); + evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(y)); + evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(z)); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_LaughingFlowers) = { + EVT_CALL(PlaySoundAt, SOUND_DF, 0, 301, 0, -27) + EVT_LOOP(6) + EVT_SET(LVar0, 2) + EVT_CALL(TranslateModel, MODEL_ea_1, 0, 0, LVar0) + EVT_CALL(TranslateModel, MODEL_ea_2, 0, 0, LVar0) + EVT_CALL(TranslateModel, MODEL_eb_1, 0, 0, LVar0) + EVT_CALL(TranslateModel, MODEL_eb_2, 0, 0, LVar0) + EVT_CALL(TranslateModel, MODEL_ec_1, 0, 0, LVar0) + EVT_CALL(TranslateModel, MODEL_ec_2, 0, 0, LVar0) + EVT_CALL(TranslateModel, MODEL_atari_kusa, 0, 0, LVar0) + EVT_WAIT(1) + EVT_SET(LVar0, -2) + EVT_CALL(TranslateModel, MODEL_ea_1, 0, 0, LVar0) + EVT_CALL(TranslateModel, MODEL_ea_2, 0, 0, LVar0) + EVT_CALL(TranslateModel, MODEL_eb_1, 0, 0, LVar0) + EVT_CALL(TranslateModel, MODEL_eb_2, 0, 0, LVar0) + EVT_CALL(TranslateModel, MODEL_ec_1, 0, 0, LVar0) + EVT_CALL(TranslateModel, MODEL_ec_2, 0, 0, LVar0) + EVT_CALL(TranslateModel, MODEL_atari_kusa, 0, 0, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(TranslateModel, MODEL_ea_1, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_ea_2, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_eb_1, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_eb_2, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_ec_1, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_ec_2, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_atari_kusa, 0, 0, 0) + EVT_WAIT(20) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, -0x8000) + EVT_WAIT(2) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, -0x10000) + EVT_WAIT(2) + EVT_CALL(PlaySoundAt, SOUND_205B, 0, 301, 0, -27) + EVT_CALL(MakeLerp, 0, 30, 50, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(N(GetFlowerNormal), MODEL_ea_1, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_ea_1, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_ea_2, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(N(GetFlowerNormal), MODEL_eb_1, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_eb_1, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_eb_2, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(N(GetFlowerNormal), MODEL_ec_1, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_ec_1, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_ec_2, LVar0, LVar7, LVar8, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_205B, 0, 301, 0, -27) + EVT_CALL(MakeLerp, 30, -30, 50, EASING_COS_IN_OUT) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(N(GetFlowerNormal), MODEL_ea_1, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_ea_1, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_ea_2, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(N(GetFlowerNormal), MODEL_eb_1, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_eb_1, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_eb_2, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(N(GetFlowerNormal), MODEL_ec_1, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_ec_1, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_ec_2, LVar0, LVar7, LVar8, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_205B, 0, 301, 0, -27) + EVT_CALL(MakeLerp, -30, 0, 50, EASING_COS_IN_OUT) + EVT_LABEL(30) + EVT_CALL(UpdateLerp) + EVT_CALL(N(GetFlowerNormal), MODEL_ea_1, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_ea_1, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_ea_2, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(N(GetFlowerNormal), MODEL_eb_1, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_eb_1, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_eb_2, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(N(GetFlowerNormal), MODEL_ec_1, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_ec_1, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, MODEL_ec_2, LVar0, LVar7, LVar8, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(30) + EVT_END_IF + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, -0x8000) + EVT_WAIT(2) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, 0) + EVT_WAIT(30) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_WaitForPlayerNearby) = { + EVT_LABEL(0) + EVT_CALL(AwaitPlayerApproach, 350, 0, 50) + EVT_EXEC_WAIT(N(EVS_LaughingFlowers)) + EVT_CALL(AwaitPlayerLeave, 350, 0, 50) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupExitHint) = { + EVT_CALL(SetTexPanner, MODEL_ea_2, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_eb_2, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_ec_2, TEX_PANNER_1) + EVT_EXEC(N(EVS_WaitForPlayerNearby)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_01/mim_01_5_gate.c b/src/world/area_mim/mim_01/mim_01_5_gate.c new file mode 100644 index 0000000000..9a770b35d9 --- /dev/null +++ b/src/world/area_mim/mim_01/mim_01_5_gate.c @@ -0,0 +1,293 @@ +#include "mim_01.h" + +EvtScript N(EVS_SetGateCameraZones) = { + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(SetZoneEnabled, ZONE_north, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_west, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_south, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_east, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_higashi, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_nishi, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_minami, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_kita, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_stage, FALSE) + EVT_SET(LVar1, 0) + EVT_CASE_EQ(1) + EVT_CALL(SetZoneEnabled, ZONE_north, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_west, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_south, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_east, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_higashi, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_nishi, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_minami, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_kita, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_stage, TRUE) + EVT_SET(LVar1, 1) + EVT_CASE_EQ(2) + EVT_CALL(SetZoneEnabled, ZONE_north, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_west, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_south, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_east, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_higashi, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_nishi, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_minami, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_kita, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_stage, FALSE) + EVT_SET(LVar1, 2) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InitializeGates) = { + EVT_CALL(ParentColliderToModel, COLLIDER_monn, MODEL_n1) + EVT_CALL(RotateGroup, MODEL_monn, LVar2, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monn) + EVT_CALL(ParentColliderToModel, COLLIDER_mons, MODEL_s1) + EVT_CALL(RotateGroup, MODEL_mons, LVar2, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_mons) + EVT_CALL(ParentColliderToModel, COLLIDER_mone, MODEL_e1) + EVT_CALL(RotateGroup, MODEL_mone, LVar2, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_mone) + EVT_CALL(ParentColliderToModel, COLLIDER_monw, MODEL_w1) + EVT_CALL(RotateGroup, MODEL_monw, 10, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monw) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ResetGates) = { + EVT_CALL(RotateGroup, MODEL_monn, 0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monn) + EVT_CALL(RotateGroup, MODEL_mons, 0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_mons) + EVT_CALL(RotateGroup, MODEL_mone, 0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_mone) + EVT_CALL(RotateGroup, MODEL_monw, 0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monw) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayGateSounds) = { + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D4, 0) + EVT_WAIT(19) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D5, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate) = { + EVT_EXEC(N(EVS_PlayGateSounds)) + EVT_SWITCH(AB_MIM_1) + EVT_CASE_EQ(0) + EVT_THREAD + EVT_CALL(MakeLerp, 10, 90, 10, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, LVar7) + EVT_ADD(LVar2, LVar8) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 15) + EVT_END_THREAD + EVT_SET(LVar1, 1) + EVT_EXEC(N(EVS_SetGateCameraZones)) + EVT_CALL(MakeLerp, 90, 360, 30, EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_EXEC(N(EVS_ResetGates)) + EVT_SET(AB_MIM_1, 1) + EVT_SET(GF_MIM_ChoosingPath, TRUE) + EVT_CASE_EQ(1) + EVT_THREAD + EVT_CALL(MakeLerp, 360, 270, 10, EASING_QUADRATIC_IN) + EVT_LABEL(30) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(30) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, LVar7) + EVT_SUB(LVar2, LVar8) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 15) + EVT_END_THREAD + EVT_SET(LVar1, 2) + EVT_EXEC(N(EVS_SetGateCameraZones)) + EVT_CALL(MakeLerp, 270, -10, 30, EASING_LINEAR) + EVT_LABEL(40) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(40) + EVT_END_IF + EVT_SET(AB_MIM_1, 2) + EVT_CASE_EQ(2) + EVT_THREAD + EVT_CALL(MakeLerp, -10, 90, 10, EASING_QUADRATIC_IN) + EVT_LABEL(50) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(50) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, LVar7) + EVT_ADD(LVar2, LVar8) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 15) + EVT_END_THREAD + EVT_SET(LVar1, 1) + EVT_EXEC(N(EVS_SetGateCameraZones)) + EVT_CALL(MakeLerp, 90, 360, 30, EASING_LINEAR) + EVT_LABEL(60) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(60) + EVT_END_IF + EVT_EXEC(N(EVS_ResetGates)) + EVT_SET(AB_MIM_1, 1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate_North) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar7, 0) + EVT_SET(LVar8, 70) + EVT_SET(LVar9, 26) + EVT_SET(LVarA, 155) + EVT_EXEC_WAIT(N(EVS_UseGate)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate_South) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar7, 0) + EVT_SET(LVar8, -70) + EVT_SET(LVar9, 30) + EVT_SET(LVarA, 161) + EVT_EXEC_WAIT(N(EVS_UseGate)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate_East) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar7, -70) + EVT_SET(LVar8, 0) + EVT_SET(LVar9, 28) + EVT_SET(LVarA, 158) + EVT_EXEC_WAIT(N(EVS_UseGate)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate_West) = { + EVT_SET(LVar9, 32) + EVT_EXEC(N(EVS_PlayGateSounds)) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_IF_NE(AB_MIM_1, 1) + EVT_THREAD + EVT_CALL(MakeLerp, 10, 90, 10, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_monw, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monw) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 70) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 15) + EVT_END_THREAD + EVT_SET(LVar1, 1) + EVT_EXEC(N(EVS_SetGateCameraZones)) + EVT_CALL(MakeLerp, 90, 360, 30, EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_monw, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monw) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_EXEC(N(EVS_ResetGates)) + EVT_SET(AB_MIM_1, 1) + EVT_SET(GF_MIM_ChoosingPath, TRUE) + EVT_ELSE + EVT_THREAD + EVT_CALL(MakeLerp, 360, 270, 10, EASING_QUADRATIC_IN) + EVT_LABEL(30) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_monw, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monw) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(30) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 70) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 15) + EVT_END_THREAD + EVT_SET(LVar1, 2) + EVT_EXEC(N(EVS_SetGateCameraZones)) + EVT_CALL(MakeLerp, 270, 10, 30, EASING_LINEAR) + EVT_LABEL(40) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_monw, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monw) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(40) + EVT_END_IF + EVT_SET(AB_MIM_1, 0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +#include "../gates/setup.inc.c" diff --git a/src/world/area_mim/mim_01/mim_01_6_npc.c b/src/world/area_mim/mim_01/mim_01_6_npc.c new file mode 100644 index 0000000000..024c8410f1 --- /dev/null +++ b/src/world/area_mim/mim_01/mim_01_6_npc.c @@ -0,0 +1,34 @@ +#include "mim_01.h" + +#include "world/common/enemy/complete/PiranhaPlant.inc.c" + +StaticNpc N(NpcData_PiranhaPlant)[] = { + { + .id = NPC_PiranhaPlant, + .settings = &N(NpcSettings_PiranhaPlant), + .pos = { 135.0f, 0.0f, -300.0f }, + .yaw = 0, + .flags = NPC_FLAG_LOCK_ANIMS, + .drops = PIRANHA_PLANT_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 135, 0, -300 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 400 }, + } + }, + .animations = PIRANHA_PLANT_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, + }, + PIRANHA_PLANT_HITBOX(NPC_PiranhaPlant_Hitbox) +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_PiranhaPlant), BTL_MIM_FORMATION_09, BTL_MIM_STAGE_00), + {} +}; diff --git a/src/world/area_mim/mim_02/B97C00.c b/src/world/area_mim/mim_02/B97C00.c deleted file mode 100644 index 035a1960f1..0000000000 --- a/src/world/area_mim/mim_02/B97C00.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "mim_02.h" - -static char* N(exit_str_0) = "mim_03"; -static char* N(exit_str_1) = "mim_01"; - -#include "world/common/SetForeverForestFog.inc.c" diff --git a/src/world/area_mim/mim_02/B97C70.c b/src/world/area_mim/mim_02/B97C70.c deleted file mode 100644 index 8b0df768a5..0000000000 --- a/src/world/area_mim/mim_02/B97C70.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "mim_02.h" - -#include "world/common/enemy/HoppingAI.inc.c" - -#include "world/common/GetNpcCollisionHeight.inc.c" - -#include "world/common/AddPlayerHandsOffset.inc.c" - -INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_802410B0_B98CB0); - -INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80241104_B98D04); - -INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_8024113C_B98D3C); diff --git a/src/world/area_mim/mim_02/mim_02.h b/src/world/area_mim/mim_02/mim_02.h index 3f06118c24..219db3c9d7 100644 --- a/src/world/area_mim/mim_02/mim_02.h +++ b/src/world/area_mim/mim_02/mim_02.h @@ -2,8 +2,27 @@ /// @brief Forever Forest - Stump Eyes #include "common.h" -#include "../mim.h" #include "message_ids.h" #include "map.h" +#include "../mim.h" +#include "mapfs/mim_02_shape.h" +#include "mapfs/mim_02_hit.h" + +#include "sprite/npc/Oaklie.h" +#include "sprite/npc/Fuzzy.h" + +enum { + NPC_Oaklie = 0, + NPC_Fuzzy_01 = 1, + NPC_Fuzzy_02 = 2, +}; + #define NAMESPACE mim_02 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupGates); +extern EvtScript N(EVS_SetupExitHint); +extern EvtScript N(EVS_EnableWestGate); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_mim/mim_02/mim_02_0_header.c b/src/world/area_mim/mim_02/mim_02_0_header.c new file mode 100644 index 0000000000..7a50600a08 --- /dev/null +++ b/src/world/area_mim/mim_02/mim_02_0_header.c @@ -0,0 +1,16 @@ +#include "mim_02.h" + +EntryList N(Entrances) = { + [mim_02_ENTRY_0] { 0.0, 0.0, -530.0, 180.0 }, + [mim_02_ENTRY_1] { -530.0, 0.0, 0.0, 90.0 }, + [mim_02_ENTRY_2] { 0.0, 0.0, 530.0, 0.0 }, + [mim_02_ENTRY_3] { 530.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mim_02 }, +}; diff --git a/src/world/area_mim/mim_02/mim_02_1_music.c b/src/world/area_mim/mim_02/mim_02_1_music.c new file mode 100644 index 0000000000..ef402e08c3 --- /dev/null +++ b/src/world/area_mim/mim_02/mim_02_1_music.c @@ -0,0 +1,8 @@ +#include "mim_02.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_FOREVER_FOREST, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_SPOOKY) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_02/mim_02_2_main.c b/src/world/area_mim/mim_02/mim_02_2_main.c new file mode 100644 index 0000000000..2ce437bbe6 --- /dev/null +++ b/src/world/area_mim/mim_02/mim_02_2_main.c @@ -0,0 +1,39 @@ +#include "mim_02.h" + +#include "world/common/SetForeverForestFog.inc.c" + +EvtScript N(EVS_ExitWalk_s) = EVT_EXIT_WALK(60, mim_02_ENTRY_0, "mim_03", mim_03_ENTRY_2); +EvtScript N(EVS_ExitWalk_e) = EVT_EXIT_WALK(60, mim_02_ENTRY_1, "mim_01", mim_01_ENTRY_3); +EvtScript N(EVS_ExitWalk_n) = EVT_EXIT_WALK(60, mim_02_ENTRY_2, "mim_01", mim_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_w) = EVT_EXIT_WALK(60, mim_02_ENTRY_3, "mim_01", mim_01_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_s)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_e)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_n)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_w)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) + EVT_CALL(SetSpriteShading, SHADING_MIM_02) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SET(AB_MIM_2, GB_MIM_CurrentMapID) + EVT_CALL(GetMapID, GB_MIM_CurrentMapID) + EVT_EXEC_WAIT(N(EVS_SetupGates)) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_SetupExitHint)) + EVT_CALL(N(SetForeverForestFog)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_02/mim_02_3_npc.c b/src/world/area_mim/mim_02/mim_02_3_npc.c new file mode 100644 index 0000000000..c67b649c45 --- /dev/null +++ b/src/world/area_mim/mim_02/mim_02_3_npc.c @@ -0,0 +1,222 @@ +#include "mim_02.h" + +EvtScript N(EVS_Unused_DoNothing) = { + EVT_RETURN + EVT_END +}; + +#include "world/common/npc/Oaklie.inc.c" + +#include "world/common/enemy/complete/ForestFuzzy.inc.c" + +s32 N(KeyList)[] = { + ITEM_FOREST_PASS, + ITEM_NONE +}; + +#include "world/common/complete/KeyItemChoice.inc.c" + +EvtScript N(EVS_NpcInteract_Oaklie) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH3_INVITED_TO_BOOS_MANSION) + EVT_CALL(SpeakToPlayer, NPC_Oaklie, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_0006) + EVT_RETURN + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_Oaklie, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_0007) + EVT_CALL(SetNpcFlagBits, NPC_Oaklie, NPC_FLAG_100, TRUE) + EVT_WAIT(5) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Jump) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -426, 58, -70) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(6.0), EVT_FLOAT(-6.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 250) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, 0) + EVT_CALL(SetNpcJumpscale, NPC_Oaklie, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Oaklie, -426, 58, -70, 20) + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Idle) + EVT_CALL(SpeakToPlayer, NPC_Oaklie, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_0008) + EVT_WAIT(5) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Jump) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_Oaklie, -333, 0, -81, 20) + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) + EVT_WAIT(5) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Jump) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_Oaklie, -300, 0, -170, 15) + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) + EVT_WAIT(5) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Jump) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_Oaklie, -226, 0, -245, 15) + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) + EVT_WAIT(5) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Jump) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_Oaklie, -160, 0, -296, 15) + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) + EVT_WAIT(5) + EVT_CALL(SetNpcPos, NPC_Oaklie, NPC_DISPOSE_LOCATION) + EVT_SET(GB_StoryProgress, STORY_CH3_ALLOWED_INTO_FOREVER_FOREST) + EVT_EXEC_WAIT(N(EVS_EnableWestGate)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Oaklie) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH3_ALLOWED_INTO_FOREVER_FOREST) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(25) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(6.0), EVT_FLOAT(-6.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_Oaklie, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_0003) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Jump) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Fall) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_Oaklie, SOUND_32C, 0) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_SELF, -455, 0, 0, 20) + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Land) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_Oaklie, ANIM_Oaklie_Idle) + EVT_WAIT(15) + EVT_IF_LT(GB_StoryProgress, STORY_CH1_RETURNED_TO_TOAD_TOWN) + EVT_CALL(SpeakToPlayer, NPC_Oaklie, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_0004) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Oaklie, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_0005) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Oaklie) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Oaklie))) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Oaklie))) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_GE(STORY_CH3_ALLOWED_INTO_FOREVER_FOREST) + EVT_CALL(SetNpcPos, NPC_Oaklie, NPC_DISPOSE_LOCATION) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Oaklie) = { + .id = NPC_Oaklie, + .settings = &N(NpcSettings_Oaklie), + .pos = { -426.0f, 58.0f, -70.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_JUMPING | NPC_FLAG_400000, + .init = &N(EVS_NpcInit_Oaklie), + .drops = OAKLIE_DROPS, + .animations = OAKLIE_ANIMS, + .tattle = MSG_NpcTattle_Oaklie, +}; + +StaticNpc N(NpcData_Fuzzy_01) = { + .id = NPC_Fuzzy_01, + .settings = &N(NpcSettings_ForestFuzzy), + .pos = { 300.0f, 0.0f, 130.0f }, + .yaw = 0, + .flags = 0, + .drops = FOREST_FUZZY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 400 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 400 }, + } + }, + .animations = FOREST_FUZZY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Fuzzy_02) = { + .id = NPC_Fuzzy_02, + .settings = &N(NpcSettings_ForestFuzzy), + .pos = { -100.0f, 0.0f, -320.0f }, + .yaw = 0, + .flags = 0, + .drops = FOREST_FUZZY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 400 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 400 }, + } + }, + .animations = FOREST_FUZZY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Oaklie)), + NPC_GROUP(N(NpcData_Fuzzy_01), BTL_MIM_FORMATION_00, BTL_MIM_STAGE_00), + NPC_GROUP(N(NpcData_Fuzzy_02), BTL_MIM_FORMATION_01, BTL_MIM_STAGE_00), + {} +}; diff --git a/src/world/area_mim/mim_02/mim_02_4_gate.c b/src/world/area_mim/mim_02/mim_02_4_gate.c new file mode 100644 index 0000000000..9f238618be --- /dev/null +++ b/src/world/area_mim/mim_02/mim_02_4_gate.c @@ -0,0 +1,90 @@ +#include "mim_02.h" + +#include "../gates/support.inc.c" + +#include "../gates/animate.inc.c" + +EvtScript N(EVS_UseGate_North) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar7, 0) + EVT_SET(LVar8, 70) + EVT_SET(LVar9, COLLIDER_monn) + EVT_SET(LVarA, MODEL_monn) + EVT_EXEC_WAIT(N(EVS_UseGate)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate_South) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar7, 0) + EVT_SET(LVar8, -70) + EVT_SET(LVar9, COLLIDER_mons) + EVT_SET(LVarA, MODEL_mons) + EVT_EXEC_WAIT(N(EVS_UseGate)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate_East) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar7, -70) + EVT_SET(LVar8, 0) + EVT_SET(LVar9, COLLIDER_mone) + EVT_SET(LVarA, MODEL_mone) + EVT_EXEC_WAIT(N(EVS_UseGate)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate_West) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar7, 70) + EVT_SET(LVar8, 0) + EVT_SET(LVar9, COLLIDER_monw) + EVT_SET(LVarA, MODEL_monw) + EVT_EXEC_WAIT(N(EVS_UseGate)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupGates) = { + EVT_IF_EQ(GF_MIM_ChoosingPath, FALSE) + EVT_SET(GF_MIM_ChoosingPath, TRUE) + EVT_SET(AB_MIM_1, 2) + EVT_SET(LVar1, 2) + EVT_SET(LVar2, -10) + EVT_ELSE + EVT_SET(GF_MIM_ChoosingPath, FALSE) + EVT_SET(AB_MIM_1, 0) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 10) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_SetGateCameraZones)) + EVT_EXEC(N(EVS_InitializeGates)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseGate_North)), TRIGGER_WALL_PRESS_A, COLLIDER_monn, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseGate_South)), TRIGGER_WALL_PRESS_A, COLLIDER_mons, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseGate_East)), TRIGGER_WALL_PRESS_A, COLLIDER_mone, 1, 0) + EVT_IF_GE(GB_StoryProgress, STORY_CH3_ALLOWED_INTO_FOREVER_FOREST) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseGate_West)), TRIGGER_WALL_PRESS_A, COLLIDER_monw, 1, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnableWestGate) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseGate_West)), TRIGGER_WALL_PRESS_A, COLLIDER_monw, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_02/mim_02_5_hint.c b/src/world/area_mim/mim_02/mim_02_5_hint.c new file mode 100644 index 0000000000..6146abb098 --- /dev/null +++ b/src/world/area_mim/mim_02/mim_02_5_hint.c @@ -0,0 +1,32 @@ +#include "mim_02.h" + +EvtScript N(EVS_SetupExitHint) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SET(LVar0, 0) + EVT_CALL(EnableModel, MODEL_o414, TRUE) + EVT_CALL(EnableModel, MODEL_me, FALSE) + EVT_LABEL(10) + EVT_CALL(AwaitPlayerApproach, 20, -340, 50) + EVT_CALL(RandInt, 1, LVar2) + EVT_ADD(LVar2, 1) + EVT_CALL(EnableModel, MODEL_o414, FALSE) + EVT_CALL(EnableModel, MODEL_me, TRUE) + EVT_CALL(PlaySoundAt, SOUND_2060, 0, 10, 110, -200) + EVT_LOOP(LVar2) + EVT_CALL(EnableModel, MODEL_o414, TRUE) + EVT_CALL(EnableModel, MODEL_me, FALSE) + EVT_WAIT(2) + EVT_CALL(EnableModel, MODEL_o414, FALSE) + EVT_CALL(EnableModel, MODEL_me, TRUE) + EVT_CALL(RandInt, 5, LVar3) + EVT_ADD(LVar3, 2) + EVT_WAIT(LVar3) + EVT_END_LOOP + EVT_WAIT(20) + EVT_CALL(EnableModel, MODEL_o414, TRUE) + EVT_CALL(EnableModel, MODEL_me, FALSE) + EVT_WAIT(60) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_03/B9B480.c b/src/world/area_mim/mim_03/B9B480.c deleted file mode 100644 index 9cfc412400..0000000000 --- a/src/world/area_mim/mim_03/B9B480.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "mim_03.h" - -static char* N(exit_str_0) = "mim_01"; -static char* N(exit_str_1) = "mim_04"; -static char* N(exit_str_2) = "mim_02"; -static char* N(exit_str_3) = ""; - -#include "world/common/SetForeverForestFog.inc.c" - -INCLUDE_ASM(s32, "world/area_mim/mim_03/B9B480", func_80240068_B9B4E8); - -INCLUDE_ASM(s32, "world/area_mim/mim_03/B9B480", func_802400A0_B9B520); - -INCLUDE_ASM(s32, "world/area_mim/mim_03/B9B480", func_80240420_B9B8A0); diff --git a/src/world/area_mim/mim_03/mim_03.h b/src/world/area_mim/mim_03/mim_03.h index 2c1ca4d682..327cad9d4d 100644 --- a/src/world/area_mim/mim_03/mim_03.h +++ b/src/world/area_mim/mim_03/mim_03.h @@ -2,8 +2,22 @@ /// @brief Forever Forest - Flowers (Oaklie) #include "common.h" -#include "../mim.h" #include "message_ids.h" #include "map.h" +#include "../mim.h" +#include "mapfs/mim_03_shape.h" +#include "mapfs/mim_03_hit.h" + +enum { + NPC_Oaklie = 0, +}; + #define NAMESPACE mim_03 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupExitHint); +extern EvtScript N(EVS_SetupGates); +extern EvtScript N(EVS_SetupMusic); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_mim/mim_03/mim_03_0_header.c b/src/world/area_mim/mim_03/mim_03_0_header.c new file mode 100644 index 0000000000..11b63a5180 --- /dev/null +++ b/src/world/area_mim/mim_03/mim_03_0_header.c @@ -0,0 +1,16 @@ +#include "mim_03.h" + +EntryList N(Entrances) = { + [mim_03_ENTRY_0] { 0.0, 0.0, -530.0, 180.0 }, + [mim_03_ENTRY_1] { -530.0, 0.0, 0.0, 90.0 }, + [mim_03_ENTRY_2] { 0.0, 0.0, 530.0, 0.0 }, + [mim_03_ENTRY_3] { 530.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mim_03 }, +}; diff --git a/src/world/area_mim/mim_03/mim_03_1_music.c b/src/world/area_mim/mim_03/mim_03_1_music.c new file mode 100644 index 0000000000..01aa2ff5a5 --- /dev/null +++ b/src/world/area_mim/mim_03/mim_03_1_music.c @@ -0,0 +1,8 @@ +#include "mim_03.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_FOREVER_FOREST, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_SPOOKY) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_03/mim_03_2_main.c b/src/world/area_mim/mim_03/mim_03_2_main.c new file mode 100644 index 0000000000..061d27a29e --- /dev/null +++ b/src/world/area_mim/mim_03/mim_03_2_main.c @@ -0,0 +1,56 @@ +#include "mim_03.h" + +#include "world/common/SetForeverForestFog.inc.c" + +API_CALLABLE(N(GetPlayerDistFromMapCenter)) { + script->varTable[0] = get_xz_dist_to_player(0.0f, 0.0f); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ExitWalk_n) = EVT_EXIT_WALK(60, mim_03_ENTRY_0, "mim_01", mim_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_w) = EVT_EXIT_WALK(60, mim_03_ENTRY_1, "mim_04", mim_04_ENTRY_3); +EvtScript N(EVS_ExitWalk_s) = EVT_EXIT_WALK(60, mim_03_ENTRY_2, "mim_02", mim_02_ENTRY_0); +EvtScript N(EVS_ExitWalk_e) = EVT_EXIT_WALK(60, mim_03_ENTRY_3, "mim_01", mim_01_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_n)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_w)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_s)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_e)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) + EVT_CALL(SetSpriteShading, SHADING_MIM_03) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SET(AB_MIM_2, GB_MIM_CurrentMapID) + EVT_CALL(GetMapID, GB_MIM_CurrentMapID) + EVT_SET(AF_MIM03_Oaklie_DialogueToggle, FALSE) + EVT_EXEC_WAIT(N(EVS_SetupGates)) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_SetupExitHint)) + EVT_CALL(N(SetForeverForestFog)) + EVT_THREAD + EVT_LABEL(0) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(N(GetPlayerDistFromMapCenter)) + EVT_IF_LT(LVar0, 350) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_ELSE + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_END_IF + EVT_GOTO(0) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_03/mim_03_3_entity.c b/src/world/area_mim/mim_03/mim_03_3_entity.c new file mode 100644 index 0000000000..ae06b80e4b --- /dev/null +++ b/src/world/area_mim/mim_03/mim_03_3_entity.c @@ -0,0 +1,6 @@ +#include "mim_03.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_03/mim_03_4_hint.c b/src/world/area_mim/mim_03/mim_03_4_hint.c new file mode 100644 index 0000000000..c9f6b583fd --- /dev/null +++ b/src/world/area_mim/mim_03/mim_03_4_hint.c @@ -0,0 +1,182 @@ +#include "mim_03.h" +#include "model.h" + +#include "world/common/util/GetFirstTriangleNormal.inc.c" + +API_CALLABLE(N(GetFlowerNormal)) { + Bytecode* args = script->ptrReadPos; + s32 modelID = evt_get_variable(script, *args++); + s32 treeIndex = get_model_list_index_from_tree_index(modelID); + Model* mdl = get_model_from_list_index(treeIndex); + f32 x, y, z; + + N(GetFirstTriangleNormal)(mdl->modelNode->displayData->displayList, &x, &y, &z); + + evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(x)); + evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(y)); + evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(z)); + return ApiStatus_DONE2; +} + +s32 N(FlowerModels_North)[] = { + MODEL_o1, MODEL_o2, + MODEL_o3, MODEL_o4, + MODEL_o5, MODEL_o6, +}; + +s32 N(FlowerModels_West)[] = { + MODEL_o19, MODEL_o20, + MODEL_o21, MODEL_o22, + MODEL_o23, MODEL_o24, + MODEL_o25, MODEL_o26, +}; + +s32 N(FlowerModels_South)[] = { + MODEL_o13, MODEL_o14, + MODEL_o15, MODEL_o16, + MODEL_o17, MODEL_o18, +}; + +s32 N(FlowerModels_East)[] = { + MODEL_o7, MODEL_o8, + MODEL_o9, MODEL_o10, + MODEL_o11, MODEL_o12, +}; + +EvtScript N(EVS_FlowersReact_Wrong) = { + EVT_CALL(SetTexPanOffset, LVar9, 0, 0, -0x8000) + EVT_WAIT(2) + EVT_CALL(SetTexPanOffset, LVar9, 0, 0, -0x10000) + EVT_WAIT(2) + EVT_CALL(MakeLerp, 0, 720, 200, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_USE_BUF(LVar8) + EVT_LOOP(3) + EVT_BUF_READ2(LVar6, LVar7) + EVT_CALL(N(GetFlowerNormal), LVar6, LVar3, LVar4, LVar5) + EVT_CALL(RotateModel, LVar6, LVar0, LVar3, LVar4, LVar5) + EVT_CALL(RotateModel, LVar7, LVar0, LVar3, LVar4, LVar5) + EVT_END_LOOP + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetTexPanOffset, LVar9, 0, 0, -0x8000) + EVT_WAIT(2) + EVT_CALL(SetTexPanOffset, LVar9, 0, 0, 0) + EVT_WAIT(2) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlowersReact_Correct) = { + EVT_LOOP(2) + EVT_CALL(SetTexPanOffset, LVar9, 0, 0, -0x8000) + EVT_WAIT(2) + EVT_CALL(MakeLerp, 0, 30, 50, EASING_COS_IN_OUT) + EVT_LABEL(5) + EVT_CALL(UpdateLerp) + EVT_USE_BUF(LVar8) + EVT_LOOP(4) + EVT_BUF_READ2(LVar6, LVar7) + EVT_CALL(N(GetFlowerNormal), LVar6, LVar3, LVar4, LVar5) + EVT_CALL(RotateModel, LVar6, LVar0, LVar3, LVar4, LVar5) + EVT_CALL(RotateModel, LVar7, LVar0, LVar3, LVar4, LVar5) + EVT_END_LOOP + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(5) + EVT_END_IF + EVT_CALL(MakeLerp, 30, -30, 50, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_USE_BUF(LVar8) + EVT_LOOP(4) + EVT_BUF_READ2(LVar6, LVar7) + EVT_CALL(N(GetFlowerNormal), LVar6, LVar3, LVar4, LVar5) + EVT_CALL(RotateModel, LVar6, LVar0, LVar3, LVar4, LVar5) + EVT_CALL(RotateModel, LVar7, LVar0, LVar3, LVar4, LVar5) + EVT_END_LOOP + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(MakeLerp, -30, 0, 50, EASING_COS_IN_OUT) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_USE_BUF(LVar8) + EVT_LOOP(4) + EVT_BUF_READ2(LVar6, LVar7) + EVT_CALL(N(GetFlowerNormal), LVar6, LVar3, LVar4, LVar5) + EVT_CALL(RotateModel, LVar6, LVar0, LVar3, LVar4, LVar5) + EVT_CALL(RotateModel, LVar7, LVar0, LVar3, LVar4, LVar5) + EVT_END_LOOP + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(SetTexPanOffset, LVar9, 0, 0, 0) + EVT_WAIT(2) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CheckFlowers_North) = { + EVT_CALL(PlaySoundAt, SOUND_2059, 0, 0, 0, -300) + EVT_SET(LVar8, EVT_PTR(N(FlowerModels_North))) + EVT_SET(LVar9, 0) + EVT_EXEC_WAIT(N(EVS_FlowersReact_Wrong)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CheckFlowers_West) = { + EVT_CALL(PlaySoundAt, SOUND_205A, 0, -300, 0, 0) + EVT_SET(LVar8, EVT_PTR(N(FlowerModels_West))) + EVT_SET(LVar9, 1) + EVT_EXEC_WAIT(N(EVS_FlowersReact_Correct)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CheckFlowers_South) = { + EVT_CALL(PlaySoundAt, SOUND_2059, 0, 0, 0, 300) + EVT_SET(LVar8, EVT_PTR(N(FlowerModels_South))) + EVT_SET(LVar9, 2) + EVT_EXEC_WAIT(N(EVS_FlowersReact_Wrong)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CheckFlowers_East) = { + EVT_CALL(PlaySoundAt, SOUND_2059, 0, 300, 0, 0) + EVT_SET(LVar8, EVT_PTR(N(FlowerModels_East))) + EVT_SET(LVar9, 3) + EVT_EXEC_WAIT(N(EVS_FlowersReact_Wrong)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupExitHint) = { + EVT_CALL(SetTexPanner, MODEL_o2, 0) + EVT_CALL(SetTexPanner, MODEL_o4, 0) + EVT_CALL(SetTexPanner, MODEL_o6, 0) + EVT_CALL(SetTexPanner, MODEL_o20, 1) + EVT_CALL(SetTexPanner, MODEL_o22, 1) + EVT_CALL(SetTexPanner, MODEL_o24, 1) + EVT_CALL(SetTexPanner, MODEL_o26, 1) + EVT_CALL(SetTexPanner, MODEL_o14, 2) + EVT_CALL(SetTexPanner, MODEL_o16, 2) + EVT_CALL(SetTexPanner, MODEL_o18, 2) + EVT_CALL(SetTexPanner, MODEL_o8, 3) + EVT_CALL(SetTexPanner, MODEL_o10, 3) + EVT_CALL(SetTexPanner, MODEL_o12, 3) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_CheckFlowers_West)), TRIGGER_WALL_PRESS_A, COLLIDER_o132, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_CheckFlowers_North)), TRIGGER_WALL_PRESS_A, COLLIDER_o149, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_CheckFlowers_South)), TRIGGER_WALL_PRESS_A, COLLIDER_o151, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_CheckFlowers_East)), TRIGGER_WALL_PRESS_A, COLLIDER_o150, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_03/mim_03_5_gate.c b/src/world/area_mim/mim_03/mim_03_5_gate.c new file mode 100644 index 0000000000..bb883ae6af --- /dev/null +++ b/src/world/area_mim/mim_03/mim_03_5_gate.c @@ -0,0 +1,6 @@ +#include "mim_03.h" + +#include "../gates/support.inc.c" +#include "../gates/animate.inc.c" +#include "../gates/use.inc.c" +#include "../gates/setup.inc.c" diff --git a/src/world/area_mim/mim_03/mim_03_6_npc.c b/src/world/area_mim/mim_03/mim_03_6_npc.c new file mode 100644 index 0000000000..fdbcbdf621 --- /dev/null +++ b/src/world/area_mim/mim_03/mim_03_6_npc.c @@ -0,0 +1,59 @@ +#include "mim_03.h" + +#include "world/common/npc/Oaklie.inc.c" + +EvtScript N(EVS_NpcInteract_Oaklie) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH3_BOW_JOINED_PARTY) + EVT_IF_EQ(AF_MIM03_Oaklie_DialogueToggle, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_0009) + EVT_SET(AF_MIM03_Oaklie_DialogueToggle, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_000A) + EVT_SET(AF_MIM03_Oaklie_DialogueToggle, FALSE) + EVT_END_IF + EVT_CASE_LT(STORY_CH5_REACHED_LAVA_LAVA_ISLAND) + EVT_IF_EQ(AF_MIM03_Oaklie_DialogueToggle, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_000B) + EVT_SET(AF_MIM03_Oaklie_DialogueToggle, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_000C) + EVT_SET(AF_MIM03_Oaklie_DialogueToggle, FALSE) + EVT_END_IF + EVT_CASE_GE(STORY_CH5_REACHED_LAVA_LAVA_ISLAND) + EVT_IF_EQ(AF_MIM03_Oaklie_DialogueToggle, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_000D) + EVT_SET(AF_MIM03_Oaklie_DialogueToggle, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Oaklie_Talk, ANIM_Oaklie_Idle, 0, MSG_CH3_000E) + EVT_SET(AF_MIM03_Oaklie_DialogueToggle, FALSE) + EVT_END_IF + EVT_END_SWITCH + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Oaklie) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Oaklie))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Oaklie) = { + .id = NPC_Oaklie, + .settings = &N(NpcSettings_Oaklie), + .pos = { 0.0f, 32.0f, 0.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_Oaklie), + .drops = OAKLIE_DROPS, + .animations = OAKLIE_ANIMS, + .tattle = MSG_NpcTattle_Oaklie, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Oaklie)), + {} +}; diff --git a/src/world/area_mim/mim_04/B9D960.c b/src/world/area_mim/mim_04/B9D960.c deleted file mode 100644 index 2489bae451..0000000000 --- a/src/world/area_mim/mim_04/B9D960.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "mim_04.h" - -static char* N(exit_str_0) = "mim_05"; -static char* N(exit_str_1) = "mim_01"; -static char* N(exit_str_2) = "mim_03"; -static char* N(exit_str_3) = ""; - -#include "world/common/SetForeverForestFog.inc.c" diff --git a/src/world/area_mim/mim_04/B9D9D0.c b/src/world/area_mim/mim_04/B9D9D0.c deleted file mode 100644 index d2f3ebc6d5..0000000000 --- a/src/world/area_mim/mim_04/B9D9D0.c +++ /dev/null @@ -1,43 +0,0 @@ -#include "mim_04.h" - -extern s32 D_80241530_B9EE90; -extern s32 D_80241534_B9EE94; -extern s32 D_80241538_B9EE98; - -void func_80240070_B9D9D0(s32 index) { - switch (D_80241530_B9EE90) { - case 1: - D_80241538_B9EE98 = 0; - D_80241530_B9EE90 = 2; - break; - case 2: - D_80241538_B9EE98 += 10; - if (D_80241538_B9EE98 >= 256) { - D_80241538_B9EE98 = 255; - D_80241534_B9EE94 = 20; - D_80241530_B9EE90 = 3; - } - break; - case 3: - D_80241534_B9EE94--; - if (D_80241534_B9EE94 < 0) { - D_80241534_B9EE94 = 0; - D_80241530_B9EE90 = 4; - } - break; - case 4: - D_80241538_B9EE98 -= 10; - if (D_80241538_B9EE98 < 0) { - D_80241538_B9EE98 = 0; - D_80241530_B9EE90 = 0; - } - break; - } - - gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, D_80241538_B9EE98); - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE_ALPHA, 0, 0, 0, 0, COMBINED); - gDPSetRenderMode(gMasterGfxPos++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_DECAL2); -} - -INCLUDE_ASM(s32, "world/area_mim/mim_04/B9D9D0", func_802401DC_B9DB3C); diff --git a/src/world/area_mim/mim_04/B9DB60.c b/src/world/area_mim/mim_04/B9DB60.c deleted file mode 100644 index 5de77b8dc3..0000000000 --- a/src/world/area_mim/mim_04/B9DB60.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "mim_04.h" - -#include "world/common/enemy/HoppingAI.inc.c" - -#include "world/common/StashVars.inc.c" - -#include "world/common/GetItemName.inc.c" diff --git a/src/world/area_mim/mim_04/mim_04.h b/src/world/area_mim/mim_04/mim_04.h index e17967b521..b0a4b7e418 100644 --- a/src/world/area_mim/mim_04/mim_04.h +++ b/src/world/area_mim/mim_04/mim_04.h @@ -2,8 +2,25 @@ /// @brief Forever Forest - Tree Face (Bub-ulb) #include "common.h" -#include "../mim.h" #include "message_ids.h" #include "map.h" +#include "../mim.h" +#include "mapfs/mim_04_shape.h" +#include "mapfs/mim_04_hit.h" + +#include "sprite/npc/Bubulb.h" +#include "sprite/npc/Fuzzy.h" + +enum { + NPC_Bubulb = 0, + NPC_Fuzzy = 1, +}; + #define NAMESPACE mim_04 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupGates); +extern EvtScript N(EVS_SetupExitHint); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_mim/mim_04/mim_04_0_header.c b/src/world/area_mim/mim_04/mim_04_0_header.c new file mode 100644 index 0000000000..f0c85da2f4 --- /dev/null +++ b/src/world/area_mim/mim_04/mim_04_0_header.c @@ -0,0 +1,16 @@ +#include "mim_04.h" + +EntryList N(Entrances) = { + [mim_04_ENTRY_0] { 0.0, 0.0, -530.0, 180.0 }, + [mim_04_ENTRY_1] { -530.0, 0.0, 0.0, 90.0 }, + [mim_04_ENTRY_2] { 0.0, 0.0, 530.0, 0.0 }, + [mim_04_ENTRY_3] { 530.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mim_04 }, +}; diff --git a/src/world/area_mim/mim_04/mim_04_1_music.c b/src/world/area_mim/mim_04/mim_04_1_music.c new file mode 100644 index 0000000000..31053d960c --- /dev/null +++ b/src/world/area_mim/mim_04/mim_04_1_music.c @@ -0,0 +1,8 @@ +#include "mim_04.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_FOREVER_FOREST, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_SPOOKY) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_04/mim_04_2_main.c b/src/world/area_mim/mim_04/mim_04_2_main.c new file mode 100644 index 0000000000..9a6fddd929 --- /dev/null +++ b/src/world/area_mim/mim_04/mim_04_2_main.c @@ -0,0 +1,41 @@ +#include "mim_04.h" + +#include "world/common/SetForeverForestFog.inc.c" + +EvtScript N(EVS_ExitWalk_n) = EVT_EXIT_WALK(60, mim_04_ENTRY_0, "mim_05", mim_05_ENTRY_2); +EvtScript N(EVS_ExitWalk_w) = EVT_EXIT_WALK(60, mim_04_ENTRY_1, "mim_01", mim_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_s) = EVT_EXIT_WALK(60, mim_04_ENTRY_2, "mim_01", mim_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_e) = EVT_EXIT_WALK(60, mim_04_ENTRY_3, "mim_03", mim_03_ENTRY_1); + +MAP_RODATA_PAD(1,main); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_n)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_w)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_s)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_e)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) + EVT_CALL(SetSpriteShading, SHADING_MIM_04) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SET(AB_MIM_2, GB_MIM_CurrentMapID) + EVT_CALL(GetMapID, GB_MIM_CurrentMapID) + EVT_EXEC_WAIT(N(EVS_SetupGates)) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_SetupExitHint)) + EVT_CALL(N(SetForeverForestFog)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_04/mim_04_3_entity.c b/src/world/area_mim/mim_04/mim_04_3_entity.c new file mode 100644 index 0000000000..3dbbc0c4c2 --- /dev/null +++ b/src/world/area_mim/mim_04/mim_04_3_entity.c @@ -0,0 +1,6 @@ +#include "mim_04.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_04/mim_04_4_hint.c b/src/world/area_mim/mim_04/mim_04_4_hint.c new file mode 100644 index 0000000000..ddcea84f84 --- /dev/null +++ b/src/world/area_mim/mim_04/mim_04_4_hint.c @@ -0,0 +1,86 @@ +#include "mim_04.h" + +enum { + EVIL_TREE_HIDDEN = 0, + EVIL_TREE_BEGIN = 1, + EVIL_TREE_FADE_IN = 2, + EVIL_TREE_VISIBLE = 3, + EVIL_TREE_FADE_OUT = 4, +}; + +s32 N(EvilTreeState) = EVIL_TREE_HIDDEN; +s32 N(EvilTreeVisibleTime) = 0; +s32 N(EvilTreeFaceAlpha) = 0; + +void N(gfx_build_evil_tree_face)(s32 index) { + switch (N(EvilTreeState)) { + case EVIL_TREE_BEGIN: + N(EvilTreeFaceAlpha) = 0; + N(EvilTreeState) = EVIL_TREE_FADE_IN; + break; + case EVIL_TREE_FADE_IN: + N(EvilTreeFaceAlpha) += 10; + if (N(EvilTreeFaceAlpha) >= 256) { + N(EvilTreeFaceAlpha) = 255; + N(EvilTreeVisibleTime) = 20; + N(EvilTreeState) = EVIL_TREE_VISIBLE; + } + break; + case EVIL_TREE_VISIBLE: + N(EvilTreeVisibleTime)--; + if (N(EvilTreeVisibleTime) < 0) { + N(EvilTreeVisibleTime) = 0; + N(EvilTreeState) = EVIL_TREE_FADE_OUT; + } + break; + case EVIL_TREE_FADE_OUT: + N(EvilTreeFaceAlpha) -= 10; + if (N(EvilTreeFaceAlpha) < 0) { + N(EvilTreeFaceAlpha) = 0; + N(EvilTreeState) = EVIL_TREE_HIDDEN; + } + break; + } + + gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(EvilTreeFaceAlpha)); + gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE_ALPHA, 0, 0, 0, 0, COMBINED); + gDPSetRenderMode(gMasterGfxPos++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_DECAL2); +} + +API_CALLABLE(N(TryEvilTreeLaugh)) { + if (N(EvilTreeState) == EVIL_TREE_HIDDEN) { + N(EvilTreeState) = EVIL_TREE_BEGIN; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ManageEvilTree) = { + EVT_LABEL(0) + EVT_CALL(AwaitPlayerApproach, 0, -340, 50) + EVT_CALL(AwaitPlayerLeave, 0, -340, 50) + EVT_CALL(N(TryEvilTreeLaugh)) + EVT_CALL(PlaySoundAt, SOUND_205F, 0, 55, 96, -254) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupExitHint) = { + EVT_CALL(SetCustomGfxBuilders, 1, EVT_PTR(N(gfx_build_evil_tree_face)), 0) + EVT_CALL(SetModelCustomGfx, MODEL_kao, 1, -1) + EVT_CALL(SetModelFlags, MODEL_kao, 16, TRUE) + EVT_WAIT(20) + EVT_EXEC(N(EVS_ManageEvilTree)) + EVT_THREAD + EVT_CALL(SetTexPanner, MODEL_kao, 0) + EVT_LABEL(0) + EVT_CALL(SetTexPanOffset, 0, 0, 0, -0x8000) + EVT_WAIT(2) + EVT_CALL(SetTexPanOffset, 0, 0, 0, 0) + EVT_WAIT(3) + EVT_GOTO(0) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_04/mim_04_5_gate.c b/src/world/area_mim/mim_04/mim_04_5_gate.c new file mode 100644 index 0000000000..7a5e9298a6 --- /dev/null +++ b/src/world/area_mim/mim_04/mim_04_5_gate.c @@ -0,0 +1,6 @@ +#include "mim_04.h" + +#include "../gates/support.inc.c" +#include "../gates/animate.inc.c" +#include "../gates/use.inc.c" +#include "../gates/setup.inc.c" diff --git a/src/world/area_mim/mim_04/mim_04_6_npc.c b/src/world/area_mim/mim_04/mim_04_6_npc.c new file mode 100644 index 0000000000..a1a5dd1c75 --- /dev/null +++ b/src/world/area_mim/mim_04/mim_04_6_npc.c @@ -0,0 +1,96 @@ +#include "mim_04.h" + +#include "world/common/enemy/complete/ForestFuzzy.inc.c" + +#include "world/common/npc/Bulbulb.inc.c" + +#include "world/common/complete/GiveReward.inc.c" + +EvtScript N(EVS_NpcInteract_Bubulb) = { + EVT_IF_EQ(GF_MIM04_Gift_MagicalSeed3, FALSE) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Green_PopUp) + EVT_WAIT(45) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Green_Idle) + EVT_CALL(SetNpcCollisionSize, NPC_SELF, 45, 26) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Bubulb_Green_Talk, ANIM_Bubulb_Green_Idle, 0, MSG_CH3_000F) + EVT_GIVE_KEY_REWARD(ITEM_MAGICAL_SEED3) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Bubulb_Green_Talk, ANIM_Bubulb_Green_Idle, 0, MSG_CH3_0010) + EVT_SET(GF_MIM04_Gift_MagicalSeed3, TRUE) + EVT_CALL(SetTattleMessage, NPC_Bubulb, MSG_NpcTattle_MIM_Bubulb_Revealed) + EVT_ELSE + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_SET(LVar0, MSG_CH3_0011) + EVT_SET(LVar1, MSG_CH3_0012) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_SET(LVar0, MSG_CH3_0013) + EVT_SET(LVar1, MSG_CH3_0014) + EVT_CASE_DEFAULT + EVT_SET(LVar0, MSG_CH3_0015) + EVT_SET(LVar1, MSG_CH3_0016) + EVT_END_SWITCH + EVT_IF_EQ(AF_MIM04_Bulbulb_DialogueToggle, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Bubulb, ANIM_Bubulb_Green_Talk, ANIM_Bubulb_Green_Idle, 0, LVar0) + EVT_SET(AF_MIM04_Bulbulb_DialogueToggle, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Bubulb, ANIM_Bubulb_Green_Talk, ANIM_Bubulb_Green_Idle, 0, LVar1) + EVT_SET(AF_MIM04_Bulbulb_DialogueToggle, FALSE) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bubulb) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Bubulb))) + EVT_IF_EQ(GF_MIM04_Gift_MagicalSeed3, FALSE) + EVT_CALL(SetNpcCollisionSize, NPC_SELF, 25, 25) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Green_BuriedIdle) + EVT_CALL(SetTattleMessage, NPC_Bubulb, MSG_NpcTattle_MIM_Bubulb_Hidden) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Fuzzy) = { + .id = NPC_Fuzzy, + .settings = &N(NpcSettings_ForestFuzzy), + .pos = { 240.0f, 0.0f, -240.0f }, + .yaw = 0, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_400000, + .drops = FOREST_FUZZY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 240, 0, -240 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 240, 0, -240 }, + .detectSize = { 200 }, + } + }, + .animations = FOREST_FUZZY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bubulb) = { + .id = NPC_Bubulb, + .settings = &N(NpcSettings_Bubulb), + .pos = { 0.0f, 32.0f, 0.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_Bubulb), + .drops = BULBULB_DROPS, + .animations = BULBULB_GREEN_ANIMS, + .tattle = MSG_NpcTattle_MIM_Bubulb_Revealed, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Fuzzy), BTL_MIM_FORMATION_04, BTL_MIM_STAGE_00), + NPC_GROUP(N(NpcData_Bubulb)), + {} +}; diff --git a/src/world/area_mim/mim_05/BA0730.c b/src/world/area_mim/mim_05/BA0730.c deleted file mode 100644 index dddb7f86c8..0000000000 --- a/src/world/area_mim/mim_05/BA0730.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "mim_05.h" - -static char* N(exit_str_0) = "mim_01"; -static char* N(exit_str_1) = "mim_06"; -static char* N(exit_str_2) = "mim_04"; -static char* N(exit_str_3) = "mim_08"; - -#include "world/common/SetForeverForestFog.inc.c" diff --git a/src/world/area_mim/mim_05/BA07A0.c b/src/world/area_mim/mim_05/BA07A0.c deleted file mode 100644 index 6364686025..0000000000 --- a/src/world/area_mim/mim_05/BA07A0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "mim_05.h" - -#include "world/common/enemy/PiranhaPlantAI.inc.c" diff --git a/src/world/area_mim/mim_05/mim_05.h b/src/world/area_mim/mim_05/mim_05.h index 9448c717a3..a72cb50c82 100644 --- a/src/world/area_mim/mim_05/mim_05.h +++ b/src/world/area_mim/mim_05/mim_05.h @@ -2,8 +2,26 @@ /// @brief Forever Forest - Mushrooms (HP Plus) #include "common.h" -#include "../mim.h" #include "message_ids.h" #include "map.h" +#include "../mim.h" +#include "mapfs/mim_05_shape.h" +#include "mapfs/mim_05_hit.h" + +#include "sprite/npc/SmallPiranha.h" + +enum { + NPC_PiranhaPlant_01 = 0, + NPC_PiranhaPlant_01_Hitbox = 1, + NPC_PiranhaPlant_02 = 2, + NPC_PiranhaPlant_02_Hitbox = 3, +}; + #define NAMESPACE mim_05 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupGates); +extern EvtScript N(EVS_SetupExitHint); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_mim/mim_05/mim_05_0_header.c b/src/world/area_mim/mim_05/mim_05_0_header.c new file mode 100644 index 0000000000..93ee7d25bc --- /dev/null +++ b/src/world/area_mim/mim_05/mim_05_0_header.c @@ -0,0 +1,16 @@ +#include "mim_05.h" + +EntryList N(Entrances) = { + [mim_05_ENTRY_0] { 0.0, 0.0, -530.0, 180.0 }, + [mim_05_ENTRY_1] { -530.0, 0.0, 0.0, 90.0 }, + [mim_05_ENTRY_2] { 0.0, 0.0, 530.0, 0.0 }, + [mim_05_ENTRY_3] { 530.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mim_05 }, +}; diff --git a/src/world/area_mim/mim_05/mim_05_1_music.c b/src/world/area_mim/mim_05/mim_05_1_music.c new file mode 100644 index 0000000000..2dee2722da --- /dev/null +++ b/src/world/area_mim/mim_05/mim_05_1_music.c @@ -0,0 +1,8 @@ +#include "mim_05.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_FOREVER_FOREST, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_SPOOKY) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_05/mim_05_2_main.c b/src/world/area_mim/mim_05/mim_05_2_main.c new file mode 100644 index 0000000000..7fa73b23b1 --- /dev/null +++ b/src/world/area_mim/mim_05/mim_05_2_main.c @@ -0,0 +1,39 @@ +#include "mim_05.h" + +#include "world/common/SetForeverForestFog.inc.c" + +EvtScript N(EVS_ExitWalk_n) = EVT_EXIT_WALK(60, mim_05_ENTRY_0, "mim_01", mim_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_w) = EVT_EXIT_WALK(60, mim_05_ENTRY_1, "mim_06", mim_06_ENTRY_3); +EvtScript N(EVS_ExitWalk_s) = EVT_EXIT_WALK(60, mim_05_ENTRY_2, "mim_04", mim_04_ENTRY_0); +EvtScript N(EVS_ExitWalk_e) = EVT_EXIT_WALK(60, mim_05_ENTRY_3, "mim_08", mim_08_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_n)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_w)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_s)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_e)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) + EVT_CALL(SetSpriteShading, SHADING_MIM_05) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SET(AB_MIM_2, GB_MIM_CurrentMapID) + EVT_CALL(GetMapID, GB_MIM_CurrentMapID) + EVT_EXEC_WAIT(N(EVS_SetupGates)) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_SetupExitHint)) + EVT_CALL(N(SetForeverForestFog)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_05/mim_05_3_entity.c b/src/world/area_mim/mim_05/mim_05_3_entity.c new file mode 100644 index 0000000000..06dc84073a --- /dev/null +++ b/src/world/area_mim/mim_05/mim_05_3_entity.c @@ -0,0 +1,6 @@ +#include "mim_05.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_05/mim_05_4_hint.c b/src/world/area_mim/mim_05/mim_05_4_hint.c new file mode 100644 index 0000000000..ecfbb82506 --- /dev/null +++ b/src/world/area_mim/mim_05/mim_05_4_hint.c @@ -0,0 +1,128 @@ +#include "mim_05.h" + +EvtScript N(EVS_FlickerTexPanner) = { + EVT_USE_ARRAY(LVar0) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(LVarA, ArrayVar(0)) + EVT_CASE_EQ(1) + EVT_SET(LVarA, ArrayVar(1)) + EVT_CASE_EQ(2) + EVT_SET(LVarA, ArrayVar(2)) + EVT_CASE_EQ(4) + EVT_SET(LVarA, ArrayVar(4)) + EVT_CASE_EQ(5) + EVT_SET(LVarA, ArrayVar(5)) + EVT_END_SWITCH + EVT_IF_EQ(LVarA, 1) + EVT_CALL(PlaySoundAt, SOUND_3A0, 0, -300, 0, -10) + EVT_CALL(SetTexPanOffset, LVar1, 0, 0, 0) + EVT_ELSE + EVT_CALL(SetTexPanOffset, LVar1, 0, 0, -0x8000) + EVT_END_IF + EVT_SET(LVar9, 1) + EVT_SUB(LVar9, LVarA) + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_SET(ArrayVar(0), LVar9) + EVT_CASE_EQ(1) + EVT_SET(ArrayVar(1), LVar9) + EVT_CASE_EQ(2) + EVT_SET(ArrayVar(2), LVar9) + EVT_CASE_EQ(4) + EVT_SET(ArrayVar(4), LVar9) + EVT_CASE_EQ(5) + EVT_SET(ArrayVar(5), LVar9) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_AnimateMushroomSet) = { + EVT_CALL(PlaySoundAt, SOUND_3A0, 0, -300, 0, -10) + EVT_EXEC(N(EVS_FlickerTexPanner)) + EVT_WAIT(30) + EVT_LOOP(4) + EVT_EXEC(N(EVS_FlickerTexPanner)) + EVT_WAIT(3) + EVT_EXEC(N(EVS_FlickerTexPanner)) + EVT_WAIT(3) + EVT_END_LOOP + EVT_EXEC(N(EVS_FlickerTexPanner)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InspectMushrooms_West) = { + EVT_SET(LVar1, TEX_PANNER_2) + EVT_EXEC(N(EVS_AnimateMushroomSet)) + EVT_WAIT(10) + EVT_SET(LVar1, TEX_PANNER_4) + EVT_EXEC(N(EVS_AnimateMushroomSet)) + EVT_WAIT(10) + EVT_SET(LVar1, TEX_PANNER_5) + EVT_EXEC(N(EVS_AnimateMushroomSet)) + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InspectMushrooms_South) = { + EVT_CALL(PlaySoundAt, SOUND_3A0, 0, -20, 0, 300) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x8000) + EVT_WAIT(20) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InspectMushrooms_North) = { + EVT_CALL(PlaySoundAt, SOUND_3A0, 0, 20, 0, -300) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, -0x8000) + EVT_WAIT(20) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InspectMushrooms_East) = { + EVT_CALL(PlaySoundAt, SOUND_3A0, 0, 300, 0, 10) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, -0x8000) + EVT_WAIT(50) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupExitHint) = { + EVT_CALL(SetTexPanner, MODEL_o402, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o510, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o511, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o403, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o500, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o501, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o404, TEX_PANNER_3) + EVT_CALL(SetTexPanner, MODEL_o498, TEX_PANNER_3) + EVT_CALL(SetTexPanner, MODEL_o499, TEX_PANNER_3) + EVT_CALL(SetTexPanner, MODEL_o505, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o509, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o507, TEX_PANNER_4) + EVT_CALL(SetTexPanner, MODEL_o508, TEX_PANNER_4) + EVT_CALL(SetTexPanner, MODEL_o405, TEX_PANNER_5) + EVT_CALL(SetTexPanner, MODEL_o502, TEX_PANNER_5) + EVT_CALL(SetTexPanner, MODEL_o503, TEX_PANNER_5) + EVT_CALL(SetTexPanner, MODEL_o504, TEX_PANNER_5) + EVT_MALLOC_ARRAY(6, LVar0) + EVT_USE_ARRAY(LVar0) + EVT_SET(ArrayVar(0), 0) + EVT_SET(ArrayVar(1), 0) + EVT_SET(ArrayVar(2), 0) + EVT_SET(ArrayVar(4), 0) + EVT_SET(ArrayVar(5), 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_InspectMushrooms_South)), TRIGGER_WALL_PRESS_A, COLLIDER_o402, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_InspectMushrooms_North)), TRIGGER_WALL_PRESS_A, COLLIDER_o403, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_InspectMushrooms_West)), TRIGGER_WALL_PRESS_A, COLLIDER_o405, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_InspectMushrooms_East)), TRIGGER_WALL_PRESS_A, COLLIDER_o404, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_05/mim_05_5_gate.c b/src/world/area_mim/mim_05/mim_05_5_gate.c new file mode 100644 index 0000000000..2466e8ce4f --- /dev/null +++ b/src/world/area_mim/mim_05/mim_05_5_gate.c @@ -0,0 +1,6 @@ +#include "mim_05.h" + +#include "../gates/support.inc.c" +#include "../gates/animate.inc.c" +#include "../gates/use.inc.c" +#include "../gates/setup.inc.c" diff --git a/src/world/area_mim/mim_05/mim_05_6_npc.c b/src/world/area_mim/mim_05/mim_05_6_npc.c new file mode 100644 index 0000000000..52cdfd6e6b --- /dev/null +++ b/src/world/area_mim/mim_05/mim_05_6_npc.c @@ -0,0 +1,61 @@ +#include "mim_05.h" + +#include "world/common/enemy/complete/PiranhaPlant.inc.c" + +StaticNpc N(NpcData_PiranhaPlant_01)[] = { + { + .id = NPC_PiranhaPlant_01, + .settings = &N(NpcSettings_PiranhaPlant), + .pos = { -240.0f, 0.0f, 240.0f }, + .yaw = 0, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = PIRANHA_PLANT_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 400 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 400 }, + } + }, + .animations = PIRANHA_PLANT_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, + }, + PIRANHA_PLANT_HITBOX(NPC_PiranhaPlant_01_Hitbox) +}; + +StaticNpc N(NpcData_PiranhaPlant_02)[] = { + { + .id = NPC_PiranhaPlant_02, + .settings = &N(NpcSettings_PiranhaPlant), + .pos = { 240.0f, 0.0f, -240.0f }, + .yaw = 0, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = PIRANHA_PLANT_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 400 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 400 }, + } + }, + .animations = PIRANHA_PLANT_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, + }, + PIRANHA_PLANT_HITBOX(NPC_PiranhaPlant_02_Hitbox) +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_PiranhaPlant_01), BTL_MIM_FORMATION_0B, BTL_MIM_STAGE_00), + NPC_GROUP(N(NpcData_PiranhaPlant_02), BTL_MIM_FORMATION_0A, BTL_MIM_STAGE_00), + {} +}; diff --git a/src/world/area_mim/mim_06/BA4780.c b/src/world/area_mim/mim_06/BA4780.c deleted file mode 100644 index 594cd78e0e..0000000000 --- a/src/world/area_mim/mim_06/BA4780.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "mim_06.h" - -static char* N(exit_str_0) = "mim_07"; -static char* N(exit_str_1) = "mim_01"; -static char* N(exit_str_2) = "mim_05"; -static char* N(exit_str_3) = ""; - -#include "world/common/SetForeverForestFog.inc.c" diff --git a/src/world/area_mim/mim_06/BA47F0.c b/src/world/area_mim/mim_06/BA47F0.c deleted file mode 100644 index 5a66537d2b..0000000000 --- a/src/world/area_mim/mim_06/BA47F0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "mim_06.h" - -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA47F0", func_80240070_BA47F0); - -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA47F0", func_802403F0_BA4B70); - -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA47F0", func_802404F8_BA4C78); diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c deleted file mode 100644 index 63da1e8d3a..0000000000 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "mim_06.h" - -#include "world/common/enemy/PiranhaPlantAI.inc.c" - -#include "world/common/enemy/HoppingAI.inc.c" diff --git a/src/world/area_mim/mim_06/mim_06.h b/src/world/area_mim/mim_06/mim_06.h index 079d942643..778ae69ff6 100644 --- a/src/world/area_mim/mim_06/mim_06.h +++ b/src/world/area_mim/mim_06/mim_06.h @@ -2,8 +2,29 @@ /// @brief Forever Forest - Bee Hive (Path Splits) #include "common.h" -#include "../mim.h" #include "message_ids.h" #include "map.h" +#include "../mim.h" +#include "mapfs/mim_06_shape.h" +#include "mapfs/mim_06_hit.h" + +#include "sprite/npc/SmallPiranha.h" +#include "sprite/npc/Fuzzy.h" + +enum { + NPC_PiranhaPlant_01 = 0, + NPC_PiranhaPlant_01_Hitbox = 1, + NPC_PiranhaPlant_02 = 2, + NPC_PiranhaPlant_02_Hitbox = 3, + NPC_Fuzzy = 4, +}; + #define NAMESPACE mim_06 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupGates); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(D_802439F8_BA8178); +extern NpcGroupList N(DefaultNPCs); + diff --git a/src/world/area_mim/mim_06/mim_06_0_header.c b/src/world/area_mim/mim_06/mim_06_0_header.c new file mode 100644 index 0000000000..3ea227f0bd --- /dev/null +++ b/src/world/area_mim/mim_06/mim_06_0_header.c @@ -0,0 +1,16 @@ +#include "mim_06.h" + +EntryList N(Entrances) = { + [mim_06_ENTRY_0] { 0.0, 0.0, -530.0, 180.0 }, + [mim_06_ENTRY_1] { -530.0, 0.0, 0.0, 90.0 }, + [mim_06_ENTRY_2] { 0.0, 0.0, 530.0, 0.0 }, + [mim_06_ENTRY_3] { 530.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mim_06 }, +}; diff --git a/src/world/area_mim/mim_06/mim_06_1_music.c b/src/world/area_mim/mim_06/mim_06_1_music.c new file mode 100644 index 0000000000..8342a560ad --- /dev/null +++ b/src/world/area_mim/mim_06/mim_06_1_music.c @@ -0,0 +1,8 @@ +#include "mim_06.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_FOREVER_FOREST, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_SPOOKY) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_06/mim_06_2_main.c b/src/world/area_mim/mim_06/mim_06_2_main.c new file mode 100644 index 0000000000..f824b1fb68 --- /dev/null +++ b/src/world/area_mim/mim_06/mim_06_2_main.c @@ -0,0 +1,41 @@ +#include "mim_06.h" + +#include "world/common/SetForeverForestFog.inc.c" + +EvtScript N(EVS_ExitWalk_n) = EVT_EXIT_WALK(60, mim_06_ENTRY_0, "mim_07", mim_07_ENTRY_2); +EvtScript N(EVS_ExitWalk_w) = EVT_EXIT_WALK(60, mim_06_ENTRY_1, "mim_01", mim_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_s) = EVT_EXIT_WALK(60, mim_06_ENTRY_2, "mim_01", mim_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_e) = EVT_EXIT_WALK(60, mim_06_ENTRY_3, "mim_05", mim_05_ENTRY_1); + +MAP_RODATA_PAD(1,main); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_n)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_w)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_s)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_e)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) + EVT_CALL(SetSpriteShading, SHADING_MIM_06) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SET(AB_MIM_2, GB_MIM_CurrentMapID) + EVT_CALL(GetMapID, GB_MIM_CurrentMapID) + EVT_EXEC_WAIT(N(EVS_SetupGates)) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(D_802439F8_BA8178)) + EVT_CALL(N(SetForeverForestFog)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_06/mim_06_3_entity.c b/src/world/area_mim/mim_06/mim_06_3_entity.c new file mode 100644 index 0000000000..1737266067 --- /dev/null +++ b/src/world/area_mim/mim_06/mim_06_3_entity.c @@ -0,0 +1,6 @@ +#include "mim_06.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_06/mim_06_4_hint.c b/src/world/area_mim/mim_06/mim_06_4_hint.c new file mode 100644 index 0000000000..4228fdb0ad --- /dev/null +++ b/src/world/area_mim/mim_06/mim_06_4_hint.c @@ -0,0 +1,212 @@ +#include "mim_06.h" +#include "model.h" + +#include "world/common/util/GetFirstTriangleNormal.inc.c" + +API_CALLABLE(N(GetFlowerNormal)) { + Bytecode* args = script->ptrReadPos; + s32 modelID = evt_get_variable(script, *args++); + s32 treeIndex = get_model_list_index_from_tree_index(modelID); + Model* mdl = get_model_from_list_index(treeIndex); + f32 x, y, z; + + N(GetFirstTriangleNormal)(mdl->modelNode->displayData->displayList, &x, &y, &z); + + evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(x)); + evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(y)); + evt_set_variable(script, *args++, EVT_FLOAT_TO_FIXED(z)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetWitherTranslation)) { + Bytecode* args = script->ptrReadPos; + s32 angle = evt_get_variable(script, *args++); + + evt_set_variable(script, *args++, sin_deg(angle) * 10.0f); + return ApiStatus_DONE2; +} + +s32 N(FlowerModels_South)[] = { + MODEL_sa_1, MODEL_sa_2, + MODEL_sb_1, MODEL_sb_2, + MODEL_sc_1, MODEL_sc_2, +}; + +s32 N(FlowerModels_West)[] = { + MODEL_wa_1, MODEL_wa_2, + MODEL_wb_1, MODEL_wb_2, + MODEL_wc_1, MODEL_wc_2, +}; + +s32 N(FlowerModels_North)[] = { + MODEL_na_1, MODEL_na_2, + MODEL_nb_1, MODEL_nb_2, + MODEL_nc_1, MODEL_nc_2, +}; + +s32 N(FlowerModels_East)[] = { + MODEL_ea_1, MODEL_ea_2, + MODEL_eb_1, MODEL_eb_2, + MODEL_ec_1, MODEL_ec_2, +}; + +EvtScript N(EVS_FlowersWither) = { + EVT_CALL(RandInt, 20, LVar0) + EVT_ADD(LVar0, 1) + EVT_WAIT(LVar0) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_SETF(LVar3, EVT_FLOAT(1.0)) + EVT_CALL(RandInt, 20, LVarC) + EVT_SUB(LVarC, 10) + EVT_LOOP(60) + EVT_ADD(LVar0, LVarC) + EVT_CALL(N(GetWitherTranslation), LVar0, LVar2) + EVT_SUB(LVar1, 1) + EVT_CALL(TranslateModel, LVarA, 0, LVar1, LVar2) + EVT_CALL(N(GetFlowerNormal), LVarA, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, LVarA, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(ScaleModel, LVarA, LVar3, LVar3, LVar3) + EVT_CALL(TranslateModel, LVarB, 0, LVar1, LVar2) + EVT_CALL(N(GetFlowerNormal), LVarA, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, LVarB, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(ScaleModel, LVarB, LVar3, LVar3, LVar3) + EVT_MULF(LVar3, EVT_FLOAT(0.9658203)) + EVT_WAIT(2) + EVT_END_LOOP + EVT_CALL(EnableModel, LVarA, FALSE) + EVT_CALL(EnableModel, LVarB, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InspectFlowers_South) = { + EVT_CALL(SetTexPanOffset, 0, 0, 0, -0x8000) + EVT_WAIT(2) + EVT_CALL(SetTexPanOffset, 0, 0, 0, -0x10000) + EVT_CALL(PlaySoundAt, SOUND_205B, 0, -10, 0, -300) + EVT_CALL(MakeLerp, 0, 30, 50, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_USE_BUF(EVT_PTR(N(FlowerModels_South))) + EVT_LOOP(3) + EVT_BUF_READ2(LVar2, LVar3) + EVT_CALL(N(GetFlowerNormal), LVar2, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, LVar2, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, LVar3, LVar0, LVar7, LVar8, LVar9) + EVT_END_LOOP + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_205B) + EVT_CALL(MakeLerp, 30, -30, 50, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_USE_BUF(EVT_PTR(N(FlowerModels_South))) + EVT_LOOP(3) + EVT_BUF_READ2(LVar2, LVar3) + EVT_CALL(N(GetFlowerNormal), LVar2, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, LVar2, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, LVar3, LVar0, LVar7, LVar8, LVar9) + EVT_END_LOOP + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_205B) + EVT_CALL(MakeLerp, -30, 0, 50, EASING_COS_IN_OUT) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_USE_BUF(EVT_PTR(N(FlowerModels_South))) + EVT_LOOP(3) + EVT_BUF_READ2(LVar2, LVar3) + EVT_CALL(N(GetFlowerNormal), LVar2, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, LVar2, LVar0, LVar7, LVar8, LVar9) + EVT_CALL(RotateModel, LVar3, LVar0, LVar7, LVar8, LVar9) + EVT_END_LOOP + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(SetTexPanOffset, 0, 0, 0, -0x8000) + EVT_WAIT(2) + EVT_CALL(SetTexPanOffset, 0, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InspectFlowers_West) = { + EVT_CALL(SetTexPanOffset, 1, 0, 0, -0x8000) + EVT_WAIT(2) + EVT_CALL(SetTexPanOffset, 1, 0, 0, -0x10000) + EVT_WAIT(15) + EVT_CALL(PlaySoundAt, SOUND_205C, 0, -300, 0, -10) + EVT_USE_BUF(EVT_PTR(N(FlowerModels_West))) + EVT_BUF_READ2(LVarA, LVarB) + EVT_EXEC(N(EVS_FlowersWither)) + EVT_BUF_READ2(LVarA, LVarB) + EVT_EXEC(N(EVS_FlowersWither)) + EVT_BUF_READ2(LVarA, LVarB) + EVT_EXEC(N(EVS_FlowersWither)) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InspectFlowers_North) = { + EVT_CALL(SetTexPanOffset, 2, 0, 0, -0x8000) + EVT_WAIT(2) + EVT_CALL(SetTexPanOffset, 2, 0, 0, -0x10000) + EVT_WAIT(15) + EVT_CALL(PlaySoundAt, SOUND_205C, 0, 10, 0, 300) + EVT_USE_BUF(EVT_PTR(N(FlowerModels_North))) + EVT_BUF_READ2(LVarA, LVarB) + EVT_EXEC(N(EVS_FlowersWither)) + EVT_BUF_READ2(LVarA, LVarB) + EVT_EXEC(N(EVS_FlowersWither)) + EVT_BUF_READ2(LVarA, LVarB) + EVT_EXEC(N(EVS_FlowersWither)) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InspectFlowers_East) = { + EVT_CALL(SetTexPanOffset, 3, 0, 0, -0x8000) + EVT_WAIT(2) + EVT_CALL(SetTexPanOffset, 3, 0, 0, -0x10000) + EVT_WAIT(15) + EVT_CALL(PlaySoundAt, SOUND_205C, 0, 300, 0, -10) + EVT_USE_BUF(EVT_PTR(N(FlowerModels_East))) + EVT_BUF_READ2(LVarA, LVarB) + EVT_EXEC(N(EVS_FlowersWither)) + EVT_BUF_READ2(LVarA, LVarB) + EVT_EXEC(N(EVS_FlowersWither)) + EVT_BUF_READ2(LVarA, LVarB) + EVT_EXEC(N(EVS_FlowersWither)) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802439F8_BA8178) = { + EVT_CALL(SetTexPanner, MODEL_sa_2, 0) + EVT_CALL(SetTexPanner, MODEL_sb_2, 0) + EVT_CALL(SetTexPanner, MODEL_sc_2, 0) + EVT_CALL(SetTexPanner, MODEL_wa_2, 1) + EVT_CALL(SetTexPanner, MODEL_wb_2, 1) + EVT_CALL(SetTexPanner, MODEL_wc_2, 1) + EVT_CALL(SetTexPanner, MODEL_na_2, 2) + EVT_CALL(SetTexPanner, MODEL_nb_2, 2) + EVT_CALL(SetTexPanner, MODEL_nc_2, 2) + EVT_CALL(SetTexPanner, MODEL_ea_2, 3) + EVT_CALL(SetTexPanner, MODEL_eb_2, 3) + EVT_CALL(SetTexPanner, MODEL_ec_2, 3) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_InspectFlowers_South)), TRIGGER_WALL_PRESS_A, COLLIDER_o416, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_InspectFlowers_West)), TRIGGER_WALL_PRESS_A, COLLIDER_o418, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_InspectFlowers_North)), TRIGGER_WALL_PRESS_A, COLLIDER_o417, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_InspectFlowers_East)), TRIGGER_WALL_PRESS_A, COLLIDER_o331, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_06/mim_06_5_gate.c b/src/world/area_mim/mim_06/mim_06_5_gate.c new file mode 100644 index 0000000000..bcc17c1310 --- /dev/null +++ b/src/world/area_mim/mim_06/mim_06_5_gate.c @@ -0,0 +1,6 @@ +#include "mim_06.h" + +#include "../gates/support.inc.c" +#include "../gates/animate.inc.c" +#include "../gates/use.inc.c" +#include "../gates/setup.inc.c" diff --git a/src/world/area_mim/mim_06/mim_06_6_npc.c b/src/world/area_mim/mim_06/mim_06_6_npc.c new file mode 100644 index 0000000000..aa1e83c9d6 --- /dev/null +++ b/src/world/area_mim/mim_06/mim_06_6_npc.c @@ -0,0 +1,86 @@ +#include "mim_06.h" + +#include "world/common/enemy/complete/PiranhaPlant.inc.c" +#include "world/common/enemy/complete/ForestFuzzy.inc.c" + +StaticNpc N(NpcData_PiranhaPlant_01)[] = { + { + .id = NPC_PiranhaPlant_01, + .settings = &N(NpcSettings_PiranhaPlant), + .pos = { -240.0f, 0.0f, -240.0f }, + .yaw = 0, + .flags = 0, + .drops = PIRANHA_PLANT_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 400 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 400 }, + } + }, + .animations = PIRANHA_PLANT_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, + }, + PIRANHA_PLANT_HITBOX(NPC_PiranhaPlant_01_Hitbox) +}; + +StaticNpc N(NpcData_PiranhaPlant_02)[] = { + { + .id = NPC_PiranhaPlant_02, + .settings = &N(NpcSettings_PiranhaPlant), + .pos = { 240.0f, 0.0f, -240.0f }, + .yaw = 0, + .flags = 0, + .drops = PIRANHA_PLANT_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 400 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 400 }, + } + }, + .animations = PIRANHA_PLANT_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, + }, + PIRANHA_PLANT_HITBOX(NPC_PiranhaPlant_02_Hitbox) +}; + +StaticNpc N(NpcData_Fuzzy) = { + .id = NPC_Fuzzy, + .settings = &N(NpcSettings_ForestFuzzy), + .pos = { -140.0f, 0.0f, 300.0f }, + .yaw = 0, + .flags = NPC_FLAG_LOCK_ANIMS, + .drops = FOREST_FUZZY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 400 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 400 }, + } + }, + .animations = FOREST_FUZZY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_PiranhaPlant_01), BTL_MIM_FORMATION_0D, BTL_MIM_STAGE_00), + NPC_GROUP(N(NpcData_PiranhaPlant_02), BTL_MIM_FORMATION_0E, BTL_MIM_STAGE_00), + NPC_GROUP(N(NpcData_Fuzzy), BTL_MIM_FORMATION_07, BTL_MIM_STAGE_00), + {} +}; diff --git a/src/world/area_mim/mim_07/BAA140.c b/src/world/area_mim/mim_07/BAA140.c deleted file mode 100644 index 34700797ff..0000000000 --- a/src/world/area_mim/mim_07/BAA140.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "mim_07.h" - -static char* N(exit_str_0) = "mim_09"; -static char* N(exit_str_1) = "mim_01"; -static char* N(exit_str_2) = "mim_06"; -static char* N(exit_str_3) = "mim_11"; - -#define NAMESPACE dup_mim_07 -#include "world/common/SetForeverForestFog.inc.c" -#define NAMESPACE mim_07 diff --git a/src/world/area_mim/mim_07/BAA1B0.c b/src/world/area_mim/mim_07/BAA1B0.c deleted file mode 100644 index e47362a38a..0000000000 --- a/src/world/area_mim/mim_07/BAA1B0.c +++ /dev/null @@ -1,45 +0,0 @@ -#include "mim_07.h" - -extern s32 D_80241680_BAB7C0; -extern s32 D_80241684_BAB7C4; -extern s32 D_80241688_BAB7C8; - -#include "world/common/SetForeverForestFog.inc.c" - -void func_802400D8_BAA218(s32 index) { - switch (D_80241680_BAB7C0) { - case 1: - D_80241688_BAB7C8 = 0; - D_80241680_BAB7C0 = 2; - break; - case 2: - D_80241688_BAB7C8 += 10; - if (D_80241688_BAB7C8 >= 256) { - D_80241688_BAB7C8 = 255; - D_80241684_BAB7C4 = 50; - D_80241680_BAB7C0 = 3; - } - break; - case 3: - D_80241684_BAB7C4--; - if (D_80241684_BAB7C4 < 0) { - D_80241684_BAB7C4 = 0; - D_80241680_BAB7C0 = 4; - } - break; - case 4: - D_80241688_BAB7C8 -= 7; - if (D_80241688_BAB7C8 < 0) { - D_80241688_BAB7C8 = 0; - D_80241680_BAB7C0 = 0; - } - break; - } - - gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, D_80241688_BAB7C8); - gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE_ALPHA, 0, 0, 0, 0, COMBINED); - gDPSetRenderMode(gMasterGfxPos++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_DECAL2); -} - -INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA1B0", func_80240244_BAA384); diff --git a/src/world/area_mim/mim_07/BAA3B0.c b/src/world/area_mim/mim_07/BAA3B0.c deleted file mode 100644 index 6acb9e55a3..0000000000 --- a/src/world/area_mim/mim_07/BAA3B0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "mim_07.h" - -#include "world/common/enemy/HoppingAI.inc.c" diff --git a/src/world/area_mim/mim_07/mim_07.h b/src/world/area_mim/mim_07/mim_07.h index 8d8afaf9a3..8c1717ac05 100644 --- a/src/world/area_mim/mim_07/mim_07.h +++ b/src/world/area_mim/mim_07/mim_07.h @@ -2,8 +2,33 @@ /// @brief Forever Forest - Flowers Vanish #include "common.h" -#include "../mim.h" #include "message_ids.h" #include "map.h" +#include "../mim.h" +#include "mapfs/mim_07_shape.h" +#include "mapfs/mim_07_hit.h" + +#include "sprite/npc/JrTroopa.h" +#include "sprite/npc/WorldGoombario.h" +#include "sprite/npc/WorldKooper.h" +#include "sprite/npc/WorldBombette.h" +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/WorldBow.h" +#include "sprite/npc/Fuzzy.h" + +enum { + NPC_Fuzzy_01 = 0, + NPC_Fuzzy_02 = 1, + NPC_JrTroopa = 2, +}; + #define NAMESPACE mim_07 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_PlayForestMusic); +extern EvtScript N(EVS_JrTroopaMusic); +extern EvtScript N(EVS_SetupGates); +extern EvtScript N(EVS_SetupExitHint); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_mim/mim_07/mim_07_0_header.c b/src/world/area_mim/mim_07/mim_07_0_header.c new file mode 100644 index 0000000000..9fcff4621d --- /dev/null +++ b/src/world/area_mim/mim_07/mim_07_0_header.c @@ -0,0 +1,16 @@ +#include "mim_07.h" + +EntryList N(Entrances) = { + [mim_07_ENTRY_0] { 0.0, 0.0, -530.0, 180.0 }, + [mim_07_ENTRY_1] { -530.0, 0.0, 0.0, 90.0 }, + [mim_07_ENTRY_2] { 0.0, 0.0, 530.0, 0.0 }, + [mim_07_ENTRY_3] { 530.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mim_07 }, +}; diff --git a/src/world/area_mim/mim_07/mim_07_1_music.c b/src/world/area_mim/mim_07/mim_07_1_music.c new file mode 100644 index 0000000000..ecc9939dc1 --- /dev/null +++ b/src/world/area_mim/mim_07/mim_07_1_music.c @@ -0,0 +1,14 @@ +#include "mim_07.h" + +EvtScript N(EVS_PlayForestMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_FOREVER_FOREST, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_SPOOKY) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_JrTroopaMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_JR_TROOPA_THEME, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_07/mim_07_2_main.c b/src/world/area_mim/mim_07/mim_07_2_main.c new file mode 100644 index 0000000000..d34ae24389 --- /dev/null +++ b/src/world/area_mim/mim_07/mim_07_2_main.c @@ -0,0 +1,53 @@ +#include "mim_07.h" + +#include "world/common/SetForeverForestFog.inc.c" + +EvtScript N(EVS_ExitWalk_n) = EVT_EXIT_WALK(60, mim_07_ENTRY_0, "mim_09", mim_09_ENTRY_2); +EvtScript N(EVS_ExitWalk_w) = EVT_EXIT_WALK(60, mim_07_ENTRY_1, "mim_01", mim_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_s) = EVT_EXIT_WALK(60, mim_07_ENTRY_2, "mim_06", mim_06_ENTRY_0); +EvtScript N(EVS_ExitWalk_e) = EVT_EXIT_WALK(60, mim_07_ENTRY_3, "mim_11", mim_11_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_n)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_w)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_s)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_e)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) + EVT_CALL(SetSpriteShading, SHADING_MIM_07) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SET(AB_MIM_2, GB_MIM_CurrentMapID) + EVT_CALL(GetMapID, GB_MIM_CurrentMapID) + EVT_EXEC_WAIT(N(EVS_SetupGates)) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_PlayForestMusic)) + EVT_EXEC_WAIT(N(EVS_SetupExitHint)) + EVT_CALL(N(SetForeverForestFog)) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mim_07_ENTRY_3) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 500, -100, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 530, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_THREAD + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_END_THREAD + EVT_ELSE + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_07/mim_07_3_entity.c b/src/world/area_mim/mim_07/mim_07_3_entity.c new file mode 100644 index 0000000000..701abad7eb --- /dev/null +++ b/src/world/area_mim/mim_07/mim_07_3_entity.c @@ -0,0 +1,24 @@ +#include "mim_07.h" +#include "entity.h" + +EvtScript N(EVS_ReadSign) = { + EVT_CALL(IsStartingConversation, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_017F, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_Signpost), 280, 0, 0, 90, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_ReadSign))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_07/mim_07_4_hint.c b/src/world/area_mim/mim_07/mim_07_4_hint.c new file mode 100644 index 0000000000..b4a5dc6d37 --- /dev/null +++ b/src/world/area_mim/mim_07/mim_07_4_hint.c @@ -0,0 +1,121 @@ +#include "mim_07.h" + +API_CALLABLE(N(ResetForeverForestFog)) { + enable_world_fog(); + set_world_fog_dist(990, 1000); + set_world_fog_color(0, 0, 0, 255); + + enable_entity_fog(); + set_entity_fog_dist(990, 1000); + set_entity_fog_color(0, 0, 0, 255); + + return ApiStatus_DONE2; +} + +enum { + EVIL_ROCK_HIDDEN = 0, + EVIL_ROCK_BEGIN = 1, + EVIL_ROCK_FADE_IN = 2, + EVIL_ROCK_VISIBLE = 3, + EVIL_ROCK_FADE_OUT = 4, +}; + +s32 N(EvilRockState) = EVIL_ROCK_HIDDEN; +s32 N(EvilRockVisibleTime) = 0; +s32 N(EvilRockAlpha) = 0; + +void N(gfx_build_evil_rock_face)(s32 index) { + switch (N(EvilRockState)) { + case EVIL_ROCK_BEGIN: + N(EvilRockAlpha) = 0; + N(EvilRockState) = EVIL_ROCK_FADE_IN; + break; + case EVIL_ROCK_FADE_IN: + N(EvilRockAlpha) += 10; + if (N(EvilRockAlpha) > 255) { + N(EvilRockAlpha) = 255; + N(EvilRockVisibleTime) = 50; + N(EvilRockState) = EVIL_ROCK_VISIBLE; + } + break; + case EVIL_ROCK_VISIBLE: + N(EvilRockVisibleTime)--; + if (N(EvilRockVisibleTime) < 0) { + N(EvilRockVisibleTime) = 0; + N(EvilRockState) = EVIL_ROCK_FADE_OUT; + } + break; + case EVIL_ROCK_FADE_OUT: + N(EvilRockAlpha) -= 7; + if (N(EvilRockAlpha) < 0) { + N(EvilRockAlpha) = 0; + N(EvilRockState) = EVIL_ROCK_HIDDEN; + } + break; + } + + gDPSetCycleType(gMasterGfxPos++, G_CYC_2CYCLE); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, N(EvilRockAlpha)); + gDPSetCombineLERP(gMasterGfxPos++, TEXEL0, 0, SHADE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE_ALPHA, 0, 0, 0, 0, COMBINED); + gDPSetRenderMode(gMasterGfxPos++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_DECAL2); +} + +API_CALLABLE(N(TryEvilRockLaugh)) { + if (N(EvilRockState) == EVIL_ROCK_HIDDEN) { + N(EvilRockState) = EVIL_ROCK_BEGIN; + script->varTable[0] = 1; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ManageEvilRock) = { + EVT_LABEL(0) + EVT_CALL(SetTexPanOffset, 0, 0, 0, -0x8000) + EVT_WAIT(3) + EVT_CALL(SetTexPanOffset, 0, 0, 0, 0) + EVT_WAIT(3) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnInspectEvilRock) = { + EVT_SET(LVar0, 0) + EVT_CALL(N(TryEvilRockLaugh)) + EVT_IF_EQ(LVar0, 1) + EVT_WAIT(10) + EVT_EXEC_GET_TID(N(EVS_ManageEvilRock), LVar9) + EVT_CALL(PlaySoundAt, SOUND_205E, 0, -34, 0, -300) + EVT_LOOP(18) + EVT_CALL(TranslateModel, MODEL_o289, EVT_FLOAT(1.0), 0, EVT_FLOAT(1.0)) + EVT_CALL(TranslateModel, MODEL_o440, EVT_FLOAT(1.0), 0, EVT_FLOAT(1.0)) + EVT_WAIT(2) + EVT_CALL(TranslateModel, MODEL_o289, EVT_FLOAT(-1.0), 0, EVT_FLOAT(-1.0)) + EVT_CALL(TranslateModel, MODEL_o440, EVT_FLOAT(-1.0), 0, EVT_FLOAT(-1.0)) + EVT_WAIT(2) + EVT_END_LOOP + EVT_LOOP(10) + EVT_CALL(TranslateModel, MODEL_o289, EVT_FLOAT(0.5), 0, EVT_FLOAT(0.5)) + EVT_CALL(TranslateModel, MODEL_o440, EVT_FLOAT(0.5), 0, EVT_FLOAT(0.5)) + EVT_WAIT(2) + EVT_CALL(TranslateModel, MODEL_o289, EVT_FLOAT(-0.5), 0, EVT_FLOAT(-0.5)) + EVT_CALL(TranslateModel, MODEL_o440, EVT_FLOAT(-0.5), 0, EVT_FLOAT(-0.5)) + EVT_WAIT(2) + EVT_END_LOOP + EVT_KILL_THREAD(LVar9) + EVT_CALL(TranslateModel, MODEL_o289, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o440, 0, 0, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupExitHint) = { + EVT_CALL(SetCustomGfxBuilders, 1, EVT_PTR(N(gfx_build_evil_rock_face)), 0) + EVT_CALL(SetModelCustomGfx, MODEL_o440, 1, -1) + EVT_CALL(SetModelFlags, MODEL_o440, 16, TRUE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnInspectEvilRock)), TRIGGER_WALL_PRESS_A, COLLIDER_o491, 1, 0) + EVT_CALL(SetTexPanner, MODEL_o440, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_07/mim_07_5_gate.c b/src/world/area_mim/mim_07/mim_07_5_gate.c new file mode 100644 index 0000000000..4f9af5752b --- /dev/null +++ b/src/world/area_mim/mim_07/mim_07_5_gate.c @@ -0,0 +1,264 @@ +#include "mim_07.h" + +EvtScript N(EVS_SetGateCameraZones) = { + EVT_SWITCH(LVar1) + EVT_CASE_EQ(0) + EVT_CALL(SetZoneEnabled, ZONE_north, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_west, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_south, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_east, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_higashi, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_nishi, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_minami, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_kita, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_stage, FALSE) + EVT_SET(LVar1, 0) + EVT_CASE_EQ(1) + EVT_CALL(SetZoneEnabled, ZONE_north, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_west, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_south, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_east, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_higashi, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_nishi, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_minami, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_kita, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_stage, TRUE) + EVT_SET(LVar1, 1) + EVT_CASE_EQ(2) + EVT_CALL(SetZoneEnabled, ZONE_north, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_west, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_south, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_east, FALSE) + EVT_CALL(SetZoneEnabled, ZONE_higashi, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_nishi, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_minami, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_kita, TRUE) + EVT_CALL(SetZoneEnabled, ZONE_stage, FALSE) + EVT_SET(LVar1, 2) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InitializeGates) = { + EVT_CALL(ParentColliderToModel, COLLIDER_monn, MODEL_n1) + EVT_CALL(RotateGroup, MODEL_monn, LVar2, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monn) + EVT_CALL(ParentColliderToModel, COLLIDER_mons, MODEL_s1) + EVT_CALL(RotateGroup, MODEL_mons, LVar2, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_mons) + EVT_CALL(ParentColliderToModel, COLLIDER_mone, MODEL_e1) + EVT_CALL(RotateGroup, MODEL_mone, LVar2, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_mone) + EVT_CALL(ParentColliderToModel, COLLIDER_monw, MODEL_w1) + EVT_CALL(RotateGroup, MODEL_monw, LVar2, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monw) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ResetGates) = { + EVT_CALL(RotateGroup, MODEL_monn, 0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monn) + EVT_CALL(RotateGroup, MODEL_mons, 0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_mons) + EVT_CALL(RotateGroup, MODEL_mone, 0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_mone) + EVT_CALL(RotateGroup, MODEL_monw, 0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_monw) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate) = { + EVT_THREAD + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D4, 0) + EVT_WAIT(19) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_1D5, 0) + EVT_END_THREAD + EVT_SWITCH(AB_MIM_1) + EVT_CASE_EQ(0) + EVT_THREAD + EVT_CALL(MakeLerp, 10, 90, 10, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, LVar7) + EVT_ADD(LVar2, LVar8) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 15) + EVT_END_THREAD + EVT_SET(LVar1, 1) + EVT_EXEC(N(EVS_SetGateCameraZones)) + EVT_CALL(MakeLerp, 90, 360, 30, EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_EXEC(N(EVS_ResetGates)) + EVT_SET(AB_MIM_1, 1) + EVT_SET(GF_MIM_ChoosingPath, TRUE) + EVT_CASE_EQ(1) + EVT_THREAD + EVT_CALL(MakeLerp, 360, 270, 10, EASING_QUADRATIC_IN) + EVT_LABEL(30) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(30) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, LVar7) + EVT_SUB(LVar2, LVar8) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 15) + EVT_END_THREAD + EVT_SET(LVar1, 2) + EVT_EXEC(N(EVS_SetGateCameraZones)) + EVT_CALL(MakeLerp, 270, -10, 30, EASING_LINEAR) + EVT_LABEL(40) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(40) + EVT_END_IF + EVT_SET(AB_MIM_1, 2) + EVT_CASE_EQ(2) + EVT_THREAD + EVT_CALL(MakeLerp, -10, 90, 10, EASING_QUADRATIC_IN) + EVT_LABEL(50) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(50) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, LVar7) + EVT_ADD(LVar2, LVar8) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 15) + EVT_END_THREAD + EVT_SET(LVar1, 1) + EVT_EXEC(N(EVS_SetGateCameraZones)) + EVT_CALL(MakeLerp, 90, 360, 30, EASING_LINEAR) + EVT_LABEL(60) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, LVarA, LVar0, 0, 1, 0) + EVT_CALL(UpdateColliderTransform, LVar9) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(60) + EVT_END_IF + EVT_EXEC(N(EVS_ResetGates)) + EVT_SET(AB_MIM_1, 1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate_North) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar7, 0) + EVT_SET(LVar8, 70) + EVT_SET(LVar9, COLLIDER_monn) + EVT_SET(LVarA, MODEL_monn) + EVT_EXEC_WAIT(N(EVS_UseGate)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate_South) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar7, 0) + EVT_SET(LVar8, -70) + EVT_SET(LVar9, COLLIDER_mons) + EVT_SET(LVarA, MODEL_mons) + EVT_EXEC_WAIT(N(EVS_UseGate)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate_East) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar7, -70) + EVT_SET(LVar8, 0) + EVT_SET(LVar9, COLLIDER_mone) + EVT_SET(LVarA, MODEL_mone) + EVT_EXEC_WAIT(N(EVS_UseGate)) + EVT_IF_GE(GB_StoryProgress, STORY_CH3_GOT_SUPER_BOOTS) + EVT_IF_EQ(GF_MIM10_Defeated_JrTroopa, FALSE) + EVT_IF_EQ(GF_MIM10_JrTroopaFreakout, FALSE) + EVT_SET(GF_MIM10_JrTroopaFreakout, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH3_0017, 160, 40) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate_West) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar7, 70) + EVT_SET(LVar8, 0) + EVT_SET(LVar9, COLLIDER_monw) + EVT_SET(LVarA, MODEL_monw) + EVT_EXEC_WAIT(N(EVS_UseGate)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupGates) = { + EVT_IF_EQ(GF_MIM_ChoosingPath, FALSE) + EVT_SET(GF_MIM_ChoosingPath, TRUE) + EVT_SET(AB_MIM_1, 2) + EVT_SET(LVar1, 2) + EVT_SET(LVar2, -10) + EVT_ELSE + EVT_SET(GF_MIM_ChoosingPath, FALSE) + EVT_SET(AB_MIM_1, 0) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 10) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_SetGateCameraZones)) + EVT_EXEC(N(EVS_InitializeGates)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseGate_North)), TRIGGER_WALL_PRESS_A, COLLIDER_monn, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseGate_South)), TRIGGER_WALL_PRESS_A, COLLIDER_mons, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseGate_West)), TRIGGER_WALL_PRESS_A, COLLIDER_monw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseGate_East)), TRIGGER_WALL_PRESS_A, COLLIDER_mone, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_07/mim_07_6_npc.c b/src/world/area_mim/mim_07/mim_07_6_npc.c new file mode 100644 index 0000000000..d73dde146f --- /dev/null +++ b/src/world/area_mim/mim_07/mim_07_6_npc.c @@ -0,0 +1,270 @@ +#include "mim_07.h" + +#include "world/common/enemy/complete/ForestFuzzy.inc.c" + +NpcSettings N(NpcSettings_JrTroopa) = { + .height = 32, + .radius = 24, + .level = 99, +}; + +s32 N(D_80242944_BACA84)[] = { + 0, -350, +}; + +s32 N(D_8024294C_BACA8C)[] = { + 0, 350, +}; + +s32 N(D_80242954_BACA94)[] = { + 350, 0, +}; + +s32 N(D_8024295C_BACA9C)[] = { + -270, -245, -150, -310, +}; + +s32 N(D_8024296C_BACAAC)[] = { + 270, -245, 150, -310, +}; + +s32 N(D_8024297C_BACABC)[] = { + -270, 245, -150, 310, +}; + +s32 N(D_8024298C_BACACC)[] = { + 270, 245, 150, 310, +}; + +s32 N(D_8024299C_BACADC)[] = { + 245, -270, 310, -150, +}; + +s32 N(D_802429AC_BACAEC)[] = { + 245, 270, 310, 150, +}; + +EvtScript N(EVS_NpcIdle_JrTroopa) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(mim_07_ENTRY_0) + EVT_USE_BUF(EVT_PTR(N(D_80242944_BACA84))) + EVT_CASE_EQ(mim_07_ENTRY_1) + EVT_USE_BUF(EVT_PTR(N(D_80242944_BACA84))) + EVT_CASE_EQ(mim_07_ENTRY_2) + EVT_USE_BUF(EVT_PTR(N(D_8024294C_BACA8C))) + EVT_CASE_EQ(mim_07_ENTRY_3) + EVT_USE_BUF(EVT_PTR(N(D_80242954_BACA94))) + EVT_END_SWITCH + EVT_BUF_READ2(LVar1, LVar2) + EVT_CALL(AwaitPlayerApproach, LVar1, LVar2, 80) + EVT_LABEL(10) + EVT_WAIT(1) + EVT_CALL(AwaitPlayerLeave, LVar1, LVar2, 100) + EVT_CALL(IsPlayerWithin, 0, 0, 410, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(GetCurrentPartner, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_CALL(InterruptUsePartner) + EVT_WAIT(20) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_JrTroopaMusic)) + EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(mim_07_ENTRY_0) + EVT_IF_LT(LVar1, 0) + EVT_USE_BUF(EVT_PTR(N(D_8024295C_BACA9C))) + EVT_ELSE + EVT_USE_BUF(EVT_PTR(N(D_8024296C_BACAAC))) + EVT_END_IF + EVT_CASE_EQ(mim_07_ENTRY_2) + EVT_IF_LT(LVar1, 0) + EVT_USE_BUF(EVT_PTR(N(D_8024297C_BACABC))) + EVT_ELSE + EVT_USE_BUF(EVT_PTR(N(D_8024298C_BACACC))) + EVT_END_IF + EVT_CASE_EQ(mim_07_ENTRY_3) + EVT_IF_LT(LVar3, 0) + EVT_USE_BUF(EVT_PTR(N(D_8024299C_BACADC))) + EVT_ELSE + EVT_USE_BUF(EVT_PTR(N(D_802429AC_BACAEC))) + EVT_END_IF + EVT_END_SWITCH + EVT_BUF_READ4(LVar2, LVar3, LVar4, LVar5) + EVT_CALL(SetSelfVar, 0, LVar2) + EVT_CALL(SetSelfVar, 1, LVar3) + EVT_CALL(SetNpcPos, NPC_SELF, LVar2, 0, LVar3) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_Talk, ANIM_JrTroopa_Idle, 0, MSG_CH3_0018) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, LVar4) + EVT_ADD(LVar2, LVar5) + EVT_DIV(LVar0, 2) + EVT_DIV(LVar2, 2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(-6.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Run) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar4, LVar5, 30) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Idle) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_Talk, ANIM_JrTroopa_Idle, 0, MSG_CH3_0019) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(PARTNER_GOOMBARIO) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 5, MSG_CH3_001A) + EVT_CASE_EQ(PARTNER_KOOPER) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 5, MSG_CH3_001B) + EVT_CASE_EQ(PARTNER_BOMBETTE) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 5, MSG_CH3_001C) + EVT_CASE_EQ(PARTNER_PARAKARRY) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, MSG_CH3_001D) + EVT_CASE_EQ(PARTNER_BOW) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 5, MSG_CH3_001E) + EVT_END_SWITCH + EVT_CALL(EnablePartnerAI) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_Talk, ANIM_JrTroopa_Idle, 0, MSG_CH3_001F) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_ChargeArmsUp) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(StartBossBattle, SONG_JR_TROOPA_BATTLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_JrTroopa) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_Talk, ANIM_JrTroopa_Idle, 0, MSG_CH3_0022) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_CALL(GetSelfVar, 1, LVar1) + EVT_IF_GE(LVar1, 0) + EVT_CALL(InterpNpcYaw, NPC_SELF, 200, 0) + EVT_ELSE + EVT_CALL(InterpNpcYaw, NPC_SELF, 330, 0) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_ChargeArmsUp) + EVT_WAIT(10) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar1, 15) + EVT_SET(GF_MIM10_Defeated_JrTroopa, TRUE) + EVT_EXEC_WAIT(N(EVS_PlayForestMusic)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_JrTroopa) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH3_GOT_SUPER_BOOTS) + EVT_IF_EQ(GF_MIM10_Defeated_JrTroopa, FALSE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_JrTroopa))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_JrTroopa))) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Fuzzy) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH3_GOT_SUPER_BOOTS) + EVT_IF_EQ(GF_MIM10_Defeated_JrTroopa, FALSE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Fuzzy_01) = { + .id = NPC_Fuzzy_01, + .settings = &N(NpcSettings_ForestFuzzy), + .pos = { -240.0f, 0.0f, -240.0f }, + .yaw = 0, + .flags = 0, + .init = &N(EVS_NpcInit_Fuzzy), + .drops = FOREST_FUZZY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 400 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 400 }, + } + }, + .animations = FOREST_FUZZY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Fuzzy_02) = { + .id = NPC_Fuzzy_02, + .settings = &N(NpcSettings_ForestFuzzy), + .pos = { 270.0f, 0.0f, 200.0f }, + .yaw = 0, + .flags = 0, + .init = &N(EVS_NpcInit_Fuzzy), + .drops = FOREST_FUZZY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 400 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 400 }, + } + }, + .animations = FOREST_FUZZY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_JrTroopa) = { + .id = NPC_JrTroopa, + .settings = &N(NpcSettings_JrTroopa), + .pos = { -338.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_40000 | NPC_FLAG_200000 | NPC_FLAG_NO_DROPS, + .init = &N(EVS_NpcInit_JrTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_JrTroopa_Idle, + .walk = ANIM_JrTroopa_Walk, + .run = ANIM_JrTroopa_Walk, + .chase = ANIM_JrTroopa_Walk, + .anim_4 = ANIM_JrTroopa_Idle, + .anim_5 = ANIM_JrTroopa_Idle, + .death = ANIM_JrTroopa_Idle, + .hit = ANIM_JrTroopa_Idle, + .anim_8 = ANIM_JrTroopa_Idle, + .anim_9 = ANIM_JrTroopa_Idle, + .anim_A = ANIM_JrTroopa_Idle, + .anim_B = ANIM_JrTroopa_Idle, + .anim_C = ANIM_JrTroopa_Idle, + .anim_D = ANIM_JrTroopa_Idle, + .anim_E = ANIM_JrTroopa_Idle, + .anim_F = ANIM_JrTroopa_Idle, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Fuzzy_01), BTL_MIM_FORMATION_02, BTL_MIM_STAGE_00), + NPC_GROUP(N(NpcData_Fuzzy_02), BTL_MIM_FORMATION_06, BTL_MIM_STAGE_00), + NPC_GROUP(N(NpcData_JrTroopa), BTL_KMR_PART_3_FORMATION_04), + {} +}; diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c deleted file mode 100644 index 7e472e0d4a..0000000000 --- a/src/world/area_mim/mim_08/BAD940.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "mim_08.h" - -static char* N(exit_str_0) = "mim_01"; -static char* N(exit_str_1) = "mim_05"; - -#include "world/common/SetForeverForestFog.inc.c" - -ApiStatus func_80240068_BAD9A8(Evt* script, s32 isInitialCall) { - script->varTable[0] = get_xz_dist_to_player(0.0f, 0.0f); - return ApiStatus_DONE2; -} - -#include "world/common/enemy/FlyingAI.inc.c" - -#include "world/common/enemy/PiranhaPlantAI.inc.c" diff --git a/src/world/area_mim/mim_08/mim_08.h b/src/world/area_mim/mim_08/mim_08.h index 78e533a73c..76010ec81e 100644 --- a/src/world/area_mim/mim_08/mim_08.h +++ b/src/world/area_mim/mim_08/mim_08.h @@ -2,8 +2,32 @@ /// @brief Forever Forest - Laughing Rock #include "common.h" -#include "../mim.h" #include "message_ids.h" #include "map.h" +#include "../mim.h" +#include "mapfs/mim_08_shape.h" +#include "mapfs/mim_08_hit.h" + +#include "sprite/npc/Bzzap.h" +#include "sprite/npc/SmallPiranha.h" + +enum { + NPC_Bzzap = 0, + NPC_PiranhaPlant_01 = 1, + NPC_PiranhaPlant_01_Hitbox = 2, + NPC_PiranhaPlant_02 = 3, + NPC_PiranhaPlant_02_Hitbox = 4, +}; + +enum { + MV_Unk_00 = MapVar(0), +}; + #define NAMESPACE mim_08 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupGates); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_mim/mim_08/mim_08_0_header.c b/src/world/area_mim/mim_08/mim_08_0_header.c new file mode 100644 index 0000000000..a3a9bfc3de --- /dev/null +++ b/src/world/area_mim/mim_08/mim_08_0_header.c @@ -0,0 +1,16 @@ +#include "mim_08.h" + +EntryList N(Entrances) = { + [mim_08_ENTRY_0] { 0.0, 0.0, -530.0, 180.0 }, + [mim_08_ENTRY_1] { -530.0, 0.0, 0.0, 90.0 }, + [mim_08_ENTRY_2] { 0.0, 0.0, 530.0, 0.0 }, + [mim_08_ENTRY_3] { 530.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mim_08 }, +}; diff --git a/src/world/area_mim/mim_08/mim_08_1_music.c b/src/world/area_mim/mim_08/mim_08_1_music.c new file mode 100644 index 0000000000..17e8f5bdb5 --- /dev/null +++ b/src/world/area_mim/mim_08/mim_08_1_music.c @@ -0,0 +1,8 @@ +#include "mim_08.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_FOREVER_FOREST, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_SPOOKY) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_08/mim_08_2_main.c b/src/world/area_mim/mim_08/mim_08_2_main.c new file mode 100644 index 0000000000..ede5edc8cc --- /dev/null +++ b/src/world/area_mim/mim_08/mim_08_2_main.c @@ -0,0 +1,75 @@ +#include "mim_08.h" + +#include "world/common/SetForeverForestFog.inc.c" + +API_CALLABLE(N(GetPlayerDistFromMapCenter)) { + script->varTable[0] = get_xz_dist_to_player(0.0f, 0.0f); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ExitWalk_n) = EVT_EXIT_WALK(60, mim_08_ENTRY_0, "mim_01", mim_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_w) = EVT_EXIT_WALK(60, mim_08_ENTRY_1, "mim_05", mim_05_ENTRY_3); +EvtScript N(EVS_ExitWalk_s) = EVT_EXIT_WALK(60, mim_08_ENTRY_2, "mim_01", mim_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_e) = EVT_EXIT_WALK(60, mim_08_ENTRY_3, "mim_01", mim_01_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_n)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_w)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_s)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_e)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802431F0_BB0B30) = { + EVT_LOOP(6) + EVT_SET(LVar0, 2) + EVT_CALL(TranslateModel, MODEL_o507, LVar0, 0, LVar0) + EVT_CALL(TranslateModel, MODEL_o508, LVar0, 0, LVar0) + EVT_WAIT(1) + EVT_SET(LVar0, -2) + EVT_CALL(TranslateModel, MODEL_o507, LVar0, 0, LVar0) + EVT_CALL(TranslateModel, MODEL_o508, LVar0, 0, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_SET(LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o507, LVar0, 0, LVar0) + EVT_CALL(TranslateModel, MODEL_o508, LVar0, 0, LVar0) + EVT_WAIT(1) + EVT_SET(MV_Unk_00, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) + EVT_CALL(SetSpriteShading, SHADING_MIM_08) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SET(AB_MIM_2, GB_MIM_CurrentMapID) + EVT_CALL(GetMapID, GB_MIM_CurrentMapID) + EVT_EXEC_WAIT(N(EVS_SetupGates)) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_BIND_TRIGGER(EVT_PTR(N(D_802431F0_BB0B30)), TRIGGER_WALL_HAMMER, COLLIDER_o473, 1, 0) + EVT_CALL(N(SetForeverForestFog)) + EVT_THREAD + EVT_LABEL(0) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(N(GetPlayerDistFromMapCenter)) + EVT_IF_LT(LVar0, 350) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_ELSE + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_END_IF + EVT_GOTO(0) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_08/mim_08_3_entity.c b/src/world/area_mim/mim_08/mim_08_3_entity.c new file mode 100644 index 0000000000..24859688fe --- /dev/null +++ b/src/world/area_mim/mim_08/mim_08_3_entity.c @@ -0,0 +1,9 @@ +#include "mim_08.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_RedBlock), 0, 93, 0, 45, ITEM_HP_PLUS_A, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_MIM08_BadgeBlock_HPPlusA) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_08/mim_08_4_gate.c b/src/world/area_mim/mim_08/mim_08_4_gate.c new file mode 100644 index 0000000000..c5af353917 --- /dev/null +++ b/src/world/area_mim/mim_08/mim_08_4_gate.c @@ -0,0 +1,6 @@ +#include "mim_08.h" + +#include "../gates/support.inc.c" +#include "../gates/animate.inc.c" +#include "../gates/use.inc.c" +#include "../gates/setup.inc.c" diff --git a/src/world/area_mim/mim_08/mim_08_5_npc.c b/src/world/area_mim/mim_08/mim_08_5_npc.c new file mode 100644 index 0000000000..9744a19e4c --- /dev/null +++ b/src/world/area_mim/mim_08/mim_08_5_npc.c @@ -0,0 +1,108 @@ +#include "mim_08.h" + +#include "world/common/enemy/complete/Bzzap.inc.c" + +#include "world/common/enemy/complete/PiranhaPlant.inc.c" + +EvtScript N(EVS_NpcIdle_Bzzap) = { + EVT_LABEL(100) + EVT_WAIT(1) + EVT_IF_EQ(MV_Unk_00, 0) + EVT_GOTO(100) + EVT_END_IF + EVT_CALL(SetNpcPos, NPC_SELF, -280, 108, 0) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.0)) + EVT_CALL(NpcJump1, NPC_SELF, -280, 50, 10, 5) + EVT_WAIT(50) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Bzzap))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bzzap) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Bzzap))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Bzzap) = { + .id = NPC_Bzzap, + .settings = &N(NpcSettings_Bzzap), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_200000, + .init = &N(EVS_NpcInit_Bzzap), + .drops = BZZAP_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -300, 60, 0 }, + .wanderSize = { 60 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -300, 60, 0 }, + .detectSize = { 200 }, + } + }, + .animations = BZZAP_ANIMS, +}; + +StaticNpc N(NpcData_PiranhaPlant_01)[] = { + { + .id = NPC_PiranhaPlant_01, + .settings = &N(NpcSettings_PiranhaPlant), + .pos = { -240.0f, 0.0f, -240.0f }, + .yaw = 0, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = PIRANHA_PLANT_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 400 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 400 }, + } + }, + .animations = PIRANHA_PLANT_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, + }, + PIRANHA_PLANT_HITBOX(NPC_PiranhaPlant_01_Hitbox) +}; + +StaticNpc N(NpcData_PiranhaPlant_02)[] = { + { + .id = NPC_PiranhaPlant_02, + .settings = &N(NpcSettings_PiranhaPlant), + .pos = { 240.0f, 0.0f, 240.0f }, + .yaw = 0, + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = PIRANHA_PLANT_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 400 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 400 }, + } + }, + .animations = PIRANHA_PLANT_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, + }, + PIRANHA_PLANT_HITBOX(NPC_PiranhaPlant_02_Hitbox) +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Bzzap), BTL_MIM_FORMATION_10, BTL_MIM_STAGE_00), + NPC_GROUP(N(NpcData_PiranhaPlant_01), BTL_MIM_FORMATION_0F, BTL_MIM_STAGE_00), + NPC_GROUP(N(NpcData_PiranhaPlant_02), BTL_MIM_FORMATION_09, BTL_MIM_STAGE_00), + {} +}; diff --git a/src/world/area_mim/mim_09/BB2E00.c b/src/world/area_mim/mim_09/BB2E00.c deleted file mode 100644 index 3acd91f3b7..0000000000 --- a/src/world/area_mim/mim_09/BB2E00.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "mim_09.h" - -static char* N(exit_str_0) = "mim_01"; -static char* N(exit_str_1) = "mim_07"; - -#include "world/common/SetForeverForestFog.inc.c" - -INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_80240068_BB2E68); - -#include "world/common/enemy/HoppingAI.inc.c" diff --git a/src/world/area_mim/mim_09/mim_09.h b/src/world/area_mim/mim_09/mim_09.h index fb33abc4a1..098486ddfc 100644 --- a/src/world/area_mim/mim_09/mim_09.h +++ b/src/world/area_mim/mim_09/mim_09.h @@ -2,8 +2,28 @@ /// @brief Forever Forest - Flowers Appear (FP Plus) #include "common.h" -#include "../mim.h" #include "message_ids.h" #include "map.h" +#include "../mim.h" +#include "mapfs/mim_09_shape.h" +#include "mapfs/mim_09_hit.h" + +#include "sprite/npc/Fuzzy.h" + +enum { + NPC_Fuzzy = 0, +}; + +enum { + MV_FoundHint = MapVar(0), +}; + #define NAMESPACE mim_09 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupGates); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupExitHint); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_mim/mim_09/mim_09_0_header.c b/src/world/area_mim/mim_09/mim_09_0_header.c new file mode 100644 index 0000000000..6e3d98b4a0 --- /dev/null +++ b/src/world/area_mim/mim_09/mim_09_0_header.c @@ -0,0 +1,16 @@ +#include "mim_09.h" + +EntryList N(Entrances) = { + [mim_09_ENTRY_0] { 0.0, 0.0, -530.0, 180.0 }, + [mim_09_ENTRY_1] { -530.0, 0.0, 0.0, 90.0 }, + [mim_09_ENTRY_2] { 0.0, 0.0, 530.0, 0.0 }, + [mim_09_ENTRY_3] { 530.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mim_09 }, +}; diff --git a/src/world/area_mim/mim_09/mim_09_1_music.c b/src/world/area_mim/mim_09/mim_09_1_music.c new file mode 100644 index 0000000000..57dbb5688a --- /dev/null +++ b/src/world/area_mim/mim_09/mim_09_1_music.c @@ -0,0 +1,8 @@ +#include "mim_09.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_FOREVER_FOREST, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_SPOOKY) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_09/mim_09_2_main.c b/src/world/area_mim/mim_09/mim_09_2_main.c new file mode 100644 index 0000000000..c420261a06 --- /dev/null +++ b/src/world/area_mim/mim_09/mim_09_2_main.c @@ -0,0 +1,55 @@ +#include "mim_09.h" + +#include "world/common/SetForeverForestFog.inc.c" + +API_CALLABLE(N(GetPlayerDistFromMapCenter)) { + script->varTable[0] = get_xz_dist_to_player(0.0f, 0.0f); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ExitWalk_n) = EVT_EXIT_WALK(60, mim_09_ENTRY_0, "mim_01", mim_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_w) = EVT_EXIT_WALK(60, mim_09_ENTRY_1, "mim_01", mim_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_s) = EVT_EXIT_WALK(60, mim_09_ENTRY_2, "mim_07", mim_07_ENTRY_0); +EvtScript N(EVS_ExitWalk_e) = EVT_EXIT_WALK(60, mim_09_ENTRY_3, "mim_01", mim_01_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_n)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_w)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_s)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_e)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) + EVT_CALL(SetSpriteShading, SHADING_MIM_09) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SET(AB_MIM_2, GB_MIM_CurrentMapID) + EVT_CALL(GetMapID, GB_MIM_CurrentMapID) + EVT_EXEC_WAIT(N(EVS_SetupGates)) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_SetupExitHint)) + EVT_CALL(N(SetForeverForestFog)) + EVT_THREAD + EVT_LABEL(0) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(N(GetPlayerDistFromMapCenter)) + EVT_IF_LT(LVar0, 350) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_ELSE + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_END_IF + EVT_GOTO(0) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_09/mim_09_3_entity.c b/src/world/area_mim/mim_09/mim_09_3_entity.c new file mode 100644 index 0000000000..429fb29c28 --- /dev/null +++ b/src/world/area_mim/mim_09/mim_09_3_entity.c @@ -0,0 +1,9 @@ +#include "mim_09.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_RedBlock), 0, 92, 0, 45, ITEM_FP_PLUS_A, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_MIM09_BadgeBlock_FPPlusA) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_09/mim_09_4_hint.c b/src/world/area_mim/mim_09/mim_09_4_hint.c new file mode 100644 index 0000000000..e660b85942 --- /dev/null +++ b/src/world/area_mim/mim_09/mim_09_4_hint.c @@ -0,0 +1,95 @@ +#include "mim_09.h" + +EvtScript N(EVS_FlowersGentleRocking) = { + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x8000) + EVT_WAIT(2) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x10000) + EVT_WAIT(2) + EVT_CALL(PlaySoundAt, SOUND_205B, 0, -23, 0, 300) + EVT_CALL(MakeLerp, 0, 30, 50, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o464, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o465, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o466, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o467, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o468, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o469, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_205B, 0, -23, 0, 300) + EVT_CALL(MakeLerp, 30, -30, 50, EASING_COS_IN_OUT) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o464, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o465, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o466, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o467, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o468, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o469, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_205B, 0, -23, 0, 300) + EVT_CALL(MakeLerp, -30, 0, 50, EASING_COS_IN_OUT) + EVT_LABEL(30) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o464, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o465, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o466, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o467, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o468, LVar0, 0, 0, 1) + EVT_CALL(RotateModel, MODEL_o469, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(30) + EVT_END_IF + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, -0x8000) + EVT_WAIT(2) + EVT_CALL(SetTexPanOffset, TEX_PANNER_0, TEX_PANNER_MAIN, 0, 0) + EVT_WAIT(20) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InspectBush) = { + EVT_IF_EQ(MV_FoundHint, FALSE) + EVT_SET(MV_FoundHint, TRUE) + EVT_CALL(SetGroupEnabled, MODEL_hana, 1) + EVT_CALL(PlaySound, SOUND_205D) + EVT_CALL(MakeLerp, 10, 100, 30, EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_MULF(LVar0, EVT_FLOAT(0.01)) + EVT_CALL(ScaleModel, MODEL_o464, LVar0, LVar0, LVar0) + EVT_CALL(ScaleModel, MODEL_o465, LVar0, LVar0, LVar0) + EVT_CALL(ScaleModel, MODEL_o466, LVar0, LVar0, LVar0) + EVT_CALL(ScaleModel, MODEL_o467, LVar0, LVar0, LVar0) + EVT_CALL(ScaleModel, MODEL_o468, LVar0, LVar0, LVar0) + EVT_CALL(ScaleModel, MODEL_o469, LVar0, LVar0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_FlowersGentleRocking)) + EVT_ELSE + EVT_EXEC_WAIT(N(EVS_FlowersGentleRocking)) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupExitHint) = { + EVT_SET(MV_FoundHint, 0) + EVT_CALL(SetGroupEnabled, MODEL_hana, 0) + EVT_CALL(SetTexPanner, MODEL_o465, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o467, TEX_PANNER_0) + EVT_CALL(SetTexPanner, MODEL_o469, TEX_PANNER_0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_InspectBush)), TRIGGER_WALL_PRESS_A, COLLIDER_atari_kusa, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_09/mim_09_5_gate.c b/src/world/area_mim/mim_09/mim_09_5_gate.c new file mode 100644 index 0000000000..280edd3c01 --- /dev/null +++ b/src/world/area_mim/mim_09/mim_09_5_gate.c @@ -0,0 +1,6 @@ +#include "mim_09.h" + +#include "../gates/support.inc.c" +#include "../gates/animate.inc.c" +#include "../gates/use.inc.c" +#include "../gates/setup.inc.c" diff --git a/src/world/area_mim/mim_09/mim_09_6_npc.c b/src/world/area_mim/mim_09/mim_09_6_npc.c new file mode 100644 index 0000000000..ea36d8f580 --- /dev/null +++ b/src/world/area_mim/mim_09/mim_09_6_npc.c @@ -0,0 +1,37 @@ +#include "mim_09.h" + +NpcSettings N(NpcSettings_Unused1) = { + .height = 32, + .radius = 24, + .level = 99, +}; + +#include "world/common/enemy/complete/ForestFuzzy.inc.c" + +StaticNpc N(NpcData_Fuzzy) = { + .id = NPC_Fuzzy, + .settings = &N(NpcSettings_ForestFuzzy), + .pos = { 270.0f, 0.0f, 200.0f }, + .yaw = 0, + .flags = NPC_FLAG_LOCK_ANIMS, + .drops = FOREST_FUZZY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 270, 0, 200 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 400 }, + } + }, + .animations = FOREST_FUZZY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Fuzzy), BTL_MIM_FORMATION_05, BTL_MIM_STAGE_00), + {} +}; diff --git a/src/world/area_mim/mim_10/BB59E0.c b/src/world/area_mim/mim_10/BB59E0.c deleted file mode 100644 index 0f825af676..0000000000 --- a/src/world/area_mim/mim_10/BB59E0.c +++ /dev/null @@ -1,22 +0,0 @@ -#include "mim_10.h" - -static char* N(exit_str_0) = "mac_02"; -static char* N(exit_str_1) = "mim_01"; -static char* N(exit_str_2) = "kmr_22"; -static char* N(exit_str_3) = ""; - -ApiStatus func_80240000_BB59E0(Evt* script, s32 isInitialCall) { - if (gPlayerStatus.position.x < 100.0f) { - return ApiStatus_BLOCK; - } else { - return ApiStatus_DONE2; - } -} - -INCLUDE_ASM(s32, "world/area_mim/mim_10/BB59E0", func_80240030_BB5A10); - -INCLUDE_ASM(s32, "world/area_mim/mim_10/BB59E0", func_80240080_BB5A60); - -INCLUDE_ASM(s32, "world/area_mim/mim_10/BB59E0", func_802400EC_BB5ACC); - -INCLUDE_ASM(s32, "world/area_mim/mim_10/BB59E0", func_80240148_BB5B28); diff --git a/src/world/area_mim/mim_10/mim_10.h b/src/world/area_mim/mim_10/mim_10.h index a8dbd10b99..79acf00794 100644 --- a/src/world/area_mim/mim_10/mim_10.h +++ b/src/world/area_mim/mim_10/mim_10.h @@ -2,8 +2,29 @@ /// @brief Forever Forest - Exit to Toad Town #include "common.h" -#include "../mim.h" #include "message_ids.h" #include "map.h" +#include "../mim.h" +#include "mapfs/mim_10_shape.h" +#include "mapfs/mim_10_hit.h" + +#include "sprite/npc/Bootler.h" +#include "sprite/npc/JrTroopa.h" + +enum { + NPC_Bootler = 0, + NPC_JrTroopa = 1, +}; + +enum { + MV_Unk_00 = MapVar(0), +}; + #define NAMESPACE mim_10 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupBootlerTrigger); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_mim/mim_10/mim_10_0_header.c b/src/world/area_mim/mim_10/mim_10_0_header.c new file mode 100644 index 0000000000..145d79e901 --- /dev/null +++ b/src/world/area_mim/mim_10/mim_10_0_header.c @@ -0,0 +1,14 @@ +#include "mim_10.h" + +EntryList N(Entrances) = { + [mim_10_ENTRY_0] { -385.0, 20.0, 10.0, 90.0 }, + [mim_10_ENTRY_1] { 385.0, 0.0, 10.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mim_10 }, +}; diff --git a/src/world/area_mim/mim_10/mim_10_1_music.c b/src/world/area_mim/mim_10/mim_10_1_music.c new file mode 100644 index 0000000000..be7542002e --- /dev/null +++ b/src/world/area_mim/mim_10/mim_10_1_music.c @@ -0,0 +1,60 @@ +#include "mim_10.h" + +EvtScript N(EVS_SetToadTownMusic) = { + 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 +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH3_SAW_BOO_ENTER_FOREST) + EVT_EXEC(N(EVS_SetToadTownMusic)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_EXEC(N(EVS_SetToadTownMusic)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) + EVT_IF_LT(LVar1, 0) + EVT_EXEC(N(EVS_SetToadTownMusic)) + EVT_WAIT(30) + EVT_ELSE + EVT_CALL(SetMusicTrack, 0, SONG_FOREVER_FOREST, 0, 8) + EVT_WAIT(15) + EVT_CALL(ClearAmbientSounds, 250) + EVT_WAIT(15) + EVT_GOTO(20) + EVT_END_IF + EVT_LABEL(10) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) + EVT_IF_GE(LVar1, 100) + EVT_CALL(FadeOutMusic, 0, 1000) + EVT_WAIT(15) + EVT_WAIT(15) + EVT_CALL(SetMusicTrack, 0, SONG_FOREVER_FOREST, 0, 8) + EVT_WAIT(30) + EVT_GOTO(20) + EVT_END_IF + EVT_GOTO(10) + EVT_LABEL(20) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) + EVT_IF_LT(LVar1, 0) + EVT_CALL(FadeOutMusic, 0, 1000) + EVT_WAIT(30) + EVT_EXEC(N(EVS_SetToadTownMusic)) + EVT_WAIT(30) + EVT_GOTO(10) + EVT_END_IF + EVT_GOTO(20) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_10/mim_10_2_entity.c b/src/world/area_mim/mim_10/mim_10_2_entity.c new file mode 100644 index 0000000000..54933478d4 --- /dev/null +++ b/src/world/area_mim/mim_10/mim_10_2_entity.c @@ -0,0 +1,8 @@ +#include "mim_10.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), -175, 60, -50, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_10/mim_10_3_main.c b/src/world/area_mim/mim_10/mim_10_3_main.c new file mode 100644 index 0000000000..c0f3487334 --- /dev/null +++ b/src/world/area_mim/mim_10/mim_10_3_main.c @@ -0,0 +1,57 @@ +#include "mim_10.h" + +EvtScript N(EVS_ExitWalk_mac_02_1) = EVT_EXIT_WALK(60, mim_10_ENTRY_0, "mac_02", mac_02_ENTRY_1); + +EvtScript N(EVS_ExitWalk_mim_01_1) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, mim_10_ENTRY_1) + EVT_EXEC(ExitWalk) + EVT_IF_EQ(GB_StoryProgress, STORY_CH3_INVITED_TO_BOOS_MANSION) + EVT_IF_EQ(GF_StartedChapter3, FALSE) + EVT_SET(GF_StartedChapter3, TRUE) + EVT_CALL(FadeOutMusic, 0, 1500) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_22"), kmr_22_ENTRY_3, TRANSITION_6) + EVT_WAIT(100) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(GotoMap, EVT_PTR("mim_01"), mim_01_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_mac_02_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_mim_01_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_EXEC(EnterSavePoint) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END_IF + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC(N(EVS_SetupBootlerTrigger)) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_SET(GF_MAC01_RowfBadgesChosen, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_10/mim_10_4_npc.c b/src/world/area_mim/mim_10/mim_10_4_npc.c new file mode 100644 index 0000000000..4be8c210c8 --- /dev/null +++ b/src/world/area_mim/mim_10/mim_10_4_npc.c @@ -0,0 +1,317 @@ +#include "mim_10.h" + +API_CALLABLE(N(AwaitPlayerApproachForest)) { + if (gPlayerStatus.position.x < 100.0f) { + return ApiStatus_BLOCK; + } else { + return ApiStatus_DONE2; + } +} + +API_CALLABLE(N(InitializeLightingBright)) { + enable_world_fog(); + set_world_fog_color(16, 16, 16, 255); + gCameras[CAM_DEFAULT].bgColor[0] = 20; + gCameras[CAM_DEFAULT].bgColor[1] = 20; + gCameras[CAM_DEFAULT].bgColor[2] = 28; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(InitializeLightingGloomy)) { + enable_world_fog(); + set_world_fog_dist(990, 1000); + set_world_fog_color(16, 16, 16, 255); + gCameras[CAM_DEFAULT].bgColor[0] = 20; + gCameras[CAM_DEFAULT].bgColor[1] = 20; + gCameras[CAM_DEFAULT].bgColor[2] = 28; + gGameStatusPtr->backgroundDarkness = 240; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(ReduceFogEndDist)) { + s32 retVal = ApiStatus_BLOCK; + + if (isInitialCall) { + script->functionTemp[1] = 1060; + } + + script->functionTemp[1]--; + if (script->functionTemp[1] <= 1000) { + script->functionTemp[1] = 1000; + retVal = ApiStatus_DONE2; + } + + set_world_fog_dist(990, script->functionTemp[1]); + return retVal; +} + +API_CALLABLE(N(DarkenBackground)) { + s32 retVal = ApiStatus_BLOCK; + + if (isInitialCall) { + script->functionTemp[1] = 0; + } + + script->functionTemp[1] += 4; + if (script->functionTemp[1] >= 240) { + script->functionTemp[1] = 240; + retVal = ApiStatus_DONE2; + } + gGameStatusPtr->backgroundDarkness = script->functionTemp[1]; + return retVal; +} + +NpcSettings N(NpcSettings_Bootler) = { + .height = 24, + .radius = 24, + .level = 99, +}; + +NpcSettings N(NpcSettings_JrTroopa) = { + .height = 32, + .radius = 24, + .level = 99, +}; + +EvtScript N(EVS_Bootler_SpookPlayer) = { + EVT_CHILD_THREAD + EVT_CALL(GetPlayerPos, LVarA, LVarB, LVarC) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVarA, LVarB, LVarC) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_LOOP(0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 450) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_WAIT(5) + EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Spook, ANIM_Bootler_Spook, 0, MSG_CH3_0002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_BootlersInvitation) = { + EVT_CALL(N(AwaitPlayerApproachForest)) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 650) + EVT_CALL(N(InitializeLightingBright)) + EVT_THREAD + EVT_CALL(N(ReduceFogEndDist)) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(N(DarkenBackground)) + EVT_END_THREAD + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcPos, NPC_Bootler, 200, 44, 0) + EVT_CALL(func_802CFD30, 0, 7, 0, 0, 0, 0) + EVT_SET(MV_Unk_00, TRUE) + EVT_CALL(SetMusicTrack, 0, SONG_BOOS_MANSION, 0, 8) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80022) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_WAIT(20) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_WAIT(20) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH, 0) + EVT_SETF(LVar0, EVT_FLOAT(0.0)) + EVT_LOOP(20) + EVT_ADDF(LVar0, EVT_FLOAT(12.0)) + EVT_CALL(func_802CFD30, 0, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(20) + EVT_CALL(GetNpcPos, NPC_Bootler, LVarA, LVarB, LVarC) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVarA, LVarB, LVarC) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVarA, LVarB, LVarC) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 270) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_0000) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, TRUE) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_0001) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR, 0) + EVT_SETF(LVar0, EVT_FLOAT(240.0)) + EVT_LOOP(20) + EVT_SUBF(LVar0, EVT_FLOAT(12.0)) + EVT_CALL(func_802CFD30, 0, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(25) + EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Spook) + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Bootler, LVarA, LVarB, LVarC) + EVT_SUB(LVarB, 40) + EVT_CALL(SetNpcPos, NPC_Bootler, LVarA, LVarB, LVarC) + EVT_CALL(SetNpcScale, NPC_Bootler, EVT_FLOAT(3.0), EVT_FLOAT(3.0), EVT_FLOAT(3.0)) + EVT_SETF(LVar0, EVT_FLOAT(0.0)) + EVT_LOOP(20) + EVT_ADDF(LVar0, EVT_FLOAT(12.0)) + EVT_CALL(func_802CFD30, 0, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_292, 0) + EVT_EXEC_WAIT(N(EVS_Bootler_SpookPlayer)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 450) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_SETF(LVar0, EVT_FLOAT(240.0)) + EVT_LOOP(20) + EVT_SUBF(LVar0, EVT_FLOAT(12.0)) + EVT_CALL(func_802CFD30, 0, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_SET(GB_StoryProgress, STORY_CH3_INVITED_TO_BOOS_MANSION) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(SetNpcPos, NPC_Bootler, 0, -1000, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupBootlerTrigger) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH3_SAW_BOO_ENTER_FOREST) + EVT_RETURN + EVT_CASE_LT(STORY_CH3_INVITED_TO_BOOS_MANSION) + EVT_EXEC(N(EVS_Scene_BootlersInvitation)) + EVT_CASE_RANGE(STORY_CH3_INVITED_TO_BOOS_MANSION, STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bootler) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH3_SAW_BOO_ENTER_FOREST) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_CASE_LT(STORY_CH3_INVITED_TO_BOOS_MANSION) + EVT_SET(GF_KMR20_ReunitedWithLuigi, TRUE) + EVT_CASE_GE(STORY_CH3_INVITED_TO_BOOS_MANSION) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_JrTroopa) = { + EVT_CALL(WaitForPlayerInputEnabled) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(MV_Unk_00, TRUE) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(3.0), LVar0, LVar1, LVar2, 300, 15, -7) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_Talk, ANIM_JrTroopa_Idle, 5, MSG_CH3_0023) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_ChargeArmsUp) + EVT_SUB(LVar0, 200) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, LVar2, 25) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_SET(GF_MIM10_JrTroopaEscaped, TRUE) + EVT_SET(MV_Unk_00, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_JrTroopa) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_JrTroopa))) + EVT_IF_EQ(GF_MIM10_JrTroopaEscaped, TRUE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GF_MIM10_Defeated_JrTroopa, FALSE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Bootler) = { + .id = NPC_Bootler, + .settings = &N(NpcSettings_Bootler), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_Bootler), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Bootler_Idle, + .walk = ANIM_Bootler_Walk, + .run = ANIM_Bootler_Run, + .chase = ANIM_Bootler_Run, + .anim_4 = ANIM_Bootler_Idle, + .anim_5 = ANIM_Bootler_Idle, + .death = ANIM_Bootler_Still, + .hit = ANIM_Bootler_Still, + .anim_8 = ANIM_Bootler_Shock, + .anim_9 = ANIM_Bootler_Panic, + .anim_A = ANIM_Bootler_Dejected, + .anim_B = ANIM_Bootler_Quaver, + .anim_C = ANIM_Bootler_Shock, + .anim_D = ANIM_Bootler_Panic, + .anim_E = ANIM_Bootler_Dejected, + .anim_F = ANIM_Bootler_Quaver, + }, +}; + +StaticNpc N(NpcData_JrTroopa) = { + .id = NPC_JrTroopa, + .settings = &N(NpcSettings_JrTroopa), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .flags = NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000, + .init = &N(EVS_NpcInit_JrTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_JrTroopa_Idle, + .walk = ANIM_JrTroopa_Walk, + .run = ANIM_JrTroopa_Walk, + .chase = ANIM_JrTroopa_Walk, + .anim_4 = ANIM_JrTroopa_Idle, + .anim_5 = ANIM_JrTroopa_Idle, + .death = ANIM_JrTroopa_Idle, + .hit = ANIM_JrTroopa_Idle, + .anim_8 = ANIM_JrTroopa_Idle, + .anim_9 = ANIM_JrTroopa_Idle, + .anim_A = ANIM_JrTroopa_Idle, + .anim_B = ANIM_JrTroopa_Idle, + .anim_C = ANIM_JrTroopa_Idle, + .anim_D = ANIM_JrTroopa_Idle, + .anim_E = ANIM_JrTroopa_Idle, + .anim_F = ANIM_JrTroopa_Idle, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Bootler)), + NPC_GROUP(N(NpcData_JrTroopa)), + {} +}; diff --git a/src/world/area_mim/mim_11/BB7070.c b/src/world/area_mim/mim_11/BB7070.c deleted file mode 100644 index 4bfbbf2f80..0000000000 --- a/src/world/area_mim/mim_11/BB7070.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "mim_11.h" - -static char* N(exit_str_0) = "osr_03"; -static char* N(exit_str_1) = "mim_07"; -static char* N(exit_str_2) = "mim_12"; -static char* N(exit_str_3) = "obk_01"; -static char* N(exit_str_4) = "tik_09"; -static char* N(exit_str_5) = ""; - -#include "world/common/atomic/Pipe.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_802405EC_BB765C); - -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_8024066C_BB76DC); - -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240790_BB7800); diff --git a/src/world/area_mim/mim_11/BB7940.c b/src/world/area_mim/mim_11/BB7940.c deleted file mode 100644 index 84238e6b27..0000000000 --- a/src/world/area_mim/mim_11/BB7940.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "mim_11.h" - -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7940", func_802408D0_BB7940); - -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7940", func_802408F0_BB7960); diff --git a/src/world/area_mim/mim_11/BB79F0.c b/src/world/area_mim/mim_11/BB79F0.c deleted file mode 100644 index f908128613..0000000000 --- a/src/world/area_mim/mim_11/BB79F0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "mim_11.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_mim/mim_11/mim_11.h b/src/world/area_mim/mim_11/mim_11.h index 83cc9a619d..7790935539 100644 --- a/src/world/area_mim/mim_11/mim_11.h +++ b/src/world/area_mim/mim_11/mim_11.h @@ -2,8 +2,35 @@ /// @brief Forever Forest - Outside Boo's Mansion #include "common.h" -#include "../mim.h" #include "message_ids.h" #include "map.h" +#include "../mim.h" +#include "mapfs/mim_11_shape.h" +#include "mapfs/mim_11_hit.h" + +#include "sprite/npc/WorldGoombario.h" +#include "sprite/npc/WorldKooper.h" +#include "sprite/npc/WorldBombette.h" +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/Bootler.h" +#include "sprite/npc/WorldSkolar.h" + +enum { + NPC_Bootler = 0, + NPC_Skolar = 2, +}; + +enum { + MF_Unk_0A = MapFlag(10), +}; + #define NAMESPACE mim_11 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(D_802430E0_BBA150); +extern EvtScript N(EVS_SetupFoliage); +extern EvtScript N(EVS_SetupMusic); + +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_mim/mim_11/mim_11_0_header.c b/src/world/area_mim/mim_11/mim_11_0_header.c new file mode 100644 index 0000000000..4285ad7150 --- /dev/null +++ b/src/world/area_mim/mim_11/mim_11_0_header.c @@ -0,0 +1,18 @@ +#include "mim_11.h" + +EntryList N(Entrances) = { + [mim_11_ENTRY_0] { -635.0, 0.0, 5.0, 90.0 }, + [mim_11_ENTRY_1] { 635.0, 0.0, 5.0, 270.0 }, + [mim_11_ENTRY_2] { 117.0, 37.0, -201.0, 227.0 }, + [mim_11_ENTRY_3] { -270.0, 35.0, -225.0, 180.0 }, + [mim_11_ENTRY_4] { -65.0, 0.0, -22.0, 315.0 }, + [mim_11_ENTRY_5] { -56.0, 0.0, -25.0, 227.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mim_11 }, +}; diff --git a/src/world/area_mim/mim_11/mim_11_1_music.c b/src/world/area_mim/mim_11/mim_11_1_music.c new file mode 100644 index 0000000000..353b694e76 --- /dev/null +++ b/src/world/area_mim/mim_11/mim_11_1_music.c @@ -0,0 +1,13 @@ +#include "mim_11.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH3_ARRIVED_AT_BOOS_MANSION) + EVT_CALL(SetMusicTrack, 0, SONG_BOOS_MANSION, 1, 8) + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_FOREVER_FOREST, 0, 8) + EVT_END_SWITCH + EVT_CALL(PlayAmbientSounds, AMBIENT_SPOOKY) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_11/mim_11_2_main.c b/src/world/area_mim/mim_11/mim_11_2_main.c new file mode 100644 index 0000000000..dbd6165189 --- /dev/null +++ b/src/world/area_mim/mim_11/mim_11_2_main.c @@ -0,0 +1,258 @@ +#include "mim_11.h" + +#include "world/common/atomic/Pipe.inc.c" +#include "world/common/atomic/Pipe.data.inc.c" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +API_CALLABLE(N(func_802405EC_BB765C)) { + enable_world_fog(); + set_world_fog_dist(960, 1000); + set_world_fog_color(32, 30, 28, 255); + + enable_entity_fog(); + set_entity_fog_dist(990, 1000); + set_entity_fog_color(0, 0, 0, 255); + + gCameras[CAM_DEFAULT].bgColor[0] = 24; + gCameras[CAM_DEFAULT].bgColor[1] = 24; + gCameras[CAM_DEFAULT].bgColor[2] = 24; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_8024066C_BB76DC)) { + Camera* cam = &gCameras[gCurrentCameraID]; + s32 retVal = ApiStatus_BLOCK; + + if (isInitialCall) { + script->functionTemp[1] = 0; + script->functionTemp[2] = 0; + script->functionTemp[3] = 100; + } + + switch (script->functionTemp[1]) { + case 0: + script->functionTemp[2] = script->functionTemp[2] + script->functionTemp[3]; + if (script->functionTemp[2] >= 16000) { + script->functionTemp[1] = 1; + } + break; + case 1: + script->functionTemp[2] += script->functionTemp[3]; + script->functionTemp[3] -= 2; + if (script->functionTemp[2] >= 18000) { + retVal = ApiStatus_DONE2; + } + break; + } + cam->controlSettings.boomPitch = (script->functionTemp[2] * 0.0010500001f) + 40.0f; + cam->controlSettings.viewPitch = (script->functionTemp[2] * 0.0025833333f) + -63.6f; + return retVal; +} + +API_CALLABLE(N(func_80240790_BB7800)) { + Camera* cam = &gCameras[CAM_DEFAULT]; + f32 angle1, angle2, moveAngle; + + if (isInitialCall) { + script->functionTemp[1] = 0; + } + + angle1 = atan2(89.0f, 84.0f, 75.0f, 309.0f); + angle2 = atan2(89.0f, 84.0f, 245.0f, 85.0f); + moveAngle = (((angle2 - angle1) / 40.0f) * script->functionTemp[1]) + angle1; + cam->movePos.x = (s32) (sin_deg(moveAngle) * 100.0f) + 89; + cam->movePos.z = (s32)(-cos_deg(moveAngle) * 100.0f) + 84; + cam->panActive = TRUE; + + script->functionTemp[1]++; + if (script->functionTemp[1] < 41) { + return ApiStatus_BLOCK; + } else { + return ApiStatus_DONE2; + } +} + +EvtScript N(EVS_Scene_ReachedMansion) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerPos, -800, 0, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, -800, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetCamType, CAM_DEFAULT, 1, TRUE) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(40.0), EVT_FLOAT(-63.59375)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 720) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 89, 84) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 89, 84) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 75, 0, 309) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(N(func_8024066C_BB76DC)) + EVT_WAIT(30) + EVT_CHILD_THREAD + EVT_CALL(N(func_80240790_BB7800)) + EVT_WAIT(90) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_LOOP(0) + 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, -350) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_WAIT(50) + EVT_CALL(SetPlayerPos, -701, 0, -34) + EVT_CALL(SetNpcPos, NPC_PARTNER, -701, 0, -34) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(SetPlayerFlagBits, PS_FLAGS_200000, TRUE) + EVT_CALL(PlayerMoveTo, -407, 103, 120) + EVT_CALL(SetPlayerFlagBits, PS_FLAGS_200000, FALSE) + EVT_WAIT(10) + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) + EVT_END_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(PARTNER_GOOMBARIO) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 5, MSG_CH3_0024) + EVT_CASE_EQ(PARTNER_KOOPER) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 5, MSG_CH3_0025) + EVT_CASE_EQ(PARTNER_BOMBETTE) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 5, MSG_CH3_0026) + EVT_CASE_EQ(PARTNER_PARAKARRY) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, MSG_CH3_0027) + EVT_END_SWITCH + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +// interesting broken, unused snippet for starting next peach sequence +EvtScript N(EVS_ExitWarp_osr_03_4) = { + EVT_CALL(FadeOutMusic, 0, 1500) + EVT_CALL(GotoMapSpecial, EVT_PTR("osr_03"), osr_03_ENTRY_4, 0xB) + EVT_WAIT(100) +}; + +EvtScript N(EVS_ExitWalk_mim_07_3) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, mim_11_ENTRY_0) + EVT_EXEC(ExitWalk) + EVT_SET(GF_MIM_ChoosingPath, FALSE) + EVT_CALL(GotoMap, EVT_PTR("mim_07"), mim_07_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_mim_12_0) = EVT_EXIT_WALK(60, mim_11_ENTRY_1, "mim_12", mim_12_ENTRY_0); + +EvtScript N(EVS_ExitWalk_obk_01_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_CREAKY) + EVT_SET(LVar0, mim_11_ENTRY_2) + EVT_SET(LVar1, COLLIDER_ttd) + EVT_SET(LVar2, MODEL_doa) + EVT_SET(LVar3, MODEL_o166) + EVT_EXEC(ExitDoubleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("obk_01"), obk_01_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_mim_07_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_mim_12_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_obk_01_0)), TRIGGER_WALL_PRESS_A, COLLIDER_ttd, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_SET(AF_MIM_01, TRUE) + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_EXEC(EnterSavePoint) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(mim_11_ENTRY_0) + EVT_SET(AF_MIM_01, FALSE) + EVT_IF_LT(GB_StoryProgress, STORY_CH3_ARRIVED_AT_BOOS_MANSION) + EVT_SET(GB_StoryProgress, STORY_CH3_ARRIVED_AT_BOOS_MANSION) + EVT_EXEC_WAIT(N(EVS_Scene_ReachedMansion)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_ELSE + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_IF + EVT_CASE_EQ(mim_11_ENTRY_1) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(mim_11_ENTRY_2) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_CREAKY) + EVT_SET(LVar2, MODEL_doa) + EVT_SET(LVar3, MODEL_o166) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(mim_11_ENTRY_3) + EVT_IF_EQ(GF_MIM11_WarpPipe, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerPos, LVar0, NPC_DISPOSE_POS_Y, LVar2) + EVT_WAIT(30) + EVT_CALL(PlaySound, SOUND_208E) + EVT_SET(GF_MIM11_WarpPipe, TRUE) + EVT_WAIT(30) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_SET(LVarA, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC_WAIT(N(EVS_Pipe_EnterVertical)) + EVT_CASE_EQ(mim_11_ENTRY_4) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(mim_11_ENTRY_5) + EVT_CALL(InterpPlayerYaw, 227, 0) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOOS_MANSION) + EVT_SET(GF_MAP_BoosMansion, TRUE) + EVT_CALL(SetSpriteShading, SHADING_MIM_11) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(EnableGroup, MODEL_g62, FALSE) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(D_802430E0_BBA150)) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_CALL(N(func_802405EC_BB765C)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_11/mim_11_3_gate.c b/src/world/area_mim/mim_11/mim_11_3_gate.c new file mode 100644 index 0000000000..3fc1044ba6 --- /dev/null +++ b/src/world/area_mim/mim_11/mim_11_3_gate.c @@ -0,0 +1,186 @@ +#include "mim_11.h" + +EvtScript N(D_80242560_BB95D0) = { + EVT_WAIT(30) + EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_OPEN, 0) + EVT_CALL(MakeLerp, 0, 80, 30, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_h_mon1, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_h_mon2, LVar0, 0, -1, 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_mon, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.0)) + EVT_CALL(PlayerMoveTo, -101, 17, 0) + EVT_WAIT(30) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_mon, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(MakeLerp, 80, 0, 8, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_h_mon1, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_h_mon2, 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_mon, SOUND_METAL_GATE_CLOSE, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(1.5)) + EVT_WAIT(20) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetCamType, CAM_DEFAULT, 0, TRUE) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(19.5), EVT_FLOAT(-14.9)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -133, 52) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 23, -109) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 23, 0, -109) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetMusicTrack, 0, SONG_BOOS_MANSION, 0, 8) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_VANISH, 0) + EVT_SETF(LVar0, EVT_FLOAT(0.0)) + EVT_LOOP(90) + EVT_ADDF(LVar0, EVT_FLOAT(2.6669922)) + EVT_CALL(func_802CFD30, 0, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_0028) + EVT_CALL(SetMusicTrack, 0, SONG_BOOS_MANSION, 1, 8) + EVT_WAIT(10) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(0.0), EVT_FLOAT(-25.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 550) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH3_0029, 160, 40) + EVT_WAIT(30) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(19.5), EVT_FLOAT(-14.9)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Talk, ANIM_Bootler_Idle, 0, MSG_CH3_002A) + EVT_CALL(PlaySoundAtNpc, NPC_Bootler, SOUND_BOO_APPEAR, 0) + EVT_SETF(LVar0, EVT_FLOAT(240.0)) + EVT_LOOP(90) + EVT_SUBF(LVar0, EVT_FLOAT(2.6669922)) + EVT_CALL(func_802CFD30, 0, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(RemoveNpc, NPC_Bootler) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + 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(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80242B90_BB9C00) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_OPEN, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_mon, COLLIDER_FLAGS_UPPER_MASK) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 80, 30, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_h_mon1, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_h_mon2, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(20) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 80) + EVT_SUB(LVar2, 80) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 30) + EVT_WAIT(10) + EVT_CALL(MakeLerp, 80, 0, 30, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_h_mon1, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_h_mon2, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_mon, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80242DC8_BB9E38) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_OPEN, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_mon, COLLIDER_FLAGS_UPPER_MASK) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 80, 30, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_h_mon1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_h_mon2, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(20) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -80) + EVT_SUB(LVar2, -80) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 20) + EVT_CALL(MakeLerp, 80, 0, 30, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_h_mon1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_h_mon2, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_mon, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAtCollider, COLLIDER_mon, SOUND_METAL_GATE_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80242FF4_BBA064) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(InterruptUsePartner) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH3_OPENED_BOOS_MANSION_GATE) + EVT_SET(GB_StoryProgress, STORY_CH3_OPENED_BOOS_MANSION_GATE) + EVT_SET(AF_MIM_01, TRUE) + EVT_EXEC_WAIT(N(D_80242560_BB95D0)) + EVT_CASE_GE(STORY_CH3_OPENED_BOOS_MANSION_GATE) + EVT_IF_EQ(AF_MIM_01, FALSE) + EVT_EXEC_WAIT(N(D_80242B90_BB9C00)) + EVT_SET(AF_MIM_01, TRUE) + EVT_ELSE + EVT_EXEC_WAIT(N(D_80242DC8_BB9E38)) + EVT_SET(AF_MIM_01, FALSE) + EVT_END_IF + EVT_END_SWITCH + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802430E0_BBA150) = { + EVT_BIND_TRIGGER(EVT_PTR(N(D_80242FF4_BBA064)), TRIGGER_WALL_PRESS_A, COLLIDER_mon, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_11/mim_11_4_entity.c b/src/world/area_mim/mim_11/mim_11_4_entity.c new file mode 100644 index 0000000000..111b4375b7 --- /dev/null +++ b/src/world/area_mim/mim_11/mim_11_4_entity.c @@ -0,0 +1,27 @@ +#include "mim_11.h" +#include "entity.h" + +EvtScript N(EVS_UseBluePipe) = { + EVT_CALL(GotoMap, EVT_PTR("tik_09"), tik_09_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_MIM11_WarpPipe, FALSE) + EVT_IF_EQ(GF_TIK09_WarpPipe, TRUE) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, mim_11_ENTRY_3) + EVT_SET(GF_KMR02_WarpPipe, TRUE) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueWarpPipe), -275, 0, -225, 270, mim_11_ENTRY_3, EVT_PTR(N(EVS_UseBluePipe)), EVT_INDEX_OF_GAME_FLAG(GF_MIM11_WarpPipe), MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), 0, 60, -300, 45, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 220, 60, -80, 45, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -282, 60, 522, 0, ITEM_VOLT_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_MIM11_ItemBlock_VoltShroom) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_11/mim_11_5_npc.c b/src/world/area_mim/mim_11/mim_11_5_npc.c new file mode 100644 index 0000000000..39c23035e5 --- /dev/null +++ b/src/world/area_mim/mim_11/mim_11_5_npc.c @@ -0,0 +1,145 @@ +#include "mim_11.h" + +void increment_max_SP(void); + +NpcSettings N(NpcSettings_Bootler) = { + .height = 24, + .radius = 24, + .level = 99, +}; + +NpcSettings N(NpcSettings_Skolar) = { + .height = 26, + .radius = 24, + .level = 99, +}; + +NpcSettings N(NpcSettings_Unused1) = { + .height = 20, + .radius = 20, + .level = 99, +}; + +NpcSettings N(NpcSettings_Unused2) = { + .height = 22, + .radius = 24, + .level = 99, +}; + +API_CALLABLE(N(IncreaseMaxSP)) { + increment_max_SP(); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(AnimateStarSpiritBobbing)) { + Npc* npc; + + if (isInitialCall) { + script->functionTemp[1] = 0; + script->functionTempPtr[2] = get_npc_safe(script->owner2.npcID); + } + + npc = script->functionTempPtr[2]; + npc->verticalRenderOffset = sin_deg(script->functionTempF[1]) * 6.0f; + script->functionTempF[1] = clamp_angle(script->functionTempF[1] + 18.0f); + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_NpcAux_Skolar) = { + EVT_CALL(N(AnimateStarSpiritBobbing)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Skolar) = { + EVT_CALL(BindNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_Skolar))) + EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, -100) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_IF_NE(GB_StoryProgress, STORY_CH3_DEFEATED_TUBBA_BLUBBA) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bootler) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH3_OPENED_BOOS_MANSION_GATE) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(func_802CFD30, -1, 7, 0, 0, 0, 0) + EVT_CASE_DEFAULT + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Bootler)[] = { + { + .id = NPC_Bootler, + .settings = &N(NpcSettings_Bootler), + .pos = { 68.0f, 60.0f, -145.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_Bootler), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Bootler_Idle, + .walk = ANIM_Bootler_Walk, + .run = ANIM_Bootler_Run, + .chase = ANIM_Bootler_Run, + .anim_4 = ANIM_Bootler_Idle, + .anim_5 = ANIM_Bootler_Idle, + .death = ANIM_Bootler_Still, + .hit = ANIM_Bootler_Still, + .anim_8 = ANIM_Bootler_Shock, + .anim_9 = ANIM_Bootler_Panic, + .anim_A = ANIM_Bootler_Dejected, + .anim_B = ANIM_Bootler_Quaver, + .anim_C = ANIM_Bootler_Shock, + .anim_D = ANIM_Bootler_Panic, + .anim_E = ANIM_Bootler_Dejected, + .anim_F = ANIM_Bootler_Quaver, + }, + }, + { + .id = NPC_Skolar, + .settings = &N(NpcSettings_Skolar), + .pos = { 68.0f, 60.0f, -145.0f }, + .yaw = 135, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_Skolar), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_WorldSkolar_Idle, + .walk = ANIM_WorldSkolar_Idle, + .run = ANIM_WorldSkolar_Idle, + .chase = ANIM_WorldSkolar_Idle, + .anim_4 = ANIM_WorldSkolar_Idle, + .anim_5 = ANIM_WorldSkolar_Idle, + .death = ANIM_WorldSkolar_Idle, + .hit = ANIM_WorldSkolar_Idle, + .anim_8 = ANIM_WorldSkolar_Still, + .anim_9 = ANIM_WorldSkolar_Idle, + .anim_A = ANIM_WorldSkolar_Idle, + .anim_B = ANIM_WorldSkolar_Idle, + .anim_C = ANIM_WorldSkolar_Idle, + .anim_D = ANIM_WorldSkolar_Idle, + .anim_E = ANIM_WorldSkolar_Idle, + .anim_F = ANIM_WorldSkolar_Idle, + }, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Bootler)), + {} +}; diff --git a/src/world/area_mim/mim_11/mim_11_6_foliage.c b/src/world/area_mim/mim_11/mim_11_6_foliage.c new file mode 100644 index 0000000000..752d79fe66 --- /dev/null +++ b/src/world/area_mim/mim_11/mim_11_6_foliage.c @@ -0,0 +1,73 @@ +#include "mim_11.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Bush1_BushModels) = { + .count = 1, + .models = { + MODEL_o182, + } +}; + +FoliageDropList N(Bush1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_STRANGE_LEAF, + .pos = { 357, 16, 315 }, + .spawnMode = ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, + .spawnFlag = MF_Unk_0A, + }, + } +}; + +SearchBushConfig N(SearchBush_Bush1) = { + .bush = &N(Bush1_BushModels), + .drops = &N(Bush1_Drops), +}; + +FoliageModelList N(Bush2_BushModels) = { + .count = 1, + .models = { + MODEL_o183, + } +}; + +SearchBushConfig N(SearchBush_Bush2) = { + .bush = &N(Bush2_BushModels), +}; + +FoliageModelList N(Bush3_BushModels) = { + .count = 1, + .models = { + MODEL_o184, + } +}; + +SearchBushConfig N(SearchBush_Bush3) = { + .bush = &N(Bush3_BushModels), +}; + +FoliageModelList N(Bush4_BushModels) = { + .count = 1, + .models = { + MODEL_o185, + } +}; + +SearchBushConfig N(SearchBush_Bush4) = { + .bush = &N(Bush4_BushModels), +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) + EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o207, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) + EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o208, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) + EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o209, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush4))) + EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o210, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_12/BBB380.c b/src/world/area_mim/mim_12/BBB380.c deleted file mode 100644 index 6752910f6f..0000000000 --- a/src/world/area_mim/mim_12/BBB380.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "mim_12.h" - -static char* N(exit_str_0) = "mim_11"; -static char* N(exit_str_1) = "arn_07"; - -INCLUDE_ASM(s32, "world/area_mim/mim_12/BBB380", func_80240000_BBB380); - -INCLUDE_ASM(s32, "world/area_mim/mim_12/BBB380", func_80240064_BBB3E4); - -INCLUDE_ASM(s32, "world/area_mim/mim_12/BBB380", func_802400CC_BBB44C); - -INCLUDE_ASM(s32, "world/area_mim/mim_12/BBB380", func_8024019C_BBB51C); - -INCLUDE_ASM(s32, "world/area_mim/mim_12/BBB380", func_8024025C_BBB5DC); - -INCLUDE_ASM(s32, "world/area_mim/mim_12/BBB380", func_802404A8_BBB828); diff --git a/src/world/area_mim/mim_12/mim_12.h b/src/world/area_mim/mim_12/mim_12.h index 199e41aa38..9e914de980 100644 --- a/src/world/area_mim/mim_12/mim_12.h +++ b/src/world/area_mim/mim_12/mim_12.h @@ -2,8 +2,27 @@ /// @brief Forever Forest - Exit to Gusty Gulch #include "common.h" -#include "../mim.h" #include "message_ids.h" #include "map.h" +#include "../mim.h" +#include "mapfs/mim_12_shape.h" +#include "mapfs/mim_12_hit.h" + +#include "sprite/npc/Boo.h" +#include "sprite/npc/WorldBow.h" + +enum { + NPC_GateBoo_01 = 0, + NPC_GateBoo_02 = 1, +}; + #define NAMESPACE mim_12 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_StartForestMusic); +extern EvtScript N(EVS_StartGustyMusic); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupForestGate); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_mim/mim_12/mim_12_0_header.c b/src/world/area_mim/mim_12/mim_12_0_header.c new file mode 100644 index 0000000000..26b8eb9fd1 --- /dev/null +++ b/src/world/area_mim/mim_12/mim_12_0_header.c @@ -0,0 +1,14 @@ +#include "mim_12.h" + +EntryList N(Entrances) = { + [mim_12_ENTRY_0] { -380.0, 0.0, 10.0, 90.0 }, + [mim_12_ENTRY_1] { 380.0, 0.0, 10.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_mim_12 }, +}; diff --git a/src/world/area_mim/mim_12/mim_12_1_music.c b/src/world/area_mim/mim_12/mim_12_1_music.c new file mode 100644 index 0000000000..3723509221 --- /dev/null +++ b/src/world/area_mim/mim_12/mim_12_1_music.c @@ -0,0 +1,38 @@ +#include "mim_12.h" + +EvtScript N(EVS_StartForestMusic) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH3_ARRIVED_AT_BOOS_MANSION) + EVT_CALL(SetMusicTrack, 0, SONG_BOOS_MANSION, 1, 8) + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_FOREVER_FOREST, 0, 8) + EVT_END_SWITCH + EVT_CALL(ClearAmbientSounds, 250) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_StartGustyMusic) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH3_TUBBA_WOKE_UP) + EVT_CALL(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, 8) + EVT_CASE_LT(STORY_CH3_DEFEATED_TUBBA_BLUBBA) + EVT_CALL(SetMusicTrack, 0, SONG_TUBBA_ESCAPE, 0, 8) + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_GUSTY_GULCH, 0, 8) + EVT_END_SWITCH + EVT_CALL(PlayAmbientSounds, AMBIENT_WIND) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mim_12_ENTRY_0) + EVT_EXEC_WAIT(N(EVS_StartForestMusic)) + EVT_ELSE + EVT_EXEC_WAIT(N(EVS_StartGustyMusic)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_12/mim_12_2_entity.c b/src/world/area_mim/mim_12/mim_12_2_entity.c new file mode 100644 index 0000000000..8738744441 --- /dev/null +++ b/src/world/area_mim/mim_12/mim_12_2_entity.c @@ -0,0 +1,9 @@ +#include "mim_12.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 100, 0, -40, 0, MODEL_o8, MAKE_ENTITY_END) + EVT_CALL(AssignPanelFlag, GF_MIM12_HiddenPanel) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_12/mim_12_3_main.c b/src/world/area_mim/mim_12/mim_12_3_main.c new file mode 100644 index 0000000000..17e0c4ca96 --- /dev/null +++ b/src/world/area_mim/mim_12/mim_12_3_main.c @@ -0,0 +1,44 @@ +#include "mim_12.h" + +EvtScript N(EVS_ExitWalk_mim_11_1) = EVT_EXIT_WALK(60, mim_12_ENTRY_0, "mim_11", mim_11_ENTRY_1); +EvtScript N(EVS_ExitWalk_arn_07_2) = EVT_EXIT_WALK(60, mim_12_ENTRY_1, "arn_07", arn_07_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_mim_11_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_arn_07_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CALL(SetNpcPos, NPC_GateBoo_01, 0, -1000, 0) + EVT_CALL(SetNpcPos, NPC_GateBoo_02, 0, -1000, 0) + EVT_SETF(LVar0, EVT_FLOAT(240.0)) + EVT_LOOP(20) + EVT_SUBF(LVar0, EVT_FLOAT(12.0)) + EVT_CALL(func_802CFD30, NPC_GateBoo_01, 7, LVar0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_GateBoo_02, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_FOREVER_FOREST) + EVT_CALL(SetSpriteShading, SHADING_MIM_12) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 1024) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_SetupForestGate)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_mim/mim_12/mim_12_4_npc.c b/src/world/area_mim/mim_12/mim_12_4_npc.c new file mode 100644 index 0000000000..5a883ab420 --- /dev/null +++ b/src/world/area_mim/mim_12/mim_12_4_npc.c @@ -0,0 +1,49 @@ +#include "mim_12.h" + +#include "world/common/npc/Boo.inc.c" + +EvtScript N(EVS_NpcInit_GateBoo_01) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_GateBoo_02) = { + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_GateBoos)[] = { + { + .id = NPC_GateBoo_01, + .settings = &N(NpcSettings_Boo), + .pos = { -68.0f, 65.0f, -56.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_GateBoo_01), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = NORMAL_BOO_ANIMS, + }, + { + .id = NPC_GateBoo_02, + .settings = &N(NpcSettings_Boo), + .pos = { -125.0f, 65.0f, 60.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_GateBoo_02), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = NORMAL_BOO_ANIMS, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_GateBoos)), + {} +}; diff --git a/src/world/area_mim/mim_12/mim_12_5_gate.c b/src/world/area_mim/mim_12/mim_12_5_gate.c new file mode 100644 index 0000000000..818d560676 --- /dev/null +++ b/src/world/area_mim/mim_12/mim_12_5_gate.c @@ -0,0 +1,419 @@ +#include "mim_12.h" + +API_CALLABLE(N(InitializeGustyFogProperties)) { + enable_world_fog(); + set_world_fog_dist(990, 1000); + set_world_fog_color(0, 8, 24, 255); + gCameras[CAM_DEFAULT].bgColor[0] = 24; + gCameras[CAM_DEFAULT].bgColor[1] = 24; + gCameras[CAM_DEFAULT].bgColor[2] = 24; + gGameStatusPtr->backgroundDarkness = 0; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(InitializeForestFogProperties)) { + enable_world_fog(); + set_world_fog_dist(980, 1000); + set_world_fog_color(0, 8, 24, 255); + gCameras[CAM_DEFAULT].bgColor[0] = 24; + gCameras[CAM_DEFAULT].bgColor[1] = 24; + gCameras[CAM_DEFAULT].bgColor[2] = 24; + gGameStatusPtr->backgroundDarkness = 232; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(InterpFogDistance)) { + Bytecode* args = script->ptrReadPos; + s32 retVal = ApiStatus_BLOCK; + + if (isInitialCall) { + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[3] = evt_get_variable(script, *args++); + } + + script->functionTemp[1] += script->functionTemp[3]; + + if (script->functionTemp[3] >= 0) { + if (script->functionTemp[1] >= script->functionTemp[2]) { + script->functionTemp[1] = script->functionTemp[2]; + retVal = ApiStatus_DONE2; + } + } else { + if (script->functionTemp[2] >= script->functionTemp[1] ) { + script->functionTemp[1] = script->functionTemp[2]; + retVal = ApiStatus_DONE2; + } + } + + set_world_fog_dist(script->functionTemp[1], script->functionTemp[0]); + return retVal; +} + +API_CALLABLE(N(InterpBackgroundDarkness)) { + Bytecode* args = script->ptrReadPos; + s32 retVal = ApiStatus_BLOCK; + + if (isInitialCall) { + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + script->functionTemp[3] = evt_get_variable(script, *args++); + } + + script->functionTemp[1] += script->functionTemp[3]; + + if (script->functionTemp[3] >= 0) { + if (script->functionTemp[1] >= script->functionTemp[2]) { + script->functionTemp[1] = script->functionTemp[2]; + retVal = ApiStatus_DONE2; + } + } else { + if (script->functionTemp[2] >= script->functionTemp[1]) { + script->functionTemp[1] = script->functionTemp[2]; + retVal = ApiStatus_DONE2; + } + } + + gGameStatusPtr->backgroundDarkness = script->functionTemp[1]; + return retVal; +} + +API_CALLABLE(N(InterpSpriteShadingColor)) { + SpriteShadingProfile* shadingProfile = D_80151328; + Bytecode* args = script->ptrReadPos; + + if (isInitialCall) { + script->varTable[0] = evt_get_variable(script, *args++); + script->varTable[1] = evt_get_variable(script, *args++); + script->varTable[2] = evt_get_variable(script, *args++); + script->varTable[3] = shadingProfile->ambientColor.r; + script->varTable[4] = shadingProfile->ambientColor.g; + script->varTable[5] = shadingProfile->ambientColor.b; + script->varTable[6] = 0; + D_80151328->flags |= 1; + } + + script->varTable[6]++; + shadingProfile->ambientColor.r = update_lerp(0, script->varTable[3], script->varTable[0], script->varTable[6], 20); + shadingProfile->ambientColor.g = update_lerp(0, script->varTable[4], script->varTable[1], script->varTable[6], 20); + shadingProfile->ambientColor.b = update_lerp(0, script->varTable[5], script->varTable[2], script->varTable[6], 20); + + if (script->varTable[6] == 20) { + if (script->varTable[0] == 255) { + D_80151328->flags &= ~1; + } + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(MoveNpcAlongArc)) { + Npc* npc = resolve_npc(script, script->varTable[0]); + f32 angle, sinAngle, cosAngle; + + if (isInitialCall) { + script->varTable[6] = script->varTable[5]; + script->varTable[7] = dist2D(npc->pos.x, npc->pos.z, script->varTable[1], script->varTable[2]); + } + + if (script->varTable[6] > 0) { + angle = update_lerp(0, script->varTable[3], script->varTable[4], (f32) script->varTable[6], (f32) script->varTable[5]); + sin_cos_deg(angle, &sinAngle, &cosAngle); + npc->pos.x = script->varTable[1] + (script->varTable[7] * sinAngle); + npc->pos.z = script->varTable[2] + (script->varTable[7] * cosAngle); + script->varTable[6]--; + return ApiStatus_BLOCK; + } else { + return ApiStatus_DONE2; + } +} + +EvtScript N(EVS_FadeToForestShading) = { + EVT_CALL(N(InitializeGustyFogProperties)) + EVT_THREAD + EVT_CALL(N(InterpFogDistance), 990, 980, 1000, -1) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(N(InterpBackgroundDarkness), 0, 232, 20) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(N(InterpSpriteShadingColor), 160, 160, 255) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FadeToGustyShading) = { + EVT_CALL(N(InitializeGustyFogProperties)) + EVT_THREAD + EVT_CALL(N(InterpFogDistance), 980, 990, 1000, 1) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(N(InterpBackgroundDarkness), 232, 0, -20) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(N(InterpSpriteShadingColor), 255, 255, 255) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenGate) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_o67, SOUND_METAL_GATE_OPEN, 0) + EVT_SET(LVar3, 0) + EVT_SUB(LVar3, LVar2) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o67, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(MakeLerp, 0, 80, 30, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o68, LVar0, 0, LVar2, 0) + EVT_CALL(RotateModel, MODEL_o67, LVar0, 0, LVar3, 0) + EVT_WAIT(1) + EVT_IF_NE(LVar1, 0) + EVT_GOTO(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CloseGate) = { + EVT_SET(LVar3, 0) + EVT_SUB(LVar3, LVar2) + EVT_CALL(MakeLerp, 80, 0, 30, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o68, LVar0, 0, LVar2, 0) + EVT_CALL(RotateModel, MODEL_o67, LVar0, 0, LVar3, 0) + EVT_WAIT(1) + EVT_IF_NE(LVar1, 0) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_o67, SOUND_METAL_GATE_CLOSE, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o67, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterForest) = { + EVT_EXEC(N(EVS_FadeToForestShading)) + EVT_SET(LVar2, -1) + EVT_EXEC(N(EVS_OpenGate)) + EVT_WAIT(20) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -185, 0, 0) + EVT_SET(LVar2, -1) + EVT_EXEC(N(EVS_CloseGate)) + EVT_EXEC_WAIT(N(EVS_StartForestMusic)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LeaveForest) = { + EVT_EXEC(N(EVS_FadeToGustyShading)) + EVT_SET(LVar2, 1) + EVT_EXEC(N(EVS_OpenGate)) + EVT_WAIT(20) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -20, 0, 0) + EVT_SET(LVar2, 1) + EVT_EXEC(N(EVS_CloseGate)) + EVT_EXEC_WAIT(N(EVS_StartGustyMusic)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CantOpenGateMessage) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D9, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseGate) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(InterruptUsePartner) + EVT_IF_EQ(AF_MIM12_BackgroundLitUp, FALSE) + EVT_EXEC_WAIT(N(EVS_LeaveForest)) + EVT_SET(AF_MIM12_BackgroundLitUp, TRUE) + EVT_ELSE + EVT_EXEC_WAIT(N(EVS_EnterForest)) + EVT_SET(AF_MIM12_BackgroundLitUp, FALSE) + EVT_END_IF + EVT_WAIT(20) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlyDownToGate) = { + EVT_THREAD + EVT_CALL(SetNpcJumpscale, NPC_GateBoo_02, EVT_FLOAT(0.0)) + EVT_CALL(NpcJump1, NPC_GateBoo_02, -66, 13, -15, 20) + EVT_END_THREAD + EVT_CALL(SetNpcJumpscale, NPC_GateBoo_01, EVT_FLOAT(0.0)) + EVT_CALL(NpcJump1, NPC_GateBoo_01, -89, 14, 28, 20) + EVT_WAIT(15) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HaveBoosOpenGate) = { + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_GateBoo_02, NPC_FLAG_100, TRUE) + EVT_SET(LVar0, NPC_GateBoo_02) + EVT_SET(LVar1, -66) + EVT_SET(LVar2, -66) + EVT_SET(LVar3, 80) + EVT_SET(LVar4, 0) + EVT_SET(LVar5, 30) + EVT_CALL(N(MoveNpcAlongArc)) + EVT_END_THREAD + EVT_CALL(SetNpcFlagBits, NPC_GateBoo_01, NPC_FLAG_100, TRUE) + EVT_SET(LVar0, NPC_GateBoo_01) + EVT_SET(LVar1, -135) + EVT_SET(LVar2, 59) + EVT_SET(LVar3, 40) + EVT_SET(LVar4, 120) + EVT_SET(LVar5, 30) + EVT_CALL(N(MoveNpcAlongArc)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HaveBoosCloseGate) = { + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_GateBoo_02, NPC_FLAG_100, TRUE) + EVT_SET(LVar0, NPC_GateBoo_02) + EVT_SET(LVar1, -66) + EVT_SET(LVar2, -66) + EVT_SET(LVar3, 0) + EVT_SET(LVar4, 80) + EVT_SET(LVar5, 30) + EVT_CALL(N(MoveNpcAlongArc)) + EVT_END_THREAD + EVT_CALL(SetNpcFlagBits, NPC_GateBoo_01, NPC_FLAG_100, TRUE) + EVT_SET(LVar0, NPC_GateBoo_01) + EVT_SET(LVar1, -135) + EVT_SET(LVar2, 59) + EVT_SET(LVar3, 120) + EVT_SET(LVar4, 40) + EVT_SET(LVar5, 30) + EVT_CALL(N(MoveNpcAlongArc)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_UnlockGate) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(20) + EVT_CALL(GetCurrentPartnerID, LVar6) + EVT_CALL(BringPartnerOut, PARTNER_BOW) + EVT_IF_NE(LVar6, PARTNER_BOW) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldBow_Walk) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_LOOP(10) + EVT_ADD(LVar1, 2) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_IF + EVT_WAIT(10) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, SPEECH_FACE_SPEAKER_ONLY, MSG_CH3_006C) + EVT_CALL(EnablePartnerAI) + EVT_CALL(SetNpcPos, NPC_GateBoo_01, -103, 65, 64) + EVT_CALL(SetNpcPos, NPC_GateBoo_02, -45, 65, -66) + EVT_CALL(PlaySoundAtNpc, NPC_GateBoo_01, SOUND_BOO_VANISH, 0) + EVT_SETF(LVar0, EVT_FLOAT(0.0)) + EVT_LOOP(20) + EVT_ADDF(LVar0, EVT_FLOAT(12.0)) + EVT_CALL(func_802CFD30, NPC_GateBoo_01, 7, LVar0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_GateBoo_02, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_FlyDownToGate)) + EVT_EXEC(N(EVS_FadeToGustyShading)) + EVT_SET(LVar2, 1) + EVT_EXEC(N(EVS_OpenGate)) + EVT_EXEC_WAIT(N(EVS_HaveBoosOpenGate)) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(PlayerMoveTo, 25, 0, 60) + EVT_END_THREAD + EVT_WAIT(3) + EVT_CALL(GetCurrentPartnerID, LVar6) + EVT_IF_NE(LVar6, PARTNER_BOW) + EVT_CALL(NpcMoveTo, NPC_PARTNER, -38, 23, 60) + EVT_ELSE + EVT_WAIT(60) + EVT_END_IF + EVT_SET(LVar2, 1) + EVT_EXEC(N(EVS_CloseGate)) + EVT_EXEC_WAIT(N(EVS_StartGustyMusic)) + EVT_EXEC_WAIT(N(EVS_HaveBoosCloseGate)) + EVT_WAIT(10) + EVT_CALL(PlaySoundAtNpc, NPC_GateBoo_01, SOUND_BOO_APPEAR, 0) + EVT_SETF(LVar0, EVT_FLOAT(240.0)) + EVT_LOOP(20) + EVT_SUBF(LVar0, EVT_FLOAT(12.0)) + EVT_CALL(func_802CFD30, NPC_GateBoo_01, 7, LVar0, 0, 0, 0) + EVT_CALL(func_802CFD30, NPC_GateBoo_02, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcPos, NPC_GateBoo_01, 0, -1000, 0) + EVT_CALL(SetNpcPos, NPC_GateBoo_02, 0, -1000, 0) + EVT_WAIT(10) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBow_Talk, ANIM_WorldBow_Idle, 0, MSG_CH3_006D) + EVT_CALL(EnablePartnerAI) + EVT_WAIT(5) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.5)) + EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 14) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10009) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_WAIT(10) + EVT_SET(GB_StoryProgress, STORY_CH3_UNLOCKED_GUSTY_GULCH) + EVT_CALL(PutPartnerAway) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_SET(AF_MIM12_BackgroundLitUp, TRUE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseGate)), TRIGGER_WALL_PRESS_A, COLLIDER_o67, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupForestGate) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH3_BOW_JOINED_PARTY) + EVT_CALL(N(InitializeForestFogProperties)) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_CantOpenGateMessage)), TRIGGER_WALL_PRESS_A, COLLIDER_o67, 1, 0) + EVT_CASE_LT(STORY_CH3_UNLOCKED_GUSTY_GULCH) + EVT_CALL(N(InitializeForestFogProperties)) + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_GE(LVar0, -200) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_EXEC_WAIT(N(EVS_Scene_UnlockGate)) + EVT_CASE_GE(STORY_CH3_UNLOCKED_GUSTY_GULCH) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, mim_12_ENTRY_0) + EVT_SET(AF_MIM12_BackgroundLitUp, FALSE) + EVT_CALL(N(InitializeForestFogProperties)) + EVT_ELSE + EVT_SET(AF_MIM12_BackgroundLitUp, TRUE) + EVT_CALL(N(InitializeGustyFogProperties)) + EVT_CALL(EnableSpriteShading, FALSE) + EVT_END_IF + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseGate)), TRIGGER_WALL_PRESS_A, COLLIDER_o67, 1, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_09/trd_09_3_npcs.c b/src/world/area_trd/trd_09/trd_09_3_npcs.c index b600383973..dbf7611edb 100644 --- a/src/world/area_trd/trd_09/trd_09_3_npcs.c +++ b/src/world/area_trd/trd_09/trd_09_3_npcs.c @@ -1,9 +1,6 @@ #include "trd_09.h" #include "effects.h" -extern EvtScript D_800936C0; -extern EvtScript EVS_NpcHitRecoil; - API_CALLABLE(N(func_80240000_9BD660)) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; @@ -39,7 +36,7 @@ EvtScript N(D_80240844_9BDEA4) = { EVT_SET(LVar3, 10) EVT_SET(LVarA, ANIM_BillBlaster_Anim01) EVT_SET(LVarB, ANIM_BillBlaster_Anim01) - EVT_EXEC_WAIT(D_800936C0) + EVT_EXEC_WAIT(EVS_800936C0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BillBlaster_Anim02) EVT_WAIT(15) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) diff --git a/src/world/common/complete/KeyItems.inc.c b/src/world/common/complete/KeyItemChoice.inc.c similarity index 91% rename from src/world/common/complete/KeyItems.inc.c rename to src/world/common/complete/KeyItemChoice.inc.c index 1d4f32fd48..308888aa2b 100644 --- a/src/world/common/complete/KeyItems.inc.c +++ b/src/world/common/complete/KeyItemChoice.inc.c @@ -2,8 +2,6 @@ static s32 N(KeyItemChoiceList)[112]; -#include "world/common/complete/GiveReward.inc.c" - s32 N(ItemChoice_HasSelectedItem) = 0; s32 N(ItemChoice_SelectedItemID) = 0; @@ -12,6 +10,10 @@ s32 N(ItemChoice_SelectedItemID) = 0; #include "world/common/atomic/MakeKeyChoice.inc.c" +// ItemChoice_WaitForSelection +// ItemChoice_SaveSelected +// BuildKeyItemChoiceList + EvtScript N(EVS_ItemChoicePopup) = { EVT_SET(LVar9, LVar1) EVT_CALL(ShowKeyChoicePopup) @@ -37,7 +39,7 @@ EvtScript N(EVS_ItemChoicePopup) = { EVT_END }; -EvtScript N(ChooseKeyItem) = { +EvtScript N(EVS_ChooseKeyItem) = { EVT_CALL(N(BuildKeyItemChoiceList), LVar0) EVT_BIND_PADLOCK(EVT_PTR(N(EVS_ItemChoicePopup)), TRIGGER_FORCE_ACTIVATE, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1) EVT_CALL(N(ItemChoice_WaitForSelection), LVar0) diff --git a/src/world/common/enemy/complete/Bzzap.h b/src/world/common/enemy/complete/Bzzap.h new file mode 100644 index 0000000000..b1ef10a9cf --- /dev/null +++ b/src/world/common/enemy/complete/Bzzap.h @@ -0,0 +1,29 @@ +#include "common.h" +#include "sprite/npc/Bzzap.h" + +#define BZZAP_NO_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define BZZAP_ANIMS \ +{ \ + .idle = ANIM_Bzzap_Anim02, \ + .walk = ANIM_Bzzap_Anim02, \ + .run = ANIM_Bzzap_Anim03, \ + .chase = ANIM_Bzzap_Anim03, \ + .anim_4 = ANIM_Bzzap_Anim01, \ + .anim_5 = ANIM_Bzzap_Anim02, \ + .death = ANIM_Bzzap_Anim06, \ + .hit = ANIM_Bzzap_Anim06, \ + .anim_8 = ANIM_Bzzap_Anim04, \ + .anim_9 = ANIM_Bzzap_Anim02, \ + .anim_A = ANIM_Bzzap_Anim01, \ + .anim_B = ANIM_Bzzap_Anim01, \ + .anim_C = ANIM_Bzzap_Anim01, \ + .anim_D = ANIM_Bzzap_Anim01, \ + .anim_E = ANIM_Bzzap_Anim01, \ + .anim_F = ANIM_Bzzap_Anim01, \ +} diff --git a/src/world/common/enemy/complete/Bzzap.inc.c b/src/world/common/enemy/complete/Bzzap.inc.c new file mode 100644 index 0000000000..29de4d0792 --- /dev/null +++ b/src/world/common/enemy/complete/Bzzap.inc.c @@ -0,0 +1,41 @@ +#include "Bzzap.h" + +#include "world/common/enemy/FlyingAI.inc.c" + +f32 N(FlyingAI_JumpVels)[] = { + 4.5, 3.5, 2.6, 2.0, 1.5, 20.0, +}; + +MobileAISettings N(AISettings_Bzzap) = { + .moveSpeed = 1.0f, + .moveTime = 30, + .waitTime = 5, + .alertRadius = 80.0f, + .alertOffsetDist = 30.0f, + .playerSearchInterval = 2, + .chaseSpeed = 4.5f, + .chaseTurnRate = 6, + .chaseUpdateInterval = 1, + .chaseRadius = 90.0f, + .chaseOffsetDist = 30.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Bzzap) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetSelfVar, 5, -630) + EVT_CALL(SetSelfVar, 6, 50) + EVT_CALL(SetSelfVar, 1, 200) + EVT_CALL(N(FlyingAI_Main), EVT_PTR(N(AISettings_Bzzap))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Bzzap) = { + .height = 26, + .radius = 24, + .level = 19, + .ai = &N(EVS_NpcAI_Bzzap), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/ForestFuzzy.h b/src/world/common/enemy/complete/ForestFuzzy.h new file mode 100644 index 0000000000..fbeff05999 --- /dev/null +++ b/src/world/common/enemy/complete/ForestFuzzy.h @@ -0,0 +1,35 @@ +#include "common.h" +#include "sprite/npc/Fuzzy.h" + +#define FOREST_FUZZY_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 5, \ + .itemDrops = { \ + { ITEM_THUNDER_BOLT, 10, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(2), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 0, \ + .maxCoinBonus = 2, \ +} + +#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, \ +} diff --git a/src/world/common/enemy/complete/ForestFuzzy.inc copy.c b/src/world/common/enemy/complete/ForestFuzzy.inc copy.c new file mode 100644 index 0000000000..fa150dc79b --- /dev/null +++ b/src/world/common/enemy/complete/ForestFuzzy.inc copy.c @@ -0,0 +1,32 @@ +#include "ForestFuzzy.h" + +#include "world/common/enemy/HoppingAI.inc.c" + +MobileAISettings N(AISettings_ForestFuzzy) = { + .moveSpeed = 1.0f, + .moveTime = 30, + .waitTime = 10, + .alertRadius = 120.0f, + .playerSearchInterval = 5, + .chaseSpeed = 4.5f, + .chaseTurnRate = 90, + .chaseUpdateInterval = 5, + .chaseRadius = 160.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_ForestFuzzy) = { + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) + EVT_CALL(N(HoppingAI_Main), EVT_PTR(N(AISettings_ForestFuzzy)), 1) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_ForestFuzzy) = { + .height = 20, + .radius = 22, + .level = 11, + .ai = &N(EVS_NpcAI_ForestFuzzy), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/ForestFuzzy.inc.c b/src/world/common/enemy/complete/ForestFuzzy.inc.c new file mode 100644 index 0000000000..fa150dc79b --- /dev/null +++ b/src/world/common/enemy/complete/ForestFuzzy.inc.c @@ -0,0 +1,32 @@ +#include "ForestFuzzy.h" + +#include "world/common/enemy/HoppingAI.inc.c" + +MobileAISettings N(AISettings_ForestFuzzy) = { + .moveSpeed = 1.0f, + .moveTime = 30, + .waitTime = 10, + .alertRadius = 120.0f, + .playerSearchInterval = 5, + .chaseSpeed = 4.5f, + .chaseTurnRate = 90, + .chaseUpdateInterval = 5, + .chaseRadius = 160.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_ForestFuzzy) = { + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) + EVT_CALL(N(HoppingAI_Main), EVT_PTR(N(AISettings_ForestFuzzy)), 1) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_ForestFuzzy) = { + .height = 20, + .radius = 22, + .level = 11, + .ai = &N(EVS_NpcAI_ForestFuzzy), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/PiranhaPlant.h b/src/world/common/enemy/complete/PiranhaPlant.h new file mode 100644 index 0000000000..88f4db50f7 --- /dev/null +++ b/src/world/common/enemy/complete/PiranhaPlant.h @@ -0,0 +1,67 @@ +#include "common.h" +#include "sprite/npc/SmallPiranha.h" + +#define PIRANHA_PLANT_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 5, \ + .itemDrops = { \ + { ITEM_FIRE_FLOWER, 10, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(2), \ + .flowerDrops = STANDARD_FLOWER_DROPS(3), \ + .minCoinBonus = 0, \ + .maxCoinBonus = 2, \ +} + +#define PIRANHA_PLANT_ANIMS \ +{ \ + .idle = ANIM_SmallPiranha_Anim01, \ + .walk = ANIM_SmallPiranha_Anim01, \ + .run = ANIM_SmallPiranha_Anim01, \ + .chase = ANIM_SmallPiranha_Anim01, \ + .anim_4 = ANIM_SmallPiranha_Anim01, \ + .anim_5 = ANIM_SmallPiranha_Anim01, \ + .death = ANIM_SmallPiranha_Anim09, \ + .hit = ANIM_SmallPiranha_Anim09, \ + .anim_8 = ANIM_SmallPiranha_Anim04, \ + .anim_9 = ANIM_SmallPiranha_Anim03, \ + .anim_A = ANIM_SmallPiranha_Anim07, \ + .anim_B = ANIM_SmallPiranha_Anim07, \ + .anim_C = ANIM_SmallPiranha_Anim08, \ + .anim_D = ANIM_SmallPiranha_Anim01, \ + .anim_E = ANIM_SmallPiranha_Anim01, \ + .anim_F = ANIM_SmallPiranha_Anim01, \ +} + +#define PIRANHA_PLANT_HITBOX(npcID) \ +{ \ + .id = npcID, \ + .settings = &N(NpcSettings_PiranhaPlant_Hitbox), \ + .pos = { NPC_DISPOSE_LOCATION }, \ + .yaw = 0, \ + .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, \ + .drops = { \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ + }, \ + .animations = { \ + .idle = ANIM_SmallPiranha_Anim01, \ + .walk = ANIM_SmallPiranha_Anim01, \ + .run = ANIM_SmallPiranha_Anim01, \ + .chase = ANIM_SmallPiranha_Anim01, \ + .anim_4 = ANIM_SmallPiranha_Anim01, \ + .anim_5 = ANIM_SmallPiranha_Anim01, \ + .death = ANIM_SmallPiranha_Anim09, \ + .hit = ANIM_SmallPiranha_Anim09, \ + .anim_8 = ANIM_SmallPiranha_Anim04, \ + .anim_9 = ANIM_SmallPiranha_Anim03, \ + .anim_A = ANIM_SmallPiranha_Anim07, \ + .anim_B = ANIM_SmallPiranha_Anim07, \ + .anim_C = ANIM_SmallPiranha_Anim08, \ + .anim_D = ANIM_SmallPiranha_Anim01, \ + .anim_E = ANIM_SmallPiranha_Anim01, \ + .anim_F = ANIM_SmallPiranha_Anim01, \ + }, \ +} diff --git a/src/world/common/enemy/complete/PiranhaPlant.inc.c b/src/world/common/enemy/complete/PiranhaPlant.inc.c new file mode 100644 index 0000000000..30e2895e97 --- /dev/null +++ b/src/world/common/enemy/complete/PiranhaPlant.inc.c @@ -0,0 +1,85 @@ +#include "PiranhaPlant.h" + +#include "world/common/enemy/PiranhaPlantAI.inc.c" + +EvtScript N(EVS_NpcDefeat_PiranhaPlant_Hitbox) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(OnPlayerFled, 1) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_10, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +MobileAISettings N(AISettings_PiranhaPlant) = { + .moveTime = 30, + .waitTime = 30, + .alertRadius = 150.0f, + .playerSearchInterval = 1, +}; + +EvtScript N(EVS_NpcAI_PiranhaPlant) = { + EVT_CALL(SetSelfVar, 7, 0) + EVT_CALL(SetSelfVar, 8, 12) + EVT_CALL(SetSelfVar, 9, 11) + EVT_CALL(SetSelfVar, 10, 14) + EVT_CALL(SetSelfVar, 11, 9) + EVT_CALL(SetSelfVar, 12, 25) + EVT_CALL(SetSelfVar, 13, -1) + EVT_CALL(SetSelfVar, 14, 10) + EVT_CALL(SetSelfVar, 15, 15) + EVT_CALL(N(PiranhaPlantAI_Main), EVT_PTR(N(AISettings_PiranhaPlant))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_PiranhaPlant) = { + .height = 32, + .radius = 26, + .level = 11, + .ai = &N(EVS_NpcAI_PiranhaPlant), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +EvtScript N(EVS_NpcAI_PiranhaPlant_Hitbox) = { + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetSelfVar, 0, 10) + EVT_CALL(SetSelfVar, 1, 18) + EVT_CALL(SetSelfVar, 4, 3) + EVT_CALL(SetSelfVar, 15, SOUND_20DE) + EVT_CALL(N(MeleeHitbox_Main)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_8024411C) = { + EVT_CALL(GetOwnerEncounterTrigger, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_NONE) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_JUMP) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_HAMMER) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_PARTNER) + EVT_CALL(GetSelfAnimationFromTable, 7, LVar0) + EVT_EXEC_WAIT(EVS_NpcHitRecoil) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_PiranhaPlant_Hitbox) = { + .height = 18, + .radius = 18, + .level = 11, + .ai = &N(EVS_NpcAI_PiranhaPlant_Hitbox), + .onDefeat = &N(EVS_NpcDefeat_PiranhaPlant_Hitbox), + .actionFlags = AI_ACTION_08, +}; diff --git a/src/world/common/enemy/complete/PutridPiranha.inc.c b/src/world/common/enemy/complete/PutridPiranha.inc.c index bf6060a1d7..2a30a3b43c 100644 --- a/src/world/common/enemy/complete/PutridPiranha.inc.c +++ b/src/world/common/enemy/complete/PutridPiranha.inc.c @@ -1,7 +1,5 @@ #include "PutridPiranha.h" -extern EvtScript EVS_NpcHitRecoil; - #include "world/common/enemy/PiranhaPlantAI.inc.c" EvtScript N(EVS_NpcDefeat_PutridPiranha_Hitbox) = { diff --git a/src/world/common/npc/Bulbulb.h b/src/world/common/npc/Bulbulb.h new file mode 100644 index 0000000000..6ff05a7162 --- /dev/null +++ b/src/world/common/npc/Bulbulb.h @@ -0,0 +1,29 @@ +#include "common.h" +#include "sprite/npc/Oaklie.h" + +#define BULBULB_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define BULBULB_GREEN_ANIMS \ +{ \ + .idle = ANIM_Bubulb_Green_Idle, \ + .walk = ANIM_Bubulb_Green_Walk, \ + .run = ANIM_Bubulb_Green_Walk, \ + .chase = ANIM_Bubulb_Green_Idle, \ + .anim_4 = ANIM_Bubulb_Green_Idle, \ + .anim_5 = ANIM_Bubulb_Green_Idle, \ + .death = ANIM_Bubulb_Green_Idle, \ + .hit = ANIM_Bubulb_Green_Idle, \ + .anim_8 = ANIM_Bubulb_Green_Idle, \ + .anim_9 = ANIM_Bubulb_Green_Idle, \ + .anim_A = ANIM_Bubulb_Green_Idle, \ + .anim_B = ANIM_Bubulb_Green_Idle, \ + .anim_C = ANIM_Bubulb_Green_Idle, \ + .anim_D = ANIM_Bubulb_Green_Idle, \ + .anim_E = ANIM_Bubulb_Green_Idle, \ + .anim_F = ANIM_Bubulb_Green_Idle, \ +} diff --git a/src/world/common/npc/Bulbulb.inc.c b/src/world/common/npc/Bulbulb.inc.c new file mode 100644 index 0000000000..074cf0c9af --- /dev/null +++ b/src/world/common/npc/Bulbulb.inc.c @@ -0,0 +1,14 @@ +#include "common.h" +#include "Bulbulb.h" + +EvtScript N(EVS_NpcAuxAI_Bubulb) = { + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Bubulb) = { + .height = 42, + .radius = 26, + .level = 99, + .otherAI = &N(EVS_NpcAuxAI_Bubulb), +}; diff --git a/src/world/common/npc/Oaklie.h b/src/world/common/npc/Oaklie.h new file mode 100644 index 0000000000..a5cba79300 --- /dev/null +++ b/src/world/common/npc/Oaklie.h @@ -0,0 +1,29 @@ +#include "common.h" +#include "sprite/npc/Oaklie.h" + +#define OAKLIE_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define OAKLIE_ANIMS \ +{ \ + .idle = ANIM_Oaklie_Idle, \ + .walk = ANIM_Oaklie_Idle, \ + .run = ANIM_Oaklie_Idle, \ + .chase = ANIM_Oaklie_Idle, \ + .anim_4 = ANIM_Oaklie_Idle, \ + .anim_5 = ANIM_Oaklie_Idle, \ + .death = ANIM_Oaklie_Idle, \ + .hit = ANIM_Oaklie_Idle, \ + .anim_8 = ANIM_Oaklie_Idle, \ + .anim_9 = ANIM_Oaklie_Idle, \ + .anim_A = ANIM_Oaklie_Idle, \ + .anim_B = ANIM_Oaklie_Idle, \ + .anim_C = ANIM_Oaklie_Idle, \ + .anim_D = ANIM_Oaklie_Idle, \ + .anim_E = ANIM_Oaklie_Idle, \ + .anim_F = ANIM_Oaklie_Idle, \ +} diff --git a/src/world/common/npc/Oaklie.inc.c b/src/world/common/npc/Oaklie.inc.c new file mode 100644 index 0000000000..7223c25991 --- /dev/null +++ b/src/world/common/npc/Oaklie.inc.c @@ -0,0 +1,9 @@ +#include "common.h" +#include "Oaklie.h" + +NpcSettings N(NpcSettings_Oaklie) = { + .height = 32, + .radius = 24, + .level = 99, +}; + diff --git a/src/world/common/util/GetFirstTriangleNormal.inc.c b/src/world/common/util/GetFirstTriangleNormal.inc.c new file mode 100644 index 0000000000..13f0ec7985 --- /dev/null +++ b/src/world/common/util/GetFirstTriangleNormal.inc.c @@ -0,0 +1,101 @@ +#include "common.h" + +static Vtx_t* N(TriNormVertexBuffer)[32]; // unk length + +enum { + READ_STATE_CONTINUE = 0, + READ_STATE_DONE = 1, + READ_STATE_TRIANGLE = 2, +}; + +void N(GetFirstTriangleNormal)(Gfx* inGfx, f32* outNx, f32* outNy, f32* outNz) { + s32 dummy[2]; + Gfx* gfx = inGfx; + s32 readState; + f32 v1x, v1y, v1z; + f32 v2x, v2y, v2z; + f32 v3x, v3y, v3z; + f32 d12x, d12y, d12z; + f32 d32x, d32y, d32z; + f32 nx, ny, nz; + f32 norm; + + Vtx_t* vtxArray; + u32 vtxCount; + s32 vtxEnd; + s32 i; + + v1x = v1y = v1z = 0.0f; + v2x = v2y = v2z = 0.0f; + v3x = v3y = v3z = 0.0f; + + while (TRUE) { + u32 w0 = gfx->words.w0; + u32 w1 = gfx->words.w1; + s32 op = w0 >> 24; + readState = READ_STATE_CONTINUE; + switch (op) { + case G_ENDDL: + readState = READ_STATE_DONE; + break; + case G_DL: + N(GetFirstTriangleNormal)((Gfx* ) w1, outNx, outNy, outNz); + break; + case G_VTX: + vtxCount = (w0 >> 0xC) & 0xFF; + vtxArray = (Vtx_t*) w1; + for (i = 0; i < vtxCount; i++) { + vtxEnd = (w0 >> 1) & 0x7F; + N(TriNormVertexBuffer)[(vtxEnd - vtxCount) + i] = &(vtxArray)[i]; + } + break; + case G_TRI1: + v1x = N(TriNormVertexBuffer)[((w1 >> 16) & 0xFF) / 2]->ob[0]; + v1y = N(TriNormVertexBuffer)[((w1 >> 16) & 0xFF) / 2]->ob[1]; + v1z = N(TriNormVertexBuffer)[((w1 >> 16) & 0xFF) / 2]->ob[2]; + v2x = N(TriNormVertexBuffer)[((w1 >> 8) & 0xFF) / 2]->ob[0]; + v2y = N(TriNormVertexBuffer)[((w1 >> 8) & 0xFF) / 2]->ob[1]; + v2z = N(TriNormVertexBuffer)[((w1 >> 8) & 0xFF) / 2]->ob[2]; + v3x = N(TriNormVertexBuffer)[(w1 & 0xFF) / 2]->ob[0]; + v3y = N(TriNormVertexBuffer)[(w1 & 0xFF) / 2]->ob[1]; + v3z = N(TriNormVertexBuffer)[(w1 & 0xFF) / 2]->ob[2]; + readState = READ_STATE_TRIANGLE; + break; + case G_TRI2: + v1x = N(TriNormVertexBuffer)[((w0 >> 16) & 0xFF) / 2]->ob[0]; + v1y = N(TriNormVertexBuffer)[((w0 >> 16) & 0xFF) / 2]->ob[1]; + v1z = N(TriNormVertexBuffer)[((w0 >> 16) & 0xFF) / 2]->ob[2]; + v2x = N(TriNormVertexBuffer)[((w0 >> 8) & 0xFF) / 2]->ob[0]; + v2y = N(TriNormVertexBuffer)[((w0 >> 8) & 0xFF) / 2]->ob[1]; + v2z = N(TriNormVertexBuffer)[((w0 >> 8) & 0xFF) / 2]->ob[2]; + v3x = N(TriNormVertexBuffer)[(w0 & 0xFF) / 2]->ob[0]; + v3y = N(TriNormVertexBuffer)[(w0 & 0xFF) / 2]->ob[1]; + v3z = N(TriNormVertexBuffer)[(w0 & 0xFF) / 2]->ob[2]; + readState = READ_STATE_TRIANGLE; + break; + } + + if (readState != READ_STATE_CONTINUE) { + break; + } + gfx++; + } + + if (readState == READ_STATE_TRIANGLE) { + // get two vectors from three points + d12x = v1x - v2x; + d12y = v1y - v2y; + d12z = v1z - v2z; + d32x = v3x - v2x; + d32y = v3y - v2y; + d32z = v3z - v2z; + // cross product to get normal vector + nx = (d12y * d32z) - (d12z * d32y); + ny = (d12z * d32x) - (d12x * d32z); + nz = (d12x * d32y) - (d12y * d32x); + norm = sqrtf(SQ(nx) + SQ(ny) + SQ(nz)); + *outNx = nx / norm; + *outNy = ny / norm; + *outNz = nz / norm; + } +} diff --git a/ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s b/ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s deleted file mode 100644 index 6f0ca3f254..0000000000 --- a/ver/us/asm/data/world/area_iwa/iwa_10/9247B0.data.s +++ /dev/null @@ -1,81 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80246240_9247B0 -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_8024626C_9247DC -.word 0x00000000 - -dlabel D_80246270_9247E0 -.word 0x00000000 - -dlabel D_80246274_9247E4 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, iwa_10_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241434_91F9A4, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802463B8_924928 -.word 0x00000043, 0x00000002, func_8024146C_91F9DC, 0xFE363C80, 0x0000004E, 0x00000006, D_80246274_9247E4, 0x00000010, 0x00000000, iwa_10_D_80248480, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802413E0_91F950, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x000000D7, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFDA8, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000D000E, 0x00000140, 0x00000096, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0x0000012C, 0xF24AB680, 0xF24A5480, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080022, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000037, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFFFFFE70, 0x000000D7, 0xFFFFFE02, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000040, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFFFFFFF1, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFE02, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFE02, 0xFE363C82, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFE70, 0xFE363C80, 0x00000037, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFE363C80, 0x000000DC, 0xFD050F8A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010017, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00040004, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A8280, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000006, PlaySoundAt, 0x000000E1, 0x00000000, 0xFE363C80, 0x000000E6, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000018, 0x00000003, 0xFE363C80, 0x000000E6, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0x000000E6, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C82, 0xFFFFFE84, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE84, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A7E80, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000006, NpcJump1, 0x00000004, 0xFE363C80, 0x000000D7, 0xFE363C82, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00040005, 0x00000043, 0x00000006, NpcJump1, 0x00000004, 0xFE363C80, 0x000000D7, 0xFE363C82, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000028, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000162, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001000F, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000004, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00040001, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000006, NpcJump1, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x00000023, 0x000000FF, 0xF24AC080, 0xF24A4C80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00040002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000004, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00040001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0011, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFB9, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8680, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0x00000004, D_802474F8_925A68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246E80_9253F0 -.word 0x00000036, 0x00000054, 0x00000040, 0x00000000 - -dlabel D_80246E90_925400 -.word 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE01FA, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E41, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E42, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E43, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000000C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFE2, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C84, 0xFE363C86, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000004, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0xF24A7A80, 0xF24F2A80, 0xF24AC080, 0xF24A5280, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246E80_9253F0, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000046, 0x00000001, D_802463B8_924928, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE01FA, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0012, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0015, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0017, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001C, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001B, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0013, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000027, 0x00000002, 0xF5DE01FA, 0x00000001, 0x00000014, 0x00000001, 0xF5DE01FA, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0014, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0016, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040007, 0x00040001, 0x00000000, 0x000D0018, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D0019, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001A, 0x00000043, 0x00000002, ShowChoice, 0x001E000F, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001B, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000023, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000004, 0x00040006, 0x00040001, 0x00000000, 0x000D001D, 0x00000043, 0x00000003, iwa_10_ChangeNpcToPartner, 0x00000004, 0x00000004, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000043, 0x00000001, func_80241510_91FA80, 0x00000044, 0x00000001, 0x8024187C, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018C, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x802418B0, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0x000D001E, 0x00000043, 0x00000002, AddKeyItem, 0x00000036, 0x00000043, 0x00000002, AddKeyItem, 0x00000054, 0x00000043, 0x00000002, AddKeyItem, 0x00000040, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802474F8_925A68 -.word 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A7E80, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFD62, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFE1B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C80, 0x00000078, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00040001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000007, 0x00000008, 0x00000001, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF88, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247688_925BF8 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80246E90_925400, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFB9, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFBA, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802474F8_925A68, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000004, D_80246240_9247B0, 0xC4188000, 0x43660000, 0xC3F28000, 0x00200D09, D_80247688_925BF8, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040001, 0x00040002, 0x00040003, 0x00040003, 0x00040001, 0x00040001, 0x00040000, 0x00040000, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00000000, 0x00000000, 0x00000000, 0x001A0084 - -dlabel D_80247910_925E80 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, iwa_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, iwa_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, iwa_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, iwa_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, iwa_10_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, iwa_10_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248274_9267E4 -.word 0x00000001, 0x00000010 - -dlabel D_8024827C_9267EC -.word 0x00000001, 0x00000157, 0xFFFFFCB9, 0x0000000F, 0x00000209, 0x00000006, 0xF8405E45, 0xFAA2B58A - -dlabel D_8024829C_92680C -.word 0x00000001, 0xFFFFFCB9, 0x0000000F, 0x00000209 - -dlabel D_802482AC_92681C -.word D_80248274_9267E4, D_8024827C_9267EC, D_8024829C_92680C, 0x00000000 - -dlabel D_802482BC_92682C -.word 0x00000001, 0x00000011 - -dlabel D_802482C4_926834 -.word 0x00000001, 0x00000157, 0xFFFFFD4D, 0x00000016, 0x00000180, 0x00000006, 0xF8405E46, 0xFAA2B58B - -dlabel D_802482E4_926854 -.word 0x00000001, 0xFFFFFD4D, 0x00000016, 0x00000180 - -dlabel D_802482F4_926864 -.word D_802482BC_92682C, D_802482C4_926834, D_802482E4_926854, 0x00000000 - -dlabel D_80248304_926874 -.word 0x00000001, 0x00000012 - -dlabel D_8024830C_92687C -.word 0x00000001, 0x00000157, 0xFFFFFC5C, 0x00000015, 0x00000195, 0x00000006, 0xF8405E47, 0xFAA2B58C - -dlabel D_8024832C_92689C -.word 0x00000001, 0xFFFFFC5C, 0x00000015, 0x00000195 - -dlabel D_8024833C_9268AC -.word D_80248304_926874, D_8024830C_92687C, D_8024832C_92689C, 0x00000000 - -dlabel D_8024834C_9268BC -.word 0x00000001, 0x00000013 - -dlabel D_80248354_9268C4 -.word 0x00000001, 0x000000AB, 0xFFFFFCE0, 0x00000017, 0x00000118, 0x00000006, 0x00000000, 0xFAA2B58D - -dlabel D_80248374_9268E4 -.word 0x00000001, 0xFFFFFCE0, 0x00000017, 0x00000118 - -dlabel D_80248384_9268F4 -.word D_8024834C_9268BC, D_80248354_9268C4, D_80248374_9268E4, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802482AC_92681C, 0x00000047, 0x00000005, D_80247910_925E80, 0x00000100, 0x0000005F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802482F4_926864, 0x00000047, 0x00000005, D_80247910_925E80, 0x00000100, 0x00000060, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024833C_9268AC, 0x00000047, 0x00000005, D_80247910_925E80, 0x00000100, 0x00000061, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80248384_9268F4, 0x00000047, 0x00000005, D_80247910_925E80, 0x00000100, 0x00000062, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_01/B952F0.data.s b/ver/us/asm/data/world/area_mim/mim_01/B952F0.data.s deleted file mode 100644 index bbc06c0327..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_01/B952F0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241EB0_B952F0 -.word 0x00000000, 0x00000000, 0xC4048000, 0x43340000, 0xC4048000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x44048000, 0x00000000, 0x44048000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242160, D_80241EB0_B952F0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900A7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_01/B953B0.data.s b/ver/us/asm/data/world/area_mim/mim_01/B953B0.data.s deleted file mode 100644 index 330fe526a8..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_01/B953B0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241F70_B953B0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802445D0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FCC_B9540C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802445D8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242028_B95468 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802445D0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242084_B954C4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802445E0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420E0_B95520 -.word 0x00000047, 0x00000005, D_80241F70_B953B0, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241FCC_B9540C, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242028_B95468, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242084_B954C4, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF8406337, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x80243CD8, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802445B4, 0x00000046, 0x00000001, D_80242354_B95794, 0x00000046, 0x00000001, 0x80242C40, 0x00000024, 0x00000002, 0xFE363C80, D_802420E0_B95520, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, mim_01_SetForeverForestFog, 0x00000044, 0x00000001, 0x80241F30, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422B0_B956F0 -.word 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D017E, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242354_B95794 -.word 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0xFFFFFED4, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802422B0_B956F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_01/B957E0.data.s b/ver/us/asm/data/world/area_mim/mim_01/B957E0.data.s deleted file mode 100644 index aee462857c..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_01/B957E0.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802423A0_B957E0 -.word 0x00000043, 0x00000006, PlaySoundAt, 0x000000DF, 0x00000000, 0x0000012D, 0x00000000, 0xFFFFFFE5, 0x00000005, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000040, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000041, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000043, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000044, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x0000003B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFFE, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000040, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000041, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000043, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000044, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x0000003B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000041, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000043, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000044, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003B, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0xFFFF0000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000006, PlaySoundAt, 0x0000205B, 0x00000000, 0x0000012D, 0x00000000, 0xFFFFFFE5, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000001E, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_802403F0_B93830, 0x0000003D, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x0000003D, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x0000003E, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, func_802403F0_B93830, 0x00000040, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x00000040, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x00000041, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, func_802403F0_B93830, 0x00000043, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x00000043, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x00000044, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000205B, 0x00000000, 0x0000012D, 0x00000000, 0xFFFFFFE5, 0x00000043, 0x00000005, MakeLerp, 0x0000001E, 0xFFFFFFE2, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_802403F0_B93830, 0x0000003D, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x0000003D, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x0000003E, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, func_802403F0_B93830, 0x00000040, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x00000040, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x00000041, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, func_802403F0_B93830, 0x00000043, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x00000043, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x00000044, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000205B, 0x00000000, 0x0000012D, 0x00000000, 0xFFFFFFE5, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFE2, 0x00000000, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, func_802403F0_B93830, 0x0000003D, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x0000003D, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x0000003E, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, func_802403F0_B93830, 0x00000040, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x00000040, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x00000041, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, func_802403F0_B93830, 0x00000043, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x00000043, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0x00000044, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242BDC_B9601C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x0000015E, 0x00000000, 0x00000032, 0x00000046, 0x00000001, D_802423A0_B957E0, 0x00000043, 0x00000004, AwaitPlayerLeave, 0x0000015E, 0x00000000, 0x00000032, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000003E, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000041, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000044, 0x00000001, 0x00000044, 0x00000001, D_80242BDC_B9601C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_01/B960E0.data.s b/ver/us/asm/data/world/area_mim/mim_01/B960E0.data.s deleted file mode 100644 index c05fd264fb..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_01/B960E0.data.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242CA0_B960E0 -.word 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F34_B96374 -.word 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001A, 0x00000099, 0x00000043, 0x00000006, RotateGroup, 0x0000009B, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001E, 0x0000009F, 0x00000043, 0x00000006, RotateGroup, 0x000000A1, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x0000009C, 0x00000043, 0x00000006, RotateGroup, 0x0000009E, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000020, 0x000000A2, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0x0000000A, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243054_B96494 -.word 0x00000043, 0x00000006, RotateGroup, 0x0000009B, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000043, 0x00000006, RotateGroup, 0x000000A1, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000006, RotateGroup, 0x0000009E, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243124_B96564 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D4, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D5, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243170_B965B0 -.word 0x00000044, 0x00000001, D_80243124_B96564, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80242CA0_B960E0, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80243054_B96494, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000168, 0x0000010E, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000044, 0x00000001, D_80242CA0_B960E0, 0x00000043, 0x00000005, MakeLerp, 0x0000010E, 0xFFFFFFF6, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000032, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80242CA0_B960E0, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000003C, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80243054_B96494, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024375C_B96B9C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000046, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000009B, 0x00000046, 0x00000001, D_80243170_B965B0, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802437D8_B96C18 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000A1, 0x00000046, 0x00000001, D_80243170_B965B0, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243854_B96C94 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000009E, 0x00000046, 0x00000001, D_80243170_B965B0, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802438D0_B96D10 -.word 0x00000024, 0x00000002, 0xFE363C89, 0x00000020, 0x00000044, 0x00000001, D_80243124_B96564, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000B, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000046, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80242CA0_B960E0, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80243054_B96494, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000168, 0x0000010E, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000046, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000044, 0x00000001, D_80242CA0_B960E0, 0x00000043, 0x00000005, MakeLerp, 0x0000010E, 0x0000000A, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x000000A4, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242CA0_B960E0, 0x00000044, 0x00000001, D_80242F34_B96374, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000047, 0x00000005, D_8024375C_B96B9C, 0x00000100, 0x0000001A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802437D8_B96C18, 0x00000100, 0x0000001E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802438D0_B96D10, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243854_B96C94, 0x00000100, 0x0000001C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243EB0_B972F0 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243F6C_B973AC -.word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243F9C_B973DC -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, mim_01_PiranhaPlantAI_Main, D_80243F6C_B973AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244070_B974B0 -.word 0x00000000, 0x0020001A, 0x00000000, 0x00000000, D_80243F9C_B973DC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 - -dlabel D_8024409C_B974DC -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_01_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802441A8_B975E8 -.word 0x00000000, 0x00120012, 0x00000000, 0x00000000, D_8024409C_B974DC, 0x00000000, 0x00000000, D_80243EB0_B972F0, 0x00000000, 0x00000000, 0x000B0008 - -dlabel D_802441D4_B97614 -.word 0x00000001, D_80244070_B974B0, 0x43070000, 0x00000000, 0xC3960000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000087, 0x00000000, 0xFFFFFED4, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_802441A8_B975E8, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_802441D4_B97614, 0x0D090001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_02/B98DE0.data.s b/ver/us/asm/data/world/area_mim/mim_02/B98DE0.data.s deleted file mode 100644 index 5daaf8609f..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_02/B98DE0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802411E0_B98DE0 -.word 0x00000000, 0x00000000, 0xC4048000, 0x43340000, 0xC4048000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x44048000, 0x00000000, 0x44048000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241490, D_802411E0_B98DE0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900A8, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s b/ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s deleted file mode 100644 index 33d6e055ab..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_02/B98EA0.data.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802412A0_B98EA0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243820, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412FC_B98EFC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243828, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241358_B98F58 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243828, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413B4_B98FB4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243828, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241410_B99010 -.word 0x00000047, 0x00000005, D_802412A0_B98EA0, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802412FC_B98EFC, 0x00080000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241358_B98F58, 0x00080000, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802413B4_B98FB4, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070001, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x80243430, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, D_80242754_B9A354, 0x00000024, 0x00000002, 0xFE363C80, D_80241410_B99010, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241260, 0x00000044, 0x00000001, 0x80243650, 0x00000043, 0x00000001, mim_02_SetForeverForestFog, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415E0_B991E0 -.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024160C_B9920C -.word 0x3F800000, 0x0000001E, 0x0000000A, 0x42F00000, 0x00000000, 0x00000005, 0x40900000, 0x0000005A, 0x00000005, 0x43200000, 0x00000000, 0x00000001 - -dlabel D_8024163C_B9923C -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, mim_02_HoppingAI_Main, D_8024160C_B9920C, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241678_B99278 -.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024163C_B9923C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000, 0x0000001B, 0x00000000 - -dlabel D_802416AC_B992AC -.word 0x00000000 - -dlabel D_802416B0_B992B0 -.word 0x00000000 - -dlabel D_802416B4_B992B4 -.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, mim_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_80241104_B98D04, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_8024113C_B98D3C, 0xFE363C80, 0x0000004E, 0x00000006, D_802416B4_B992B4, 0x00000010, 0x00000000, dro_01_foliage_setup_shear_mtx, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_802410B0_B98CB0, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241848_B99448 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFCE, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00BE0002, 0x00BE0001, 0x00000000, 0x000E0006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00BE0002, 0x00BE0001, 0x00000000, 0x000E0007, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0004, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFE56, 0x0000003A, 0xFFFFFFBA, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A6280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000FA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFE56, 0x0000003A, 0xFFFFFFBA, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0005, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00BE0002, 0x00BE0001, 0x00000000, 0x000E0008, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0004, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFEB3, 0x00000000, 0xFFFFFFAF, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0005, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0004, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFED4, 0x00000000, 0xFFFFFF56, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0005, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0004, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF1E, 0x00000000, 0xFFFFFF0B, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0005, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0004, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF60, 0x00000000, 0xFFFFFED8, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0005, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFCF, 0x00000046, 0x00000001, 0x80243620, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DE0_B999E0 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCF, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A6280, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00BE0002, 0x00BE0001, 0x00000000, 0x000E0003, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0003, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0004, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x0000032C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFE39, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0005, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BE0001, 0x00000008, 0x00000001, 0x0000000F, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFB7, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00BE0002, 0x00BE0001, 0x00000000, 0x000E0004, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00BE0002, 0x00BE0001, 0x00000000, 0x000E0005, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242110_B99D10 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241848_B99448, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241DE0_B999E0, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001B, 0x00000001, 0xFFFFFFCF, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242184_B99D84 -.word 0x00000000, D_802415E0_B991E0, 0xC3D50000, 0x42680000, 0xC28C0000, 0x00400901, D_80242110_B99D10, 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, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00A1 - -dlabel D_80242374_B99F74 -.word 0x00000001, D_80241678_B99278, 0x43960000, 0x00000000, 0x43020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050084, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0102, 0x002B0102, 0x002B0103, 0x002B0103, 0x002B0101, 0x002B0101, 0x002B0108, 0x002B0108, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242564_B9A164 -.word 0x00000002, D_80241678_B99278, 0xC2C80000, 0x00000000, 0xC3A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050084, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0102, 0x002B0102, 0x002B0103, 0x002B0103, 0x002B0101, 0x002B0101, 0x002B0108, 0x002B0108, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242754_B9A354 -.word 0x00000001, D_80242184_B99D84, 0x00000000, 0x00000001, D_80242374_B99F74, 0x0D000001, 0x00000001, D_80242564_B9A164, 0x0D010001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_02/B9A390.data.s b/ver/us/asm/data/world/area_mim/mim_02/B9A390.data.s deleted file mode 100644 index fce1cded2f..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_02/B9A390.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242790_B9A390 -.word 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A24_B9A624 -.word 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001B, 0x00000095, 0x00000043, 0x00000006, RotateGroup, 0x00000097, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001F, 0x0000009B, 0x00000043, 0x00000006, RotateGroup, 0x0000009D, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001F, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x00000098, 0x00000043, 0x00000006, RotateGroup, 0x0000009A, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x0000009E, 0x00000043, 0x00000006, RotateGroup, 0x000000A0, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B44_B9A744 -.word 0x00000043, 0x00000006, RotateGroup, 0x00000097, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001B, 0x00000043, 0x00000006, RotateGroup, 0x0000009D, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001F, 0x00000043, 0x00000006, RotateGroup, 0x0000009A, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000043, 0x00000006, RotateGroup, 0x000000A0, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C14_B9A814 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D4, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D5, 0x00000000, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80242790_B9A390, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80242B44_B9A744, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000168, 0x0000010E, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000044, 0x00000001, D_80242790_B9A390, 0x00000043, 0x00000005, MakeLerp, 0x0000010E, 0xFFFFFFF6, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000032, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80242790_B9A390, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000003C, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80242B44_B9A744, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243240_B9AE40 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000046, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000097, 0x00000046, 0x00000001, D_80242C14_B9A814, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802432BC_B9AEBC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000009D, 0x00000046, 0x00000001, D_80242C14_B9A814, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243338_B9AF38 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000009A, 0x00000046, 0x00000001, D_80242C14_B9A814, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802433B4_B9AFB4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000046, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000021, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000A0, 0x00000046, 0x00000001, D_80242C14_B9A814, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80242790_B9A390, 0x00000044, 0x00000001, D_80242A24_B9A624, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000047, 0x00000005, D_80243240_B9AE40, 0x00000100, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802432BC_B9AEBC, 0x00000100, 0x0000001F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243338_B9AF38, 0x00000100, 0x0000001D, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFCF, 0x00000047, 0x00000005, D_802433B4_B9AFB4, 0x00000100, 0x00000021, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802433B4_B9AFB4, 0x00000100, 0x00000021, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_02/B9B250.data.s b/ver/us/asm/data/world/area_mim/mim_02/B9B250.data.s deleted file mode 100644 index 842c5122a9..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_02/B9B250.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243650_B9B250 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000078, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000077, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000014, 0xFFFFFEAC, 0x00000032, 0x00000043, 0x00000003, RandInt, 0x00000001, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000078, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000077, 0x00000001, 0x00000043, 0x00000006, PlaySoundAt, 0x00002060, 0x00000000, 0x0000000A, 0x0000006E, 0xFFFFFF38, 0x00000005, 0x00000001, 0xFE363C82, 0x00000043, 0x00000003, EnableModel, 0x00000078, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000077, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, EnableModel, 0x00000078, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000077, 0x00000001, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000002, 0x00000008, 0x00000001, 0xFE363C83, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, EnableModel, 0x00000078, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000077, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_03/B9B9B0.data.s b/ver/us/asm/data/world/area_mim/mim_03/B9B9B0.data.s deleted file mode 100644 index fb50154ce9..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_03/B9B9B0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240530_B9B9B0 -.word 0x00000000, 0x00000000, 0xC4048000, 0x43340000, 0xC4048000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x44048000, 0x00000000, 0x44048000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802407E0, D_80240530_B9B9B0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900A9, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_03/B9BA70.data.s b/ver/us/asm/data/world/area_mim/mim_03/B9BA70.data.s deleted file mode 100644 index 8bcd76ad23..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_03/B9BA70.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802405F0_B9BA70 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802424C0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024064C_B9BACC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802424C8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406A8_B9BB28 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802424D0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240704_B9BB84 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802424C0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240760_B9BBE0 -.word 0x00000047, 0x00000005, D_802405F0_B9BA70, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024064C_B9BACC, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802406A8_B9BB28, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240704_B9BB84, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070002, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000046, 0x00000001, 0x80241EA0, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802424A8, 0x00000046, 0x00000001, 0x802409B0, 0x00000024, 0x00000002, 0xFE363C80, D_80240760_B9BBE0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802405B0, 0x00000046, 0x00000001, 0x8024107C, 0x00000043, 0x00000001, mim_03_SetForeverForestFog, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, func_80240068_B9B4E8, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_03/B9BE30.data.s b/ver/us/asm/data/world/area_mim/mim_03/B9BE30.data.s deleted file mode 100644 index 5d53b8b2ba..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_03/B9BE30.data.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802409B0_B9BE30 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409C0_B9BE40 -.word 0x0000003B, 0x0000003C, 0x0000003E, 0x0000003F, 0x00000041, 0x00000042 - -dlabel D_802409D8_B9BE58 -.word 0x00000059, 0x0000005A, 0x0000005C, 0x0000005D, 0x0000005F, 0x00000060, 0x00000062, 0x00000063 - -dlabel D_802409F8_B9BE78 -.word 0x0000004F, 0x00000050, 0x00000052, 0x00000053, 0x00000055, 0x00000056 - -dlabel D_80240A10_B9BE90 -.word 0x00000045, 0x00000046, 0x00000048, 0x00000049, 0x0000004B, 0x0000004C - -dlabel D_80240A28_B9BEA8 -.word 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C89, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C89, 0x00000000, 0x00000000, 0xFFFF0000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000002D0, 0x000000C8, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000030, 0x00000001, 0xFE363C88, 0x00000005, 0x00000001, 0x00000003, 0x00000032, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, func_80240420_B9B8A0, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, RotateModel, 0xFE363C87, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C89, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BC8_B9C048 -.word 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C89, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000001E, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x00000005, 0x00000043, 0x00000001, UpdateLerp, 0x00000030, 0x00000001, 0xFE363C88, 0x00000005, 0x00000001, 0x00000004, 0x00000032, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, func_80240420_B9B8A0, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, RotateModel, 0xFE363C87, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000001E, 0xFFFFFFE2, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000030, 0x00000001, 0xFE363C88, 0x00000005, 0x00000001, 0x00000004, 0x00000032, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, func_80240420_B9B8A0, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, RotateModel, 0xFE363C87, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFE2, 0x00000000, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000030, 0x00000001, 0xFE363C88, 0x00000005, 0x00000001, 0x00000004, 0x00000032, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, func_80240420_B9B8A0, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, RotateModel, 0xFE363C87, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F0C_B9C38C -.word 0x00000043, 0x00000006, PlaySoundAt, 0x00002059, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFED4, 0x00000024, 0x00000002, 0xFE363C88, D_802409C0_B9BE40, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000046, 0x00000001, D_80240A28_B9BEA8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F68_B9C3E8 -.word 0x00000043, 0x00000006, PlaySoundAt, 0x0000205A, 0x00000000, 0xFFFFFED4, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, D_802409D8_B9BE58, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000046, 0x00000001, D_80240BC8_B9C048, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FC4_B9C444 -.word 0x00000043, 0x00000006, PlaySoundAt, 0x00002059, 0x00000000, 0x00000000, 0x00000000, 0x0000012C, 0x00000024, 0x00000002, 0xFE363C88, D_802409F8_B9BE78, 0x00000024, 0x00000002, 0xFE363C89, 0x00000002, 0x00000046, 0x00000001, D_80240A28_B9BEA8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241020_B9C4A0 -.word 0x00000043, 0x00000006, PlaySoundAt, 0x00002059, 0x00000000, 0x0000012C, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, D_80240A10_B9BE90, 0x00000024, 0x00000002, 0xFE363C89, 0x00000003, 0x00000046, 0x00000001, D_80240A28_B9BEA8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000003F, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000042, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000005A, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x0000005D, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000060, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000063, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000050, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x00000053, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x00000056, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x00000046, 0x00000003, 0x00000043, 0x00000003, SetTexPanner, 0x00000049, 0x00000003, 0x00000043, 0x00000003, SetTexPanner, 0x0000004C, 0x00000003, 0x00000047, 0x00000005, D_80240F68_B9C3E8, 0x00000100, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240F0C_B9C38C, 0x00000100, 0x0000001C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240FC4_B9C444, 0x00000100, 0x0000001E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241020_B9C4A0, 0x00000100, 0x0000001D, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241200_B9C680 -.word 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000006, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241494_B9C914 -.word 0x00000043, 0x00000003, ParentColliderToModel, 0x00000023, 0x00000098, 0x00000043, 0x00000006, RotateGroup, 0x0000009A, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000027, 0x0000009E, 0x00000043, 0x00000006, RotateGroup, 0x000000A0, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000027, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000025, 0x0000009B, 0x00000043, 0x00000006, RotateGroup, 0x0000009D, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000029, 0x000000A1, 0x00000043, 0x00000006, RotateGroup, 0x000000A3, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000029, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415B4_B9CA34 -.word 0x00000043, 0x00000006, RotateGroup, 0x0000009A, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000043, 0x00000006, RotateGroup, 0x000000A0, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000027, 0x00000043, 0x00000006, RotateGroup, 0x0000009D, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000043, 0x00000006, RotateGroup, 0x000000A3, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000029, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241684_B9CB04 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D4, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D5, 0x00000000, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80241200_B9C680, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802415B4_B9CA34, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000168, 0x0000010E, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000044, 0x00000001, D_80241200_B9C680, 0x00000043, 0x00000005, MakeLerp, 0x0000010E, 0xFFFFFFF6, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000032, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80241200_B9C680, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000003C, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802415B4_B9CA34, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CB0_B9D130 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000046, 0x00000024, 0x00000002, 0xFE363C89, 0x00000023, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000009A, 0x00000046, 0x00000001, D_80241684_B9CB04, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D2C_B9D1AC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C89, 0x00000027, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000A0, 0x00000046, 0x00000001, D_80241684_B9CB04, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DA8_B9D228 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000025, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000009D, 0x00000046, 0x00000001, D_80241684_B9CB04, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E24_B9D2A4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000046, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000029, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000A3, 0x00000046, 0x00000001, D_80241684_B9CB04, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241200_B9C680, 0x00000044, 0x00000001, D_80241494_B9C914, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000047, 0x00000005, D_80241CB0_B9D130, 0x00000100, 0x00000023, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241D2C_B9D1AC, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241E24_B9D2A4, 0x00000100, 0x00000029, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241DA8_B9D228, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_03/B9D500.data.s b/ver/us/asm/data/world/area_mim/mim_03/B9D500.data.s deleted file mode 100644 index 8734e75ca0..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_03/B9D500.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242080_B9D500 -.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802420AC_B9D52C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFDC, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00BE0002, 0x00BE0001, 0x00000000, 0x000E0009, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00BE0002, 0x00BE0001, 0x00000000, 0x000E000A, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000000B, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00BE0002, 0x00BE0001, 0x00000000, 0x000E000B, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00BE0002, 0x00BE0001, 0x00000000, 0x000E000C, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0x0000000B, 0x0000000A, 0x00000002, 0xF9718882, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00BE0002, 0x00BE0001, 0x00000000, 0x000E000D, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00BE0002, 0x00BE0001, 0x00000000, 0x000E000E, 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242294_B9D714 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802420AC_B9D52C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422B8_B9D738 -.word 0x00000000, D_80242080_B9D500, 0x00000000, 0x42000000, 0x00000000, 0x00000801, D_80242294_B9D714, 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, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00BE0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00A1, 0x00000001, D_802422B8_B9D738, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_04/B9EA90.data.s b/ver/us/asm/data/world/area_mim/mim_04/B9EA90.data.s deleted file mode 100644 index 580a04e523..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_04/B9EA90.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241130_B9EA90 -.word 0x00000000, 0x00000000, 0xC4048000, 0x43340000, 0xC4048000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x44048000, 0x00000000, 0x44048000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802413E0, D_80241130_B9EA90, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900AA, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_04/B9EB50.data.s b/ver/us/asm/data/world/area_mim/mim_04/B9EB50.data.s deleted file mode 100644 index e636b5969d..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_04/B9EB50.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802411F0_B9EB50 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242D60, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024124C_B9EBAC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242D68, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412A8_B9EC08 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242D68, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241304_B9EC64 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242D70, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241360_B9ECC0 -.word 0x00000047, 0x00000005, D_802411F0_B9EB50, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024124C_B9EBAC, 0x00080000, 0x00000014, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802412A8_B9EC08, 0x00080000, 0x0000000F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241304_B9EC64, 0x00080000, 0x0000000A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070003, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x80242360, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242D34, 0x00000024, 0x00000002, 0xFE363C80, D_80241360_B9ECC0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802411B0, 0x00000044, 0x00000001, D_802415C0_B9EF20, 0x00000043, 0x00000001, mim_04_SetForeverForestFog, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241530_B9EE90 -.word 0x00000000 - -dlabel D_80241534_B9EE94 -.word 0x00000000 - -dlabel D_80241538_B9EE98 -.byte 0x00, 0x00, 0x00 - -dlabel D_8024153B_B9EE9B -.byte 0x00 - -dlabel D_8024153C_B9EE9C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000000, 0xFFFFFEAC, 0x00000032, 0x00000043, 0x00000004, AwaitPlayerLeave, 0x00000000, 0xFFFFFEAC, 0x00000032, 0x00000043, 0x00000001, func_802401DC_B9DB3C, 0x00000043, 0x00000006, PlaySoundAt, 0x0000205F, 0x00000000, 0x00000037, 0x00000060, 0xFFFFFF02, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415C0_B9EF20 -.word 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, func_80240070_B9D9D0, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000026, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelFlags, 0x00000026, 0x00000010, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, D_8024153C_B9EE9C, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000026, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_04/B9F020.data.s b/ver/us/asm/data/world/area_mim/mim_04/B9F020.data.s deleted file mode 100644 index e69b46ae61..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_04/B9F020.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802416C0_B9F020 -.word 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000006, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241954_B9F2B4 -.word 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x0000006F, 0x00000043, 0x00000006, RotateGroup, 0x00000071, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000020, 0x00000075, 0x00000043, 0x00000006, RotateGroup, 0x00000077, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001E, 0x00000072, 0x00000043, 0x00000006, RotateGroup, 0x00000074, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000022, 0x00000078, 0x00000043, 0x00000006, RotateGroup, 0x0000007A, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000022, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A74_B9F3D4 -.word 0x00000043, 0x00000006, RotateGroup, 0x00000071, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000006, RotateGroup, 0x00000077, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000006, RotateGroup, 0x00000074, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000006, RotateGroup, 0x0000007A, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000022, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B44_B9F4A4 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D4, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D5, 0x00000000, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_802416C0_B9F020, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80241A74_B9F3D4, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000168, 0x0000010E, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000044, 0x00000001, D_802416C0_B9F020, 0x00000043, 0x00000005, MakeLerp, 0x0000010E, 0xFFFFFFF6, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000032, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_802416C0_B9F020, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000003C, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80241A74_B9F3D4, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242170_B9FAD0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000046, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000071, 0x00000046, 0x00000001, D_80241B44_B9F4A4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421EC_B9FB4C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C89, 0x00000020, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000077, 0x00000046, 0x00000001, D_80241B44_B9F4A4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242268_B9FBC8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000074, 0x00000046, 0x00000001, D_80241B44_B9F4A4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422E4_B9FC44 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000046, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000022, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000007A, 0x00000046, 0x00000001, D_80241B44_B9F4A4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802416C0_B9F020, 0x00000044, 0x00000001, D_80241954_B9F2B4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000047, 0x00000005, D_80242170_B9FAD0, 0x00000100, 0x0000001C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802421EC_B9FB4C, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802422E4_B9FC44, 0x00000100, 0x00000022, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242268_B9FBC8, 0x00000100, 0x0000001E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s b/ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s deleted file mode 100644 index 60a4a337fb..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_04/B9FEA0.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242540_B9FEA0 -.word 0x3F800000, 0x0000001E, 0x0000000A, 0x42F00000, 0x00000000, 0x00000005, 0x40900000, 0x0000005A, 0x00000005, 0x43200000, 0x00000000, 0x00000001 - -dlabel D_80242570_B9FED0 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, mim_04_HoppingAI_Main, D_80242540_B9FEA0, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802425AC_B9FF0C -.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80242570_B9FED0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 - -dlabel D_802425D8_B9FF38 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802425E8_B9FF48 -.word 0x00000000, 0x002A001A, D_802425D8_B9FF38, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel mim_04_varStash -.word 0x00000000 - -dlabel D_80242618_B9FF78 -.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_80242678_B9FFD8 -.word 0x0000000A, 0x00000002, 0xF8405F22, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990205, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990202, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000002D, 0x0000001A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990203, 0x00990202, 0x00000000, 0x000E000F, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_80242618_B9FF78, 0x00000043, 0x00000002, AddKeyItem, 0x0000002D, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00990203, 0x00990202, 0x00000000, 0x000E0010, 0x00000024, 0x00000002, 0xF8405F22, 0x00000001, 0x00000043, 0x00000003, SetTattleMessage, 0x00000000, 0x001A00A3, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000024, 0x00000002, 0xFE363C80, 0x000E0011, 0x00000024, 0x00000002, 0xFE363C81, 0x000E0012, 0x00000018, 0x00000001, 0x00000027, 0x00000024, 0x00000002, 0xFE363C80, 0x000E0013, 0x00000024, 0x00000002, 0xFE363C81, 0x000E0014, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000E0015, 0x00000024, 0x00000002, 0xFE363C81, 0x000E0016, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00990203, 0x00990202, 0x00000000, 0xFE363C80, 0x00000024, 0x00000002, 0xF9718884, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00990203, 0x00990202, 0x00000000, 0xFE363C81, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428D8_BA0238 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242678_B9FFD8, 0x0000000A, 0x00000002, 0xF8405F22, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000019, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990207, 0x00000043, 0x00000003, SetTattleMessage, 0x00000000, 0x001A00A2, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242954_BA02B4 -.word 0x00000001, D_802425AC_B9FF0C, 0x43700000, 0x00000000, 0xC3700000, 0x00400400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050084, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x000000F0, 0x00000000, 0xFFFFFF10, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000F0, 0x00000000, 0xFFFFFF10, 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, 0x002B0102, 0x002B0102, 0x002B0103, 0x002B0103, 0x002B0101, 0x002B0101, 0x002B0108, 0x002B0108, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242B44_BA04A4 -.word 0x00000000, D_802425E8_B9FF48, 0x00000000, 0x42000000, 0x00000000, 0x00000801, D_802428D8_BA0238, 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, 0x00990202, 0x0099020E, 0x0099020E, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00990202, 0x00000000, 0x00000000, 0x00000000, 0x001A00A3, 0x00000001, D_80242954_BA02B4, 0x0D040001, 0x00000001, D_80242B44_BA04A4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_05/BA2150.data.s b/ver/us/asm/data/world/area_mim/mim_05/BA2150.data.s deleted file mode 100644 index a151a0318d..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_05/BA2150.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241A20_BA2150 -.word 0x00000000, 0x00000000, 0xC4048000, 0x43340000, 0xC4048000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x44048000, 0x00000000, 0x44048000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241CD0, D_80241A20_BA2150, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900AB, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_05/BA2210.data.s b/ver/us/asm/data/world/area_mim/mim_05/BA2210.data.s deleted file mode 100644 index 20d9762940..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_05/BA2210.data.s +++ /dev/null @@ -1,66 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241AE0_BA2210 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243E60, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B3C_BA226C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243E68, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B98_BA22C8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243E70, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BF4_BA2324 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243E78, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C50_BA2380 -.word 0x00000047, 0x00000005, D_80241AE0_BA2210, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241B3C_BA226C, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241B98_BA22C8, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241BF4_BA2324, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070004, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, D_80243170_BA38A0, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80243E34, 0x00000024, 0x00000002, 0xFE363C80, D_80241C50_BA2380, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241AA0, 0x00000046, 0x00000001, D_80242290_BA29C0, 0x00000043, 0x00000001, mim_05_SetForeverForestFog, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E20_BA2550 -.word 0x0000003C, 0x00000001, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD480, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD481, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD482, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD484, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000006, PlaySoundAt, 0x000003A0, 0x00000000, 0xFFFFFED4, 0x00000000, 0xFFFFFFF6, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C81, 0x00000000, 0x00000000, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000028, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C89, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C89, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C89, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C89, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C89, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242014_BA2744 -.word 0x00000043, 0x00000006, PlaySoundAt, 0x000003A0, 0x00000000, 0xFFFFFED4, 0x00000000, 0xFFFFFFF6, 0x00000044, 0x00000001, D_80241E20_BA2550, 0x00000008, 0x00000001, 0x0000001E, 0x00000005, 0x00000001, 0x00000004, 0x00000044, 0x00000001, D_80241E20_BA2550, 0x00000008, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_80241E20_BA2550, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_80241E20_BA2550, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420AC_BA27DC -.word 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000044, 0x00000001, D_80242014_BA2744, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000044, 0x00000001, D_80242014_BA2744, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0x00000005, 0x00000044, 0x00000001, D_80242014_BA2744, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242134_BA2864 -.word 0x00000043, 0x00000006, PlaySoundAt, 0x000003A0, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x0000012C, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421A8_BA28D8 -.word 0x00000043, 0x00000006, PlaySoundAt, 0x000003A0, 0x00000000, 0x00000014, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024221C_BA294C -.word 0x00000043, 0x00000006, PlaySoundAt, 0x000003A0, 0x00000000, 0x0000012C, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242290_BA29C0 -.word 0x00000043, 0x00000003, SetTexPanner, 0x0000004D, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000004E, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000004F, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000041, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000042, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x0000003C, 0x00000003, 0x00000043, 0x00000003, SetTexPanner, 0x0000003D, 0x00000003, 0x00000043, 0x00000003, SetTexPanner, 0x0000003E, 0x00000003, 0x00000043, 0x00000003, SetTexPanner, 0x00000048, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x0000004B, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x00000049, 0x00000004, 0x00000043, 0x00000003, SetTexPanner, 0x0000004A, 0x00000004, 0x00000043, 0x00000003, SetTexPanner, 0x00000044, 0x00000005, 0x00000043, 0x00000003, SetTexPanner, 0x00000045, 0x00000005, 0x00000043, 0x00000003, SetTexPanner, 0x00000046, 0x00000005, 0x00000043, 0x00000003, SetTexPanner, 0x00000047, 0x00000005, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD480, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD481, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD482, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000024, 0x00000002, 0xF4ACD485, 0x00000000, 0x00000047, 0x00000005, D_80242134_BA2864, 0x00000100, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802421A8_BA28D8, 0x00000100, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802420AC_BA27DC, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024221C_BA294C, 0x00000100, 0x00000015, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802424D0_BA2C00 -.word 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242764_BA2E94 -.word 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x00000083, 0x00000043, 0x00000006, RotateGroup, 0x00000085, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000025, 0x00000089, 0x00000043, 0x00000006, RotateGroup, 0x0000008B, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000023, 0x00000086, 0x00000043, 0x00000006, RotateGroup, 0x00000088, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000027, 0x0000008C, 0x00000043, 0x00000006, RotateGroup, 0x0000008E, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000027, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242884_BA2FB4 -.word 0x00000043, 0x00000006, RotateGroup, 0x00000085, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000043, 0x00000006, RotateGroup, 0x0000008B, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000043, 0x00000006, RotateGroup, 0x00000088, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000043, 0x00000006, RotateGroup, 0x0000008E, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000027, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242954_BA3084 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D4, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D5, 0x00000000, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_802424D0_BA2C00, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80242884_BA2FB4, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000168, 0x0000010E, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000044, 0x00000001, D_802424D0_BA2C00, 0x00000043, 0x00000005, MakeLerp, 0x0000010E, 0xFFFFFFF6, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000032, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_802424D0_BA2C00, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000003C, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80242884_BA2FB4, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F80_BA36B0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000046, 0x00000024, 0x00000002, 0xFE363C89, 0x00000021, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000085, 0x00000046, 0x00000001, D_80242954_BA3084, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242FFC_BA372C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C89, 0x00000025, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000008B, 0x00000046, 0x00000001, D_80242954_BA3084, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243078_BA37A8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000023, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000088, 0x00000046, 0x00000001, D_80242954_BA3084, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430F4_BA3824 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000046, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000027, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000008E, 0x00000046, 0x00000001, D_80242954_BA3084, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243170_BA38A0 -.word 0x0000000A, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802424D0_BA2C00, 0x00000044, 0x00000001, D_80242764_BA2E94, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000047, 0x00000005, D_80242F80_BA36B0, 0x00000100, 0x00000021, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242FFC_BA372C, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802430F4_BA3824, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243078_BA37A8, 0x00000100, 0x00000023, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_05/BA3A80.data.s b/ver/us/asm/data/world/area_mim/mim_05/BA3A80.data.s deleted file mode 100644 index 38f7d6b0ec..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_05/BA3A80.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243350_BA3A80 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024340C_BA3B3C -.word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024343C_BA3B6C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, mim_05_PiranhaPlantAI_Main, D_8024340C_BA3B3C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243510_BA3C40 -.word 0x00000000, 0x0020001A, 0x00000000, 0x00000000, D_8024343C_BA3B6C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 - -dlabel D_8024353C_BA3C6C -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_05_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243648_BA3D78 -.word 0x00000000, 0x00120012, 0x00000000, 0x00000000, D_8024353C_BA3C6C, 0x00000000, 0x00000000, D_80243350_BA3A80, 0x00000000, 0x00000000, 0x000B0008 - -dlabel D_80243674_BA3DA4 -.word 0x00000000, D_80243510_BA3C40, 0xC3700000, 0x00000000, 0x43700000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80243648_BA3D78, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243A54_BA4184 -.word 0x00000002, D_80243510_BA3C40, 0x43700000, 0x00000000, 0xC3700000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_80243648_BA3D78, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80243674_BA3DA4, 0x0D0B0001, 0x00000002, D_80243A54_BA4184, 0x0D0A0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_06/BA74B0.data.s b/ver/us/asm/data/world/area_mim/mim_06/BA74B0.data.s deleted file mode 100644 index fa8163cdef..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_06/BA74B0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242D30_BA74B0 -.word 0x00000000, 0x00000000, 0xC4048000, 0x43340000, 0xC4048000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x44048000, 0x00000000, 0x44048000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242FE0, D_80242D30_BA74B0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900AC, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_06/BA7570.data.s b/ver/us/asm/data/world/area_mim/mim_06/BA7570.data.s deleted file mode 100644 index 7b1a1f5d38..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_06/BA7570.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242DF0_BA7570 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245790, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E4C_BA75CC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245798, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242EA8_BA7628 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245798, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F04_BA7684 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802457A0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F60_BA76E0 -.word 0x00000047, 0x00000005, D_80242DF0_BA7570, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242E4C_BA75CC, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242EA8_BA7628, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242F04_BA7684, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070005, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x80244810, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x8024575C, 0x00000024, 0x00000002, 0xFE363C80, D_80242F60_BA76E0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80242DB0, 0x00000046, 0x00000001, D_802439F8_BA8178, 0x00000043, 0x00000001, mim_06_SetForeverForestFog, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243130_BA78B0 -.word 0x0000005A, 0x0000005B, 0x0000005D, 0x0000005E, 0x00000060, 0x00000061 - -dlabel D_80243148_BA78C8 -.word 0x00000050, 0x00000051, 0x00000053, 0x00000054, 0x00000056, 0x00000057 - -dlabel D_80243160_BA78E0 -.word 0x00000046, 0x00000047, 0x00000049, 0x0000004A, 0x0000004C, 0x0000004D - -dlabel D_80243178_BA78F8 -.word 0x0000003C, 0x0000003D, 0x0000003F, 0x00000040, 0x00000042, 0x00000043 - -dlabel D_80243190_BA7910 -.word 0x00000043, 0x00000003, RandInt, 0x00000014, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7E80, 0x00000043, 0x00000003, RandInt, 0x00000014, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8C, 0x0000000A, 0x00000005, 0x00000001, 0x0000003C, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000003, func_802404F8_BA4C78, 0xFE363C80, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802403F0_BA4B70, 0xFE363C8A, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0xFE363C8A, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xFE363C83, 0xFE363C83, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802403F0_BA4B70, 0xFE363C8A, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0xFE363C8B, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8B, 0xFE363C83, 0xFE363C83, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C83, 0xF24A7E5D, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8B, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243398_BA7B18 -.word 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0xFFFF0000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000205B, 0x00000000, 0xFFFFFFF6, 0x00000000, 0xFFFFFED4, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000001E, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000030, 0x00000001, D_80243130_BA78B0, 0x00000005, 0x00000001, 0x00000003, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, func_802403F0_BA4B70, 0xFE363C82, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0xFE363C83, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000205B, 0x00000043, 0x00000005, MakeLerp, 0x0000001E, 0xFFFFFFE2, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000030, 0x00000001, D_80243130_BA78B0, 0x00000005, 0x00000001, 0x00000003, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, func_802403F0_BA4B70, 0xFE363C82, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0xFE363C83, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000205B, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFE2, 0x00000000, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000030, 0x00000001, D_80243130_BA78B0, 0x00000005, 0x00000001, 0x00000003, 0x00000032, 0x00000002, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, func_802403F0_BA4B70, 0xFE363C82, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0xFE363C82, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000043, 0x00000006, RotateModel, 0xFE363C83, 0xFE363C80, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243740_BA7EC0 -.word 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0xFFFF0000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, PlaySoundAt, 0x0000205C, 0x00000000, 0xFFFFFED4, 0x00000000, 0xFFFFFFF6, 0x00000030, 0x00000001, D_80243148_BA78C8, 0x00000032, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000044, 0x00000001, D_80243190_BA7910, 0x00000032, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000044, 0x00000001, D_80243190_BA7910, 0x00000032, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000044, 0x00000001, D_80243190_BA7910, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243828_BA7FA8 -.word 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0x00000000, 0xFFFF0000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, PlaySoundAt, 0x0000205C, 0x00000000, 0x0000000A, 0x00000000, 0x0000012C, 0x00000030, 0x00000001, D_80243160_BA78E0, 0x00000032, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000044, 0x00000001, D_80243190_BA7910, 0x00000032, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000044, 0x00000001, D_80243190_BA7910, 0x00000032, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000044, 0x00000001, D_80243190_BA7910, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243910_BA8090 -.word 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0x00000000, 0xFFFF0000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, PlaySoundAt, 0x0000205C, 0x00000000, 0x0000012C, 0x00000000, 0xFFFFFFF6, 0x00000030, 0x00000001, D_80243178_BA78F8, 0x00000032, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000044, 0x00000001, D_80243190_BA7910, 0x00000032, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000044, 0x00000001, D_80243190_BA7910, 0x00000032, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0x00000044, 0x00000001, D_80243190_BA7910, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802439F8_BA8178 -.word 0x00000043, 0x00000003, SetTexPanner, 0x0000005B, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000005E, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000061, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000051, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000054, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000057, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000047, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x0000004A, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x0000004D, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x0000003D, 0x00000003, 0x00000043, 0x00000003, SetTexPanner, 0x00000040, 0x00000003, 0x00000043, 0x00000003, SetTexPanner, 0x00000043, 0x00000003, 0x00000047, 0x00000005, D_80243398_BA7B18, 0x00000100, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243740_BA7EC0, 0x00000100, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243828_BA7FA8, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243910_BA8090, 0x00000100, 0x00000017, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_06/BA82F0.data.s b/ver/us/asm/data/world/area_mim/mim_06/BA82F0.data.s deleted file mode 100644 index 5bcade7765..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_06/BA82F0.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243B70_BA82F0 -.word 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243E04_BA8584 -.word 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x00000098, 0x00000043, 0x00000006, RotateGroup, 0x0000009A, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000025, 0x0000009E, 0x00000043, 0x00000006, RotateGroup, 0x000000A0, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000023, 0x0000009B, 0x00000043, 0x00000006, RotateGroup, 0x0000009D, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000027, 0x000000A1, 0x00000043, 0x00000006, RotateGroup, 0x000000A3, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000027, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243F24_BA86A4 -.word 0x00000043, 0x00000006, RotateGroup, 0x0000009A, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000043, 0x00000006, RotateGroup, 0x000000A0, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000043, 0x00000006, RotateGroup, 0x0000009D, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000043, 0x00000006, RotateGroup, 0x000000A3, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000027, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243FF4_BA8774 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D4, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D5, 0x00000000, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80243B70_BA82F0, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80243F24_BA86A4, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000168, 0x0000010E, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000044, 0x00000001, D_80243B70_BA82F0, 0x00000043, 0x00000005, MakeLerp, 0x0000010E, 0xFFFFFFF6, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000032, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80243B70_BA82F0, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000003C, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80243F24_BA86A4, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244620_BA8DA0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000046, 0x00000024, 0x00000002, 0xFE363C89, 0x00000021, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000009A, 0x00000046, 0x00000001, D_80243FF4_BA8774, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024469C_BA8E1C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C89, 0x00000025, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000A0, 0x00000046, 0x00000001, D_80243FF4_BA8774, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244718_BA8E98 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000023, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000009D, 0x00000046, 0x00000001, D_80243FF4_BA8774, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244794_BA8F14 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000046, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000027, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000A3, 0x00000046, 0x00000001, D_80243FF4_BA8774, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243B70_BA82F0, 0x00000044, 0x00000001, D_80243E04_BA8584, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000047, 0x00000005, D_80244620_BA8DA0, 0x00000100, 0x00000021, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024469C_BA8E1C, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244794_BA8F14, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244718_BA8E98, 0x00000100, 0x00000023, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_06/BA9170.data.s b/ver/us/asm/data/world/area_mim/mim_06/BA9170.data.s deleted file mode 100644 index 8f8b69b4fb..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_06/BA9170.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802449F0_BA9170 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244AAC_BA922C -.word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244ADC_BA925C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, mim_06_PiranhaPlantAI_Main, D_80244AAC_BA922C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244BB0_BA9330 -.word 0x00000000, 0x0020001A, 0x00000000, 0x00000000, D_80244ADC_BA925C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 - -dlabel D_80244BDC_BA935C -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_06_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244CE8_BA9468 -.word 0x00000000, 0x00120012, 0x00000000, 0x00000000, D_80244BDC_BA935C, 0x00000000, 0x00000000, D_802449F0_BA9170, 0x00000000, 0x00000000, 0x000B0008 - -dlabel D_80244D14_BA9494 -.word 0x3F800000, 0x0000001E, 0x0000000A, 0x42F00000, 0x00000000, 0x00000005, 0x40900000, 0x0000005A, 0x00000005, 0x43200000, 0x00000000, 0x00000001 - -dlabel D_80244D44_BA94C4 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, mim_06_HoppingAI_Main, D_80244D14_BA9494, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244D80_BA9500 -.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244D44_BA94C4, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 - -dlabel D_80244DAC_BA952C -.word 0x00000000, D_80244BB0_BA9330, 0xC3700000, 0x00000000, 0xC3700000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80244CE8_BA9468, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024518C_BA990C -.word 0x00000002, D_80244BB0_BA9330, 0x43700000, 0x00000000, 0xC3700000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_80244CE8_BA9468, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024556C_BA9CEC -.word 0x00000004, D_80244D80_BA9500, 0xC30C0000, 0x00000000, 0x43960000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050084, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0102, 0x002B0102, 0x002B0103, 0x002B0103, 0x002B0101, 0x002B0101, 0x002B0108, 0x002B0108, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80244DAC_BA952C, 0x0D0D0001, 0x00000002, D_8024518C_BA990C, 0x0D0E0001, 0x00000001, D_8024556C_BA9CEC, 0x0D070001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_07/BAB1D0.data.s b/ver/us/asm/data/world/area_mim/mim_07/BAB1D0.data.s deleted file mode 100644 index e10326634b..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_07/BAB1D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241090_BAB1D0 -.word 0x00000000, 0x00000000, 0xC4048000, 0x43340000, 0xC4048000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x44048000, 0x00000000, 0x44048000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241370, D_80241090_BAB1D0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900AD, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000047, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_07/BAB2C0.data.s b/ver/us/asm/data/world/area_mim/mim_07/BAB2C0.data.s deleted file mode 100644 index 8f263e4a16..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_07/BAB2C0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241180_BAB2C0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243790, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411DC_BAB31C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243798, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241238_BAB378 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802437A0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241294_BAB3D4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802437A8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412F0_BAB430 -.word 0x00000047, 0x00000005, D_80241180_BAB2C0, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802411DC_BAB31C, 0x00080000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241238_BAB378, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241294_BAB3D4, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070006, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x802426A0, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80243758, 0x00000046, 0x00000001, 0x80241634, 0x00000024, 0x00000002, 0xFE363C80, D_802412F0_BAB430, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241110, 0x00000046, 0x00000001, 0x80241900, 0x00000043, 0x00000001, dup_mim_07_SetForeverForestFog, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000001F4, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000212, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_07/BAB6D0.data.s b/ver/us/asm/data/world/area_mim/mim_07/BAB6D0.data.s deleted file mode 100644 index a43946ff67..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_07/BAB6D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241590_BAB6D0 -.word 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D017F, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0x00000118, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241590_BAB6D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_07/BAB7C0.data.s b/ver/us/asm/data/world/area_mim/mim_07/BAB7C0.data.s deleted file mode 100644 index f1dfbcf78a..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_07/BAB7C0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241680_BAB7C0 -.word 0x00000000 - -dlabel D_80241684_BAB7C4 -.word 0x00000000 - -dlabel D_80241688_BAB7C8 -.byte 0x00, 0x00, 0x00 - -dlabel D_8024168B_BAB7CB -.byte 0x00 - -dlabel D_8024168C_BAB7CC -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241704_BAB844 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_80240244_BAA384, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000045, 0x00000002, D_8024168C_BAB7CC, 0xFE363C89, 0x00000043, 0x00000006, PlaySoundAt, 0x0000205E, 0x00000000, 0xFFFFFFDE, 0x00000000, 0xFFFFFED4, 0x00000005, 0x00000001, 0x00000012, 0x00000043, 0x00000005, TranslateModel, 0x00000030, 0xF24A7E80, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, TranslateModel, 0x00000032, 0xF24A7E80, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateModel, 0x00000030, 0xF24A7680, 0x00000000, 0xF24A7680, 0x00000043, 0x00000005, TranslateModel, 0x00000032, 0xF24A7680, 0x00000000, 0xF24A7680, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, TranslateModel, 0x00000030, 0xF24A7C80, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000005, TranslateModel, 0x00000032, 0xF24A7C80, 0x00000000, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateModel, 0x00000030, 0xF24A7880, 0x00000000, 0xF24A7880, 0x00000043, 0x00000005, TranslateModel, 0x00000032, 0xF24A7880, 0x00000000, 0xF24A7880, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000005, TranslateModel, 0x00000030, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000032, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, func_802400D8_BAA218, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000032, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelFlags, 0x00000032, 0x00000010, 0x00000001, 0x00000047, 0x00000005, D_80241704_BAB844, 0x00000100, 0x00000017, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000032, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_07/BABAD0.data.s b/ver/us/asm/data/world/area_mim/mim_07/BABAD0.data.s deleted file mode 100644 index a52a7c317c..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_07/BABAD0.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241990_BABAD0 -.word 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C24_BABD64 -.word 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001C, 0x00000076, 0x00000043, 0x00000006, RotateGroup, 0x00000078, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000020, 0x0000007C, 0x00000043, 0x00000006, RotateGroup, 0x0000007E, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001E, 0x00000079, 0x00000043, 0x00000006, RotateGroup, 0x0000007B, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000022, 0x0000007F, 0x00000043, 0x00000006, RotateGroup, 0x00000081, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000022, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D44_BABE84 -.word 0x00000043, 0x00000006, RotateGroup, 0x00000078, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001C, 0x00000043, 0x00000006, RotateGroup, 0x0000007E, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000006, RotateGroup, 0x0000007B, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001E, 0x00000043, 0x00000006, RotateGroup, 0x00000081, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000022, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E14_BABF54 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D4, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D5, 0x00000000, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80241990_BABAD0, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80241D44_BABE84, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000168, 0x0000010E, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000044, 0x00000001, D_80241990_BABAD0, 0x00000043, 0x00000005, MakeLerp, 0x0000010E, 0xFFFFFFF6, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000032, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80241990_BABAD0, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000003C, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80241D44_BABE84, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242440_BAC580 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000046, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000078, 0x00000046, 0x00000001, D_80241E14_BABF54, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802424BC_BAC5FC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C89, 0x00000020, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000007E, 0x00000046, 0x00000001, D_80241E14_BABF54, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242538_BAC678 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000007B, 0x00000046, 0x00000001, D_80241E14_BABF54, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFD8, 0x0000000A, 0x00000002, 0xF8405F1F, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F20, 0x00000000, 0x00000024, 0x00000002, 0xF8405F20, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000E0017, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242624_BAC764 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000046, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000022, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000081, 0x00000046, 0x00000001, D_80241E14_BABF54, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241990_BABAD0, 0x00000044, 0x00000001, D_80241C24_BABD64, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000047, 0x00000005, D_80242440_BAC580, 0x00000100, 0x0000001C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802424BC_BAC5FC, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242624_BAC764, 0x00000100, 0x00000022, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242538_BAC678, 0x00000100, 0x0000001E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_07/BAC9C0.data.s b/ver/us/asm/data/world/area_mim/mim_07/BAC9C0.data.s deleted file mode 100644 index 1318804cb8..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_07/BAC9C0.data.s +++ /dev/null @@ -1,63 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242880_BAC9C0 -.word 0x3F800000, 0x0000001E, 0x0000000A, 0x42F00000, 0x00000000, 0x00000005, 0x40900000, 0x0000005A, 0x00000005, 0x43200000, 0x00000000, 0x00000001 - -dlabel D_802428B0_BAC9F0 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, mim_07_HoppingAI_Main, D_80242880_BAC9C0, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428EC_BACA2C -.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_802428B0_BAC9F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 - -dlabel D_80242918_BACA58 -.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80242944_BACA84 -.word 0x00000000, 0xFFFFFEA2 - -dlabel D_8024294C_BACA8C -.word 0x00000000, 0x0000015E - -dlabel D_80242954_BACA94 -.word 0x0000015E, 0x00000000 - -dlabel D_8024295C_BACA9C -.word 0xFFFFFEF2, 0xFFFFFF0B, 0xFFFFFF6A, 0xFFFFFECA - -dlabel D_8024296C_BACAAC -.word 0x0000010E, 0xFFFFFF0B, 0x00000096, 0xFFFFFECA - -dlabel D_8024297C_BACABC -.word 0xFFFFFEF2, 0x000000F5, 0xFFFFFF6A, 0x00000136 - -dlabel D_8024298C_BACACC -.word 0x0000010E, 0x000000F5, 0x00000096, 0x00000136 - -dlabel D_8024299C_BACADC -.word 0x000000F5, 0xFFFFFEF2, 0x00000136, 0xFFFFFF6A - -dlabel D_802429AC_BACAEC -.word 0x000000F5, 0x0000010E, 0x00000136, 0x00000096 - -dlabel D_802429BC_BACAFC -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_80242944_BACA84, 0x00000016, 0x00000001, 0x00000001, 0x00000030, 0x00000001, D_80242944_BACA84, 0x00000016, 0x00000001, 0x00000002, 0x00000030, 0x00000001, D_8024294C_BACA8C, 0x00000016, 0x00000001, 0x00000003, 0x00000030, 0x00000001, D_80242954_BACA94, 0x00000023, 0x00000000, 0x00000032, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFE363C81, 0xFE363C82, 0x00000050, 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, AwaitPlayerLeave, 0xFE363C81, 0xFE363C82, 0x00000064, 0x00000043, 0x00000005, IsPlayerWithin, 0x00000000, 0x00000000, 0x0000019A, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x8024114C, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000030, 0x00000001, D_8024295C_BACA9C, 0x00000012, 0x00000000, 0x00000030, 0x00000001, D_8024296C_BACAAC, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000030, 0x00000001, D_8024297C_BACABC, 0x00000012, 0x00000000, 0x00000030, 0x00000001, D_8024298C_BACACC, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x0000000C, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, D_8024299C_BACADC, 0x00000012, 0x00000000, 0x00000030, 0x00000001, D_802429AC_BACAEC, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0x00000000, 0xFE363C83, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210016, 0x00210003, 0x00000000, 0x000E0018, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A6280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00210009, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00210003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210016, 0x00210003, 0x00000000, 0x000E0019, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000005, 0x000E001A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0002000D, 0x00020003, 0x00000005, 0x000E001B, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000005, 0x000E001C, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0x000E001D, 0x00000016, 0x00000001, 0x00000009, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000005, 0x000E001E, 0x00000023, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210016, 0x00210003, 0x00000000, 0x000E001F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0021000B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000004, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F94_BAD0D4 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210016, 0x00210003, 0x00000000, 0x000E0022, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C81, 0x0000000F, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x000000C8, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000014A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0021000B, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0x0000000F, 0x00000024, 0x00000002, 0xF8405F1F, 0x00000001, 0x00000046, 0x00000001, 0x80241110, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430B8_BAD1F8 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFD8, 0x0000000A, 0x00000002, 0xF8405F1F, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802429BC_BACAFC, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80242F94_BAD0D4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243138_BAD278 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFD8, 0x0000000A, 0x00000002, 0xF8405F1F, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243188_BAD2C8 -.word 0x00000000, D_802428EC_BACA2C, 0xC3700000, 0x00000000, 0xC3700000, 0x00000000, D_80243138_BAD278, 0x00000000, 0x00000000, 0x00000000, 0x80050084, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0102, 0x002B0102, 0x002B0103, 0x002B0103, 0x002B0101, 0x002B0101, 0x002B0108, 0x002B0108, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243378_BAD4B8 -.word 0x00000001, D_802428EC_BACA2C, 0x43870000, 0x00000000, 0x43480000, 0x00000000, D_80243138_BAD278, 0x00000000, 0x00000000, 0x00000000, 0x80050084, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0102, 0x002B0102, 0x002B0103, 0x002B0103, 0x002B0101, 0x002B0101, 0x002B0108, 0x002B0108, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243568_BAD6A8 -.word 0x00000002, D_80242918_BACA58, 0xC3A90000, 0x00000000, 0x00000000, 0x00A40D04, D_802430B8_BAD1F8, 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, 0x00210003, 0x00210007, 0x00210007, 0x00210007, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80243188_BAD2C8, 0x0D020001, 0x00000001, D_80243378_BAD4B8, 0x0D060001, 0x00000001, D_80243568_BAD6A8, 0x02040000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_08/BB0880.data.s b/ver/us/asm/data/world/area_mim/mim_08/BB0880.data.s deleted file mode 100644 index 3347cc37d3..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_08/BB0880.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242F40_BB0880 -.word 0x00000000, 0x00000000, 0xC4048000, 0x43340000, 0xC4048000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x44048000, 0x00000000, 0x44048000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243320, D_80242F40_BB0880, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900AE, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_08/BB0940.data.s b/ver/us/asm/data/world/area_mim/mim_08/BB0940.data.s deleted file mode 100644 index c90c0c325e..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_08/BB0940.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243000_BB0940 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245290, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024305C_BB099C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245298, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430B8_BB09F8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245290, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243114_BB0A54 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245290, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243170_BB0AB0 -.word 0x00000047, 0x00000005, D_80243000_BB0940, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024305C_BB099C, 0x00080000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802430B8_BB09F8, 0x00080000, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243114_BB0A54, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802431F0_BB0B30 -.word 0x00000005, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000020, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFFE, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000020, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, TranslateModel, 0x00000020, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070007, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x802441E0, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80245258, 0x00000046, 0x00000001, 0x802434F0, 0x00000024, 0x00000002, 0xFE363C80, D_80243170_BB0AB0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80242FC0, 0x00000047, 0x00000005, D_802431F0_BB0B30, 0x00001000, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000001, mim_08_SetForeverForestFog, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, func_80240068_BAD9A8, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_08/BB0E30.data.s b/ver/us/asm/data/world/area_mim/mim_08/BB0E30.data.s deleted file mode 100644 index 805988093e..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_08/BB0E30.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802434F0_BB0E30 -.word 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0x00000000, 0x0000005D, 0x00000000, 0x0000002D, 0x000000E7, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F1D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_08/BB0E80.data.s b/ver/us/asm/data/world/area_mim/mim_08/BB0E80.data.s deleted file mode 100644 index 2b99a7184e..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_08/BB0E80.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243540_BB0E80 -.word 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802437D4_BB1114 -.word 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001F, 0x00000071, 0x00000043, 0x00000006, RotateGroup, 0x00000073, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001F, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000023, 0x00000077, 0x00000043, 0x00000006, RotateGroup, 0x00000079, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x00000074, 0x00000043, 0x00000006, RotateGroup, 0x00000076, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000025, 0x0000007A, 0x00000043, 0x00000006, RotateGroup, 0x0000007C, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802438F4_BB1234 -.word 0x00000043, 0x00000006, RotateGroup, 0x00000073, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001F, 0x00000043, 0x00000006, RotateGroup, 0x00000079, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000043, 0x00000006, RotateGroup, 0x00000076, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000043, 0x00000006, RotateGroup, 0x0000007C, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000025, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802439C4_BB1304 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D4, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D5, 0x00000000, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80243540_BB0E80, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802438F4_BB1234, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000168, 0x0000010E, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000044, 0x00000001, D_80243540_BB0E80, 0x00000043, 0x00000005, MakeLerp, 0x0000010E, 0xFFFFFFF6, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000032, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80243540_BB0E80, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000003C, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802438F4_BB1234, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243FF0_BB1930 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000046, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000073, 0x00000046, 0x00000001, D_802439C4_BB1304, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024406C_BB19AC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C89, 0x00000023, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000079, 0x00000046, 0x00000001, D_802439C4_BB1304, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802440E8_BB1A28 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000021, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000076, 0x00000046, 0x00000001, D_802439C4_BB1304, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244164_BB1AA4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000046, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000025, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000007C, 0x00000046, 0x00000001, D_802439C4_BB1304, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243540_BB0E80, 0x00000044, 0x00000001, D_802437D4_BB1114, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000047, 0x00000005, D_80243FF0_BB1930, 0x00000100, 0x0000001F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024406C_BB19AC, 0x00000100, 0x00000023, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244164_BB1AA4, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802440E8_BB1A28, 0x00000100, 0x00000021, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_08/BB1D00.data.s b/ver/us/asm/data/world/area_mim/mim_08/BB1D00.data.s deleted file mode 100644 index 4d33f9f09b..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_08/BB1D00.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel mim_08_FlyingAI_JumpVels -.float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 - -dlabel D_802443D8_BB1D18 -.word 0x3F800000, 0x0000001E, 0x00000005, 0x42A00000, 0x41F00000, 0x00000002, 0x40900000, 0x00000006, 0x00000001, 0x42B40000, 0x41F00000, 0x00000001 - -dlabel D_80244408_BB1D48 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x00000032, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, mim_08_FlyingAI_Main, D_802443D8_BB1D18, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244478_BB1DB8 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80244408_BB1D48, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00130000 - -dlabel D_802444A4_BB1DE4 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244560_BB1EA0 -.word 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244590_BB1ED0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000008, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000009, 0x0000000B, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0x0000000E, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0x00000009, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0x00000019, 0x00000043, 0x00000003, SetSelfVar, 0x0000000D, 0xFFFFFFFF, 0x00000043, 0x00000003, SetSelfVar, 0x0000000E, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, mim_08_PiranhaPlantAI_Main, D_80244560_BB1EA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244664_BB1FA4 -.word 0x00000000, 0x0020001A, 0x00000000, 0x00000000, D_80244590_BB1ED0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 - -dlabel D_80244690_BB1FD0 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000012, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, mim_08_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024479C_BB20DC -.word 0x00000000, 0x00120012, 0x00000000, 0x00000000, D_80244690_BB1FD0, 0x00000000, 0x00000000, D_802444A4_BB1DE4, 0x00000000, 0x00000000, 0x000B0008 - -dlabel D_802447C8_BB2108 -.word 0x00000003, 0x00000001, 0x00000064, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFEE8, 0x0000006C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFFFFFEE8, 0x00000032, 0x0000000A, 0x00000005, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244408_BB1D48, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244884_BB21C4 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802447C8_BB2108, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802448A8_BB21E8 -.word 0x00000000, D_80244478_BB1DB8, 0x00000000, 0xC47A0000, 0x00000000, 0x00202D00, D_80244884_BB21C4, 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, 0xFFFFFED4, 0x0000003C, 0x00000000, 0x0000003C, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFED4, 0x0000003C, 0x00000000, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004B0002, 0x004B0002, 0x004B0003, 0x004B0003, 0x004B0001, 0x004B0002, 0x004B0006, 0x004B0006, 0x004B0004, 0x004B0002, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244A98_BB23D8 -.word 0x00000001, D_80244664_BB1FA4, 0xC3700000, 0x00000000, 0xC3700000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_8024479C_BB20DC, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244E78_BB27B8 -.word 0x00000003, D_80244664_BB1FA4, 0x43700000, 0x00000000, 0x43700000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_8024479C_BB20DC, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370001, 0x00370009, 0x00370009, 0x00370004, 0x00370003, 0x00370007, 0x00370007, 0x00370008, 0x00370001, 0x00370001, 0x00370001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802448A8_BB21E8, 0x0D100001, 0x00000002, D_80244A98_BB23D8, 0x0D0F0001, 0x00000002, D_80244E78_BB27B8, 0x0D090001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_09/BB3CC0.data.s b/ver/us/asm/data/world/area_mim/mim_09/BB3CC0.data.s deleted file mode 100644 index c750b4efa5..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_09/BB3CC0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240EC0_BB3CC0 -.word 0x00000000, 0x00000000, 0xC4048000, 0x43340000, 0xC4048000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x44048000, 0x00000000, 0x44048000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241170, D_80240EC0_BB3CC0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900AF, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_09/BB3D80.data.s b/ver/us/asm/data/world/area_mim/mim_09/BB3D80.data.s deleted file mode 100644 index 748ea6be37..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_09/BB3D80.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240F80_BB3D80 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242B80, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FDC_BB3DDC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242B80, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241038_BB3E38 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242B88, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241094_BB3E94 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242B80, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410F0_BB3EF0 -.word 0x00000047, 0x00000005, D_80240F80_BB3D80, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240FDC_BB3DDC, 0x00080000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241038_BB3E38, 0x00080000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241094_BB3E94, 0x00080000, 0x0000000C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x00070008, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0xF5DE022B, 0x00000043, 0x00000002, GetMapID, 0xF5DE022B, 0x00000046, 0x00000001, 0x802426D0, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242B64, 0x00000046, 0x00000001, 0x80241330, 0x00000024, 0x00000002, 0xFE363C80, D_802410F0_BB3EF0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240F40, 0x00000046, 0x00000001, 0x802419A0, 0x00000043, 0x00000001, mim_09_SetForeverForestFog, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, func_80240068_BB2E68, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000015E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_09/BB4130.data.s b/ver/us/asm/data/world/area_mim/mim_09/BB4130.data.s deleted file mode 100644 index 6f2f8d5b76..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_09/BB4130.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241330_BB4130 -.word 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0x00000000, 0x0000005C, 0x00000000, 0x0000002D, 0x000000F8, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F1E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_09/BB4180.data.s b/ver/us/asm/data/world/area_mim/mim_09/BB4180.data.s deleted file mode 100644 index 06a80255c6..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_09/BB4180.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241380_BB4180 -.word 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0xFFFF0000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000006, PlaySoundAt, 0x0000205B, 0x00000000, 0xFFFFFFE9, 0x00000000, 0x0000012C, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000001E, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000003C, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000003E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000003F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000041, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000042, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000205B, 0x00000000, 0xFFFFFFE9, 0x00000000, 0x0000012C, 0x00000043, 0x00000005, MakeLerp, 0x0000001E, 0xFFFFFFE2, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000003C, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000003E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000003F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000041, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000042, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000205B, 0x00000000, 0xFFFFFFE9, 0x00000000, 0x0000012C, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFE2, 0x00000000, 0x00000032, 0x0000000A, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000003C, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000003E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x0000003F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000041, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000042, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417FC_BB45FC -.word 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000044, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x0000205D, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x00000064, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7A8B, 0x00000043, 0x00000005, ScaleModel, 0x0000003B, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000043, 0x00000005, ScaleModel, 0x0000003C, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000043, 0x00000005, ScaleModel, 0x0000003E, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000043, 0x00000005, ScaleModel, 0x0000003F, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000043, 0x00000005, ScaleModel, 0x00000041, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000043, 0x00000005, ScaleModel, 0x00000042, 0xFE363C80, 0xFE363C80, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80241380_BB4180, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80241380_BB4180, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000044, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000003F, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000042, 0x00000000, 0x00000047, 0x00000005, D_802417FC_BB45FC, 0x00000100, 0x0000001B, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_09/BB4830.data.s b/ver/us/asm/data/world/area_mim/mim_09/BB4830.data.s deleted file mode 100644 index e5eb1fc77a..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_09/BB4830.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241A30_BB4830 -.word 0x00000014, 0x00000001, 0xFE363C81, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000002, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000005, 0x00000001, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CC4_BB4AC4 -.word 0x00000043, 0x00000003, ParentColliderToModel, 0x00000020, 0x00000078, 0x00000043, 0x00000006, RotateGroup, 0x0000007A, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000024, 0x0000007E, 0x00000043, 0x00000006, RotateGroup, 0x00000080, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000024, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000022, 0x0000007B, 0x00000043, 0x00000006, RotateGroup, 0x0000007D, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000022, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000026, 0x00000081, 0x00000043, 0x00000006, RotateGroup, 0x00000083, 0xFE363C82, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000026, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DE4_BB4BE4 -.word 0x00000043, 0x00000006, RotateGroup, 0x0000007A, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000020, 0x00000043, 0x00000006, RotateGroup, 0x00000080, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000024, 0x00000043, 0x00000006, RotateGroup, 0x0000007D, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000022, 0x00000043, 0x00000006, RotateGroup, 0x00000083, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000026, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241EB4_BB4CB4 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D4, 0x00000000, 0x00000008, 0x00000001, 0x00000013, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x000001D5, 0x00000000, 0x00000057, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E81, 0x00000016, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80241A30_BB4830, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80241DE4_BB4BE4, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000168, 0x0000010E, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000044, 0x00000001, D_80241A30_BB4830, 0x00000043, 0x00000005, MakeLerp, 0x0000010E, 0xFFFFFFF6, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x0000005A, 0x0000000A, 0x00000001, 0x00000003, 0x00000001, 0x00000032, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C88, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_80241A30_BB4830, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000168, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000003C, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0xFE363C8A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C89, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80241DE4_BB4BE4, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802424E0_BB52E0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000046, 0x00000024, 0x00000002, 0xFE363C89, 0x00000020, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000007A, 0x00000046, 0x00000001, D_80241EB4_BB4CB4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024255C_BB535C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C89, 0x00000024, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000080, 0x00000046, 0x00000001, D_80241EB4_BB4CB4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802425D8_BB53D8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000022, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000007D, 0x00000046, 0x00000001, D_80241EB4_BB4CB4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242654_BB5454 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000046, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000026, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000083, 0x00000046, 0x00000001, D_80241EB4_BB4CB4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241A30_BB4830, 0x00000044, 0x00000001, D_80241CC4_BB4AC4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000047, 0x00000005, D_802424E0_BB52E0, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024255C_BB535C, 0x00000100, 0x00000024, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242654_BB5454, 0x00000100, 0x00000026, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802425D8_BB53D8, 0x00000100, 0x00000022, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802428DC_BB56DC -.word 0x3F800000, 0x0000001E, 0x0000000A, 0x42F00000, 0x00000000, 0x00000005, 0x40900000, 0x0000005A, 0x00000005, 0x43200000, 0x00000000, 0x00000001 - -dlabel D_8024290C_BB570C -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, mim_09_HoppingAI_Main, D_802428DC_BB56DC, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242948_BB5748 -.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024290C_BB570C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000B0000 - -dlabel D_80242974_BB5774 -.word 0x00000000, D_80242948_BB5748, 0x43870000, 0x00000000, 0x43480000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80050084, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x0000010E, 0x00000000, 0x000000C8, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0102, 0x002B0102, 0x002B0103, 0x002B0103, 0x002B0101, 0x002B0101, 0x002B0108, 0x002B0108, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x002B0103, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242974_BB5774, 0x0D050001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_10/BB5B70.data.s b/ver/us/asm/data/world/area_mim/mim_10/BB5B70.data.s deleted file mode 100644 index 0953c875c0..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_10/BB5B70.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240190_BB5B70 -.word 0xC3C08000, 0x41A00000, 0x41200000, 0x42B40000, 0x43C08000, 0x00000000, 0x41200000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240704, D_80240190_BB5B70, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900A6 - -dlabel D_802401F0_BB5BD0 -.word 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, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFCD, 0x00000044, 0x00000001, D_802401F0_BB5BD0, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, D_802401F0_BB5BD0, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000044, 0x00000001, D_802401F0_BB5BD0, 0x00000008, 0x00000001, 0x0000001E, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000008, 0x00000001, 0x0000000F, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000F, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000008, 0x00000001, 0x0000000F, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x0000001E, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000003, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, D_802401F0_BB5BD0, 0x00000008, 0x00000001, 0x0000001E, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_10/BB5EB0.data.s b/ver/us/asm/data/world/area_mim/mim_10/BB5EB0.data.s deleted file mode 100644 index f47bed6c1b..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_10/BB5EB0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802404D0_BB5EB0 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0xFFFFFF51, 0x0000003C, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_10/BB5EF0.data.s b/ver/us/asm/data/world/area_mim/mim_10/BB5EF0.data.s deleted file mode 100644 index 8c7df65fc2..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_10/BB5EF0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240510_BB5EF0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241670, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024056C_BB5F4C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFCE, 0x0000000A, 0x00000002, 0xF8405B83, 0x00000000, 0x00000024, 0x00000002, 0xF8405B83, 0x00000001, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000005DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x80241680, 0x00000003, 0x00000006, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80241678, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240648_BB6028 -.word 0x00000047, 0x00000005, D_80240510_BB5EF0, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024056C_BB5F4C, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240690_BB6070 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80240648_BB6028, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240648_BB6028, 0x00000044, 0x00000001, EnterWalk, 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, MakeNpcs, 0x00000001, 0x80241640, 0x00000044, 0x00000001, 0x80240FC0, 0x00000046, 0x00000001, D_802404D0_BB5EB0, 0x00000044, 0x00000001, 0x80240264, 0x00000044, 0x00000001, D_80240690_BB6070, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF8405C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_10/BB61D0.data.s b/ver/us/asm/data/world/area_mim/mim_10/BB61D0.data.s deleted file mode 100644 index 991d25cfc4..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_10/BB61D0.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802407F0_BB61D0 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024081C_BB61FC -.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240848_BB6228 -.word 0x00000058, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00BF0009, 0x00BF0009, 0x00000000, 0x000E0002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240980_BB6360 -.word 0x00000043, 0x00000001, func_80240000_BB59E0, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x0000028A, 0x00000043, 0x00000001, func_80240030_BB5A10, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802400EC_BB5ACC, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240148_BB5B28, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000C8, 0x0000002C, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001B, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080022, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000C1, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000C3, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24E3A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00BF0009, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8B, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, SetNpcScale, 0x00000000, 0xF24A8680, 0xF24A8680, 0xF24A8680, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00000292, 0x00000000, 0x00000046, 0x00000001, D_80240848_BB6228, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24E3A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFCE, 0x00000044, 0x00000001, 0x80240264, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCD, 0x00000002, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFCE, 0x00000044, 0x00000001, D_80240980_BB6360, 0x00000021, 0x00000002, 0xFFFFFFCE, 0xFFFFFFF1, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241020_BB6A00 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFCD, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000018, 0x00000001, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xF8405BE2, 0x00000001, 0x0000001B, 0x00000001, 0xFFFFFFCE, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241098_BB6A78 -.word 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8680, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000012C, 0x0000000F, 0xFFFFFFF9, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210016, 0x00210003, 0x00000005, 0x000E0023, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0021000B, 0x00000028, 0x00000002, 0xFE363C80, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0xFE363C82, 0x00000019, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF8405F21, 0x00000001, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411DC_BB6BBC -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241098_BB6A78, 0x0000000A, 0x00000002, 0xF8405F21, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405F1F, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241260_BB6C40 -.word 0x00000000, D_802407F0_BB61D0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000801, D_80241020_BB6A00, 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, 0x00BF0001, 0x00BF0002, 0x00BF0003, 0x00BF0003, 0x00BF0001, 0x00BF0001, 0x00BF0000, 0x00BF0000, 0x00BF0005, 0x00BF0006, 0x00BF0007, 0x00BF0008, 0x00BF0005, 0x00BF0006, 0x00BF0007, 0x00BF0008, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241450_BB6E30 -.word 0x00000001, D_8024081C_BB61FC, 0x00000000, 0x00000000, 0x00000000, 0x00200D04, D_802411DC_BB6BBC, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00210003, 0x00210007, 0x00210007, 0x00210007, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241260_BB6C40, 0x00000000, 0x00000001, D_80241450_BB6E30, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s b/ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s deleted file mode 100644 index 517be29c0c..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_11/BB7C30.data.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240BC0_BB7C30 -.word 0xC41EC000, 0x00000000, 0x40A00000, 0x42B40000, 0x441EC000, 0x00000000, 0x40A00000, 0x43870000, 0x42EA0000, 0x42140000, 0xC3490000, 0x43630000, 0xC3870000, 0x420C0000, 0xC3610000, 0x43340000, 0xC2820000, 0x00000000, 0xC1B00000, 0x439D8000, 0xC2600000, 0x00000000, 0xC1C80000, 0x43630000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024244C_BB94BC, D_80240BC0_BB7C30, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900B0 - -dlabel D_80240C60_BB7CD0 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFD0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001B, 0x00000001, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CE0_BB7D50 -.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, mim_11_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, mim_11_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, mim_11_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, mim_11_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, mim_11_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_80241500_BB8570, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241500_BB8570 -.word 0x00000043, 0x00000001, mim_11_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, mim_11_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, mim_11_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, mim_11_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, mim_11_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, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, mim_11_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, mim_11_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241AAC_BB8B1C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFCE0, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFCE0, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24B1A80, 0xF2497C20, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000002D0, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000059, 0x00000054, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000059, 0x00000054, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000004B, 0x00000000, 0x00000135, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_8024066C_BB76DC, 0x00000008, 0x00000001, 0x0000001E, 0x00000058, 0x00000000, 0x00000043, 0x00000001, func_80240790_BB7800, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFD43, 0x00000000, 0xFFFFFFDE, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFD43, 0x00000000, 0xFFFFFFDE, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFE69, 0x00000067, 0x00000078, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000005, 0x000E0024, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0002000D, 0x00020003, 0x00000005, 0x000E0025, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x0003000E, 0x00030003, 0x00000005, 0x000E0026, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0x000E0027, 0x00000023, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000005DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x802442E0, 0x00000004, 0x0000000B, 0x00000008, 0x00000001, 0x00000064 - -dlabel D_80241EC8_BB8F38 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000024, 0x00000002, 0xF8405F1C, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802442E8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F34_BB8FA4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802442F0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F90_BB9000 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, UseDoorSounds, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000066, 0x00000024, 0x00000002, 0xFE363C83, 0x00000068, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802442F8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242044_BB90B4 -.word 0x00000047, 0x00000005, D_80241EC8_BB8F38, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241F34_BB8FA4, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241F90_BB9000, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420A8_BB9118 -.word 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80242044_BB90B4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFD0, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFD0, 0x00000046, 0x00000001, D_80241AAC_BB8B1C, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80242044_BB90B4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242044_BB90B4, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80242044_BB90B4, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, UseDoorSounds, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000066, 0x00000024, 0x00000002, 0xFE363C83, 0x00000068, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80242044_BB90B4, 0x00000016, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xF8406314, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFFFFFC18, 0xFE363C82, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000024, 0x00000002, 0xF8406314, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_80242044_BB90B4, 0x00000046, 0x00000001, D_80240CE0_BB7D50, 0x00000016, 0x00000001, 0x00000004, 0x00000044, 0x00000001, D_80242044_BB90B4, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E3, 0x00000000, 0x00000044, 0x00000001, D_80242044_BB90B4, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024244C_BB94BC -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000D, 0x00000024, 0x00000002, 0xF8406338, 0x00000001, 0x00000043, 0x00000002, SetSpriteShading, 0x00070009, 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, EnableGroup, 0x00000074, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80243818, 0x00000046, 0x00000001, 0x80243140, 0x00000044, 0x00000001, D_802430E0_BBA150, 0x00000044, 0x00000001, 0x80244214, 0x00000044, 0x00000001, D_80240C60_BB7CD0, 0x00000044, 0x00000001, D_802420A8_BB9118, 0x00000043, 0x00000001, func_802405EC_BB765C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242560_BB95D0 -.word 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000D, 0x000001C9, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006C, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8280, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF9B, 0x00000011, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006C, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000D, 0x000001CA, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A8080, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC880, 0xF24A3EE7, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFF7B, 0x00000034, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x00000017, 0xFFFFFF93, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000017, 0x00000000, 0xFFFFFF93, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001B, 0x00000000, 0x00000008, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000C1, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x0000005A, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A852B, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E0028, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001B, 0x00000001, 0x00000008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A7A80, 0xF24A1680, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000226, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000E0029, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AC880, 0xF24A3EE7, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00BF0004, 0x00BF0001, 0x00000000, 0x000E002A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000C3, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24E3A80, 0x00000005, 0x00000001, 0x0000005A, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A852B, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B90_BB9C00 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000D, 0x000001C9, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006C, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000050, 0x00000028, 0x00000002, 0xFE363C82, 0x00000050, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006C, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000D, 0x000001CA, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242DC8_BB9E38 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000D, 0x000001C9, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006C, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x00000028, 0x00000002, 0xFE363C82, 0xFFFFFFB0, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x0000006C, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000D, 0x000001CA, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242FF4_BBA064 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFD1, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFD1, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000046, 0x00000001, D_80242560_BB95D0, 0x0000001B, 0x00000001, 0xFFFFFFD1, 0x0000000A, 0x00000002, 0xF9718881, 0x00000000, 0x00000046, 0x00000001, D_80242B90_BB9C00, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80242DC8_BB9E38, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430E0_BBA150 -.word 0x00000047, 0x00000005, D_80242FF4_BBA064, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_11/BBA180.data.s b/ver/us/asm/data/world/area_mim/mim_11/BBA180.data.s deleted file mode 100644 index 498d0d1225..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_11/BBA180.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243110_BBA180 -.word 0x00000043, 0x00000003, GotoMap, 0x80244300, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406314, 0x00000000, 0x0000000A, 0x00000002, 0xF840630F, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406311, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0xFFFFFEED, 0x00000000, 0xFFFFFF1F, 0x0000010E, 0x00000003, D_80243110_BBA180, 0x00000794, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x00000000, 0x0000003C, 0xFFFFFED4, 0x0000002D, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000DC, 0x0000003C, 0xFFFFFFB0, 0x0000002D, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFEE6, 0x0000003C, 0x0000020A, 0x00000000, 0x0000008B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405F27, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_11/BBA2E0.data.s b/ver/us/asm/data/world/area_mim/mim_11/BBA2E0.data.s deleted file mode 100644 index d1eb46b55f..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_11/BBA2E0.data.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243270_BBA2E0 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024329C_BBA30C -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80243320_BBA390 -.word 0x00000043, 0x00000001, func_802408F0_BB7960, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024333C_BBA3AC -.word 0x00000043, 0x00000003, BindNpcAux, 0xFFFFFFFF, D_80243320_BBA390, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0xFFFFFF9C, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFFF0, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802433B8_BBA428 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFD1, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243438_BBA4A8 -.word 0x00000000, D_80243270_BBA2E0, 0x42880000, 0x42700000, 0xC3110000, 0x00000801, D_802433B8_BBA428, 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, 0x00BF0001, 0x00BF0002, 0x00BF0003, 0x00BF0003, 0x00BF0001, 0x00BF0001, 0x00BF0000, 0x00BF0000, 0x00BF0005, 0x00BF0006, 0x00BF0007, 0x00BF0008, 0x00BF0005, 0x00BF0006, 0x00BF0007, 0x00BF0008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_8024329C_BBA30C, 0x42880000, 0x42700000, 0xC3110000, 0x00000B01, D_8024333C_BBA3AC, 0x00000000, 0x00000000, 0x00000087, 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, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140000, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00140001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80243438_BBA4A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243830_BBA8A0 -.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, mim_11_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, mim_11_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 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, mim_11_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, mim_11_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, mim_11_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, mim_11_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_80244194_BBB204 -.word 0x00000001, 0x00000075 - -dlabel D_8024419C_BBB20C -.word 0x00000001, 0x000000A9, 0x00000165, 0x00000010, 0x0000013B, 0x00000005, 0x00000000, 0xFAA2B58A - -dlabel D_802441BC_BBB22C -.word D_80244194_BBB204, D_8024419C_BBB20C, 0x00000000, 0x00000000 - -dlabel D_802441CC_BBB23C -.word 0x00000001, 0x00000076 - -dlabel D_802441D4_BBB244 -.word D_802441CC_BBB23C, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802441E4_BBB254 -.word 0x00000001, 0x00000077 - -dlabel D_802441EC_BBB25C -.word D_802441E4_BBB254, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802441FC_BBB26C -.word 0x00000001, 0x00000078 - -dlabel D_80244204_BBB274 -.word D_802441FC_BBB26C, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802441BC_BBB22C, 0x00000047, 0x00000005, D_80243830_BBA8A0, 0x00000100, 0x0000001F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802441D4_BBB244, 0x00000047, 0x00000005, D_80243830_BBA8A0, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802441EC_BBB25C, 0x00000047, 0x00000005, D_80243830_BBA8A0, 0x00000100, 0x00000021, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244204_BBB274, 0x00000047, 0x00000005, D_80243830_BBA8A0, 0x00000100, 0x00000022, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_12/BBB960.data.s b/ver/us/asm/data/world/area_mim/mim_12/BBB960.data.s deleted file mode 100644 index 4cf61202c0..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_12/BBB960.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802405E0_BBB960 -.word 0xC3BE0000, 0x00000000, 0x41200000, 0x42B40000, 0x43BE0000, 0x00000000, 0x41200000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240A08, D_802405E0_BBB960, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900B1 - -dlabel D_80240640_BBB9C0 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFD0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001B, 0x00000001, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001A, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406C0_BBBA40 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFE3, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000018, 0x00000001, 0xFFFFFFF0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001F, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000001D, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80240640_BBB9C0, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_802406C0_BBBA40, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000064, 0x00000000, 0xFFFFFFD8, 0x00000000, 0x00000004, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405F25, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_12/BBBB90.data.s b/ver/us/asm/data/world/area_mim/mim_12/BBBB90.data.s deleted file mode 100644 index dbceb46c43..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_12/BBBB90.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240810_BBBB90 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241E10, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024086C_BBBBEC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241E18, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408C8_BBBC48 -.word 0x00000047, 0x00000005, D_80240810_BBBB90, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024086C_BBBBEC, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240910_BBBC90 -.word 0x00000024, 0x00000002, 0xFE363C80, D_802408C8_BBBC48, 0x00000044, 0x00000001, EnterWalk, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24E3A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000C, 0x00000043, 0x00000002, SetSpriteShading, 0x0007000A, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00000400, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80240F0C, 0x00000046, 0x00000001, 0x802407C0, 0x00000044, 0x00000001, 0x80240768, 0x00000044, 0x00000001, 0x80241C94, 0x00000044, 0x00000001, D_80240910_BBBC90, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_12/BBBE60.data.s b/ver/us/asm/data/world/area_mim/mim_12/BBBE60.data.s deleted file mode 100644 index 69e6aab161..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_12/BBBE60.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240AE0_BBBE60 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240B0C_BBBE8C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B1C_BBBE9C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B2C_BBBEAC -.word 0x00000000, D_80240AE0_BBBE60, 0xC2880000, 0x42820000, 0xC2600000, 0x00000801, D_80240B0C_BBBE8C, 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, 0x00950001, 0x00950002, 0x00950003, 0x00950003, 0x00950001, 0x00950001, 0x00950000, 0x00950000, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240AE0_BBBE60, 0xC2FA0000, 0x42820000, 0x42700000, 0x00000801, D_80240B1C_BBBE9C, 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, 0x00950001, 0x00950002, 0x00950003, 0x00950003, 0x00950001, 0x00950001, 0x00950000, 0x00950000, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00950003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80240B2C_BBBEAC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_mim/mim_12/BBC2B0.data.s b/ver/us/asm/data/world/area_mim/mim_12/BBC2B0.data.s deleted file mode 100644 index 066c15cad3..0000000000 --- a/ver/us/asm/data/world/area_mim/mim_12/BBC2B0.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240F30_BBC2B0 -.word 0x00000043, 0x00000001, func_80240000_BBB380, 0x00000056, 0x00000000, 0x00000043, 0x00000005, func_802400CC_BBB44C, 0x000003DE, 0x000003D4, 0x000003E8, 0xFFFFFFFF, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, func_8024019C_BBB51C, 0x00000000, 0x000000E8, 0x00000014, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, func_8024025C_BBB5DC, 0x000000A0, 0x000000A0, 0x000000FF, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FC8_BBC348 -.word 0x00000043, 0x00000001, func_80240000_BBB380, 0x00000056, 0x00000000, 0x00000043, 0x00000005, func_802400CC_BBB44C, 0x000003D4, 0x000003DE, 0x000003E8, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, func_8024019C_BBB51C, 0x000000E8, 0x00000000, 0xFFFFFFEC, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, func_8024025C_BBB5DC, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241060_BBC3E0 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C9, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000F, 0x7FFFFE00, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000027, 0xFE363C80, 0x00000000, 0xFE363C83, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241164_BBC4E4 -.word 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000029, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000027, 0xFE363C80, 0x00000000, 0xFE363C83, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001CA, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000000F, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241268_BBC5E8 -.word 0x00000044, 0x00000001, D_80240F30_BBC2B0, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000044, 0x00000001, D_80241060_BBC3E0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF47, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000044, 0x00000001, D_80241164_BBC4E4, 0x00000046, 0x00000001, D_80240640_BBB9C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412FC_BBC67C -.word 0x00000044, 0x00000001, D_80240FC8_BBC348, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000044, 0x00000001, D_80241060_BBC3E0, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000044, 0x00000001, D_80241164_BBC4E4, 0x00000046, 0x00000001, D_802406C0_BBBA40, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241390_BBC710 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D9, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413D8_BBC758 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, InterruptUsePartner, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000046, 0x00000001, D_802412FC_BBC67C, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80241268_BBC5E8, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241478_BBC7F8 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0x00000001, 0xFFFFFFBE, 0x0000000D, 0xFFFFFFF1, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0x00000000, 0xFFFFFFA7, 0x0000000E, 0x0000001C, 0x00000014, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024150C_BBC88C -.word 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFBE, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFBE, 0x00000024, 0x00000002, 0xFE363C83, 0x00000050, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000001, func_802404A8_BBB828, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF79, 0x00000024, 0x00000002, 0xFE363C82, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C84, 0x00000078, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000001, func_802404A8_BBB828, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241634_BBC9B4 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFBE, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFBE, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000050, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000001, func_802404A8_BBB828, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF79, 0x00000024, 0x00000002, 0xFE363C82, 0x0000003B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000078, 0x00000024, 0x00000002, 0xFE363C84, 0x00000028, 0x00000024, 0x00000002, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000001, func_802404A8_BBB828, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024175C_BBCADC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C86, 0x00000043, 0x00000002, BringPartnerOut, 0x00000009, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000009, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00050002, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000004, 0x000E006C, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFF99, 0x00000041, 0x00000040, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFFD3, 0x00000041, 0xFFFFFFBE, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000C1, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80241478_BBC7F8, 0x00000044, 0x00000001, D_80240FC8_BBC348, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000044, 0x00000001, D_80241060_BBC3E0, 0x00000046, 0x00000001, D_8024150C_BBC88C, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000019, 0x00000000, 0x0000003C, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C86, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000009, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFFDA, 0x00000017, 0x0000003C, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000044, 0x00000001, D_80241164_BBC4E4, 0x00000046, 0x00000001, D_802406C0_BBBA40, 0x00000046, 0x00000001, D_80241634_BBC9B4, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000C3, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24E3A80, 0x00000005, 0x00000001, 0x00000014, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24AAA80, 0x00000043, 0x00000007, func_802CFD30, 0x00000000, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00050004, 0x00050001, 0x00000000, 0x000E006D, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8080, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFDD, 0x00000043, 0x00000001, PutPartnerAway, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000047, 0x00000005, D_802413D8_BBC758, 0x00000100, 0x0000000F, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFDC, 0x00000043, 0x00000001, func_80240064_BBB3E4, 0x00000047, 0x00000005, D_80241390_BBC710, 0x00000100, 0x0000000F, 0x00000001, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFDD, 0x00000043, 0x00000001, func_80240064_BBB3E4, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C80, 0xFFFFFF38, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000046, 0x00000001, D_8024175C_BBCADC, 0x0000001B, 0x00000001, 0xFFFFFFDD, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000001, func_80240064_BBB3E4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000043, 0x00000001, func_80240000_BBB380, 0x00000043, 0x00000002, EnableSpriteShading, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_802413D8_BBC758, 0x00000100, 0x0000000F, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s deleted file mode 100644 index 1b637b9683..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s +++ /dev/null @@ -1,239 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_B934B0 -/* B934B0 80240070 27BDFF88 */ addiu $sp, $sp, -0x78 -/* B934B4 80240074 F7B60050 */ sdc1 $f22, 0x50($sp) -/* B934B8 80240078 4480B000 */ mtc1 $zero, $f22 -/* B934BC 8024007C AFB30034 */ sw $s3, 0x34($sp) -/* B934C0 80240080 00A0982D */ daddu $s3, $a1, $zero -/* B934C4 80240084 AFB40038 */ sw $s4, 0x38($sp) -/* B934C8 80240088 00C0A02D */ daddu $s4, $a2, $zero -/* B934CC 8024008C AFB5003C */ sw $s5, 0x3c($sp) -/* B934D0 80240090 00E0A82D */ daddu $s5, $a3, $zero -/* B934D4 80240094 AFB20030 */ sw $s2, 0x30($sp) -/* B934D8 80240098 0080902D */ daddu $s2, $a0, $zero -/* B934DC 8024009C AFB1002C */ sw $s1, 0x2c($sp) -/* B934E0 802400A0 3C118024 */ lui $s1, %hi(D_802447C0) -/* B934E4 802400A4 263147C0 */ addiu $s1, $s1, %lo(D_802447C0) -/* B934E8 802400A8 AFBF0040 */ sw $ra, 0x40($sp) -/* B934EC 802400AC AFB00028 */ sw $s0, 0x28($sp) -/* B934F0 802400B0 F7BE0070 */ sdc1 $f30, 0x70($sp) -/* B934F4 802400B4 F7BC0068 */ sdc1 $f28, 0x68($sp) -/* B934F8 802400B8 F7BA0060 */ sdc1 $f26, 0x60($sp) -/* B934FC 802400BC F7B80058 */ sdc1 $f24, 0x58($sp) -/* B93500 802400C0 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B93504 802400C4 4600B006 */ mov.s $f0, $f22 -/* B93508 802400C8 4600B406 */ mov.s $f16, $f22 -/* B9350C 802400CC 4600B506 */ mov.s $f20, $f22 -/* B93510 802400D0 4600A786 */ mov.s $f30, $f20 -/* B93514 802400D4 4600A086 */ mov.s $f2, $f20 -/* B93518 802400D8 4600A606 */ mov.s $f24, $f20 -/* B9351C 802400DC 4600A686 */ mov.s $f26, $f20 -/* B93520 802400E0 4600A706 */ mov.s $f28, $f20 -.L802400E4: -/* B93524 802400E4 24020006 */ addiu $v0, $zero, 6 -/* B93528 802400E8 8E460000 */ lw $a2, ($s2) -/* B9352C 802400EC 8E470004 */ lw $a3, 4($s2) -/* B93530 802400F0 00061E02 */ srl $v1, $a2, 0x18 -/* B93534 802400F4 1062004E */ beq $v1, $v0, .L80240230 -/* B93538 802400F8 0000802D */ daddu $s0, $zero, $zero -/* B9353C 802400FC 28620007 */ slti $v0, $v1, 7 -/* B93540 80240100 10400007 */ beqz $v0, .L80240120 -/* B93544 80240104 24020001 */ addiu $v0, $zero, 1 -/* B93548 80240108 10620018 */ beq $v1, $v0, .L8024016C -/* B9354C 8024010C 24020005 */ addiu $v0, $zero, 5 -/* B93550 80240110 10620029 */ beq $v1, $v0, .L802401B8 -/* B93554 80240114 000713C2 */ srl $v0, $a3, 0xf -/* B93558 80240118 080900BD */ j .L802402F4 -/* B9355C 8024011C 00000000 */ nop -.L80240120: -/* B93560 80240120 240200DE */ addiu $v0, $zero, 0xde -/* B93564 80240124 10620005 */ beq $v1, $v0, .L8024013C -/* B93568 80240128 240200DF */ addiu $v0, $zero, 0xdf -/* B9356C 8024012C 50620071 */ beql $v1, $v0, .L802402F4 -/* B93570 80240130 24100001 */ addiu $s0, $zero, 1 -/* B93574 80240134 080900BD */ j .L802402F4 -/* B93578 80240138 00000000 */ nop -.L8024013C: -/* B9357C 8024013C 00E0202D */ daddu $a0, $a3, $zero -/* B93580 80240140 0260282D */ daddu $a1, $s3, $zero -/* B93584 80240144 0280302D */ daddu $a2, $s4, $zero -/* B93588 80240148 02A0382D */ daddu $a3, $s5, $zero -/* B9358C 8024014C E7A00018 */ swc1 $f0, 0x18($sp) -/* B93590 80240150 E7A2001C */ swc1 $f2, 0x1c($sp) -/* B93594 80240154 0C09001C */ jal func_80240070_B934B0 -/* B93598 80240158 E7B00020 */ swc1 $f16, 0x20($sp) -/* B9359C 8024015C C7A00018 */ lwc1 $f0, 0x18($sp) -/* B935A0 80240160 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* B935A4 80240164 080900BD */ j .L802402F4 -/* B935A8 80240168 C7B00020 */ lwc1 $f16, 0x20($sp) -.L8024016C: -/* B935AC 8024016C 00061302 */ srl $v0, $a2, 0xc -/* B935B0 80240170 304500FF */ andi $a1, $v0, 0xff -/* B935B4 80240174 0205102B */ sltu $v0, $s0, $a1 -/* B935B8 80240178 1040005E */ beqz $v0, .L802402F4 -/* B935BC 8024017C 0000182D */ daddu $v1, $zero, $zero -/* B935C0 80240180 00061042 */ srl $v0, $a2, 1 -/* B935C4 80240184 3042007F */ andi $v0, $v0, 0x7f -/* B935C8 80240188 00453023 */ subu $a2, $v0, $a1 -/* B935CC 8024018C 00E0202D */ daddu $a0, $a3, $zero -.L80240190: -/* B935D0 80240190 00C31021 */ addu $v0, $a2, $v1 -/* B935D4 80240194 00021080 */ sll $v0, $v0, 2 -/* B935D8 80240198 00511021 */ addu $v0, $v0, $s1 -/* B935DC 8024019C AC440000 */ sw $a0, ($v0) -/* B935E0 802401A0 24630001 */ addiu $v1, $v1, 1 -/* B935E4 802401A4 0065102B */ sltu $v0, $v1, $a1 -/* B935E8 802401A8 1440FFF9 */ bnez $v0, .L80240190 -/* B935EC 802401AC 24840010 */ addiu $a0, $a0, 0x10 -/* B935F0 802401B0 080900BD */ j .L802402F4 -/* B935F4 802401B4 00000000 */ nop -.L802401B8: -/* B935F8 802401B8 304201FC */ andi $v0, $v0, 0x1fc -/* B935FC 802401BC 00511021 */ addu $v0, $v0, $s1 -/* B93600 802401C0 8C440000 */ lw $a0, ($v0) -/* B93604 802401C4 24100002 */ addiu $s0, $zero, 2 -/* B93608 802401C8 84820000 */ lh $v0, ($a0) -/* B9360C 802401CC 84830002 */ lh $v1, 2($a0) -/* B93610 802401D0 44828000 */ mtc1 $v0, $f16 -/* B93614 802401D4 00000000 */ nop -/* B93618 802401D8 46808420 */ cvt.s.w $f16, $f16 -/* B9361C 802401DC 44830000 */ mtc1 $v1, $f0 -/* B93620 802401E0 00000000 */ nop -/* B93624 802401E4 46800020 */ cvt.s.w $f0, $f0 -/* B93628 802401E8 000711C2 */ srl $v0, $a3, 7 -/* B9362C 802401EC 304201FC */ andi $v0, $v0, 0x1fc -/* B93630 802401F0 00511021 */ addu $v0, $v0, $s1 -/* B93634 802401F4 84830004 */ lh $v1, 4($a0) -/* B93638 802401F8 8C440000 */ lw $a0, ($v0) -/* B9363C 802401FC 4483B000 */ mtc1 $v1, $f22 -/* B93640 80240200 00000000 */ nop -/* B93644 80240204 4680B5A0 */ cvt.s.w $f22, $f22 -/* B93648 80240208 84820000 */ lh $v0, ($a0) -/* B9364C 8024020C 84830002 */ lh $v1, 2($a0) -/* B93650 80240210 44821000 */ mtc1 $v0, $f2 -/* B93654 80240214 00000000 */ nop -/* B93658 80240218 468010A0 */ cvt.s.w $f2, $f2 -/* B9365C 8024021C 4483F000 */ mtc1 $v1, $f30 -/* B93660 80240220 00000000 */ nop -/* B93664 80240224 4680F7A0 */ cvt.s.w $f30, $f30 -/* B93668 80240228 080900AA */ j .L802402A8 -/* B9366C 8024022C 00071040 */ sll $v0, $a3, 1 -.L80240230: -/* B93670 80240230 000613C2 */ srl $v0, $a2, 0xf -/* B93674 80240234 304201FC */ andi $v0, $v0, 0x1fc -/* B93678 80240238 00511021 */ addu $v0, $v0, $s1 -/* B9367C 8024023C 8C440000 */ lw $a0, ($v0) -/* B93680 80240240 24100002 */ addiu $s0, $zero, 2 -/* B93684 80240244 84820000 */ lh $v0, ($a0) -/* B93688 80240248 84830002 */ lh $v1, 2($a0) -/* B9368C 8024024C 44828000 */ mtc1 $v0, $f16 -/* B93690 80240250 00000000 */ nop -/* B93694 80240254 46808420 */ cvt.s.w $f16, $f16 -/* B93698 80240258 44830000 */ mtc1 $v1, $f0 -/* B9369C 8024025C 00000000 */ nop -/* B936A0 80240260 46800020 */ cvt.s.w $f0, $f0 -/* B936A4 80240264 000611C2 */ srl $v0, $a2, 7 -/* B936A8 80240268 304201FC */ andi $v0, $v0, 0x1fc -/* B936AC 8024026C 00511021 */ addu $v0, $v0, $s1 -/* B936B0 80240270 84830004 */ lh $v1, 4($a0) -/* B936B4 80240274 8C440000 */ lw $a0, ($v0) -/* B936B8 80240278 4483B000 */ mtc1 $v1, $f22 -/* B936BC 8024027C 00000000 */ nop -/* B936C0 80240280 4680B5A0 */ cvt.s.w $f22, $f22 -/* B936C4 80240284 84820000 */ lh $v0, ($a0) -/* B936C8 80240288 84830002 */ lh $v1, 2($a0) -/* B936CC 8024028C 44821000 */ mtc1 $v0, $f2 -/* B936D0 80240290 00000000 */ nop -/* B936D4 80240294 468010A0 */ cvt.s.w $f2, $f2 -/* B936D8 80240298 4483F000 */ mtc1 $v1, $f30 -/* B936DC 8024029C 00000000 */ nop -/* B936E0 802402A0 4680F7A0 */ cvt.s.w $f30, $f30 -/* B936E4 802402A4 00061040 */ sll $v0, $a2, 1 -.L802402A8: -/* B936E8 802402A8 304201FC */ andi $v0, $v0, 0x1fc -/* B936EC 802402AC 00511021 */ addu $v0, $v0, $s1 -/* B936F0 802402B0 84830004 */ lh $v1, 4($a0) -/* B936F4 802402B4 8C420000 */ lw $v0, ($v0) -/* B936F8 802402B8 4483A000 */ mtc1 $v1, $f20 -/* B936FC 802402BC 00000000 */ nop -/* B93700 802402C0 4680A520 */ cvt.s.w $f20, $f20 -/* B93704 802402C4 84440000 */ lh $a0, ($v0) -/* B93708 802402C8 84430002 */ lh $v1, 2($v0) -/* B9370C 802402CC 84420004 */ lh $v0, 4($v0) -/* B93710 802402D0 4484E000 */ mtc1 $a0, $f28 -/* B93714 802402D4 00000000 */ nop -/* B93718 802402D8 4680E720 */ cvt.s.w $f28, $f28 -/* B9371C 802402DC 4483D000 */ mtc1 $v1, $f26 -/* B93720 802402E0 00000000 */ nop -/* B93724 802402E4 4680D6A0 */ cvt.s.w $f26, $f26 -/* B93728 802402E8 4482C000 */ mtc1 $v0, $f24 -/* B9372C 802402EC 00000000 */ nop -/* B93730 802402F0 4680C620 */ cvt.s.w $f24, $f24 -.L802402F4: -/* B93734 802402F4 1200FF7B */ beqz $s0, .L802400E4 -/* B93738 802402F8 26520008 */ addiu $s2, $s2, 8 -/* B9373C 802402FC 24020002 */ addiu $v0, $zero, 2 -/* B93740 80240300 1602002C */ bne $s0, $v0, .L802403B4 -/* B93744 80240304 00000000 */ nop -/* B93748 80240308 461E0201 */ sub.s $f8, $f0, $f30 -/* B9374C 8024030C 4614C181 */ sub.s $f6, $f24, $f20 -/* B93750 80240310 46064382 */ mul.s $f14, $f8, $f6 -/* B93754 80240314 00000000 */ nop -/* B93758 80240318 4614B101 */ sub.s $f4, $f22, $f20 -/* B9375C 8024031C 461ED281 */ sub.s $f10, $f26, $f30 -/* B93760 80240320 460A2302 */ mul.s $f12, $f4, $f10 -/* B93764 80240324 00000000 */ nop -/* B93768 80240328 4602E001 */ sub.s $f0, $f28, $f2 -/* B9376C 8024032C 46002102 */ mul.s $f4, $f4, $f0 -/* B93770 80240330 00000000 */ nop -/* B93774 80240334 46028081 */ sub.s $f2, $f16, $f2 -/* B93778 80240338 46061182 */ mul.s $f6, $f2, $f6 -/* B9377C 8024033C 00000000 */ nop -/* B93780 80240340 460A1082 */ mul.s $f2, $f2, $f10 -/* B93784 80240344 00000000 */ nop -/* B93788 80240348 46004202 */ mul.s $f8, $f8, $f0 -/* B9378C 8024034C 00000000 */ nop -/* B93790 80240350 460C7501 */ sub.s $f20, $f14, $f12 -/* B93794 80240354 4614A002 */ mul.s $f0, $f20, $f20 -/* B93798 80240358 00000000 */ nop -/* B9379C 8024035C 46062581 */ sub.s $f22, $f4, $f6 -/* B937A0 80240360 4616B102 */ mul.s $f4, $f22, $f22 -/* B937A4 80240364 00000000 */ nop -/* B937A8 80240368 46081601 */ sub.s $f24, $f2, $f8 -/* B937AC 8024036C 4618C082 */ mul.s $f2, $f24, $f24 -/* B937B0 80240370 00000000 */ nop -/* B937B4 80240374 46040000 */ add.s $f0, $f0, $f4 -/* B937B8 80240378 46020300 */ add.s $f12, $f0, $f2 -/* B937BC 8024037C 46006084 */ sqrt.s $f2, $f12 -/* B937C0 80240380 46021032 */ c.eq.s $f2, $f2 -/* B937C4 80240384 00000000 */ nop -/* B937C8 80240388 45030005 */ bc1tl .L802403A0 -/* B937CC 8024038C 4602A003 */ div.s $f0, $f20, $f2 -/* B937D0 80240390 0C0187BC */ jal sqrtf -/* B937D4 80240394 00000000 */ nop -/* B937D8 80240398 46000086 */ mov.s $f2, $f0 -/* B937DC 8024039C 4602A003 */ div.s $f0, $f20, $f2 -.L802403A0: -/* B937E0 802403A0 E6600000 */ swc1 $f0, ($s3) -/* B937E4 802403A4 4602B003 */ div.s $f0, $f22, $f2 -/* B937E8 802403A8 E6800000 */ swc1 $f0, ($s4) -/* B937EC 802403AC 4602C003 */ div.s $f0, $f24, $f2 -/* B937F0 802403B0 E6A00000 */ swc1 $f0, ($s5) -.L802403B4: -/* B937F4 802403B4 8FBF0040 */ lw $ra, 0x40($sp) -/* B937F8 802403B8 8FB5003C */ lw $s5, 0x3c($sp) -/* B937FC 802403BC 8FB40038 */ lw $s4, 0x38($sp) -/* B93800 802403C0 8FB30034 */ lw $s3, 0x34($sp) -/* B93804 802403C4 8FB20030 */ lw $s2, 0x30($sp) -/* B93808 802403C8 8FB1002C */ lw $s1, 0x2c($sp) -/* B9380C 802403CC 8FB00028 */ lw $s0, 0x28($sp) -/* B93810 802403D0 D7BE0070 */ ldc1 $f30, 0x70($sp) -/* B93814 802403D4 D7BC0068 */ ldc1 $f28, 0x68($sp) -/* B93818 802403D8 D7BA0060 */ ldc1 $f26, 0x60($sp) -/* B9381C 802403DC D7B80058 */ ldc1 $f24, 0x58($sp) -/* B93820 802403E0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B93824 802403E4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B93828 802403E8 03E00008 */ jr $ra -/* B9382C 802403EC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s b/ver/us/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s deleted file mode 100644 index 2b5323cad8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F0_B93830 -/* B93830 802403F0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B93834 802403F4 AFB10024 */ sw $s1, 0x24($sp) -/* B93838 802403F8 0080882D */ daddu $s1, $a0, $zero -/* B9383C 802403FC AFBF0028 */ sw $ra, 0x28($sp) -/* B93840 80240400 AFB00020 */ sw $s0, 0x20($sp) -/* B93844 80240404 F7B60038 */ sdc1 $f22, 0x38($sp) -/* B93848 80240408 F7B40030 */ sdc1 $f20, 0x30($sp) -/* B9384C 8024040C 8E30000C */ lw $s0, 0xc($s1) -/* B93850 80240410 8E050000 */ lw $a1, ($s0) -/* B93854 80240414 0C0B1EAF */ jal evt_get_variable -/* B93858 80240418 26100004 */ addiu $s0, $s0, 4 -/* B9385C 8024041C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B93860 80240420 0040202D */ daddu $a0, $v0, $zero -/* B93864 80240424 0C046B4C */ jal get_model_from_list_index -/* B93868 80240428 0040202D */ daddu $a0, $v0, $zero -/* B9386C 8024042C 8C420008 */ lw $v0, 8($v0) -/* B93870 80240430 27A50010 */ addiu $a1, $sp, 0x10 -/* B93874 80240434 8C420004 */ lw $v0, 4($v0) -/* B93878 80240438 27A60014 */ addiu $a2, $sp, 0x14 -/* B9387C 8024043C 8C440000 */ lw $a0, ($v0) -/* B93880 80240440 0C09001C */ jal func_80240070_B934B0 -/* B93884 80240444 27A70018 */ addiu $a3, $sp, 0x18 -/* B93888 80240448 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B9388C 8024044C 3C014480 */ lui $at, 0x4480 -/* B93890 80240450 4481A000 */ mtc1 $at, $f20 -/* B93894 80240454 00000000 */ nop -/* B93898 80240458 46140002 */ mul.s $f0, $f0, $f20 -/* B9389C 8024045C 00000000 */ nop -/* B938A0 80240460 3C01CD5B */ lui $at, 0xcd5b -/* B938A4 80240464 34215858 */ ori $at, $at, 0x5858 -/* B938A8 80240468 4481B000 */ mtc1 $at, $f22 -/* B938AC 8024046C 00000000 */ nop -/* B938B0 80240470 46160000 */ add.s $f0, $f0, $f22 -/* B938B4 80240474 8E050000 */ lw $a1, ($s0) -/* B938B8 80240478 4600008D */ trunc.w.s $f2, $f0 -/* B938BC 8024047C 44061000 */ mfc1 $a2, $f2 -/* B938C0 80240480 0C0B2026 */ jal evt_set_variable -/* B938C4 80240484 0220202D */ daddu $a0, $s1, $zero -/* B938C8 80240488 C7A00014 */ lwc1 $f0, 0x14($sp) -/* B938CC 8024048C 46140002 */ mul.s $f0, $f0, $f20 -/* B938D0 80240490 00000000 */ nop -/* B938D4 80240494 26100004 */ addiu $s0, $s0, 4 -/* B938D8 80240498 46160000 */ add.s $f0, $f0, $f22 -/* B938DC 8024049C 8E050000 */ lw $a1, ($s0) -/* B938E0 802404A0 4600008D */ trunc.w.s $f2, $f0 -/* B938E4 802404A4 44061000 */ mfc1 $a2, $f2 -/* B938E8 802404A8 0C0B2026 */ jal evt_set_variable -/* B938EC 802404AC 0220202D */ daddu $a0, $s1, $zero -/* B938F0 802404B0 C7A00018 */ lwc1 $f0, 0x18($sp) -/* B938F4 802404B4 46140002 */ mul.s $f0, $f0, $f20 -/* B938F8 802404B8 00000000 */ nop -/* B938FC 802404BC 26100004 */ addiu $s0, $s0, 4 -/* B93900 802404C0 46160000 */ add.s $f0, $f0, $f22 -/* B93904 802404C4 8E050000 */ lw $a1, ($s0) -/* B93908 802404C8 4600008D */ trunc.w.s $f2, $f0 -/* B9390C 802404CC 44061000 */ mfc1 $a2, $f2 -/* B93910 802404D0 0C0B2026 */ jal evt_set_variable -/* B93914 802404D4 0220202D */ daddu $a0, $s1, $zero -/* B93918 802404D8 8FBF0028 */ lw $ra, 0x28($sp) -/* B9391C 802404DC 8FB10024 */ lw $s1, 0x24($sp) -/* B93920 802404E0 8FB00020 */ lw $s0, 0x20($sp) -/* B93924 802404E4 D7B60038 */ ldc1 $f22, 0x38($sp) -/* B93928 802404E8 D7B40030 */ ldc1 $f20, 0x30($sp) -/* B9392C 802404EC 24020002 */ addiu $v0, $zero, 2 -/* B93930 802404F0 03E00008 */ jr $ra -/* B93934 802404F4 27BD0040 */ addiu $sp, $sp, 0x40 -/* B93938 802404F8 00000000 */ nop -/* B9393C 802404FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s deleted file mode 100644 index 7509129383..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_802410B0_B98CB0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410B0_B98CB0 -/* B98CB0 802410B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B98CB4 802410B4 AFBF0010 */ sw $ra, 0x10($sp) -/* B98CB8 802410B8 10A00003 */ beqz $a1, .L802410C8 -/* B98CBC 802410BC 8C86000C */ lw $a2, 0xc($a0) -/* B98CC0 802410C0 3C018024 */ lui $at, %hi(D_802416AC_B992AC) -/* B98CC4 802410C4 AC2016AC */ sw $zero, %lo(D_802416AC_B992AC)($at) -.L802410C8: -/* B98CC8 802410C8 3C038024 */ lui $v1, %hi(D_802416AC_B992AC) -/* B98CCC 802410CC 246316AC */ addiu $v1, $v1, %lo(D_802416AC_B992AC) -/* B98CD0 802410D0 8C620000 */ lw $v0, ($v1) -/* B98CD4 802410D4 54400003 */ bnel $v0, $zero, .L802410E4 -/* B98CD8 802410D8 AC600000 */ sw $zero, ($v1) -/* B98CDC 802410DC 0809043E */ j .L802410F8 -/* B98CE0 802410E0 0000102D */ daddu $v0, $zero, $zero -.L802410E4: -/* B98CE4 802410E4 8CC50000 */ lw $a1, ($a2) -/* B98CE8 802410E8 3C068024 */ lui $a2, %hi(D_802416B0_B992B0) -/* B98CEC 802410EC 0C0B2026 */ jal evt_set_variable -/* B98CF0 802410F0 8CC616B0 */ lw $a2, %lo(D_802416B0_B992B0)($a2) -/* B98CF4 802410F4 24020002 */ addiu $v0, $zero, 2 -.L802410F8: -/* B98CF8 802410F8 8FBF0010 */ lw $ra, 0x10($sp) -/* B98CFC 802410FC 03E00008 */ jr $ra -/* B98D00 80241100 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80241104_B98D04.s b/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80241104_B98D04.s deleted file mode 100644 index 9bc82634de..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80241104_B98D04.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241104_B98D04 -/* B98D04 80241104 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B98D08 80241108 AFBF0010 */ sw $ra, 0x10($sp) -/* B98D0C 8024110C 8C82000C */ lw $v0, 0xc($a0) -/* B98D10 80241110 0C0B1EAF */ jal evt_get_variable -/* B98D14 80241114 8C450000 */ lw $a1, ($v0) -/* B98D18 80241118 3C018024 */ lui $at, %hi(D_802416B0_B992B0) -/* B98D1C 8024111C AC2216B0 */ sw $v0, %lo(D_802416B0_B992B0)($at) -/* B98D20 80241120 24020002 */ addiu $v0, $zero, 2 -/* B98D24 80241124 8FBF0010 */ lw $ra, 0x10($sp) -/* B98D28 80241128 24030001 */ addiu $v1, $zero, 1 -/* B98D2C 8024112C 3C018024 */ lui $at, %hi(D_802416AC_B992AC) -/* B98D30 80241130 AC2316AC */ sw $v1, %lo(D_802416AC_B992AC)($at) -/* B98D34 80241134 03E00008 */ jr $ra -/* B98D38 80241138 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s deleted file mode 100644 index 823b127b75..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024113C_B98D3C -/* B98D3C 8024113C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B98D40 80241140 AFBF0010 */ sw $ra, 0x10($sp) -/* B98D44 80241144 8C82000C */ lw $v0, 0xc($a0) -/* B98D48 80241148 0C0B1EAF */ jal evt_get_variable -/* B98D4C 8024114C 8C450000 */ lw $a1, ($v0) -/* B98D50 80241150 0040182D */ daddu $v1, $v0, $zero -/* B98D54 80241154 10600012 */ beqz $v1, .L802411A0 -/* B98D58 80241158 0000202D */ daddu $a0, $zero, $zero -/* B98D5C 8024115C 8C620000 */ lw $v0, ($v1) -/* B98D60 80241160 5040000A */ beql $v0, $zero, .L8024118C -/* B98D64 80241164 00041080 */ sll $v0, $a0, 2 -/* B98D68 80241168 3C058024 */ lui $a1, %hi(dro_01_foliage_setup_shear_mtx) -/* B98D6C 8024116C 24A53880 */ addiu $a1, $a1, %lo(dro_01_foliage_setup_shear_mtx) -.L80241170: -/* B98D70 80241170 24630004 */ addiu $v1, $v1, 4 -/* B98D74 80241174 24840001 */ addiu $a0, $a0, 1 -/* B98D78 80241178 ACA20000 */ sw $v0, ($a1) -/* B98D7C 8024117C 8C620000 */ lw $v0, ($v1) -/* B98D80 80241180 1440FFFB */ bnez $v0, .L80241170 -/* B98D84 80241184 24A50004 */ addiu $a1, $a1, 4 -/* B98D88 80241188 00041080 */ sll $v0, $a0, 2 -.L8024118C: -/* B98D8C 8024118C 3C018024 */ lui $at, %hi(dro_01_foliage_setup_shear_mtx) -/* B98D90 80241190 00220821 */ addu $at, $at, $v0 -/* B98D94 80241194 AC203880 */ sw $zero, %lo(dro_01_foliage_setup_shear_mtx)($at) -/* B98D98 80241198 08090472 */ j .L802411C8 -/* B98D9C 8024119C 00000000 */ nop -.L802411A0: -/* B98DA0 802411A0 3C038024 */ lui $v1, %hi(dro_01_foliage_setup_shear_mtx) -/* B98DA4 802411A4 24633880 */ addiu $v1, $v1, %lo(dro_01_foliage_setup_shear_mtx) -/* B98DA8 802411A8 0060282D */ daddu $a1, $v1, $zero -.L802411AC: -/* B98DAC 802411AC 24820010 */ addiu $v0, $a0, 0x10 -/* B98DB0 802411B0 AC620000 */ sw $v0, ($v1) -/* B98DB4 802411B4 24630004 */ addiu $v1, $v1, 4 -/* B98DB8 802411B8 24840001 */ addiu $a0, $a0, 1 -/* B98DBC 802411BC 28820070 */ slti $v0, $a0, 0x70 -/* B98DC0 802411C0 1440FFFA */ bnez $v0, .L802411AC -/* B98DC4 802411C4 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802411C8: -/* B98DC8 802411C8 8FBF0010 */ lw $ra, 0x10($sp) -/* B98DCC 802411CC 24020002 */ addiu $v0, $zero, 2 -/* B98DD0 802411D0 03E00008 */ jr $ra -/* B98DD4 802411D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B98DD8 802411D8 00000000 */ nop -/* B98DDC 802411DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240068_B9B4E8.s b/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240068_B9B4E8.s deleted file mode 100644 index 8074bba83d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240068_B9B4E8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240068_B9B4E8 -/* B9B4E8 80240068 44806000 */ mtc1 $zero, $f12 -/* B9B4EC 8024006C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B9B4F0 80240070 AFB00010 */ sw $s0, 0x10($sp) -/* B9B4F4 80240074 0080802D */ daddu $s0, $a0, $zero -/* B9B4F8 80240078 AFBF0014 */ sw $ra, 0x14($sp) -/* B9B4FC 8024007C 0C038022 */ jal get_xz_dist_to_player -/* B9B500 80240080 46006386 */ mov.s $f14, $f12 -/* B9B504 80240084 4600008D */ trunc.w.s $f2, $f0 -/* B9B508 80240088 E6020084 */ swc1 $f2, 0x84($s0) -/* B9B50C 8024008C 8FBF0014 */ lw $ra, 0x14($sp) -/* B9B510 80240090 8FB00010 */ lw $s0, 0x10($sp) -/* B9B514 80240094 24020002 */ addiu $v0, $zero, 2 -/* B9B518 80240098 03E00008 */ jr $ra -/* B9B51C 8024009C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s b/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s deleted file mode 100644 index 8f104f8e4f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s +++ /dev/null @@ -1,239 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400A0_B9B520 -/* B9B520 802400A0 27BDFF88 */ addiu $sp, $sp, -0x78 -/* B9B524 802400A4 F7B60050 */ sdc1 $f22, 0x50($sp) -/* B9B528 802400A8 4480B000 */ mtc1 $zero, $f22 -/* B9B52C 802400AC AFB30034 */ sw $s3, 0x34($sp) -/* B9B530 802400B0 00A0982D */ daddu $s3, $a1, $zero -/* B9B534 802400B4 AFB40038 */ sw $s4, 0x38($sp) -/* B9B538 802400B8 00C0A02D */ daddu $s4, $a2, $zero -/* B9B53C 802400BC AFB5003C */ sw $s5, 0x3c($sp) -/* B9B540 802400C0 00E0A82D */ daddu $s5, $a3, $zero -/* B9B544 802400C4 AFB20030 */ sw $s2, 0x30($sp) -/* B9B548 802400C8 0080902D */ daddu $s2, $a0, $zero -/* B9B54C 802400CC AFB1002C */ sw $s1, 0x2c($sp) -/* B9B550 802400D0 3C118024 */ lui $s1, %hi(mim_03_802424E0) -/* B9B554 802400D4 263124E0 */ addiu $s1, $s1, %lo(mim_03_802424E0) -/* B9B558 802400D8 AFBF0040 */ sw $ra, 0x40($sp) -/* B9B55C 802400DC AFB00028 */ sw $s0, 0x28($sp) -/* B9B560 802400E0 F7BE0070 */ sdc1 $f30, 0x70($sp) -/* B9B564 802400E4 F7BC0068 */ sdc1 $f28, 0x68($sp) -/* B9B568 802400E8 F7BA0060 */ sdc1 $f26, 0x60($sp) -/* B9B56C 802400EC F7B80058 */ sdc1 $f24, 0x58($sp) -/* B9B570 802400F0 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B9B574 802400F4 4600B006 */ mov.s $f0, $f22 -/* B9B578 802400F8 4600B406 */ mov.s $f16, $f22 -/* B9B57C 802400FC 4600B506 */ mov.s $f20, $f22 -/* B9B580 80240100 4600A786 */ mov.s $f30, $f20 -/* B9B584 80240104 4600A086 */ mov.s $f2, $f20 -/* B9B588 80240108 4600A606 */ mov.s $f24, $f20 -/* B9B58C 8024010C 4600A686 */ mov.s $f26, $f20 -/* B9B590 80240110 4600A706 */ mov.s $f28, $f20 -.L80240114: -/* B9B594 80240114 24020006 */ addiu $v0, $zero, 6 -/* B9B598 80240118 8E460000 */ lw $a2, ($s2) -/* B9B59C 8024011C 8E470004 */ lw $a3, 4($s2) -/* B9B5A0 80240120 00061E02 */ srl $v1, $a2, 0x18 -/* B9B5A4 80240124 1062004E */ beq $v1, $v0, .L80240260 -/* B9B5A8 80240128 0000802D */ daddu $s0, $zero, $zero -/* B9B5AC 8024012C 28620007 */ slti $v0, $v1, 7 -/* B9B5B0 80240130 10400007 */ beqz $v0, .L80240150 -/* B9B5B4 80240134 24020001 */ addiu $v0, $zero, 1 -/* B9B5B8 80240138 10620018 */ beq $v1, $v0, .L8024019C -/* B9B5BC 8024013C 24020005 */ addiu $v0, $zero, 5 -/* B9B5C0 80240140 10620029 */ beq $v1, $v0, .L802401E8 -/* B9B5C4 80240144 000713C2 */ srl $v0, $a3, 0xf -/* B9B5C8 80240148 080900C9 */ j .L80240324 -/* B9B5CC 8024014C 00000000 */ nop -.L80240150: -/* B9B5D0 80240150 240200DE */ addiu $v0, $zero, 0xde -/* B9B5D4 80240154 10620005 */ beq $v1, $v0, .L8024016C -/* B9B5D8 80240158 240200DF */ addiu $v0, $zero, 0xdf -/* B9B5DC 8024015C 50620071 */ beql $v1, $v0, .L80240324 -/* B9B5E0 80240160 24100001 */ addiu $s0, $zero, 1 -/* B9B5E4 80240164 080900C9 */ j .L80240324 -/* B9B5E8 80240168 00000000 */ nop -.L8024016C: -/* B9B5EC 8024016C 00E0202D */ daddu $a0, $a3, $zero -/* B9B5F0 80240170 0260282D */ daddu $a1, $s3, $zero -/* B9B5F4 80240174 0280302D */ daddu $a2, $s4, $zero -/* B9B5F8 80240178 02A0382D */ daddu $a3, $s5, $zero -/* B9B5FC 8024017C E7A00018 */ swc1 $f0, 0x18($sp) -/* B9B600 80240180 E7A2001C */ swc1 $f2, 0x1c($sp) -/* B9B604 80240184 0C090028 */ jal func_802400A0_B9B520 -/* B9B608 80240188 E7B00020 */ swc1 $f16, 0x20($sp) -/* B9B60C 8024018C C7A00018 */ lwc1 $f0, 0x18($sp) -/* B9B610 80240190 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* B9B614 80240194 080900C9 */ j .L80240324 -/* B9B618 80240198 C7B00020 */ lwc1 $f16, 0x20($sp) -.L8024019C: -/* B9B61C 8024019C 00061302 */ srl $v0, $a2, 0xc -/* B9B620 802401A0 304500FF */ andi $a1, $v0, 0xff -/* B9B624 802401A4 0205102B */ sltu $v0, $s0, $a1 -/* B9B628 802401A8 1040005E */ beqz $v0, .L80240324 -/* B9B62C 802401AC 0000182D */ daddu $v1, $zero, $zero -/* B9B630 802401B0 00061042 */ srl $v0, $a2, 1 -/* B9B634 802401B4 3042007F */ andi $v0, $v0, 0x7f -/* B9B638 802401B8 00453023 */ subu $a2, $v0, $a1 -/* B9B63C 802401BC 00E0202D */ daddu $a0, $a3, $zero -.L802401C0: -/* B9B640 802401C0 00C31021 */ addu $v0, $a2, $v1 -/* B9B644 802401C4 00021080 */ sll $v0, $v0, 2 -/* B9B648 802401C8 00511021 */ addu $v0, $v0, $s1 -/* B9B64C 802401CC AC440000 */ sw $a0, ($v0) -/* B9B650 802401D0 24630001 */ addiu $v1, $v1, 1 -/* B9B654 802401D4 0065102B */ sltu $v0, $v1, $a1 -/* B9B658 802401D8 1440FFF9 */ bnez $v0, .L802401C0 -/* B9B65C 802401DC 24840010 */ addiu $a0, $a0, 0x10 -/* B9B660 802401E0 080900C9 */ j .L80240324 -/* B9B664 802401E4 00000000 */ nop -.L802401E8: -/* B9B668 802401E8 304201FC */ andi $v0, $v0, 0x1fc -/* B9B66C 802401EC 00511021 */ addu $v0, $v0, $s1 -/* B9B670 802401F0 8C440000 */ lw $a0, ($v0) -/* B9B674 802401F4 24100002 */ addiu $s0, $zero, 2 -/* B9B678 802401F8 84820000 */ lh $v0, ($a0) -/* B9B67C 802401FC 84830002 */ lh $v1, 2($a0) -/* B9B680 80240200 44828000 */ mtc1 $v0, $f16 -/* B9B684 80240204 00000000 */ nop -/* B9B688 80240208 46808420 */ cvt.s.w $f16, $f16 -/* B9B68C 8024020C 44830000 */ mtc1 $v1, $f0 -/* B9B690 80240210 00000000 */ nop -/* B9B694 80240214 46800020 */ cvt.s.w $f0, $f0 -/* B9B698 80240218 000711C2 */ srl $v0, $a3, 7 -/* B9B69C 8024021C 304201FC */ andi $v0, $v0, 0x1fc -/* B9B6A0 80240220 00511021 */ addu $v0, $v0, $s1 -/* B9B6A4 80240224 84830004 */ lh $v1, 4($a0) -/* B9B6A8 80240228 8C440000 */ lw $a0, ($v0) -/* B9B6AC 8024022C 4483B000 */ mtc1 $v1, $f22 -/* B9B6B0 80240230 00000000 */ nop -/* B9B6B4 80240234 4680B5A0 */ cvt.s.w $f22, $f22 -/* B9B6B8 80240238 84820000 */ lh $v0, ($a0) -/* B9B6BC 8024023C 84830002 */ lh $v1, 2($a0) -/* B9B6C0 80240240 44821000 */ mtc1 $v0, $f2 -/* B9B6C4 80240244 00000000 */ nop -/* B9B6C8 80240248 468010A0 */ cvt.s.w $f2, $f2 -/* B9B6CC 8024024C 4483F000 */ mtc1 $v1, $f30 -/* B9B6D0 80240250 00000000 */ nop -/* B9B6D4 80240254 4680F7A0 */ cvt.s.w $f30, $f30 -/* B9B6D8 80240258 080900B6 */ j .L802402D8 -/* B9B6DC 8024025C 00071040 */ sll $v0, $a3, 1 -.L80240260: -/* B9B6E0 80240260 000613C2 */ srl $v0, $a2, 0xf -/* B9B6E4 80240264 304201FC */ andi $v0, $v0, 0x1fc -/* B9B6E8 80240268 00511021 */ addu $v0, $v0, $s1 -/* B9B6EC 8024026C 8C440000 */ lw $a0, ($v0) -/* B9B6F0 80240270 24100002 */ addiu $s0, $zero, 2 -/* B9B6F4 80240274 84820000 */ lh $v0, ($a0) -/* B9B6F8 80240278 84830002 */ lh $v1, 2($a0) -/* B9B6FC 8024027C 44828000 */ mtc1 $v0, $f16 -/* B9B700 80240280 00000000 */ nop -/* B9B704 80240284 46808420 */ cvt.s.w $f16, $f16 -/* B9B708 80240288 44830000 */ mtc1 $v1, $f0 -/* B9B70C 8024028C 00000000 */ nop -/* B9B710 80240290 46800020 */ cvt.s.w $f0, $f0 -/* B9B714 80240294 000611C2 */ srl $v0, $a2, 7 -/* B9B718 80240298 304201FC */ andi $v0, $v0, 0x1fc -/* B9B71C 8024029C 00511021 */ addu $v0, $v0, $s1 -/* B9B720 802402A0 84830004 */ lh $v1, 4($a0) -/* B9B724 802402A4 8C440000 */ lw $a0, ($v0) -/* B9B728 802402A8 4483B000 */ mtc1 $v1, $f22 -/* B9B72C 802402AC 00000000 */ nop -/* B9B730 802402B0 4680B5A0 */ cvt.s.w $f22, $f22 -/* B9B734 802402B4 84820000 */ lh $v0, ($a0) -/* B9B738 802402B8 84830002 */ lh $v1, 2($a0) -/* B9B73C 802402BC 44821000 */ mtc1 $v0, $f2 -/* B9B740 802402C0 00000000 */ nop -/* B9B744 802402C4 468010A0 */ cvt.s.w $f2, $f2 -/* B9B748 802402C8 4483F000 */ mtc1 $v1, $f30 -/* B9B74C 802402CC 00000000 */ nop -/* B9B750 802402D0 4680F7A0 */ cvt.s.w $f30, $f30 -/* B9B754 802402D4 00061040 */ sll $v0, $a2, 1 -.L802402D8: -/* B9B758 802402D8 304201FC */ andi $v0, $v0, 0x1fc -/* B9B75C 802402DC 00511021 */ addu $v0, $v0, $s1 -/* B9B760 802402E0 84830004 */ lh $v1, 4($a0) -/* B9B764 802402E4 8C420000 */ lw $v0, ($v0) -/* B9B768 802402E8 4483A000 */ mtc1 $v1, $f20 -/* B9B76C 802402EC 00000000 */ nop -/* B9B770 802402F0 4680A520 */ cvt.s.w $f20, $f20 -/* B9B774 802402F4 84440000 */ lh $a0, ($v0) -/* B9B778 802402F8 84430002 */ lh $v1, 2($v0) -/* B9B77C 802402FC 84420004 */ lh $v0, 4($v0) -/* B9B780 80240300 4484E000 */ mtc1 $a0, $f28 -/* B9B784 80240304 00000000 */ nop -/* B9B788 80240308 4680E720 */ cvt.s.w $f28, $f28 -/* B9B78C 8024030C 4483D000 */ mtc1 $v1, $f26 -/* B9B790 80240310 00000000 */ nop -/* B9B794 80240314 4680D6A0 */ cvt.s.w $f26, $f26 -/* B9B798 80240318 4482C000 */ mtc1 $v0, $f24 -/* B9B79C 8024031C 00000000 */ nop -/* B9B7A0 80240320 4680C620 */ cvt.s.w $f24, $f24 -.L80240324: -/* B9B7A4 80240324 1200FF7B */ beqz $s0, .L80240114 -/* B9B7A8 80240328 26520008 */ addiu $s2, $s2, 8 -/* B9B7AC 8024032C 24020002 */ addiu $v0, $zero, 2 -/* B9B7B0 80240330 1602002C */ bne $s0, $v0, .L802403E4 -/* B9B7B4 80240334 00000000 */ nop -/* B9B7B8 80240338 461E0201 */ sub.s $f8, $f0, $f30 -/* B9B7BC 8024033C 4614C181 */ sub.s $f6, $f24, $f20 -/* B9B7C0 80240340 46064382 */ mul.s $f14, $f8, $f6 -/* B9B7C4 80240344 00000000 */ nop -/* B9B7C8 80240348 4614B101 */ sub.s $f4, $f22, $f20 -/* B9B7CC 8024034C 461ED281 */ sub.s $f10, $f26, $f30 -/* B9B7D0 80240350 460A2302 */ mul.s $f12, $f4, $f10 -/* B9B7D4 80240354 00000000 */ nop -/* B9B7D8 80240358 4602E001 */ sub.s $f0, $f28, $f2 -/* B9B7DC 8024035C 46002102 */ mul.s $f4, $f4, $f0 -/* B9B7E0 80240360 00000000 */ nop -/* B9B7E4 80240364 46028081 */ sub.s $f2, $f16, $f2 -/* B9B7E8 80240368 46061182 */ mul.s $f6, $f2, $f6 -/* B9B7EC 8024036C 00000000 */ nop -/* B9B7F0 80240370 460A1082 */ mul.s $f2, $f2, $f10 -/* B9B7F4 80240374 00000000 */ nop -/* B9B7F8 80240378 46004202 */ mul.s $f8, $f8, $f0 -/* B9B7FC 8024037C 00000000 */ nop -/* B9B800 80240380 460C7501 */ sub.s $f20, $f14, $f12 -/* B9B804 80240384 4614A002 */ mul.s $f0, $f20, $f20 -/* B9B808 80240388 00000000 */ nop -/* B9B80C 8024038C 46062581 */ sub.s $f22, $f4, $f6 -/* B9B810 80240390 4616B102 */ mul.s $f4, $f22, $f22 -/* B9B814 80240394 00000000 */ nop -/* B9B818 80240398 46081601 */ sub.s $f24, $f2, $f8 -/* B9B81C 8024039C 4618C082 */ mul.s $f2, $f24, $f24 -/* B9B820 802403A0 00000000 */ nop -/* B9B824 802403A4 46040000 */ add.s $f0, $f0, $f4 -/* B9B828 802403A8 46020300 */ add.s $f12, $f0, $f2 -/* B9B82C 802403AC 46006084 */ sqrt.s $f2, $f12 -/* B9B830 802403B0 46021032 */ c.eq.s $f2, $f2 -/* B9B834 802403B4 00000000 */ nop -/* B9B838 802403B8 45030005 */ bc1tl .L802403D0 -/* B9B83C 802403BC 4602A003 */ div.s $f0, $f20, $f2 -/* B9B840 802403C0 0C0187BC */ jal sqrtf -/* B9B844 802403C4 00000000 */ nop -/* B9B848 802403C8 46000086 */ mov.s $f2, $f0 -/* B9B84C 802403CC 4602A003 */ div.s $f0, $f20, $f2 -.L802403D0: -/* B9B850 802403D0 E6600000 */ swc1 $f0, ($s3) -/* B9B854 802403D4 4602B003 */ div.s $f0, $f22, $f2 -/* B9B858 802403D8 E6800000 */ swc1 $f0, ($s4) -/* B9B85C 802403DC 4602C003 */ div.s $f0, $f24, $f2 -/* B9B860 802403E0 E6A00000 */ swc1 $f0, ($s5) -.L802403E4: -/* B9B864 802403E4 8FBF0040 */ lw $ra, 0x40($sp) -/* B9B868 802403E8 8FB5003C */ lw $s5, 0x3c($sp) -/* B9B86C 802403EC 8FB40038 */ lw $s4, 0x38($sp) -/* B9B870 802403F0 8FB30034 */ lw $s3, 0x34($sp) -/* B9B874 802403F4 8FB20030 */ lw $s2, 0x30($sp) -/* B9B878 802403F8 8FB1002C */ lw $s1, 0x2c($sp) -/* B9B87C 802403FC 8FB00028 */ lw $s0, 0x28($sp) -/* B9B880 80240400 D7BE0070 */ ldc1 $f30, 0x70($sp) -/* B9B884 80240404 D7BC0068 */ ldc1 $f28, 0x68($sp) -/* B9B888 80240408 D7BA0060 */ ldc1 $f26, 0x60($sp) -/* B9B88C 8024040C D7B80058 */ ldc1 $f24, 0x58($sp) -/* B9B890 80240410 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B9B894 80240414 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B9B898 80240418 03E00008 */ jr $ra -/* B9B89C 8024041C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s deleted file mode 100644 index f44d670859..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240420_B9B8A0 -/* B9B8A0 80240420 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B9B8A4 80240424 AFB10024 */ sw $s1, 0x24($sp) -/* B9B8A8 80240428 0080882D */ daddu $s1, $a0, $zero -/* B9B8AC 8024042C AFBF0028 */ sw $ra, 0x28($sp) -/* B9B8B0 80240430 AFB00020 */ sw $s0, 0x20($sp) -/* B9B8B4 80240434 F7B60038 */ sdc1 $f22, 0x38($sp) -/* B9B8B8 80240438 F7B40030 */ sdc1 $f20, 0x30($sp) -/* B9B8BC 8024043C 8E30000C */ lw $s0, 0xc($s1) -/* B9B8C0 80240440 8E050000 */ lw $a1, ($s0) -/* B9B8C4 80240444 0C0B1EAF */ jal evt_get_variable -/* B9B8C8 80240448 26100004 */ addiu $s0, $s0, 4 -/* B9B8CC 8024044C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B9B8D0 80240450 0040202D */ daddu $a0, $v0, $zero -/* B9B8D4 80240454 0C046B4C */ jal get_model_from_list_index -/* B9B8D8 80240458 0040202D */ daddu $a0, $v0, $zero -/* B9B8DC 8024045C 8C420008 */ lw $v0, 8($v0) -/* B9B8E0 80240460 27A50010 */ addiu $a1, $sp, 0x10 -/* B9B8E4 80240464 8C420004 */ lw $v0, 4($v0) -/* B9B8E8 80240468 27A60014 */ addiu $a2, $sp, 0x14 -/* B9B8EC 8024046C 8C440000 */ lw $a0, ($v0) -/* B9B8F0 80240470 0C090028 */ jal func_802400A0_B9B520 -/* B9B8F4 80240474 27A70018 */ addiu $a3, $sp, 0x18 -/* B9B8F8 80240478 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B9B8FC 8024047C 3C014480 */ lui $at, 0x4480 -/* B9B900 80240480 4481A000 */ mtc1 $at, $f20 -/* B9B904 80240484 00000000 */ nop -/* B9B908 80240488 46140002 */ mul.s $f0, $f0, $f20 -/* B9B90C 8024048C 00000000 */ nop -/* B9B910 80240490 3C01CD5B */ lui $at, 0xcd5b -/* B9B914 80240494 34215858 */ ori $at, $at, 0x5858 -/* B9B918 80240498 4481B000 */ mtc1 $at, $f22 -/* B9B91C 8024049C 00000000 */ nop -/* B9B920 802404A0 46160000 */ add.s $f0, $f0, $f22 -/* B9B924 802404A4 8E050000 */ lw $a1, ($s0) -/* B9B928 802404A8 4600008D */ trunc.w.s $f2, $f0 -/* B9B92C 802404AC 44061000 */ mfc1 $a2, $f2 -/* B9B930 802404B0 0C0B2026 */ jal evt_set_variable -/* B9B934 802404B4 0220202D */ daddu $a0, $s1, $zero -/* B9B938 802404B8 C7A00014 */ lwc1 $f0, 0x14($sp) -/* B9B93C 802404BC 46140002 */ mul.s $f0, $f0, $f20 -/* B9B940 802404C0 00000000 */ nop -/* B9B944 802404C4 26100004 */ addiu $s0, $s0, 4 -/* B9B948 802404C8 46160000 */ add.s $f0, $f0, $f22 -/* B9B94C 802404CC 8E050000 */ lw $a1, ($s0) -/* B9B950 802404D0 4600008D */ trunc.w.s $f2, $f0 -/* B9B954 802404D4 44061000 */ mfc1 $a2, $f2 -/* B9B958 802404D8 0C0B2026 */ jal evt_set_variable -/* B9B95C 802404DC 0220202D */ daddu $a0, $s1, $zero -/* B9B960 802404E0 C7A00018 */ lwc1 $f0, 0x18($sp) -/* B9B964 802404E4 46140002 */ mul.s $f0, $f0, $f20 -/* B9B968 802404E8 00000000 */ nop -/* B9B96C 802404EC 26100004 */ addiu $s0, $s0, 4 -/* B9B970 802404F0 46160000 */ add.s $f0, $f0, $f22 -/* B9B974 802404F4 8E050000 */ lw $a1, ($s0) -/* B9B978 802404F8 4600008D */ trunc.w.s $f2, $f0 -/* B9B97C 802404FC 44061000 */ mfc1 $a2, $f2 -/* B9B980 80240500 0C0B2026 */ jal evt_set_variable -/* B9B984 80240504 0220202D */ daddu $a0, $s1, $zero -/* B9B988 80240508 8FBF0028 */ lw $ra, 0x28($sp) -/* B9B98C 8024050C 8FB10024 */ lw $s1, 0x24($sp) -/* B9B990 80240510 8FB00020 */ lw $s0, 0x20($sp) -/* B9B994 80240514 D7B60038 */ ldc1 $f22, 0x38($sp) -/* B9B998 80240518 D7B40030 */ ldc1 $f20, 0x30($sp) -/* B9B99C 8024051C 24020002 */ addiu $v0, $zero, 2 -/* B9B9A0 80240520 03E00008 */ jr $ra -/* B9B9A4 80240524 27BD0040 */ addiu $sp, $sp, 0x40 -/* B9B9A8 80240528 00000000 */ nop -/* B9B9AC 8024052C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s deleted file mode 100644 index ff7e81a289..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_04/B9D9D0/func_802401DC_B9DB3C.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401DC_B9DB3C -/* B9DB3C 802401DC 3C038024 */ lui $v1, %hi(D_80241530_B9EE90) -/* B9DB40 802401E0 24631530 */ addiu $v1, $v1, %lo(D_80241530_B9EE90) -/* B9DB44 802401E4 8C620000 */ lw $v0, ($v1) -/* B9DB48 802401E8 14400002 */ bnez $v0, .L802401F4 -/* B9DB4C 802401EC 24020001 */ addiu $v0, $zero, 1 -/* B9DB50 802401F0 AC620000 */ sw $v0, ($v1) -.L802401F4: -/* B9DB54 802401F4 03E00008 */ jr $ra -/* B9DB58 802401F8 24020002 */ addiu $v0, $zero, 2 -/* B9DB5C 802401FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s deleted file mode 100644 index 27e9c5f60d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s +++ /dev/null @@ -1,239 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070_BA47F0 -/* BA47F0 80240070 27BDFF88 */ addiu $sp, $sp, -0x78 -/* BA47F4 80240074 F7B60050 */ sdc1 $f22, 0x50($sp) -/* BA47F8 80240078 4480B000 */ mtc1 $zero, $f22 -/* BA47FC 8024007C AFB30034 */ sw $s3, 0x34($sp) -/* BA4800 80240080 00A0982D */ daddu $s3, $a1, $zero -/* BA4804 80240084 AFB40038 */ sw $s4, 0x38($sp) -/* BA4808 80240088 00C0A02D */ daddu $s4, $a2, $zero -/* BA480C 8024008C AFB5003C */ sw $s5, 0x3c($sp) -/* BA4810 80240090 00E0A82D */ daddu $s5, $a3, $zero -/* BA4814 80240094 AFB20030 */ sw $s2, 0x30($sp) -/* BA4818 80240098 0080902D */ daddu $s2, $a0, $zero -/* BA481C 8024009C AFB1002C */ sw $s1, 0x2c($sp) -/* BA4820 802400A0 3C118024 */ lui $s1, %hi(D_802459C0) -/* BA4824 802400A4 263159C0 */ addiu $s1, $s1, %lo(D_802459C0) -/* BA4828 802400A8 AFBF0040 */ sw $ra, 0x40($sp) -/* BA482C 802400AC AFB00028 */ sw $s0, 0x28($sp) -/* BA4830 802400B0 F7BE0070 */ sdc1 $f30, 0x70($sp) -/* BA4834 802400B4 F7BC0068 */ sdc1 $f28, 0x68($sp) -/* BA4838 802400B8 F7BA0060 */ sdc1 $f26, 0x60($sp) -/* BA483C 802400BC F7B80058 */ sdc1 $f24, 0x58($sp) -/* BA4840 802400C0 F7B40048 */ sdc1 $f20, 0x48($sp) -/* BA4844 802400C4 4600B006 */ mov.s $f0, $f22 -/* BA4848 802400C8 4600B406 */ mov.s $f16, $f22 -/* BA484C 802400CC 4600B506 */ mov.s $f20, $f22 -/* BA4850 802400D0 4600A786 */ mov.s $f30, $f20 -/* BA4854 802400D4 4600A086 */ mov.s $f2, $f20 -/* BA4858 802400D8 4600A606 */ mov.s $f24, $f20 -/* BA485C 802400DC 4600A686 */ mov.s $f26, $f20 -/* BA4860 802400E0 4600A706 */ mov.s $f28, $f20 -.L802400E4: -/* BA4864 802400E4 24020006 */ addiu $v0, $zero, 6 -/* BA4868 802400E8 8E460000 */ lw $a2, ($s2) -/* BA486C 802400EC 8E470004 */ lw $a3, 4($s2) -/* BA4870 802400F0 00061E02 */ srl $v1, $a2, 0x18 -/* BA4874 802400F4 1062004E */ beq $v1, $v0, .L80240230 -/* BA4878 802400F8 0000802D */ daddu $s0, $zero, $zero -/* BA487C 802400FC 28620007 */ slti $v0, $v1, 7 -/* BA4880 80240100 10400007 */ beqz $v0, .L80240120 -/* BA4884 80240104 24020001 */ addiu $v0, $zero, 1 -/* BA4888 80240108 10620018 */ beq $v1, $v0, .L8024016C -/* BA488C 8024010C 24020005 */ addiu $v0, $zero, 5 -/* BA4890 80240110 10620029 */ beq $v1, $v0, .L802401B8 -/* BA4894 80240114 000713C2 */ srl $v0, $a3, 0xf -/* BA4898 80240118 080900BD */ j .L802402F4 -/* BA489C 8024011C 00000000 */ nop -.L80240120: -/* BA48A0 80240120 240200DE */ addiu $v0, $zero, 0xde -/* BA48A4 80240124 10620005 */ beq $v1, $v0, .L8024013C -/* BA48A8 80240128 240200DF */ addiu $v0, $zero, 0xdf -/* BA48AC 8024012C 50620071 */ beql $v1, $v0, .L802402F4 -/* BA48B0 80240130 24100001 */ addiu $s0, $zero, 1 -/* BA48B4 80240134 080900BD */ j .L802402F4 -/* BA48B8 80240138 00000000 */ nop -.L8024013C: -/* BA48BC 8024013C 00E0202D */ daddu $a0, $a3, $zero -/* BA48C0 80240140 0260282D */ daddu $a1, $s3, $zero -/* BA48C4 80240144 0280302D */ daddu $a2, $s4, $zero -/* BA48C8 80240148 02A0382D */ daddu $a3, $s5, $zero -/* BA48CC 8024014C E7A00018 */ swc1 $f0, 0x18($sp) -/* BA48D0 80240150 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BA48D4 80240154 0C09001C */ jal func_80240070_BA47F0 -/* BA48D8 80240158 E7B00020 */ swc1 $f16, 0x20($sp) -/* BA48DC 8024015C C7A00018 */ lwc1 $f0, 0x18($sp) -/* BA48E0 80240160 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* BA48E4 80240164 080900BD */ j .L802402F4 -/* BA48E8 80240168 C7B00020 */ lwc1 $f16, 0x20($sp) -.L8024016C: -/* BA48EC 8024016C 00061302 */ srl $v0, $a2, 0xc -/* BA48F0 80240170 304500FF */ andi $a1, $v0, 0xff -/* BA48F4 80240174 0205102B */ sltu $v0, $s0, $a1 -/* BA48F8 80240178 1040005E */ beqz $v0, .L802402F4 -/* BA48FC 8024017C 0000182D */ daddu $v1, $zero, $zero -/* BA4900 80240180 00061042 */ srl $v0, $a2, 1 -/* BA4904 80240184 3042007F */ andi $v0, $v0, 0x7f -/* BA4908 80240188 00453023 */ subu $a2, $v0, $a1 -/* BA490C 8024018C 00E0202D */ daddu $a0, $a3, $zero -.L80240190: -/* BA4910 80240190 00C31021 */ addu $v0, $a2, $v1 -/* BA4914 80240194 00021080 */ sll $v0, $v0, 2 -/* BA4918 80240198 00511021 */ addu $v0, $v0, $s1 -/* BA491C 8024019C AC440000 */ sw $a0, ($v0) -/* BA4920 802401A0 24630001 */ addiu $v1, $v1, 1 -/* BA4924 802401A4 0065102B */ sltu $v0, $v1, $a1 -/* BA4928 802401A8 1440FFF9 */ bnez $v0, .L80240190 -/* BA492C 802401AC 24840010 */ addiu $a0, $a0, 0x10 -/* BA4930 802401B0 080900BD */ j .L802402F4 -/* BA4934 802401B4 00000000 */ nop -.L802401B8: -/* BA4938 802401B8 304201FC */ andi $v0, $v0, 0x1fc -/* BA493C 802401BC 00511021 */ addu $v0, $v0, $s1 -/* BA4940 802401C0 8C440000 */ lw $a0, ($v0) -/* BA4944 802401C4 24100002 */ addiu $s0, $zero, 2 -/* BA4948 802401C8 84820000 */ lh $v0, ($a0) -/* BA494C 802401CC 84830002 */ lh $v1, 2($a0) -/* BA4950 802401D0 44828000 */ mtc1 $v0, $f16 -/* BA4954 802401D4 00000000 */ nop -/* BA4958 802401D8 46808420 */ cvt.s.w $f16, $f16 -/* BA495C 802401DC 44830000 */ mtc1 $v1, $f0 -/* BA4960 802401E0 00000000 */ nop -/* BA4964 802401E4 46800020 */ cvt.s.w $f0, $f0 -/* BA4968 802401E8 000711C2 */ srl $v0, $a3, 7 -/* BA496C 802401EC 304201FC */ andi $v0, $v0, 0x1fc -/* BA4970 802401F0 00511021 */ addu $v0, $v0, $s1 -/* BA4974 802401F4 84830004 */ lh $v1, 4($a0) -/* BA4978 802401F8 8C440000 */ lw $a0, ($v0) -/* BA497C 802401FC 4483B000 */ mtc1 $v1, $f22 -/* BA4980 80240200 00000000 */ nop -/* BA4984 80240204 4680B5A0 */ cvt.s.w $f22, $f22 -/* BA4988 80240208 84820000 */ lh $v0, ($a0) -/* BA498C 8024020C 84830002 */ lh $v1, 2($a0) -/* BA4990 80240210 44821000 */ mtc1 $v0, $f2 -/* BA4994 80240214 00000000 */ nop -/* BA4998 80240218 468010A0 */ cvt.s.w $f2, $f2 -/* BA499C 8024021C 4483F000 */ mtc1 $v1, $f30 -/* BA49A0 80240220 00000000 */ nop -/* BA49A4 80240224 4680F7A0 */ cvt.s.w $f30, $f30 -/* BA49A8 80240228 080900AA */ j .L802402A8 -/* BA49AC 8024022C 00071040 */ sll $v0, $a3, 1 -.L80240230: -/* BA49B0 80240230 000613C2 */ srl $v0, $a2, 0xf -/* BA49B4 80240234 304201FC */ andi $v0, $v0, 0x1fc -/* BA49B8 80240238 00511021 */ addu $v0, $v0, $s1 -/* BA49BC 8024023C 8C440000 */ lw $a0, ($v0) -/* BA49C0 80240240 24100002 */ addiu $s0, $zero, 2 -/* BA49C4 80240244 84820000 */ lh $v0, ($a0) -/* BA49C8 80240248 84830002 */ lh $v1, 2($a0) -/* BA49CC 8024024C 44828000 */ mtc1 $v0, $f16 -/* BA49D0 80240250 00000000 */ nop -/* BA49D4 80240254 46808420 */ cvt.s.w $f16, $f16 -/* BA49D8 80240258 44830000 */ mtc1 $v1, $f0 -/* BA49DC 8024025C 00000000 */ nop -/* BA49E0 80240260 46800020 */ cvt.s.w $f0, $f0 -/* BA49E4 80240264 000611C2 */ srl $v0, $a2, 7 -/* BA49E8 80240268 304201FC */ andi $v0, $v0, 0x1fc -/* BA49EC 8024026C 00511021 */ addu $v0, $v0, $s1 -/* BA49F0 80240270 84830004 */ lh $v1, 4($a0) -/* BA49F4 80240274 8C440000 */ lw $a0, ($v0) -/* BA49F8 80240278 4483B000 */ mtc1 $v1, $f22 -/* BA49FC 8024027C 00000000 */ nop -/* BA4A00 80240280 4680B5A0 */ cvt.s.w $f22, $f22 -/* BA4A04 80240284 84820000 */ lh $v0, ($a0) -/* BA4A08 80240288 84830002 */ lh $v1, 2($a0) -/* BA4A0C 8024028C 44821000 */ mtc1 $v0, $f2 -/* BA4A10 80240290 00000000 */ nop -/* BA4A14 80240294 468010A0 */ cvt.s.w $f2, $f2 -/* BA4A18 80240298 4483F000 */ mtc1 $v1, $f30 -/* BA4A1C 8024029C 00000000 */ nop -/* BA4A20 802402A0 4680F7A0 */ cvt.s.w $f30, $f30 -/* BA4A24 802402A4 00061040 */ sll $v0, $a2, 1 -.L802402A8: -/* BA4A28 802402A8 304201FC */ andi $v0, $v0, 0x1fc -/* BA4A2C 802402AC 00511021 */ addu $v0, $v0, $s1 -/* BA4A30 802402B0 84830004 */ lh $v1, 4($a0) -/* BA4A34 802402B4 8C420000 */ lw $v0, ($v0) -/* BA4A38 802402B8 4483A000 */ mtc1 $v1, $f20 -/* BA4A3C 802402BC 00000000 */ nop -/* BA4A40 802402C0 4680A520 */ cvt.s.w $f20, $f20 -/* BA4A44 802402C4 84440000 */ lh $a0, ($v0) -/* BA4A48 802402C8 84430002 */ lh $v1, 2($v0) -/* BA4A4C 802402CC 84420004 */ lh $v0, 4($v0) -/* BA4A50 802402D0 4484E000 */ mtc1 $a0, $f28 -/* BA4A54 802402D4 00000000 */ nop -/* BA4A58 802402D8 4680E720 */ cvt.s.w $f28, $f28 -/* BA4A5C 802402DC 4483D000 */ mtc1 $v1, $f26 -/* BA4A60 802402E0 00000000 */ nop -/* BA4A64 802402E4 4680D6A0 */ cvt.s.w $f26, $f26 -/* BA4A68 802402E8 4482C000 */ mtc1 $v0, $f24 -/* BA4A6C 802402EC 00000000 */ nop -/* BA4A70 802402F0 4680C620 */ cvt.s.w $f24, $f24 -.L802402F4: -/* BA4A74 802402F4 1200FF7B */ beqz $s0, .L802400E4 -/* BA4A78 802402F8 26520008 */ addiu $s2, $s2, 8 -/* BA4A7C 802402FC 24020002 */ addiu $v0, $zero, 2 -/* BA4A80 80240300 1602002C */ bne $s0, $v0, .L802403B4 -/* BA4A84 80240304 00000000 */ nop -/* BA4A88 80240308 461E0201 */ sub.s $f8, $f0, $f30 -/* BA4A8C 8024030C 4614C181 */ sub.s $f6, $f24, $f20 -/* BA4A90 80240310 46064382 */ mul.s $f14, $f8, $f6 -/* BA4A94 80240314 00000000 */ nop -/* BA4A98 80240318 4614B101 */ sub.s $f4, $f22, $f20 -/* BA4A9C 8024031C 461ED281 */ sub.s $f10, $f26, $f30 -/* BA4AA0 80240320 460A2302 */ mul.s $f12, $f4, $f10 -/* BA4AA4 80240324 00000000 */ nop -/* BA4AA8 80240328 4602E001 */ sub.s $f0, $f28, $f2 -/* BA4AAC 8024032C 46002102 */ mul.s $f4, $f4, $f0 -/* BA4AB0 80240330 00000000 */ nop -/* BA4AB4 80240334 46028081 */ sub.s $f2, $f16, $f2 -/* BA4AB8 80240338 46061182 */ mul.s $f6, $f2, $f6 -/* BA4ABC 8024033C 00000000 */ nop -/* BA4AC0 80240340 460A1082 */ mul.s $f2, $f2, $f10 -/* BA4AC4 80240344 00000000 */ nop -/* BA4AC8 80240348 46004202 */ mul.s $f8, $f8, $f0 -/* BA4ACC 8024034C 00000000 */ nop -/* BA4AD0 80240350 460C7501 */ sub.s $f20, $f14, $f12 -/* BA4AD4 80240354 4614A002 */ mul.s $f0, $f20, $f20 -/* BA4AD8 80240358 00000000 */ nop -/* BA4ADC 8024035C 46062581 */ sub.s $f22, $f4, $f6 -/* BA4AE0 80240360 4616B102 */ mul.s $f4, $f22, $f22 -/* BA4AE4 80240364 00000000 */ nop -/* BA4AE8 80240368 46081601 */ sub.s $f24, $f2, $f8 -/* BA4AEC 8024036C 4618C082 */ mul.s $f2, $f24, $f24 -/* BA4AF0 80240370 00000000 */ nop -/* BA4AF4 80240374 46040000 */ add.s $f0, $f0, $f4 -/* BA4AF8 80240378 46020300 */ add.s $f12, $f0, $f2 -/* BA4AFC 8024037C 46006084 */ sqrt.s $f2, $f12 -/* BA4B00 80240380 46021032 */ c.eq.s $f2, $f2 -/* BA4B04 80240384 00000000 */ nop -/* BA4B08 80240388 45030005 */ bc1tl .L802403A0 -/* BA4B0C 8024038C 4602A003 */ div.s $f0, $f20, $f2 -/* BA4B10 80240390 0C0187BC */ jal sqrtf -/* BA4B14 80240394 00000000 */ nop -/* BA4B18 80240398 46000086 */ mov.s $f2, $f0 -/* BA4B1C 8024039C 4602A003 */ div.s $f0, $f20, $f2 -.L802403A0: -/* BA4B20 802403A0 E6600000 */ swc1 $f0, ($s3) -/* BA4B24 802403A4 4602B003 */ div.s $f0, $f22, $f2 -/* BA4B28 802403A8 E6800000 */ swc1 $f0, ($s4) -/* BA4B2C 802403AC 4602C003 */ div.s $f0, $f24, $f2 -/* BA4B30 802403B0 E6A00000 */ swc1 $f0, ($s5) -.L802403B4: -/* BA4B34 802403B4 8FBF0040 */ lw $ra, 0x40($sp) -/* BA4B38 802403B8 8FB5003C */ lw $s5, 0x3c($sp) -/* BA4B3C 802403BC 8FB40038 */ lw $s4, 0x38($sp) -/* BA4B40 802403C0 8FB30034 */ lw $s3, 0x34($sp) -/* BA4B44 802403C4 8FB20030 */ lw $s2, 0x30($sp) -/* BA4B48 802403C8 8FB1002C */ lw $s1, 0x2c($sp) -/* BA4B4C 802403CC 8FB00028 */ lw $s0, 0x28($sp) -/* BA4B50 802403D0 D7BE0070 */ ldc1 $f30, 0x70($sp) -/* BA4B54 802403D4 D7BC0068 */ ldc1 $f28, 0x68($sp) -/* BA4B58 802403D8 D7BA0060 */ ldc1 $f26, 0x60($sp) -/* BA4B5C 802403DC D7B80058 */ ldc1 $f24, 0x58($sp) -/* BA4B60 802403E0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* BA4B64 802403E4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* BA4B68 802403E8 03E00008 */ jr $ra -/* BA4B6C 802403EC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s deleted file mode 100644 index 7b2f7007d8..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F0_BA4B70 -/* BA4B70 802403F0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BA4B74 802403F4 AFB10024 */ sw $s1, 0x24($sp) -/* BA4B78 802403F8 0080882D */ daddu $s1, $a0, $zero -/* BA4B7C 802403FC AFBF0028 */ sw $ra, 0x28($sp) -/* BA4B80 80240400 AFB00020 */ sw $s0, 0x20($sp) -/* BA4B84 80240404 F7B60038 */ sdc1 $f22, 0x38($sp) -/* BA4B88 80240408 F7B40030 */ sdc1 $f20, 0x30($sp) -/* BA4B8C 8024040C 8E30000C */ lw $s0, 0xc($s1) -/* BA4B90 80240410 8E050000 */ lw $a1, ($s0) -/* BA4B94 80240414 0C0B1EAF */ jal evt_get_variable -/* BA4B98 80240418 26100004 */ addiu $s0, $s0, 4 -/* BA4B9C 8024041C 0C046C04 */ jal get_model_list_index_from_tree_index -/* BA4BA0 80240420 0040202D */ daddu $a0, $v0, $zero -/* BA4BA4 80240424 0C046B4C */ jal get_model_from_list_index -/* BA4BA8 80240428 0040202D */ daddu $a0, $v0, $zero -/* BA4BAC 8024042C 8C420008 */ lw $v0, 8($v0) -/* BA4BB0 80240430 27A50010 */ addiu $a1, $sp, 0x10 -/* BA4BB4 80240434 8C420004 */ lw $v0, 4($v0) -/* BA4BB8 80240438 27A60014 */ addiu $a2, $sp, 0x14 -/* BA4BBC 8024043C 8C440000 */ lw $a0, ($v0) -/* BA4BC0 80240440 0C09001C */ jal func_80240070_BA47F0 -/* BA4BC4 80240444 27A70018 */ addiu $a3, $sp, 0x18 -/* BA4BC8 80240448 C7A00010 */ lwc1 $f0, 0x10($sp) -/* BA4BCC 8024044C 3C014480 */ lui $at, 0x4480 -/* BA4BD0 80240450 4481A000 */ mtc1 $at, $f20 -/* BA4BD4 80240454 00000000 */ nop -/* BA4BD8 80240458 46140002 */ mul.s $f0, $f0, $f20 -/* BA4BDC 8024045C 00000000 */ nop -/* BA4BE0 80240460 3C01CD5B */ lui $at, 0xcd5b -/* BA4BE4 80240464 34215858 */ ori $at, $at, 0x5858 -/* BA4BE8 80240468 4481B000 */ mtc1 $at, $f22 -/* BA4BEC 8024046C 00000000 */ nop -/* BA4BF0 80240470 46160000 */ add.s $f0, $f0, $f22 -/* BA4BF4 80240474 8E050000 */ lw $a1, ($s0) -/* BA4BF8 80240478 4600008D */ trunc.w.s $f2, $f0 -/* BA4BFC 8024047C 44061000 */ mfc1 $a2, $f2 -/* BA4C00 80240480 0C0B2026 */ jal evt_set_variable -/* BA4C04 80240484 0220202D */ daddu $a0, $s1, $zero -/* BA4C08 80240488 C7A00014 */ lwc1 $f0, 0x14($sp) -/* BA4C0C 8024048C 46140002 */ mul.s $f0, $f0, $f20 -/* BA4C10 80240490 00000000 */ nop -/* BA4C14 80240494 26100004 */ addiu $s0, $s0, 4 -/* BA4C18 80240498 46160000 */ add.s $f0, $f0, $f22 -/* BA4C1C 8024049C 8E050000 */ lw $a1, ($s0) -/* BA4C20 802404A0 4600008D */ trunc.w.s $f2, $f0 -/* BA4C24 802404A4 44061000 */ mfc1 $a2, $f2 -/* BA4C28 802404A8 0C0B2026 */ jal evt_set_variable -/* BA4C2C 802404AC 0220202D */ daddu $a0, $s1, $zero -/* BA4C30 802404B0 C7A00018 */ lwc1 $f0, 0x18($sp) -/* BA4C34 802404B4 46140002 */ mul.s $f0, $f0, $f20 -/* BA4C38 802404B8 00000000 */ nop -/* BA4C3C 802404BC 26100004 */ addiu $s0, $s0, 4 -/* BA4C40 802404C0 46160000 */ add.s $f0, $f0, $f22 -/* BA4C44 802404C4 8E050000 */ lw $a1, ($s0) -/* BA4C48 802404C8 4600008D */ trunc.w.s $f2, $f0 -/* BA4C4C 802404CC 44061000 */ mfc1 $a2, $f2 -/* BA4C50 802404D0 0C0B2026 */ jal evt_set_variable -/* BA4C54 802404D4 0220202D */ daddu $a0, $s1, $zero -/* BA4C58 802404D8 8FBF0028 */ lw $ra, 0x28($sp) -/* BA4C5C 802404DC 8FB10024 */ lw $s1, 0x24($sp) -/* BA4C60 802404E0 8FB00020 */ lw $s0, 0x20($sp) -/* BA4C64 802404E4 D7B60038 */ ldc1 $f22, 0x38($sp) -/* BA4C68 802404E8 D7B40030 */ ldc1 $f20, 0x30($sp) -/* BA4C6C 802404EC 24020002 */ addiu $v0, $zero, 2 -/* BA4C70 802404F0 03E00008 */ jr $ra -/* BA4C74 802404F4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802404F8_BA4C78.s b/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802404F8_BA4C78.s deleted file mode 100644 index ecab76c81b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802404F8_BA4C78.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404F8_BA4C78 -/* BA4C78 802404F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA4C7C 802404FC AFB10014 */ sw $s1, 0x14($sp) -/* BA4C80 80240500 0080882D */ daddu $s1, $a0, $zero -/* BA4C84 80240504 AFBF0018 */ sw $ra, 0x18($sp) -/* BA4C88 80240508 AFB00010 */ sw $s0, 0x10($sp) -/* BA4C8C 8024050C 8E30000C */ lw $s0, 0xc($s1) -/* BA4C90 80240510 8E050000 */ lw $a1, ($s0) -/* BA4C94 80240514 0C0B1EAF */ jal evt_get_variable -/* BA4C98 80240518 26100004 */ addiu $s0, $s0, 4 -/* BA4C9C 8024051C 44826000 */ mtc1 $v0, $f12 -/* BA4CA0 80240520 00000000 */ nop -/* BA4CA4 80240524 0C00A8BB */ jal sin_deg -/* BA4CA8 80240528 46806320 */ cvt.s.w $f12, $f12 -/* BA4CAC 8024052C 3C014120 */ lui $at, 0x4120 -/* BA4CB0 80240530 44811000 */ mtc1 $at, $f2 -/* BA4CB4 80240534 00000000 */ nop -/* BA4CB8 80240538 46020002 */ mul.s $f0, $f0, $f2 -/* BA4CBC 8024053C 00000000 */ nop -/* BA4CC0 80240540 8E050000 */ lw $a1, ($s0) -/* BA4CC4 80240544 4600010D */ trunc.w.s $f4, $f0 -/* BA4CC8 80240548 44062000 */ mfc1 $a2, $f4 -/* BA4CCC 8024054C 0C0B2026 */ jal evt_set_variable -/* BA4CD0 80240550 0220202D */ daddu $a0, $s1, $zero -/* BA4CD4 80240554 8FBF0018 */ lw $ra, 0x18($sp) -/* BA4CD8 80240558 8FB10014 */ lw $s1, 0x14($sp) -/* BA4CDC 8024055C 8FB00010 */ lw $s0, 0x10($sp) -/* BA4CE0 80240560 24020002 */ addiu $v0, $zero, 2 -/* BA4CE4 80240564 03E00008 */ jr $ra -/* BA4CE8 80240568 27BD0020 */ addiu $sp, $sp, 0x20 -/* BA4CEC 8024056C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s b/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s deleted file mode 100644 index 9a31e191d7..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240244_BAA384 -/* BAA384 80240244 3C038024 */ lui $v1, %hi(D_80241680_BAB7C0) -/* BAA388 80240248 24631680 */ addiu $v1, $v1, %lo(D_80241680_BAB7C0) -/* BAA38C 8024024C 8C620000 */ lw $v0, ($v1) -/* BAA390 80240250 14400003 */ bnez $v0, .L80240260 -/* BAA394 80240254 24020001 */ addiu $v0, $zero, 1 -/* BAA398 80240258 AC620000 */ sw $v0, ($v1) -/* BAA39C 8024025C AC820084 */ sw $v0, 0x84($a0) -.L80240260: -/* BAA3A0 80240260 03E00008 */ jr $ra -/* BAA3A4 80240264 24020002 */ addiu $v0, $zero, 2 -/* BAA3A8 80240268 00000000 */ nop -/* BAA3AC 8024026C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240068_BB2E68.s b/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240068_BB2E68.s deleted file mode 100644 index 5496740c79..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240068_BB2E68.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240068_BB2E68 -/* BB2E68 80240068 44806000 */ mtc1 $zero, $f12 -/* BB2E6C 8024006C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB2E70 80240070 AFB00010 */ sw $s0, 0x10($sp) -/* BB2E74 80240074 0080802D */ daddu $s0, $a0, $zero -/* BB2E78 80240078 AFBF0014 */ sw $ra, 0x14($sp) -/* BB2E7C 8024007C 0C038022 */ jal get_xz_dist_to_player -/* BB2E80 80240080 46006386 */ mov.s $f14, $f12 -/* BB2E84 80240084 4600008D */ trunc.w.s $f2, $f0 -/* BB2E88 80240088 E6020084 */ swc1 $f2, 0x84($s0) -/* BB2E8C 8024008C 8FBF0014 */ lw $ra, 0x14($sp) -/* BB2E90 80240090 8FB00010 */ lw $s0, 0x10($sp) -/* BB2E94 80240094 24020002 */ addiu $v0, $zero, 2 -/* BB2E98 80240098 03E00008 */ jr $ra -/* BB2E9C 8024009C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240030_BB5A10.s b/ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240030_BB5A10.s deleted file mode 100644 index 436c60fbb3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240030_BB5A10.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030_BB5A10 -/* BB5A10 80240030 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB5A14 80240034 AFBF0010 */ sw $ra, 0x10($sp) -/* BB5A18 80240038 0C046ED4 */ jal enable_world_fog -/* BB5A1C 8024003C 00000000 */ nop -/* BB5A20 80240040 24040010 */ addiu $a0, $zero, 0x10 -/* BB5A24 80240044 0080282D */ daddu $a1, $a0, $zero -/* BB5A28 80240048 0080302D */ daddu $a2, $a0, $zero -/* BB5A2C 8024004C 0C046EE2 */ jal set_world_fog_color -/* BB5A30 80240050 240700FF */ addiu $a3, $zero, 0xff -/* BB5A34 80240054 3C02800B */ lui $v0, %hi(gCameras) -/* BB5A38 80240058 24421D80 */ addiu $v0, $v0, %lo(gCameras) -/* BB5A3C 8024005C 24030014 */ addiu $v1, $zero, 0x14 -/* BB5A40 80240060 A443002C */ sh $v1, 0x2c($v0) -/* BB5A44 80240064 A443002E */ sh $v1, 0x2e($v0) -/* BB5A48 80240068 2403001C */ addiu $v1, $zero, 0x1c -/* BB5A4C 8024006C A4430030 */ sh $v1, 0x30($v0) -/* BB5A50 80240070 8FBF0010 */ lw $ra, 0x10($sp) -/* BB5A54 80240074 24020002 */ addiu $v0, $zero, 2 -/* BB5A58 80240078 03E00008 */ jr $ra -/* BB5A5C 8024007C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240080_BB5A60.s b/ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240080_BB5A60.s deleted file mode 100644 index fdc8d9024b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240080_BB5A60.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240080_BB5A60 -/* BB5A60 80240080 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB5A64 80240084 AFBF0010 */ sw $ra, 0x10($sp) -/* BB5A68 80240088 0C046ED4 */ jal enable_world_fog -/* BB5A6C 8024008C 00000000 */ nop -/* BB5A70 80240090 240403DE */ addiu $a0, $zero, 0x3de -/* BB5A74 80240094 0C046EDD */ jal set_world_fog_dist -/* BB5A78 80240098 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BB5A7C 8024009C 24040010 */ addiu $a0, $zero, 0x10 -/* BB5A80 802400A0 0080282D */ daddu $a1, $a0, $zero -/* BB5A84 802400A4 0080302D */ daddu $a2, $a0, $zero -/* BB5A88 802400A8 0C046EE2 */ jal set_world_fog_color -/* BB5A8C 802400AC 240700FF */ addiu $a3, $zero, 0xff -/* BB5A90 802400B0 3C03800B */ lui $v1, %hi(gCameras) -/* BB5A94 802400B4 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* BB5A98 802400B8 24020014 */ addiu $v0, $zero, 0x14 -/* BB5A9C 802400BC A462002C */ sh $v0, 0x2c($v1) -/* BB5AA0 802400C0 A462002E */ sh $v0, 0x2e($v1) -/* BB5AA4 802400C4 2402001C */ addiu $v0, $zero, 0x1c -/* BB5AA8 802400C8 A4620030 */ sh $v0, 0x30($v1) -/* BB5AAC 802400CC 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* BB5AB0 802400D0 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* BB5AB4 802400D4 240200F0 */ addiu $v0, $zero, 0xf0 -/* BB5AB8 802400D8 A462015C */ sh $v0, 0x15c($v1) -/* BB5ABC 802400DC 8FBF0010 */ lw $ra, 0x10($sp) -/* BB5AC0 802400E0 24020002 */ addiu $v0, $zero, 2 -/* BB5AC4 802400E4 03E00008 */ jr $ra -/* BB5AC8 802400E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_802400EC_BB5ACC.s b/ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_802400EC_BB5ACC.s deleted file mode 100644 index 54fc4383dd..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_802400EC_BB5ACC.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC_BB5ACC -/* BB5ACC 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB5AD0 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* BB5AD4 802400F4 0000802D */ daddu $s0, $zero, $zero -/* BB5AD8 802400F8 10A00003 */ beqz $a1, .L80240108 -/* BB5ADC 802400FC AFBF0014 */ sw $ra, 0x14($sp) -/* BB5AE0 80240100 24020424 */ addiu $v0, $zero, 0x424 -/* BB5AE4 80240104 AC820074 */ sw $v0, 0x74($a0) -.L80240108: -/* BB5AE8 80240108 8C820074 */ lw $v0, 0x74($a0) -/* BB5AEC 8024010C 2442FFFF */ addiu $v0, $v0, -1 -/* BB5AF0 80240110 AC820074 */ sw $v0, 0x74($a0) -/* BB5AF4 80240114 284203E9 */ slti $v0, $v0, 0x3e9 -/* BB5AF8 80240118 10400003 */ beqz $v0, .L80240128 -/* BB5AFC 8024011C 240203E8 */ addiu $v0, $zero, 0x3e8 -/* BB5B00 80240120 AC820074 */ sw $v0, 0x74($a0) -/* BB5B04 80240124 24100002 */ addiu $s0, $zero, 2 -.L80240128: -/* BB5B08 80240128 8C850074 */ lw $a1, 0x74($a0) -/* BB5B0C 8024012C 0C046EDD */ jal set_world_fog_dist -/* BB5B10 80240130 240403DE */ addiu $a0, $zero, 0x3de -/* BB5B14 80240134 0200102D */ daddu $v0, $s0, $zero -/* BB5B18 80240138 8FBF0014 */ lw $ra, 0x14($sp) -/* BB5B1C 8024013C 8FB00010 */ lw $s0, 0x10($sp) -/* BB5B20 80240140 03E00008 */ jr $ra -/* BB5B24 80240144 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240148_BB5B28.s b/ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240148_BB5B28.s deleted file mode 100644 index d6b714392c..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240148_BB5B28.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240148_BB5B28 -/* BB5B28 80240148 10A00002 */ beqz $a1, .L80240154 -/* BB5B2C 8024014C 0000302D */ daddu $a2, $zero, $zero -/* BB5B30 80240150 AC800074 */ sw $zero, 0x74($a0) -.L80240154: -/* BB5B34 80240154 8C820074 */ lw $v0, 0x74($a0) -/* BB5B38 80240158 24420004 */ addiu $v0, $v0, 4 -/* BB5B3C 8024015C AC820074 */ sw $v0, 0x74($a0) -/* BB5B40 80240160 284200F0 */ slti $v0, $v0, 0xf0 -/* BB5B44 80240164 14400004 */ bnez $v0, .L80240178 -/* BB5B48 80240168 00000000 */ nop -/* BB5B4C 8024016C 240200F0 */ addiu $v0, $zero, 0xf0 -/* BB5B50 80240170 AC820074 */ sw $v0, 0x74($a0) -/* BB5B54 80240174 24060002 */ addiu $a2, $zero, 2 -.L80240178: -/* BB5B58 80240178 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* BB5B5C 8024017C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* BB5B60 80240180 94820076 */ lhu $v0, 0x76($a0) -/* BB5B64 80240184 A462015C */ sh $v0, 0x15c($v1) -/* BB5B68 80240188 03E00008 */ jr $ra -/* BB5B6C 8024018C 00C0102D */ daddu $v0, $a2, $zero diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802405EC_BB765C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802405EC_BB765C.s deleted file mode 100644 index 03b0e76475..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_802405EC_BB765C.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC_BB765C -/* BB765C 802405EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB7660 802405F0 AFBF0010 */ sw $ra, 0x10($sp) -/* BB7664 802405F4 0C046ED4 */ jal enable_world_fog -/* BB7668 802405F8 00000000 */ nop -/* BB766C 802405FC 240403C0 */ addiu $a0, $zero, 0x3c0 -/* BB7670 80240600 0C046EDD */ jal set_world_fog_dist -/* BB7674 80240604 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BB7678 80240608 24040020 */ addiu $a0, $zero, 0x20 -/* BB767C 8024060C 2405001E */ addiu $a1, $zero, 0x1e -/* BB7680 80240610 2406001C */ addiu $a2, $zero, 0x1c -/* BB7684 80240614 0C046EE2 */ jal set_world_fog_color -/* BB7688 80240618 240700FF */ addiu $a3, $zero, 0xff -/* BB768C 8024061C 0C048BFB */ jal enable_entity_fog -/* BB7690 80240620 00000000 */ nop -/* BB7694 80240624 240403DE */ addiu $a0, $zero, 0x3de -/* BB7698 80240628 0C048C04 */ jal set_entity_fog_dist -/* BB769C 8024062C 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BB76A0 80240630 0000202D */ daddu $a0, $zero, $zero -/* BB76A4 80240634 0080282D */ daddu $a1, $a0, $zero -/* BB76A8 80240638 0080302D */ daddu $a2, $a0, $zero -/* BB76AC 8024063C 0C048C0A */ jal set_entity_fog_color -/* BB76B0 80240640 240700FF */ addiu $a3, $zero, 0xff -/* BB76B4 80240644 3C03800B */ lui $v1, %hi(gCameras) -/* BB76B8 80240648 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* BB76BC 8024064C 24020018 */ addiu $v0, $zero, 0x18 -/* BB76C0 80240650 A462002C */ sh $v0, 0x2c($v1) -/* BB76C4 80240654 A462002E */ sh $v0, 0x2e($v1) -/* BB76C8 80240658 A4620030 */ sh $v0, 0x30($v1) -/* BB76CC 8024065C 8FBF0010 */ lw $ra, 0x10($sp) -/* BB76D0 80240660 24020002 */ addiu $v0, $zero, 2 -/* BB76D4 80240664 03E00008 */ jr $ra -/* BB76D8 80240668 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024066C_BB76DC.s b/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024066C_BB76DC.s deleted file mode 100644 index e6dd94739b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024066C_BB76DC.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024066C_BB76DC -/* BB76DC 8024066C 0080302D */ daddu $a2, $a0, $zero -/* BB76E0 80240670 0000382D */ daddu $a3, $zero, $zero -/* BB76E4 80240674 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* BB76E8 80240678 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* BB76EC 8024067C 3C04800B */ lui $a0, %hi(gCameras) -/* BB76F0 80240680 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* BB76F4 80240684 00031080 */ sll $v0, $v1, 2 -/* BB76F8 80240688 00431021 */ addu $v0, $v0, $v1 -/* BB76FC 8024068C 00021080 */ sll $v0, $v0, 2 -/* BB7700 80240690 00431023 */ subu $v0, $v0, $v1 -/* BB7704 80240694 000218C0 */ sll $v1, $v0, 3 -/* BB7708 80240698 00431021 */ addu $v0, $v0, $v1 -/* BB770C 8024069C 000210C0 */ sll $v0, $v0, 3 -/* BB7710 802406A0 10A00005 */ beqz $a1, .L802406B8 -/* BB7714 802406A4 00442021 */ addu $a0, $v0, $a0 -/* BB7718 802406A8 24020064 */ addiu $v0, $zero, 0x64 -/* BB771C 802406AC ACC00074 */ sw $zero, 0x74($a2) -/* BB7720 802406B0 ACC00078 */ sw $zero, 0x78($a2) -/* BB7724 802406B4 ACC2007C */ sw $v0, 0x7c($a2) -.L802406B8: -/* BB7728 802406B8 8CC30074 */ lw $v1, 0x74($a2) -/* BB772C 802406BC 10600005 */ beqz $v1, .L802406D4 -/* BB7730 802406C0 24020001 */ addiu $v0, $zero, 1 -/* BB7734 802406C4 1062000C */ beq $v1, $v0, .L802406F8 -/* BB7738 802406C8 00000000 */ nop -/* BB773C 802406CC 080901C9 */ j .L80240724 -/* BB7740 802406D0 00000000 */ nop -.L802406D4: -/* BB7744 802406D4 8CC20078 */ lw $v0, 0x78($a2) -/* BB7748 802406D8 8CC3007C */ lw $v1, 0x7c($a2) -/* BB774C 802406DC 00431021 */ addu $v0, $v0, $v1 -/* BB7750 802406E0 ACC20078 */ sw $v0, 0x78($a2) -/* BB7754 802406E4 28423E80 */ slti $v0, $v0, 0x3e80 -/* BB7758 802406E8 1440000E */ bnez $v0, .L80240724 -/* BB775C 802406EC 24020001 */ addiu $v0, $zero, 1 -/* BB7760 802406F0 080901C9 */ j .L80240724 -/* BB7764 802406F4 ACC20074 */ sw $v0, 0x74($a2) -.L802406F8: -/* BB7768 802406F8 8CC20078 */ lw $v0, 0x78($a2) -/* BB776C 802406FC 8CC3007C */ lw $v1, 0x7c($a2) -/* BB7770 80240700 00431021 */ addu $v0, $v0, $v1 -/* BB7774 80240704 ACC20078 */ sw $v0, 0x78($a2) -/* BB7778 80240708 0060102D */ daddu $v0, $v1, $zero -/* BB777C 8024070C 8CC30078 */ lw $v1, 0x78($a2) -/* BB7780 80240710 2442FFFE */ addiu $v0, $v0, -2 -/* BB7784 80240714 28634650 */ slti $v1, $v1, 0x4650 -/* BB7788 80240718 14600002 */ bnez $v1, .L80240724 -/* BB778C 8024071C ACC2007C */ sw $v0, 0x7c($a2) -/* BB7790 80240720 24070002 */ addiu $a3, $zero, 2 -.L80240724: -/* BB7794 80240724 3C013A89 */ lui $at, 0x3a89 -/* BB7798 80240728 3421A028 */ ori $at, $at, 0xa028 -/* BB779C 8024072C 44811000 */ mtc1 $at, $f2 -/* BB77A0 80240730 C4C00078 */ lwc1 $f0, 0x78($a2) -/* BB77A4 80240734 46800020 */ cvt.s.w $f0, $f0 -/* BB77A8 80240738 46020002 */ mul.s $f0, $f0, $f2 -/* BB77AC 8024073C 00000000 */ nop -/* BB77B0 80240740 3C014220 */ lui $at, 0x4220 -/* BB77B4 80240744 44811000 */ mtc1 $at, $f2 -/* BB77B8 80240748 00000000 */ nop -/* BB77BC 8024074C 46020000 */ add.s $f0, $f0, $f2 -/* BB77C0 80240750 3C013B29 */ lui $at, 0x3b29 -/* BB77C4 80240754 34214D24 */ ori $at, $at, 0x4d24 -/* BB77C8 80240758 44811000 */ mtc1 $at, $f2 -/* BB77CC 8024075C E48004E0 */ swc1 $f0, 0x4e0($a0) -/* BB77D0 80240760 C4C00078 */ lwc1 $f0, 0x78($a2) -/* BB77D4 80240764 46800020 */ cvt.s.w $f0, $f0 -/* BB77D8 80240768 46020002 */ mul.s $f0, $f0, $f2 -/* BB77DC 8024076C 00000000 */ nop -/* BB77E0 80240770 3C01C27E */ lui $at, 0xc27e -/* BB77E4 80240774 34216666 */ ori $at, $at, 0x6666 -/* BB77E8 80240778 44811000 */ mtc1 $at, $f2 -/* BB77EC 8024077C 00000000 */ nop -/* BB77F0 80240780 46020000 */ add.s $f0, $f0, $f2 -/* BB77F4 80240784 00E0102D */ daddu $v0, $a3, $zero -/* BB77F8 80240788 03E00008 */ jr $ra -/* BB77FC 8024078C E48004FC */ swc1 $f0, 0x4fc($a0) diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240790_BB7800.s b/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240790_BB7800.s deleted file mode 100644 index 2e02259ea3..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240790_BB7800.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240790_BB7800 -/* BB7800 80240790 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BB7804 80240794 AFB00010 */ sw $s0, 0x10($sp) -/* BB7808 80240798 AFB10014 */ sw $s1, 0x14($sp) -/* BB780C 8024079C 3C11800B */ lui $s1, %hi(gCameras) -/* BB7810 802407A0 26311D80 */ addiu $s1, $s1, %lo(gCameras) -/* BB7814 802407A4 AFBF0018 */ sw $ra, 0x18($sp) -/* BB7818 802407A8 F7B60028 */ sdc1 $f22, 0x28($sp) -/* BB781C 802407AC F7B40020 */ sdc1 $f20, 0x20($sp) -/* BB7820 802407B0 10A00002 */ beqz $a1, .L802407BC -/* BB7824 802407B4 0080802D */ daddu $s0, $a0, $zero -/* BB7828 802407B8 AE000074 */ sw $zero, 0x74($s0) -.L802407BC: -/* BB782C 802407BC 3C064296 */ lui $a2, 0x4296 -/* BB7830 802407C0 3C07439A */ lui $a3, 0x439a -/* BB7834 802407C4 34E78000 */ ori $a3, $a3, 0x8000 -/* BB7838 802407C8 3C0142B2 */ lui $at, 0x42b2 -/* BB783C 802407CC 4481A000 */ mtc1 $at, $f20 -/* BB7840 802407D0 3C0142A8 */ lui $at, 0x42a8 -/* BB7844 802407D4 4481B000 */ mtc1 $at, $f22 -/* BB7848 802407D8 4600A306 */ mov.s $f12, $f20 -/* BB784C 802407DC 0C00A720 */ jal atan2 -/* BB7850 802407E0 4600B386 */ mov.s $f14, $f22 -/* BB7854 802407E4 4600A306 */ mov.s $f12, $f20 -/* BB7858 802407E8 4600B386 */ mov.s $f14, $f22 -/* BB785C 802407EC 3C064375 */ lui $a2, 0x4375 -/* BB7860 802407F0 3C0742AA */ lui $a3, 0x42aa -/* BB7864 802407F4 0C00A720 */ jal atan2 -/* BB7868 802407F8 46000586 */ mov.s $f22, $f0 -/* BB786C 802407FC 46160501 */ sub.s $f20, $f0, $f22 -/* BB7870 80240800 3C014220 */ lui $at, 0x4220 -/* BB7874 80240804 44810000 */ mtc1 $at, $f0 -/* BB7878 80240808 00000000 */ nop -/* BB787C 8024080C 4600A503 */ div.s $f20, $f20, $f0 -/* BB7880 80240810 C6000074 */ lwc1 $f0, 0x74($s0) -/* BB7884 80240814 46800020 */ cvt.s.w $f0, $f0 -/* BB7888 80240818 4600A502 */ mul.s $f20, $f20, $f0 -/* BB788C 8024081C 00000000 */ nop -/* BB7890 80240820 4616A500 */ add.s $f20, $f20, $f22 -/* BB7894 80240824 3C0142C8 */ lui $at, 0x42c8 -/* BB7898 80240828 4481B000 */ mtc1 $at, $f22 -/* BB789C 8024082C 0C00A8BB */ jal sin_deg -/* BB78A0 80240830 4600A306 */ mov.s $f12, $f20 -/* BB78A4 80240834 46160002 */ mul.s $f0, $f0, $f22 -/* BB78A8 80240838 00000000 */ nop -/* BB78AC 8024083C 4600A306 */ mov.s $f12, $f20 -/* BB78B0 80240840 4600008D */ trunc.w.s $f2, $f0 -/* BB78B4 80240844 44021000 */ mfc1 $v0, $f2 -/* BB78B8 80240848 00000000 */ nop -/* BB78BC 8024084C 24420059 */ addiu $v0, $v0, 0x59 -/* BB78C0 80240850 44820000 */ mtc1 $v0, $f0 -/* BB78C4 80240854 00000000 */ nop -/* BB78C8 80240858 46800020 */ cvt.s.w $f0, $f0 -/* BB78CC 8024085C 0C00A8D4 */ jal cos_deg -/* BB78D0 80240860 E62004B0 */ swc1 $f0, 0x4b0($s1) -/* BB78D4 80240864 46000007 */ neg.s $f0, $f0 -/* BB78D8 80240868 46160002 */ mul.s $f0, $f0, $f22 -/* BB78DC 8024086C 00000000 */ nop -/* BB78E0 80240870 24020001 */ addiu $v0, $zero, 1 -/* BB78E4 80240874 A6220506 */ sh $v0, 0x506($s1) -/* BB78E8 80240878 4600008D */ trunc.w.s $f2, $f0 -/* BB78EC 8024087C 44021000 */ mfc1 $v0, $f2 -/* BB78F0 80240880 00000000 */ nop -/* BB78F4 80240884 24420054 */ addiu $v0, $v0, 0x54 -/* BB78F8 80240888 44820000 */ mtc1 $v0, $f0 -/* BB78FC 8024088C 00000000 */ nop -/* BB7900 80240890 46800020 */ cvt.s.w $f0, $f0 -/* BB7904 80240894 E62004B8 */ swc1 $f0, 0x4b8($s1) -/* BB7908 80240898 8E020074 */ lw $v0, 0x74($s0) -/* BB790C 8024089C 24420001 */ addiu $v0, $v0, 1 -/* BB7910 802408A0 AE020074 */ sw $v0, 0x74($s0) -/* BB7914 802408A4 28420029 */ slti $v0, $v0, 0x29 -/* BB7918 802408A8 38420001 */ xori $v0, $v0, 1 -/* BB791C 802408AC 8FBF0018 */ lw $ra, 0x18($sp) -/* BB7920 802408B0 8FB10014 */ lw $s1, 0x14($sp) -/* BB7924 802408B4 8FB00010 */ lw $s0, 0x10($sp) -/* BB7928 802408B8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* BB792C 802408BC D7B40020 */ ldc1 $f20, 0x20($sp) -/* BB7930 802408C0 00021040 */ sll $v0, $v0, 1 -/* BB7934 802408C4 03E00008 */ jr $ra -/* BB7938 802408C8 27BD0030 */ addiu $sp, $sp, 0x30 -/* BB793C 802408CC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408D0_BB7940.s b/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408D0_BB7940.s deleted file mode 100644 index 8ae3d8401e..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408D0_BB7940.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D0_BB7940 -/* BB7940 802408D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB7944 802408D4 AFBF0010 */ sw $ra, 0x10($sp) -/* BB7948 802408D8 0C03A86D */ jal increment_max_SP -/* BB794C 802408DC 00000000 */ nop -/* BB7950 802408E0 8FBF0010 */ lw $ra, 0x10($sp) -/* BB7954 802408E4 24020002 */ addiu $v0, $zero, 2 -/* BB7958 802408E8 03E00008 */ jr $ra -/* BB795C 802408EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408F0_BB7960.s b/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408F0_BB7960.s deleted file mode 100644 index c8e3e2ca03..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_11/BB7940/func_802408F0_BB7960.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F0_BB7960 -/* BB7960 802408F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BB7964 802408F4 AFB10014 */ sw $s1, 0x14($sp) -/* BB7968 802408F8 0080882D */ daddu $s1, $a0, $zero -/* BB796C 802408FC AFBF0018 */ sw $ra, 0x18($sp) -/* BB7970 80240900 10A00005 */ beqz $a1, .L80240918 -/* BB7974 80240904 AFB00010 */ sw $s0, 0x10($sp) -/* BB7978 80240908 8E24014C */ lw $a0, 0x14c($s1) -/* BB797C 8024090C 0C00EAD2 */ jal get_npc_safe -/* BB7980 80240910 AE200074 */ sw $zero, 0x74($s1) -/* BB7984 80240914 AE220078 */ sw $v0, 0x78($s1) -.L80240918: -/* BB7988 80240918 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BB798C 8024091C 0C00A8BB */ jal sin_deg -/* BB7990 80240920 8E300078 */ lw $s0, 0x78($s1) -/* BB7994 80240924 3C0140C0 */ lui $at, 0x40c0 -/* BB7998 80240928 44811000 */ mtc1 $at, $f2 -/* BB799C 8024092C 00000000 */ nop -/* BB79A0 80240930 46020002 */ mul.s $f0, $f0, $f2 -/* BB79A4 80240934 00000000 */ nop -/* BB79A8 80240938 3C014190 */ lui $at, 0x4190 -/* BB79AC 8024093C 44816000 */ mtc1 $at, $f12 -/* BB79B0 80240940 4600010D */ trunc.w.s $f4, $f0 -/* BB79B4 80240944 44022000 */ mfc1 $v0, $f4 -/* BB79B8 80240948 00000000 */ nop -/* BB79BC 8024094C A20200AB */ sb $v0, 0xab($s0) -/* BB79C0 80240950 C6200074 */ lwc1 $f0, 0x74($s1) -/* BB79C4 80240954 0C00A6C9 */ jal clamp_angle -/* BB79C8 80240958 460C0300 */ add.s $f12, $f0, $f12 -/* BB79CC 8024095C E6200074 */ swc1 $f0, 0x74($s1) -/* BB79D0 80240960 8FBF0018 */ lw $ra, 0x18($sp) -/* BB79D4 80240964 8FB10014 */ lw $s1, 0x14($sp) -/* BB79D8 80240968 8FB00010 */ lw $s0, 0x10($sp) -/* BB79DC 8024096C 0000102D */ daddu $v0, $zero, $zero -/* BB79E0 80240970 03E00008 */ jr $ra -/* BB79E4 80240974 27BD0020 */ addiu $sp, $sp, 0x20 -/* BB79E8 80240978 00000000 */ nop -/* BB79EC 8024097C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240000_BBB380.s b/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240000_BBB380.s deleted file mode 100644 index e34af444ed..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240000_BBB380.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_BBB380 -/* BBB380 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BBB384 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* BBB388 80240008 0C046ED4 */ jal enable_world_fog -/* BBB38C 8024000C 00000000 */ nop -/* BBB390 80240010 240403DE */ addiu $a0, $zero, 0x3de -/* BBB394 80240014 0C046EDD */ jal set_world_fog_dist -/* BBB398 80240018 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BBB39C 8024001C 0000202D */ daddu $a0, $zero, $zero -/* BBB3A0 80240020 24050008 */ addiu $a1, $zero, 8 -/* BBB3A4 80240024 24060018 */ addiu $a2, $zero, 0x18 -/* BBB3A8 80240028 0C046EE2 */ jal set_world_fog_color -/* BBB3AC 8024002C 240700FF */ addiu $a3, $zero, 0xff -/* BBB3B0 80240030 3C02800B */ lui $v0, %hi(gCameras) -/* BBB3B4 80240034 24421D80 */ addiu $v0, $v0, %lo(gCameras) -/* BBB3B8 80240038 3C048007 */ lui $a0, %hi(gGameStatusPtr) -/* BBB3BC 8024003C 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) -/* BBB3C0 80240040 24030018 */ addiu $v1, $zero, 0x18 -/* BBB3C4 80240044 A443002C */ sh $v1, 0x2c($v0) -/* BBB3C8 80240048 A443002E */ sh $v1, 0x2e($v0) -/* BBB3CC 8024004C A4430030 */ sh $v1, 0x30($v0) -/* BBB3D0 80240050 A480015C */ sh $zero, 0x15c($a0) -/* BBB3D4 80240054 8FBF0010 */ lw $ra, 0x10($sp) -/* BBB3D8 80240058 24020002 */ addiu $v0, $zero, 2 -/* BBB3DC 8024005C 03E00008 */ jr $ra -/* BBB3E0 80240060 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240064_BBB3E4.s b/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240064_BBB3E4.s deleted file mode 100644 index 0f4c5f1a30..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_80240064_BBB3E4.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240064_BBB3E4 -/* BBB3E4 80240064 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BBB3E8 80240068 AFBF0010 */ sw $ra, 0x10($sp) -/* BBB3EC 8024006C 0C046ED4 */ jal enable_world_fog -/* BBB3F0 80240070 00000000 */ nop -/* BBB3F4 80240074 240403D4 */ addiu $a0, $zero, 0x3d4 -/* BBB3F8 80240078 0C046EDD */ jal set_world_fog_dist -/* BBB3FC 8024007C 240503E8 */ addiu $a1, $zero, 0x3e8 -/* BBB400 80240080 0000202D */ daddu $a0, $zero, $zero -/* BBB404 80240084 24050008 */ addiu $a1, $zero, 8 -/* BBB408 80240088 24060018 */ addiu $a2, $zero, 0x18 -/* BBB40C 8024008C 0C046EE2 */ jal set_world_fog_color -/* BBB410 80240090 240700FF */ addiu $a3, $zero, 0xff -/* BBB414 80240094 3C03800B */ lui $v1, %hi(gCameras) -/* BBB418 80240098 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* BBB41C 8024009C 24020018 */ addiu $v0, $zero, 0x18 -/* BBB420 802400A0 A462002C */ sh $v0, 0x2c($v1) -/* BBB424 802400A4 A462002E */ sh $v0, 0x2e($v1) -/* BBB428 802400A8 A4620030 */ sh $v0, 0x30($v1) -/* BBB42C 802400AC 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* BBB430 802400B0 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* BBB434 802400B4 240200E8 */ addiu $v0, $zero, 0xe8 -/* BBB438 802400B8 A462015C */ sh $v0, 0x15c($v1) -/* BBB43C 802400BC 8FBF0010 */ lw $ra, 0x10($sp) -/* BBB440 802400C0 24020002 */ addiu $v0, $zero, 2 -/* BBB444 802400C4 03E00008 */ jr $ra -/* BBB448 802400C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802400CC_BBB44C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802400CC_BBB44C.s deleted file mode 100644 index 419fc1f8e2..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802400CC_BBB44C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400CC_BBB44C -/* BBB44C 802400CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BBB450 802400D0 AFB10014 */ sw $s1, 0x14($sp) -/* BBB454 802400D4 0080882D */ daddu $s1, $a0, $zero -/* BBB458 802400D8 AFB20018 */ sw $s2, 0x18($sp) -/* BBB45C 802400DC AFBF001C */ sw $ra, 0x1c($sp) -/* BBB460 802400E0 AFB00010 */ sw $s0, 0x10($sp) -/* BBB464 802400E4 8E30000C */ lw $s0, 0xc($s1) -/* BBB468 802400E8 10A00013 */ beqz $a1, .L80240138 -/* BBB46C 802400EC 0000902D */ daddu $s2, $zero, $zero -/* BBB470 802400F0 8E050000 */ lw $a1, ($s0) -/* BBB474 802400F4 0C0B1EAF */ jal evt_get_variable -/* BBB478 802400F8 26100004 */ addiu $s0, $s0, 4 -/* BBB47C 802400FC AE220074 */ sw $v0, 0x74($s1) -/* BBB480 80240100 8E050000 */ lw $a1, ($s0) -/* BBB484 80240104 26100004 */ addiu $s0, $s0, 4 -/* BBB488 80240108 0C0B1EAF */ jal evt_get_variable -/* BBB48C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* BBB490 80240110 AE220078 */ sw $v0, 0x78($s1) -/* BBB494 80240114 8E050000 */ lw $a1, ($s0) -/* BBB498 80240118 26100004 */ addiu $s0, $s0, 4 -/* BBB49C 8024011C 0C0B1EAF */ jal evt_get_variable -/* BBB4A0 80240120 0220202D */ daddu $a0, $s1, $zero -/* BBB4A4 80240124 AE220070 */ sw $v0, 0x70($s1) -/* BBB4A8 80240128 8E050000 */ lw $a1, ($s0) -/* BBB4AC 8024012C 0C0B1EAF */ jal evt_get_variable -/* BBB4B0 80240130 0220202D */ daddu $a0, $s1, $zero -/* BBB4B4 80240134 AE22007C */ sw $v0, 0x7c($s1) -.L80240138: -/* BBB4B8 80240138 8E23007C */ lw $v1, 0x7c($s1) -/* BBB4BC 8024013C 8E220074 */ lw $v0, 0x74($s1) -/* BBB4C0 80240140 0060202D */ daddu $a0, $v1, $zero -/* BBB4C4 80240144 00431021 */ addu $v0, $v0, $v1 -/* BBB4C8 80240148 04800004 */ bltz $a0, .L8024015C -/* BBB4CC 8024014C AE220074 */ sw $v0, 0x74($s1) -/* BBB4D0 80240150 8E230078 */ lw $v1, 0x78($s1) -/* BBB4D4 80240154 08090059 */ j .L80240164 -/* BBB4D8 80240158 0043102A */ slt $v0, $v0, $v1 -.L8024015C: -/* BBB4DC 8024015C 8E230078 */ lw $v1, 0x78($s1) -/* BBB4E0 80240160 0062102A */ slt $v0, $v1, $v0 -.L80240164: -/* BBB4E4 80240164 14400003 */ bnez $v0, .L80240174 -/* BBB4E8 80240168 00000000 */ nop -/* BBB4EC 8024016C AE230074 */ sw $v1, 0x74($s1) -/* BBB4F0 80240170 24120002 */ addiu $s2, $zero, 2 -.L80240174: -/* BBB4F4 80240174 8E240074 */ lw $a0, 0x74($s1) -/* BBB4F8 80240178 0C046EDD */ jal set_world_fog_dist -/* BBB4FC 8024017C 8E250070 */ lw $a1, 0x70($s1) -/* BBB500 80240180 0240102D */ daddu $v0, $s2, $zero -/* BBB504 80240184 8FBF001C */ lw $ra, 0x1c($sp) -/* BBB508 80240188 8FB20018 */ lw $s2, 0x18($sp) -/* BBB50C 8024018C 8FB10014 */ lw $s1, 0x14($sp) -/* BBB510 80240190 8FB00010 */ lw $s0, 0x10($sp) -/* BBB514 80240194 03E00008 */ jr $ra -/* BBB518 80240198 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024019C_BBB51C.s b/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024019C_BBB51C.s deleted file mode 100644 index 3ad7a9dc8b..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024019C_BBB51C.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024019C_BBB51C -/* BBB51C 8024019C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BBB520 802401A0 AFB10014 */ sw $s1, 0x14($sp) -/* BBB524 802401A4 0080882D */ daddu $s1, $a0, $zero -/* BBB528 802401A8 AFB20018 */ sw $s2, 0x18($sp) -/* BBB52C 802401AC AFBF001C */ sw $ra, 0x1c($sp) -/* BBB530 802401B0 AFB00010 */ sw $s0, 0x10($sp) -/* BBB534 802401B4 8E30000C */ lw $s0, 0xc($s1) -/* BBB538 802401B8 10A0000E */ beqz $a1, .L802401F4 -/* BBB53C 802401BC 0000902D */ daddu $s2, $zero, $zero -/* BBB540 802401C0 8E050000 */ lw $a1, ($s0) -/* BBB544 802401C4 0C0B1EAF */ jal evt_get_variable -/* BBB548 802401C8 26100004 */ addiu $s0, $s0, 4 -/* BBB54C 802401CC AE220074 */ sw $v0, 0x74($s1) -/* BBB550 802401D0 8E050000 */ lw $a1, ($s0) -/* BBB554 802401D4 26100004 */ addiu $s0, $s0, 4 -/* BBB558 802401D8 0C0B1EAF */ jal evt_get_variable -/* BBB55C 802401DC 0220202D */ daddu $a0, $s1, $zero -/* BBB560 802401E0 AE220078 */ sw $v0, 0x78($s1) -/* BBB564 802401E4 8E050000 */ lw $a1, ($s0) -/* BBB568 802401E8 0C0B1EAF */ jal evt_get_variable -/* BBB56C 802401EC 0220202D */ daddu $a0, $s1, $zero -/* BBB570 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* BBB574 802401F4 8E23007C */ lw $v1, 0x7c($s1) -/* BBB578 802401F8 8E220074 */ lw $v0, 0x74($s1) -/* BBB57C 802401FC 0060202D */ daddu $a0, $v1, $zero -/* BBB580 80240200 00431021 */ addu $v0, $v0, $v1 -/* BBB584 80240204 04800004 */ bltz $a0, .L80240218 -/* BBB588 80240208 AE220074 */ sw $v0, 0x74($s1) -/* BBB58C 8024020C 8E230078 */ lw $v1, 0x78($s1) -/* BBB590 80240210 08090088 */ j .L80240220 -/* BBB594 80240214 0043102A */ slt $v0, $v0, $v1 -.L80240218: -/* BBB598 80240218 8E230078 */ lw $v1, 0x78($s1) -/* BBB59C 8024021C 0062102A */ slt $v0, $v1, $v0 -.L80240220: -/* BBB5A0 80240220 14400003 */ bnez $v0, .L80240230 -/* BBB5A4 80240224 00000000 */ nop -/* BBB5A8 80240228 AE230074 */ sw $v1, 0x74($s1) -/* BBB5AC 8024022C 24120002 */ addiu $s2, $zero, 2 -.L80240230: -/* BBB5B0 80240230 3C048007 */ lui $a0, %hi(gGameStatusPtr) -/* BBB5B4 80240234 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) -/* BBB5B8 80240238 96230076 */ lhu $v1, 0x76($s1) -/* BBB5BC 8024023C 0240102D */ daddu $v0, $s2, $zero -/* BBB5C0 80240240 A483015C */ sh $v1, 0x15c($a0) -/* BBB5C4 80240244 8FBF001C */ lw $ra, 0x1c($sp) -/* BBB5C8 80240248 8FB20018 */ lw $s2, 0x18($sp) -/* BBB5CC 8024024C 8FB10014 */ lw $s1, 0x14($sp) -/* BBB5D0 80240250 8FB00010 */ lw $s0, 0x10($sp) -/* BBB5D4 80240254 03E00008 */ jr $ra -/* BBB5D8 80240258 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024025C_BBB5DC.s b/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024025C_BBB5DC.s deleted file mode 100644 index 08b20fdd53..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024025C_BBB5DC.s +++ /dev/null @@ -1,159 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024025C_BBB5DC -/* BBB5DC 8024025C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BBB5E0 80240260 AFB1001C */ sw $s1, 0x1c($sp) -/* BBB5E4 80240264 0080882D */ daddu $s1, $a0, $zero -/* BBB5E8 80240268 AFB30024 */ sw $s3, 0x24($sp) -/* BBB5EC 8024026C 3C138015 */ lui $s3, %hi(D_80151328) -/* BBB5F0 80240270 26731328 */ addiu $s3, $s3, %lo(D_80151328) -/* BBB5F4 80240274 AFBF0028 */ sw $ra, 0x28($sp) -/* BBB5F8 80240278 AFB20020 */ sw $s2, 0x20($sp) -/* BBB5FC 8024027C AFB00018 */ sw $s0, 0x18($sp) -/* BBB600 80240280 8E30000C */ lw $s0, 0xc($s1) -/* BBB604 80240284 10A00019 */ beqz $a1, .L802402EC -/* BBB608 80240288 8E720000 */ lw $s2, ($s3) -/* BBB60C 8024028C 8E050000 */ lw $a1, ($s0) -/* BBB610 80240290 0C0B1EAF */ jal evt_get_variable -/* BBB614 80240294 26100004 */ addiu $s0, $s0, 4 -/* BBB618 80240298 AE220084 */ sw $v0, 0x84($s1) -/* BBB61C 8024029C 8E050000 */ lw $a1, ($s0) -/* BBB620 802402A0 26100004 */ addiu $s0, $s0, 4 -/* BBB624 802402A4 0C0B1EAF */ jal evt_get_variable -/* BBB628 802402A8 0220202D */ daddu $a0, $s1, $zero -/* BBB62C 802402AC AE220088 */ sw $v0, 0x88($s1) -/* BBB630 802402B0 8E050000 */ lw $a1, ($s0) -/* BBB634 802402B4 0C0B1EAF */ jal evt_get_variable -/* BBB638 802402B8 0220202D */ daddu $a0, $s1, $zero -/* BBB63C 802402BC AE22008C */ sw $v0, 0x8c($s1) -/* BBB640 802402C0 924200AC */ lbu $v0, 0xac($s2) -/* BBB644 802402C4 AE220090 */ sw $v0, 0x90($s1) -/* BBB648 802402C8 924200AD */ lbu $v0, 0xad($s2) -/* BBB64C 802402CC AE220094 */ sw $v0, 0x94($s1) -/* BBB650 802402D0 924200AE */ lbu $v0, 0xae($s2) -/* BBB654 802402D4 8E630000 */ lw $v1, ($s3) -/* BBB658 802402D8 AE20009C */ sw $zero, 0x9c($s1) -/* BBB65C 802402DC AE220098 */ sw $v0, 0x98($s1) -/* BBB660 802402E0 94620000 */ lhu $v0, ($v1) -/* BBB664 802402E4 34420001 */ ori $v0, $v0, 1 -/* BBB668 802402E8 A4620000 */ sh $v0, ($v1) -.L802402EC: -/* BBB66C 802402EC C6200090 */ lwc1 $f0, 0x90($s1) -/* BBB670 802402F0 46800020 */ cvt.s.w $f0, $f0 -/* BBB674 802402F4 44050000 */ mfc1 $a1, $f0 -/* BBB678 802402F8 C6200084 */ lwc1 $f0, 0x84($s1) -/* BBB67C 802402FC 46800020 */ cvt.s.w $f0, $f0 -/* BBB680 80240300 8E22009C */ lw $v0, 0x9c($s1) -/* BBB684 80240304 44060000 */ mfc1 $a2, $f0 -/* BBB688 80240308 24420001 */ addiu $v0, $v0, 1 -/* BBB68C 8024030C AE22009C */ sw $v0, 0x9c($s1) -/* BBB690 80240310 24020014 */ addiu $v0, $zero, 0x14 -/* BBB694 80240314 AFA20010 */ sw $v0, 0x10($sp) -/* BBB698 80240318 8E27009C */ lw $a3, 0x9c($s1) -/* BBB69C 8024031C 0C00A8ED */ jal update_lerp -/* BBB6A0 80240320 0000202D */ daddu $a0, $zero, $zero -/* BBB6A4 80240324 3C014F00 */ lui $at, 0x4f00 -/* BBB6A8 80240328 44811000 */ mtc1 $at, $f2 -/* BBB6AC 8024032C 00000000 */ nop -/* BBB6B0 80240330 4600103E */ c.le.s $f2, $f0 -/* BBB6B4 80240334 00000000 */ nop -/* BBB6B8 80240338 45010005 */ bc1t .L80240350 -/* BBB6BC 8024033C 264400AC */ addiu $a0, $s2, 0xac -/* BBB6C0 80240340 4600010D */ trunc.w.s $f4, $f0 -/* BBB6C4 80240344 44032000 */ mfc1 $v1, $f4 -/* BBB6C8 80240348 080900DB */ j .L8024036C -/* BBB6CC 8024034C A0830000 */ sb $v1, ($a0) -.L80240350: -/* BBB6D0 80240350 46020001 */ sub.s $f0, $f0, $f2 -/* BBB6D4 80240354 3C028000 */ lui $v0, 0x8000 -/* BBB6D8 80240358 4600010D */ trunc.w.s $f4, $f0 -/* BBB6DC 8024035C 44032000 */ mfc1 $v1, $f4 -/* BBB6E0 80240360 00000000 */ nop -/* BBB6E4 80240364 00621825 */ or $v1, $v1, $v0 -/* BBB6E8 80240368 A0830000 */ sb $v1, ($a0) -.L8024036C: -/* BBB6EC 8024036C C6200094 */ lwc1 $f0, 0x94($s1) -/* BBB6F0 80240370 46800020 */ cvt.s.w $f0, $f0 -/* BBB6F4 80240374 44050000 */ mfc1 $a1, $f0 -/* BBB6F8 80240378 C6200088 */ lwc1 $f0, 0x88($s1) -/* BBB6FC 8024037C 46800020 */ cvt.s.w $f0, $f0 -/* BBB700 80240380 44060000 */ mfc1 $a2, $f0 -/* BBB704 80240384 24020014 */ addiu $v0, $zero, 0x14 -/* BBB708 80240388 AFA20010 */ sw $v0, 0x10($sp) -/* BBB70C 8024038C 8E27009C */ lw $a3, 0x9c($s1) -/* BBB710 80240390 0C00A8ED */ jal update_lerp -/* BBB714 80240394 0000202D */ daddu $a0, $zero, $zero -/* BBB718 80240398 3C014F00 */ lui $at, 0x4f00 -/* BBB71C 8024039C 44811000 */ mtc1 $at, $f2 -/* BBB720 802403A0 00000000 */ nop -/* BBB724 802403A4 4600103E */ c.le.s $f2, $f0 -/* BBB728 802403A8 00000000 */ nop -/* BBB72C 802403AC 45010005 */ bc1t .L802403C4 -/* BBB730 802403B0 264400AD */ addiu $a0, $s2, 0xad -/* BBB734 802403B4 4600010D */ trunc.w.s $f4, $f0 -/* BBB738 802403B8 44032000 */ mfc1 $v1, $f4 -/* BBB73C 802403BC 080900F8 */ j .L802403E0 -/* BBB740 802403C0 A0830000 */ sb $v1, ($a0) -.L802403C4: -/* BBB744 802403C4 46020001 */ sub.s $f0, $f0, $f2 -/* BBB748 802403C8 3C028000 */ lui $v0, 0x8000 -/* BBB74C 802403CC 4600010D */ trunc.w.s $f4, $f0 -/* BBB750 802403D0 44032000 */ mfc1 $v1, $f4 -/* BBB754 802403D4 00000000 */ nop -/* BBB758 802403D8 00621825 */ or $v1, $v1, $v0 -/* BBB75C 802403DC A0830000 */ sb $v1, ($a0) -.L802403E0: -/* BBB760 802403E0 C6200098 */ lwc1 $f0, 0x98($s1) -/* BBB764 802403E4 46800020 */ cvt.s.w $f0, $f0 -/* BBB768 802403E8 44050000 */ mfc1 $a1, $f0 -/* BBB76C 802403EC C620008C */ lwc1 $f0, 0x8c($s1) -/* BBB770 802403F0 46800020 */ cvt.s.w $f0, $f0 -/* BBB774 802403F4 44060000 */ mfc1 $a2, $f0 -/* BBB778 802403F8 24020014 */ addiu $v0, $zero, 0x14 -/* BBB77C 802403FC AFA20010 */ sw $v0, 0x10($sp) -/* BBB780 80240400 8E27009C */ lw $a3, 0x9c($s1) -/* BBB784 80240404 0C00A8ED */ jal update_lerp -/* BBB788 80240408 0000202D */ daddu $a0, $zero, $zero -/* BBB78C 8024040C 3C014F00 */ lui $at, 0x4f00 -/* BBB790 80240410 44811000 */ mtc1 $at, $f2 -/* BBB794 80240414 00000000 */ nop -/* BBB798 80240418 4600103E */ c.le.s $f2, $f0 -/* BBB79C 8024041C 00000000 */ nop -/* BBB7A0 80240420 45010005 */ bc1t .L80240438 -/* BBB7A4 80240424 264400AE */ addiu $a0, $s2, 0xae -/* BBB7A8 80240428 4600010D */ trunc.w.s $f4, $f0 -/* BBB7AC 8024042C 44032000 */ mfc1 $v1, $f4 -/* BBB7B0 80240430 08090115 */ j .L80240454 -/* BBB7B4 80240434 A0830000 */ sb $v1, ($a0) -.L80240438: -/* BBB7B8 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* BBB7BC 8024043C 3C028000 */ lui $v0, 0x8000 -/* BBB7C0 80240440 4600010D */ trunc.w.s $f4, $f0 -/* BBB7C4 80240444 44032000 */ mfc1 $v1, $f4 -/* BBB7C8 80240448 00000000 */ nop -/* BBB7CC 8024044C 00621825 */ or $v1, $v1, $v0 -/* BBB7D0 80240450 A0830000 */ sb $v1, ($a0) -.L80240454: -/* BBB7D4 80240454 8E23009C */ lw $v1, 0x9c($s1) -/* BBB7D8 80240458 24020014 */ addiu $v0, $zero, 0x14 -/* BBB7DC 8024045C 1462000B */ bne $v1, $v0, .L8024048C -/* BBB7E0 80240460 0000102D */ daddu $v0, $zero, $zero -/* BBB7E4 80240464 8E230084 */ lw $v1, 0x84($s1) -/* BBB7E8 80240468 240200FF */ addiu $v0, $zero, 0xff -/* BBB7EC 8024046C 54620007 */ bnel $v1, $v0, .L8024048C -/* BBB7F0 80240470 24020002 */ addiu $v0, $zero, 2 -/* BBB7F4 80240474 3C038015 */ lui $v1, %hi(D_80151328) -/* BBB7F8 80240478 8C631328 */ lw $v1, %lo(D_80151328)($v1) -/* BBB7FC 8024047C 94620000 */ lhu $v0, ($v1) -/* BBB800 80240480 3042FFFE */ andi $v0, $v0, 0xfffe -/* BBB804 80240484 A4620000 */ sh $v0, ($v1) -/* BBB808 80240488 24020002 */ addiu $v0, $zero, 2 -.L8024048C: -/* BBB80C 8024048C 8FBF0028 */ lw $ra, 0x28($sp) -/* BBB810 80240490 8FB30024 */ lw $s3, 0x24($sp) -/* BBB814 80240494 8FB20020 */ lw $s2, 0x20($sp) -/* BBB818 80240498 8FB1001C */ lw $s1, 0x1c($sp) -/* BBB81C 8024049C 8FB00018 */ lw $s0, 0x18($sp) -/* BBB820 802404A0 03E00008 */ jr $ra -/* BBB824 802404A4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802404A8_BBB828.s b/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802404A8_BBB828.s deleted file mode 100644 index ae8aac9d37..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802404A8_BBB828.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A8_BBB828 -/* BBB828 802404A8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BBB82C 802404AC AFB10024 */ sw $s1, 0x24($sp) -/* BBB830 802404B0 0080882D */ daddu $s1, $a0, $zero -/* BBB834 802404B4 AFB00020 */ sw $s0, 0x20($sp) -/* BBB838 802404B8 00A0802D */ daddu $s0, $a1, $zero -/* BBB83C 802404BC AFBF002C */ sw $ra, 0x2c($sp) -/* BBB840 802404C0 AFB20028 */ sw $s2, 0x28($sp) -/* BBB844 802404C4 0C0B36B0 */ jal resolve_npc -/* BBB848 802404C8 8E250084 */ lw $a1, 0x84($s1) -/* BBB84C 802404CC 1200000E */ beqz $s0, .L80240508 -/* BBB850 802404D0 0040902D */ daddu $s2, $v0, $zero -/* BBB854 802404D4 C6260088 */ lwc1 $f6, 0x88($s1) -/* BBB858 802404D8 468031A0 */ cvt.s.w $f6, $f6 -/* BBB85C 802404DC 44063000 */ mfc1 $a2, $f6 -/* BBB860 802404E0 C626008C */ lwc1 $f6, 0x8c($s1) -/* BBB864 802404E4 468031A0 */ cvt.s.w $f6, $f6 -/* BBB868 802404E8 8E220098 */ lw $v0, 0x98($s1) -/* BBB86C 802404EC 44073000 */ mfc1 $a3, $f6 -/* BBB870 802404F0 AE22009C */ sw $v0, 0x9c($s1) -/* BBB874 802404F4 C64C0038 */ lwc1 $f12, 0x38($s2) -/* BBB878 802404F8 0C00A7B5 */ jal dist2D -/* BBB87C 802404FC C64E0040 */ lwc1 $f14, 0x40($s2) -/* BBB880 80240500 4600018D */ trunc.w.s $f6, $f0 -/* BBB884 80240504 E62600A0 */ swc1 $f6, 0xa0($s1) -.L80240508: -/* BBB888 80240508 8E22009C */ lw $v0, 0x9c($s1) -/* BBB88C 8024050C 1C400003 */ bgtz $v0, .L8024051C -/* BBB890 80240510 00000000 */ nop -/* BBB894 80240514 08090172 */ j .L802405C8 -/* BBB898 80240518 24020002 */ addiu $v0, $zero, 2 -.L8024051C: -/* BBB89C 8024051C C6220090 */ lwc1 $f2, 0x90($s1) -/* BBB8A0 80240520 468010A0 */ cvt.s.w $f2, $f2 -/* BBB8A4 80240524 C6240094 */ lwc1 $f4, 0x94($s1) -/* BBB8A8 80240528 46802120 */ cvt.s.w $f4, $f4 -/* BBB8AC 8024052C C6200098 */ lwc1 $f0, 0x98($s1) -/* BBB8B0 80240530 46800020 */ cvt.s.w $f0, $f0 -/* BBB8B4 80240534 4600018D */ trunc.w.s $f6, $f0 -/* BBB8B8 80240538 E7A60010 */ swc1 $f6, 0x10($sp) -/* BBB8BC 8024053C 44820000 */ mtc1 $v0, $f0 -/* BBB8C0 80240540 00000000 */ nop -/* BBB8C4 80240544 46800020 */ cvt.s.w $f0, $f0 -/* BBB8C8 80240548 44051000 */ mfc1 $a1, $f2 -/* BBB8CC 8024054C 44062000 */ mfc1 $a2, $f4 -/* BBB8D0 80240550 4600018D */ trunc.w.s $f6, $f0 -/* BBB8D4 80240554 44073000 */ mfc1 $a3, $f6 -/* BBB8D8 80240558 0C00A8ED */ jal update_lerp -/* BBB8DC 8024055C 0000202D */ daddu $a0, $zero, $zero -/* BBB8E0 80240560 46000306 */ mov.s $f12, $f0 -/* BBB8E4 80240564 27A50018 */ addiu $a1, $sp, 0x18 -/* BBB8E8 80240568 0C00A88D */ jal sin_cos_deg -/* BBB8EC 8024056C 27A6001C */ addiu $a2, $sp, 0x1c -/* BBB8F0 80240570 C7A00018 */ lwc1 $f0, 0x18($sp) -/* BBB8F4 80240574 C62200A0 */ lwc1 $f2, 0xa0($s1) -/* BBB8F8 80240578 468010A0 */ cvt.s.w $f2, $f2 -/* BBB8FC 8024057C 46001082 */ mul.s $f2, $f2, $f0 -/* BBB900 80240580 00000000 */ nop -/* BBB904 80240584 C6200088 */ lwc1 $f0, 0x88($s1) -/* BBB908 80240588 46800020 */ cvt.s.w $f0, $f0 -/* BBB90C 8024058C 46020000 */ add.s $f0, $f0, $f2 -/* BBB910 80240590 E6400038 */ swc1 $f0, 0x38($s2) -/* BBB914 80240594 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BBB918 80240598 C62200A0 */ lwc1 $f2, 0xa0($s1) -/* BBB91C 8024059C 468010A0 */ cvt.s.w $f2, $f2 -/* BBB920 802405A0 46001082 */ mul.s $f2, $f2, $f0 -/* BBB924 802405A4 00000000 */ nop -/* BBB928 802405A8 C620008C */ lwc1 $f0, 0x8c($s1) -/* BBB92C 802405AC 46800020 */ cvt.s.w $f0, $f0 -/* BBB930 802405B0 46020000 */ add.s $f0, $f0, $f2 -/* BBB934 802405B4 E6400040 */ swc1 $f0, 0x40($s2) -/* BBB938 802405B8 8E23009C */ lw $v1, 0x9c($s1) -/* BBB93C 802405BC 0000102D */ daddu $v0, $zero, $zero -/* BBB940 802405C0 2463FFFF */ addiu $v1, $v1, -1 -/* BBB944 802405C4 AE23009C */ sw $v1, 0x9c($s1) -.L802405C8: -/* BBB948 802405C8 8FBF002C */ lw $ra, 0x2c($sp) -/* BBB94C 802405CC 8FB20028 */ lw $s2, 0x28($sp) -/* BBB950 802405D0 8FB10024 */ lw $s1, 0x24($sp) -/* BBB954 802405D4 8FB00020 */ lw $s0, 0x20($sp) -/* BBB958 802405D8 03E00008 */ jr $ra -/* BBB95C 802405DC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 40524f57a5..64d48fcd2a 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -10762,158 +10762,163 @@ segments: start: 0xB93440 vram: 0x80240000 subsegments: - - [0xB93440, c] - - [0xB934B0, c] - - [0xB93940, c] - - [0xB952F0, data] - - [0xB953B0, data] - - [0xB957E0, data] - - [0xB960E0, data] - - [0xB97A10] + - [0xB93440, c, mim_01_0_header] + - [0xB93440, c, mim_01_1_music] + - [0xB93440, c, mim_01_2_main] + - [0xB934B0, c, mim_01_3_entity] + - [0xB934B0, c, mim_01_4_hint] + - [0xB934B0, c, mim_01_5_gate] + - [0xB93940, c, mim_01_6_npc] + - [0xB952F0] - name: mim_02 dir: world/area_mim/mim_02 type: code start: 0xB97C00 vram: 0x80240000 subsegments: - - [0xB97C00, c] - - [0xB97C70, c] - - [0xB98DE0, data] - - [0xB98EA0, data] - - [0xB9A390, data] - - [0xB9B250, data] - - [0xB9B420] + - [0xB97C00, c, mim_02_0_header] + - [0xB97C00, c, mim_02_1_music] + - [0xB97C00, c, mim_02_2_main] + - [0xB97C70, c, mim_02_3_npc] + - [0xB97C70, c, mim_02_4_gate] + - [0xB97C70, c, mim_02_5_hint] + - [0xB98DE0] - name: mim_03 dir: world/area_mim/mim_03 type: code start: 0xB9B480 vram: 0x80240000 subsegments: - - [0xB9B480, c] - - [0xB9B9B0, data] - - [0xB9BA70, data] - - [0xB9BE30, data] - - [0xB9D500, data] - - [0xB9D940] + - [0xB9B480, c, mim_03_0_header] + - [0xB9B480, c, mim_03_1_music] + - [0xB9B480, c, mim_03_2_main] + - [0xB9B480, c, mim_03_3_entity] + - [0xB9B480, c, mim_03_4_hint] + - [0xB9B480, c, mim_03_5_gate] + - [0xB9B480, c, mim_03_6_npc] + - [0xB9B9B0] - name: mim_04 dir: world/area_mim/mim_04 type: code start: 0xB9D960 vram: 0x80240000 subsegments: - - [0xB9D960, c] - - [0xB9D9D0, c] - - [0xB9DB60, c] - - [0xB9EA90, data] - - [0xB9EB50, data] - - [0xB9F020, data] - - [0xB9FEA0, data] - - [0xBA06C0] + - [0xB9D960, c, mim_04_0_header] + - [0xB9D960, c, mim_04_1_music] + - [0xB9D960, c, mim_04_2_main] + - [0xB9D9D0, c, mim_04_3_entity] + - [0xB9D9D0, c, mim_04_4_hint] + - [0xB9DB60, c, mim_04_5_gate] + - [0xB9DB60, c, mim_04_6_npc] + - [0xB9EA90] - name: mim_05 dir: world/area_mim/mim_05 type: code start: 0xBA0730 vram: 0x80240000 subsegments: - - [0xBA0730, c] - - [0xBA07A0, c] - - [0xBA2150, data] - - [0xBA2210, data] - - [0xBA3A80, data] - - [0xBA4590] + - [0xBA0730, c, mim_05_0_header] + - [0xBA07A0, c, mim_05_1_music] + - [0xBA07A0, c, mim_05_2_main] + - [0xBA07A0, c, mim_05_3_entity] + - [0xBA07A0, c, mim_05_4_hint] + - [0xBA07A0, c, mim_05_5_gate] + - [0xBA07A0, c, mim_05_6_npc] + - [0xBA2150] - name: mim_06 dir: world/area_mim/mim_06 type: code start: 0xBA4780 vram: 0x80240000 subsegments: - - [0xBA4780, c] - - [0xBA47F0, c] - - [0xBA4CF0, c] - - [0xBA74B0, data] - - [0xBA7570, data] - - [0xBA82F0, data] - - [0xBA9170, data] - - [0xBA9F10] + - [0xBA4780, c, mim_06_0_header] + - [0xBA4780, c, mim_06_1_music] + - [0xBA4780, c, mim_06_2_main] + - [0xBA4780, c, mim_06_3_entity] + - [0xBA47F0, c, mim_06_4_hint] + - [0xBA47F0, c, mim_06_5_gate] + - [0xBA4CF0, c, mim_06_6_npc] + - [0xBA74B0] - name: mim_07 dir: world/area_mim/mim_07 type: code start: 0xBAA140 vram: 0x80240000 subsegments: - - [0xBAA140, c] - - [0xBAA1B0, c] - - [0xBAA3B0, c] - - [0xBAB1D0, data] - - [0xBAB2C0, data] - - [0xBAB6D0, data] - - [0xBAB7C0, data] - - [0xBABAD0, data] - - [0xBAC9C0, data] - - [0xBAD8D0] + - [0xBAA140, c, mim_07_0_header] + - [0xBAA140, c, mim_07_1_music] + - [0xBAA140, c, mim_07_2_main] + - [0xBAA1B0, c, mim_07_3_entity] + - [0xBAA1B0, c, mim_07_4_hint] + - [0xBAA3B0, c, mim_07_5_gate] + - [0xBAA3B0, c, mim_07_6_npc] + - [0xBAB1D0] - name: mim_08 dir: world/area_mim/mim_08 type: code start: 0xBAD940 vram: 0x80240000 subsegments: - - [0xBAD940, c] - - [0xBB0880, data] - - [0xBB0940, data] - - [0xBB0E30, data] - - [0xBB0E80, data] - - [0xBB1D00, data] - - [0xBB2BD0] + - [0xBAD940, c, mim_08_0_header] + - [0xBAD940, c, mim_08_1_music] + - [0xBAD940, c, mim_08_2_main] + - [0xBAD9E0, c, mim_08_3_entity] + - [0xBAD9E0, c, mim_08_4_gate] + - [0xBAD9E0, c, mim_08_5_npc] + - [0xBB0880] - name: mim_09 dir: world/area_mim/mim_09 type: code start: 0xBB2E00 vram: 0x80240000 subsegments: - - [0xBB2E00, c] - - [0xBB3CC0, data] - - [0xBB3D80, data] - - [0xBB4130, data] - - [0xBB4180, data] - - [0xBB4830, data] - - [0xBB5980] + - [0xBB2E00, c, mim_09_0_header] + - [0xBB2E00, c, mim_09_1_music] + - [0xBB2E00, c, mim_09_2_main] + - [0xBB2EA0, c, mim_09_3_entity] + - [0xBB2EA0, c, mim_09_4_hint] + - [0xBB2EA0, c, mim_09_5_gate] + - [0xBB2EA0, c, mim_09_6_npc] + - [0xBB3CC0] - name: mim_10 dir: world/area_mim/mim_10 type: code start: 0xBB59E0 vram: 0x80240000 subsegments: - - [0xBB59E0, c] - - [0xBB5B70, data] - - [0xBB5EB0, data] - - [0xBB5EF0, data] - - [0xBB61D0, data] - - [0xBB7050] + - [0xBB59E0, c, mim_10_0_header] + - [0xBB59E0, c, mim_10_1_music] + - [0xBB59E0, c, mim_10_2_entity] + - [0xBB59E0, c, mim_10_3_main] + - [0xBB59E0, c, mim_10_4_npc] + - [0xBB5B70] - name: mim_11 dir: world/area_mim/mim_11 type: code start: 0xBB7070 vram: 0x80240000 subsegments: - - [0xBB7070, c] - - [0xBB7940, c] - - [0xBB79F0, c] - - [0xBB7C30, data] - - [0xBBA180, data] - - [0xBBA2E0, data] - - [0xBBB350] + - [0xBB7070, c, mim_11_0_header] + - [0xBB7070, c, mim_11_1_music] + - [0xBB7070, c, mim_11_2_main] + - [0xBB7070, c, mim_11_3_gate] + - [0xBB7070, c, mim_11_4_entity] + - [0xBB7940, c, mim_11_5_npc] + - [0xBB79F0, c, mim_11_6_foliage] + - [0xBB7C30] - name: mim_12 dir: world/area_mim/mim_12 type: code start: 0xBBB380 vram: 0x80240000 subsegments: - - [0xBBB380, c] - - [0xBBB960, data] - - [0xBBBB90, data] - - [0xBBBE60, data] - - [0xBBC2B0, data] - - [0xBBD190] + - [0xBBB380, c, mim_12_0_header] + - [0xBBB380, c, mim_12_1_music] + - [0xBBB380, c, mim_12_2_entity] + - [0xBBB380, c, mim_12_3_main] + - [0xBBB380, c, mim_12_4_npc] + - [0xBBB380, c, mim_12_5_gate] + - [0xBBB960] - name: obk_01 dir: world/area_obk/obk_01 type: code diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index cef6024397..dd62597f1a 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -2402,7 +2402,7 @@ end_maps = 0x80093410; // type:data rom:0x6E810 mgm_maps = 0x80093450; // type:data rom:0x6E850 gv_maps = 0x800934D0; // type:data rom:0x6E8D0 gAreas = 0x800934F0; // type:data rom:0x6E8F0 size:0x1D0 -D_800936C0 = 0x800936C0; // type:data rom:0x6EAC0 +EVS_800936C0 = 0x800936C0; // type:data rom:0x6EAC0 EVS_NpcHitRecoil = 0x800936DC; // type:data rom:0x6EADC D_800939A4 = 0x800939A4; // type:data rom:0x6EDA4 D_800939B4 = 0x800939B4; // type:data rom:0x6EDB4 @@ -19554,8 +19554,8 @@ D_8024B9A0_B8FB20 = 0x8024B9A0; // type:data rom:0xB8FB20 sam_02_Quizmo_AnswerResult = 0x8024B9A8; // type:data rom:0xB8FB28 D_8024BB40_B8FCC0 = 0x8024BB40; // type:data rom:0xB8FCC0 mim_01_SetForeverForestFog = 0x80240000; // type:func rom:0xB93440 -func_80240070_B934B0 = 0x80240070; // type:func rom:0xB934B0 -func_802403F0_B93830 = 0x802403F0; // type:func rom:0xB93830 +mim_01_GetFirstTriangleNormal = 0x80240070; // type:func rom:0xB934B0 +mim_01_GetFlowerNormal = 0x802403F0; // type:func rom:0xB93830 mim_01_MeleeHitbox_30 = 0x80240500; // type:func rom:0xB93940 mim_01_MeleeHitbox_31 = 0x8024056C; // type:func rom:0xB939AC mim_01_MeleeHitbox_32 = 0x802405DC; // type:func rom:0xB93A1C @@ -19589,19 +19589,19 @@ mim_02_HoppingAI_LosePlayer = 0x80240C1C; // type:func rom:0xB9881C mim_02_HoppingAI_Main = 0x80240C60; // type:func rom:0xB98860 mim_02_GetNpcCollisionHeight = 0x80240E84; // type:func rom:0xB98A84 mim_02_AddPlayerHandsOffset = 0x80240EE0; // type:func rom:0xB98AE0 -func_802410B0_B98CB0 = 0x802410B0; // type:func rom:0xB98CB0 -func_80241104_B98D04 = 0x80241104; // type:func rom:0xB98D04 -func_8024113C_B98D3C = 0x8024113C; // type:func rom:0xB98D3C +mim_02_ItemChoice_WaitForSelection = 0x802410B0; // type:func rom:0xB98CB0 +mim_02_ItemChoice_SaveSelected = 0x80241104; // type:func rom:0xB98D04 +mim_02_BuildKeyItemChoiceList = 0x8024113C; // type:func rom:0xB98D3C D_802416AC_B992AC = 0x802416AC; // type:data rom:0xB992AC D_802416B0_B992B0 = 0x802416B0; // type:data rom:0xB992B0 D_80243830_B9B430 = 0x80243830; // type:data rom:0xB9B430 mim_03_SetForeverForestFog = 0x80240000; // type:func rom:0xB9B480 -func_80240068_B9B4E8 = 0x80240068; // type:func rom:0xB9B4E8 -func_802400A0_B9B520 = 0x802400A0; // type:func rom:0xB9B520 -func_80240420_B9B8A0 = 0x80240420; // type:func rom:0xB9B8A0 +mim_03_GetPlayerDistFromMapCenter = 0x80240068; // type:func rom:0xB9B4E8 +mim_03_GetFirstTriangleNormal = 0x802400A0; // type:func rom:0xB9B520 +mim_03_GetFlowerNormal = 0x80240420; // type:func rom:0xB9B8A0 mim_04_SetForeverForestFog = 0x80240000; // type:func rom:0xB9D960 -func_80240070_B9D9D0 = 0x80240070; // type:func rom:0xB9D9D0 -func_802401DC_B9DB3C = 0x802401DC; // type:func rom:0xB9DB3C +mim_04_gfx_build_evil_tree_face = 0x80240070; // type:func rom:0xB9D9D0 +mim_04_func_802401DC_B9DB3C = 0x802401DC; // type:func rom:0xB9DB3C mim_04_HoppingAI_HopInit = 0x80240200; // type:func rom:0xB9DB60 mim_04_HoppingAI_Hop = 0x80240430; // type:func rom:0xB9DD90 mim_04_HoppingAI_LoiterInit = 0x80240768; // type:func rom:0xB9E0C8 @@ -19642,9 +19642,9 @@ D_80244030_BA4760 = 0x80244030; // type:data rom:0xBA4760 D_80244038_BA4768 = 0x80244038; // type:data rom:0xBA4768 D_80244040_BA4770 = 0x80244040; // type:data rom:0xBA4770 mim_06_SetForeverForestFog = 0x80240000; // type:func rom:0xBA4780 -func_80240070_BA47F0 = 0x80240070; // type:func rom:0xBA47F0 -func_802403F0_BA4B70 = 0x802403F0; // type:func rom:0xBA4B70 -func_802404F8_BA4C78 = 0x802404F8; // type:func rom:0xBA4C78 +mim_06_GetFirstTriangleNormal = 0x80240070; // type:func rom:0xBA47F0 +mim_06_GetFlowerNormal = 0x802403F0; // type:func rom:0xBA4B70 +mim_06_GetWitherTranslation = 0x802404F8; // type:func rom:0xBA4C78 mim_06_MeleeHitbox_30 = 0x80240570; // type:func rom:0xBA4CF0 mim_06_MeleeHitbox_31 = 0x802405DC; // type:func rom:0xBA4D5C mim_06_MeleeHitbox_32 = 0x8024064C; // type:func rom:0xBA4DCC @@ -19676,10 +19676,10 @@ D_80245960_BAA0E0 = 0x80245960; // type:data rom:0xBAA0E0 D_80245968_BAA0E8 = 0x80245968; // type:data rom:0xBAA0E8 D_80245970_BAA0F0 = 0x80245970; // type:data rom:0xBAA0F0 D_80245978_BAA0F8 = 0x80245978; // type:data rom:0xBAA0F8 -dup_mim_07_SetForeverForestFog = 0x80240000; // type:func rom:0xBAA140 -mim_07_SetForeverForestFog = 0x80240070; // type:func rom:0xBAA1B0 -func_802400D8_BAA218 = 0x802400D8; // type:func rom:0xBAA218 -func_80240244_BAA384 = 0x80240244; // type:func rom:0xBAA384 +mim_07_SetForeverForestFog = 0x80240000; // type:func rom:0xBAA140 +mim_07_ResetForeverForestFog = 0x80240070; // type:func rom:0xBAA1B0 +mim_07_func_802400D8_BAA218 = 0x802400D8; // type:func rom:0xBAA218 +mim_07_func_80240244_BAA384 = 0x80240244; // type:func rom:0xBAA384 mim_07_HoppingAI_HopInit = 0x80240270; // type:func rom:0xBAA3B0 mim_07_HoppingAI_Hop = 0x802404A0; // type:func rom:0xBAA5E0 mim_07_HoppingAI_LoiterInit = 0x802407D8; // type:func rom:0xBAA918 @@ -19694,7 +19694,7 @@ D_80241688_BAB7C8 = 0x80241688; // type:data rom:0xBAB7C8 D_8024168B_BAB7CB = 0x8024168B; // type:data rom:0xBAB7CB D_802437B0_BAD8F0 = 0x802437B0; // type:data rom:0xBAD8F0 mim_08_SetForeverForestFog = 0x80240000; // type:func rom:0xBAD940 -func_80240068_BAD9A8 = 0x80240068; // type:func rom:0xBAD9A8 +mim_08_GetPlayerDistFromMapCenter = 0x80240068; // type:func rom:0xBAD9A8 mim_08_FlyingAI_WanderInit = 0x802400A0; // type:func rom:0xBAD9E0 mim_08_FlyingAI_Wander = 0x80240250; // type:func rom:0xBADB90 mim_08_FlyingAI_LoiterInit = 0x80240878; // type:func rom:0xBAE1B8 @@ -19733,7 +19733,7 @@ D_802454A8_BB2DE8 = 0x802454A8; // type:data rom:0xBB2DE8 D_802454B0_BB2DF0 = 0x802454B0; // type:data rom:0xBB2DF0 D_802454B8_BB2DF8 = 0x802454B8; // type:data rom:0xBB2DF8 mim_09_SetForeverForestFog = 0x80240000; // type:func rom:0xBB2E00 -func_80240068_BB2E68 = 0x80240068; // type:func rom:0xBB2E68 +mim_09_GetPlayerDistFromMapCenter = 0x80240068; // type:func rom:0xBB2E68 mim_09_HoppingAI_HopInit = 0x802400A0; // type:func rom:0xBB2EA0 mim_09_HoppingAI_Hop = 0x802402D0; // type:func rom:0xBB30D0 mim_09_HoppingAI_LoiterInit = 0x80240608; // type:func rom:0xBB3408 @@ -19743,11 +19743,11 @@ mim_09_HoppingAI_Chase = 0x8024094C; // type:func rom:0xBB374C mim_09_HoppingAI_LosePlayer = 0x80240C4C; // type:func rom:0xBB3A4C mim_09_HoppingAI_Main = 0x80240C90; // type:func rom:0xBB3A90 D_80242B90_BB5990 = 0x80242B90; // type:data rom:0xBB5990 -func_80240000_BB59E0 = 0x80240000; // type:func rom:0xBB59E0 -func_80240030_BB5A10 = 0x80240030; // type:func rom:0xBB5A10 -func_80240080_BB5A60 = 0x80240080; // type:func rom:0xBB5A60 -func_802400EC_BB5ACC = 0x802400EC; // type:func rom:0xBB5ACC -func_80240148_BB5B28 = 0x80240148; // type:func rom:0xBB5B28 +mim_10_AwaitPlayerApproachForest = 0x80240000; // type:func rom:0xBB59E0 +mim_10_InitializeLightingBright = 0x80240030; // type:func rom:0xBB5A10 +mim_10_InitializeLightingGloomy = 0x80240080; // type:func rom:0xBB5A60 +mim_10_ReduceFogEndDist = 0x802400EC; // type:func rom:0xBB5ACC +mim_10_DarkenBackground = 0x80240148; // type:func rom:0xBB5B28 mim_11_Pipe_SetAnimFlag = 0x80240000; // type:func rom:0xBB7070 mim_11_Pipe_GetCurrentFloor = 0x80240020; // type:func rom:0xBB7090 mim_11_Pipe_AwaitDownInput = 0x80240034; // type:func rom:0xBB70A4 @@ -19756,19 +19756,19 @@ mim_11_Pipe_GetCameraYaw = 0x802401D0; // type:func rom:0xBB7240 mim_11_Pipe_GetPointAheadOfPlayer = 0x8024023C; // type:func rom:0xBB72AC mim_11_UpdateTexturePanSmooth = 0x802402E0; // type:func rom:0xBB7350 mim_11_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xBB7474 -func_802405EC_BB765C = 0x802405EC; // type:func rom:0xBB765C -func_8024066C_BB76DC = 0x8024066C; // type:func rom:0xBB76DC -func_80240790_BB7800 = 0x80240790; // type:func rom:0xBB7800 -func_802408D0_BB7940 = 0x802408D0; // type:func rom:0xBB7940 -func_802408F0_BB7960 = 0x802408F0; // type:func rom:0xBB7960 +mim_11_func_802405EC_BB765C = 0x802405EC; // type:func rom:0xBB765C +mim_11_func_8024066C_BB76DC = 0x8024066C; // type:func rom:0xBB76DC +mim_11_func_80240790_BB7800 = 0x80240790; // type:func rom:0xBB7800 +mim_11_IncreaseMaxSP = 0x802408D0; // type:func rom:0xBB7940 +mim_11_AnimateStarSpiritBobbing = 0x802408F0; // type:func rom:0xBB7960 mim_11_foliage_setup_shear_mtx = 0x80240980; // type:func rom:0xBB79F0 mim_11_TransformFoliage = 0x802409F0; // type:func rom:0xBB7A60 -func_80240000_BBB380 = 0x80240000; // type:func rom:0xBBB380 -func_80240064_BBB3E4 = 0x80240064; // type:func rom:0xBBB3E4 -func_802400CC_BBB44C = 0x802400CC; // type:func rom:0xBBB44C -func_8024019C_BBB51C = 0x8024019C; // type:func rom:0xBBB51C -func_8024025C_BBB5DC = 0x8024025C; // type:func rom:0xBBB5DC -func_802404A8_BBB828 = 0x802404A8; // type:func rom:0xBBB828 +mim_12_InitializeGustyFogProperties = 0x80240000; // type:func rom:0xBBB380 +mim_12_InitializeForestFogProperties = 0x80240064; // type:func rom:0xBBB3E4 +mim_12_InterpFogDistance = 0x802400CC; // type:func rom:0xBBB44C +mim_12_InterpBackgroundDarkness = 0x8024019C; // type:func rom:0xBBB51C +mim_12_InterpSpriteShadingColor = 0x8024025C; // type:func rom:0xBBB5DC +mim_12_MoveNpcAlongArc = 0x802404A8; // type:func rom:0xBBB828 obk_01_UnsetCamera0MoveFlag1 = 0x80240000; // type:func rom:0xBBD1A0 obk_01_SetCamera0MoveFlag1 = 0x8024001C; // type:func rom:0xBBD1BC func_80240038_BBD1D8 = 0x80240038; // type:func rom:0xBBD1D8