From 0e54cd9b3097911736508f7390c73e705fcaeb38 Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Sun, 1 Jan 2023 20:58:39 -0500 Subject: [PATCH] area kmr (#898) * kmr_02 ok * some cleanup * foliage EVS * quiz cleanup * partners * cleanup pass ? * kmr_02 done * kmr_20 ok * begin kmr_20 cleanup * enough kmr_20 * kpa_90+ * more kpa Co-authored-by: HailSanta --- include/enums.h | 16 + include/map.h | 1 + include/npc.h | 7 + include/saved_byte_names.h | 4 +- include/script_api/battle.h | 1 - include/script_api/common.h | 1 + include/variables.h | 6 +- src/77480.c | 60 +- src/7B440.c | 6 +- src/E20110.c | 6 +- src/E21870.c | 4 +- src/E225B0.c | 6 +- .../area_kmr_part_2/actor/goomnut_tree.c | 4 +- src/collision.c | 24 +- src/common/foliage.inc.c | 4 +- src/e20eb0.c | 4 +- src/encounter_api.c | 6 +- src/entity/HeartBlock.c | 5 +- src/msg.c | 4 +- src/npc.c | 2 +- src/world/area_dro/dro_01/dro_01_3_npc.c | 2 +- src/world/area_dro/dro_01/dro_01_7_foliage.c | 4 +- src/world/area_dro/dro_02/dro_02_5_npc.c | 2 +- src/world/area_flo/flo_03/flo_03_4_foliage.c | 4 +- src/world/area_flo/flo_07/flo_07_3_npc.c | 4 +- src/world/area_flo/flo_08/flo_08_5_foliage.c | 4 +- src/world/area_flo/flo_09/flo_09_4_foliage.c | 12 +- src/world/area_flo/flo_10/flo_10_7_foliage.c | 4 +- src/world/area_flo/flo_18/flo_18_4_npc.c | 2 +- src/world/area_flo/flo_22/flo_22_5_foliage.c | 8 +- src/world/area_flo/flo_24/flo_24_3_foliage.c | 4 +- src/world/area_flo/flo_25/flo_25_5_foliage.c | 4 +- src/world/area_iwa/iwa_10/iwa_10_8_foliage.c | 8 +- src/world/area_jan/jan_00/jan_00_5_foliage.c | 4 +- src/world/area_kmr/kmr.h | 2 + src/world/area_kmr/kmr_02/8B0070.c | 306 --- src/world/area_kmr/kmr_02/8B30E0.c | 3 - src/world/area_kmr/kmr_02/8B33E0.c | 43 - src/world/area_kmr/kmr_02/8B36B0.c | 26 - src/world/area_kmr/kmr_02/8B37D0.c | 3 - src/world/area_kmr/kmr_02/8B3A10.c | 8 - src/world/area_kmr/kmr_02/kmr_02.h | 68 +- src/world/area_kmr/kmr_02/kmr_02_0_header.c | 23 + src/world/area_kmr/kmr_02/kmr_02_1_music.c | 43 + src/world/area_kmr/kmr_02/kmr_02_2_main.c | 191 ++ src/world/area_kmr/kmr_02/kmr_02_3_npc.c | 2353 +++++++++++++++++ src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c | 312 +++ src/world/area_kmr/kmr_02/kmr_02_5_entity.c | 147 + src/world/area_kmr/kmr_02/kmr_02_6_rooms_2.c | 103 + src/world/area_kmr/kmr_02/kmr_02_7_kammy.c | 351 +++ src/world/area_kmr/kmr_02/kmr_02_8_foliage.c | 110 + src/world/area_kmr/kmr_02/kmr_02_9_images.c | 7 + .../area_kmr/kmr_02/wander_territories.inc.c | 80 + src/world/area_kmr/kmr_03/kmr_03_3_npc.c | 4 +- src/world/area_kmr/kmr_03/kmr_03_5_foliage.c | 6 +- src/world/area_kmr/kmr_04/kmr_04_3_npc.c | 4 +- src/world/area_kmr/kmr_04/kmr_04_5_foliage.c | 32 +- src/world/area_kmr/kmr_05/kmr_05_5_foliage.c | 4 +- src/world/area_kmr/kmr_10/kmr_10_5_foliage.c | 6 +- src/world/area_kmr/kmr_11/kmr_11_2_main.c | 2 +- src/world/area_kmr/kmr_11/kmr_11_7_foliage.c | 14 +- src/world/area_kmr/kmr_20/8EBE20.c | 13 - src/world/area_kmr/kmr_20/8EBE50.c | 292 -- src/world/area_kmr/kmr_20/8ECBF0.c | 8 - src/world/area_kmr/kmr_20/8ECC40.c | 6 - src/world/area_kmr/kmr_20/8ECE80.c | 6 - src/world/area_kmr/kmr_20/8ED0C0.c | 15 - src/world/area_kmr/kmr_20/8ED440.c | 19 - src/world/area_kmr/kmr_20/8ED5A0.c | 33 - src/world/area_kmr/kmr_20/8EDB70.c | 62 - src/world/area_kmr/kmr_20/8EDFC0.c | 198 -- src/world/area_kmr/kmr_20/kmr_20.h | 51 +- src/world/area_kmr/kmr_20/kmr_20_0_header.c | 17 + src/world/area_kmr/kmr_20/kmr_20_10_npc.c | 821 ++++++ .../area_kmr/kmr_20/kmr_20_11_npc_intro.c | 445 ++++ .../area_kmr/kmr_20/kmr_20_12_npc_epilogue.c | 332 +++ src/world/area_kmr/kmr_20/kmr_20_13_records.c | 255 ++ src/world/area_kmr/kmr_20/kmr_20_1_music.c | 43 + src/world/area_kmr/kmr_20/kmr_20_2_main.c | 106 + src/world/area_kmr/kmr_20/kmr_20_3_rooms.c | 102 + .../area_kmr/kmr_20/kmr_20_4_documents.c | 538 ++++ src/world/area_kmr/kmr_20/kmr_20_5_entity.c | 146 + src/world/area_kmr/kmr_20/kmr_20_6_trees.c | 35 + src/world/area_kmr/kmr_20/kmr_20_7_bushes.c | 90 + src/world/area_kmr/kmr_20/kmr_20_8_bed.c | 195 ++ .../area_kmr/kmr_20/kmr_20_9_npc_scenes.c | 91 + src/world/area_kpa/kpa.h | 96 +- src/world/area_kpa/kpa_01/A46F60.c | 6 - src/world/area_kpa/kpa_01/A470C0.c | 5 - src/world/area_kpa/kpa_01/kpa_01.h | 15 +- src/world/area_kpa/kpa_01/kpa_01_0_header.c | 13 + src/world/area_kpa/kpa_01/kpa_01_1_music.c | 9 + src/world/area_kpa/kpa_01/kpa_01_2_main.c | 67 + src/world/area_kpa/kpa_01/kpa_01_3_npc.c | 53 + src/world/area_kpa/kpa_01/kpa_01_4_entity.c | 9 + src/world/area_kpa/kpa_03/A485C0.c | 6 - src/world/area_kpa/kpa_03/A48720.c | 7 - src/world/area_kpa/kpa_03/A4A410.c | 13 - src/world/area_kpa/kpa_03/kpa_03.h | 28 +- src/world/area_kpa/kpa_03/kpa_03_0_header.c | 13 + src/world/area_kpa/kpa_03/kpa_03_1_music.c | 8 + src/world/area_kpa/kpa_03/kpa_03_2_main.c | 42 + src/world/area_kpa/kpa_03/kpa_03_3_npc.c | 144 + src/world/area_kpa/kpa_03/kpa_03_4_entity.c | 63 + src/world/area_kpa/kpa_04/A4BF60.c | 34 - src/world/area_kpa/kpa_04/kpa_04.h | 9 +- src/world/area_kpa/kpa_04/kpa_04_0_header.c | 13 + src/world/area_kpa/kpa_04/kpa_04_1_music.c | 12 + src/world/area_kpa/kpa_04/kpa_04_2_main.c | 30 + src/world/area_kpa/kpa_04/kpa_04_3_statues.c | 130 + src/world/area_kpa/kpa_08/A4CA20.c | 18 - src/world/area_kpa/kpa_08/A4CAC0.c | 3 - src/world/area_kpa/kpa_08/kpa_08.h | 17 +- src/world/area_kpa/kpa_08/kpa_08_0_header.c | 13 + src/world/area_kpa/kpa_08/kpa_08_1_music.c | 12 + src/world/area_kpa/kpa_08/kpa_08_2_main.c | 41 + src/world/area_kpa/kpa_08/kpa_08_3_entity.c | 100 + src/world/area_kpa/kpa_08/kpa_08_4_npc.c | 35 + src/world/area_kpa/kpa_09/A4F000.c | 18 - src/world/area_kpa/kpa_09/A4F0A0.c | 5 - src/world/area_kpa/kpa_09/kpa_09.h | 20 +- src/world/area_kpa/kpa_09/kpa_09_0_header.c | 13 + src/world/area_kpa/kpa_09/kpa_09_1_music.c | 12 + src/world/area_kpa/kpa_09/kpa_09_2_main.c | 45 + src/world/area_kpa/kpa_09/kpa_09_3_entity.c | 100 + src/world/area_kpa/kpa_09/kpa_09_4_npc.c | 36 + src/world/area_kpa/kpa_10/A51980.c | 9 - src/world/area_kpa/kpa_10/kpa_10.h | 19 +- src/world/area_kpa/kpa_10/kpa_10_0_header.c | 16 + src/world/area_kpa/kpa_10/kpa_10_1_music.c | 12 + src/world/area_kpa/kpa_10/kpa_10_2_main.c | 48 + src/world/area_kpa/kpa_10/kpa_10_3_npc.c | 41 + src/world/area_kpa/kpa_10/kpa_10_4_entity.c | 10 + src/world/area_kpa/kpa_100/A93160.c | 9 - src/world/area_kpa/kpa_100/kpa_100.h | 9 +- src/world/area_kpa/kpa_100/kpa_100_0_header.c | 12 + src/world/area_kpa/kpa_100/kpa_100_1_music.c | 12 + src/world/area_kpa/kpa_100/kpa_100_2_main.c | 29 + src/world/area_kpa/kpa_100/kpa_100_3_entity.c | 7 + src/world/area_kpa/kpa_101/A93440.c | 9 - src/world/area_kpa/kpa_101/kpa_101.h | 9 +- src/world/area_kpa/kpa_101/kpa_101_0_header.c | 12 + src/world/area_kpa/kpa_101/kpa_101_1_music.c | 12 + src/world/area_kpa/kpa_101/kpa_101_2_main.c | 29 + src/world/area_kpa/kpa_101/kpa_101_3_entity.c | 7 + src/world/area_kpa/kpa_102/A93740.c | 7 - src/world/area_kpa/kpa_102/A93A50.c | 9 - src/world/area_kpa/kpa_102/kpa_102.h | 19 +- src/world/area_kpa/kpa_102/kpa_102_0_header.c | 13 + src/world/area_kpa/kpa_102/kpa_102_1_music.c | 12 + src/world/area_kpa/kpa_102/kpa_102_2_main.c | 94 + src/world/area_kpa/kpa_102/kpa_102_3_npc.c | 91 + src/world/area_kpa/kpa_11/A528C0.c | 9 - src/world/area_kpa/kpa_11/A52BD0.c | 3 - src/world/area_kpa/kpa_11/kpa_11.h | 21 +- src/world/area_kpa/kpa_11/kpa_11_0_header.c | 16 + src/world/area_kpa/kpa_11/kpa_11_1_music.c | 13 + src/world/area_kpa/kpa_11/kpa_11_2_main.c | 110 + src/world/area_kpa/kpa_11/kpa_11_3_entity.c | 13 + src/world/area_kpa/kpa_11/kpa_11_4_npc.c | 104 + src/world/area_kpa/kpa_111/A99590.c | 12 - src/world/area_kpa/kpa_111/kpa_111.h | 25 +- src/world/area_kpa/kpa_111/kpa_111_0_header.c | 13 + src/world/area_kpa/kpa_111/kpa_111_1_music.c | 12 + src/world/area_kpa/kpa_111/kpa_111_2_main.c | 42 + .../area_kpa/kpa_111/kpa_111_3_statues.c | 133 + src/world/area_kpa/kpa_111/kpa_111_4_npc.c | 63 + src/world/area_kpa/kpa_111/kpa_111_5_entity.c | 11 + src/world/area_kpa/kpa_112/A9C990.c | 4 - src/world/area_kpa/kpa_112/kpa_112.h | 8 +- src/world/area_kpa/kpa_112/kpa_112_0_header.c | 13 + src/world/area_kpa/kpa_112/kpa_112_1_music.c | 12 + src/world/area_kpa/kpa_112/kpa_112_2_main.c | 24 + src/world/area_kpa/kpa_113/A9CC30.c | 8 - src/world/area_kpa/kpa_113/A9CC70.c | 9 - src/world/area_kpa/kpa_113/kpa_113.h | 19 +- src/world/area_kpa/kpa_113/kpa_113_0_header.c | 14 + src/world/area_kpa/kpa_113/kpa_113_1_music.c | 12 + src/world/area_kpa/kpa_113/kpa_113_2_main.c | 46 + src/world/area_kpa/kpa_113/kpa_113_3_entity.c | 51 + .../area_kpa/kpa_113/kpa_113_4_statues.c | 134 + src/world/area_kpa/kpa_113/kpa_113_5_npc.c | 30 + src/world/area_kpa/kpa_114/A9E980.c | 9 - src/world/area_kpa/kpa_114/kpa_114.h | 9 +- src/world/area_kpa/kpa_114/kpa_114_0_header.c | 13 + src/world/area_kpa/kpa_114/kpa_114_1_music.c | 12 + src/world/area_kpa/kpa_114/kpa_114_2_main.c | 44 + src/world/area_kpa/kpa_114/kpa_114_3_entity.c | 8 + src/world/area_kpa/kpa_115/A9ED40.c | 14 - src/world/area_kpa/kpa_115/kpa_115.h | 14 +- src/world/area_kpa/kpa_115/kpa_115_0_header.c | 14 + src/world/area_kpa/kpa_115/kpa_115_1_music.c | 12 + src/world/area_kpa/kpa_115/kpa_115_2_main.c | 29 + .../area_kpa/kpa_115/kpa_115_3_statues.c | 141 + src/world/area_kpa/kpa_115/kpa_115_4_npc.c | 38 + src/world/area_kpa/kpa_116/AA1EE0.c | 4 - src/world/area_kpa/kpa_116/kpa_116.h | 8 +- src/world/area_kpa/kpa_116/kpa_116_0_header.c | 13 + src/world/area_kpa/kpa_116/kpa_116_1_music.c | 12 + src/world/area_kpa/kpa_116/kpa_116_2_main.c | 23 + src/world/area_kpa/kpa_117/kpa_117_0_header.c | 11 - src/world/area_kpa/kpa_117/kpa_117_1_music.c | 12 + .../{kpa_117_1_main.c => kpa_117_2_main.c} | 0 src/world/area_kpa/kpa_118/AA23C0.c | 4 - src/world/area_kpa/kpa_118/kpa_118.h | 8 +- src/world/area_kpa/kpa_118/kpa_118_0_header.c | 13 + src/world/area_kpa/kpa_118/kpa_118_1_music.c | 12 + src/world/area_kpa/kpa_118/kpa_118_2_main.c | 23 + src/world/area_kpa/kpa_119/AA2660.c | 3 - src/world/area_kpa/kpa_119/kpa_119.h | 9 +- src/world/area_kpa/kpa_119/kpa_119_0_header.c | 12 + src/world/area_kpa/kpa_119/kpa_119_1_music.c | 12 + src/world/area_kpa/kpa_119/kpa_119_2_entity.c | 7 + src/world/area_kpa/kpa_119/kpa_119_3_main.c | 24 + src/world/area_kpa/kpa_12/A54950.c | 13 - src/world/area_kpa/kpa_12/A54990.c | 4 - src/world/area_kpa/kpa_12/A54CA0.c | 37 - src/world/area_kpa/kpa_12/kpa_12.h | 9 +- src/world/area_kpa/kpa_12/kpa_12_0_header.c | 22 + src/world/area_kpa/kpa_12/kpa_12_1_music.c | 15 + src/world/area_kpa/kpa_12/kpa_12_2_main.c | 115 + .../area_kpa/kpa_12/kpa_12_3_platforms.c | 229 ++ src/world/area_kpa/kpa_121/AA28F0.c | 4 - src/world/area_kpa/kpa_121/kpa_121.h | 8 +- src/world/area_kpa/kpa_121/kpa_121_0_header.c | 13 + src/world/area_kpa/kpa_121/kpa_121_1_music.c | 12 + src/world/area_kpa/kpa_121/kpa_121_2_main.c | 59 + src/world/area_kpa/kpa_13/A55F20.c | 13 - src/world/area_kpa/kpa_13/A55F60.c | 4 - src/world/area_kpa/kpa_13/A56270.c | 38 - src/world/area_kpa/kpa_13/kpa_13.h | 10 +- src/world/area_kpa/kpa_13/kpa_13_0_header.c | 22 + src/world/area_kpa/kpa_13/kpa_13_1_music.c | 15 + src/world/area_kpa/kpa_13/kpa_13_2_main.c | 94 + src/world/area_kpa/kpa_13/kpa_13_3_entity.c | 17 + .../area_kpa/kpa_13/kpa_13_4_platforms.c | 184 ++ src/world/area_kpa/kpa_130/AA2D20.c | 6 - src/world/area_kpa/kpa_130/kpa_130.h | 43 +- src/world/area_kpa/kpa_130/kpa_130_0_header.c | 13 + src/world/area_kpa/kpa_130/kpa_130_1_music.c | 13 + src/world/area_kpa/kpa_130/kpa_130_2_main.c | 44 + src/world/area_kpa/kpa_130/kpa_130_3_npc.c | 381 +++ src/world/area_kpa/kpa_133/AA7480.c | 7 - src/world/area_kpa/kpa_133/AA7790.c | 21 - src/world/area_kpa/kpa_133/kpa_133.h | 21 +- src/world/area_kpa/kpa_133/kpa_133_0_header.c | 15 + src/world/area_kpa/kpa_133/kpa_133_1_music.c | 12 + src/world/area_kpa/kpa_133/kpa_133_2_main.c | 108 + src/world/area_kpa/kpa_133/kpa_133_3_entity.c | 137 + src/world/area_kpa/kpa_133/kpa_133_4_npc.c | 25 + src/world/area_kpa/kpa_133/kpa_133_5_water.c | 36 + src/world/area_kpa/kpa_133/kpa_133_6.c | 14 + src/world/area_kpa/kpa_134/AA8FA0.c | 7 - src/world/area_kpa/kpa_134/AA92B0.c | 63 - src/world/area_kpa/kpa_134/AA94B0.c | 16 - src/world/area_kpa/kpa_134/kpa_134.h | 24 +- src/world/area_kpa/kpa_134/kpa_134_0_header.c | 15 + src/world/area_kpa/kpa_134/kpa_134_1_music.c | 12 + src/world/area_kpa/kpa_134/kpa_134_2_main.c | 101 + src/world/area_kpa/kpa_134/kpa_134_3_chains.c | 532 ++++ src/world/area_kpa/kpa_134/kpa_134_4_npc.c | 25 + src/world/area_kpa/kpa_134/kpa_134_5_panels.c | 87 + src/world/area_kpa/kpa_134/kpa_134_6_entity.c | 99 + src/world/area_kpa/kpa_90/A867B0.c | 4 - src/world/area_kpa/kpa_90/kpa_90.h | 8 +- src/world/area_kpa/kpa_90/kpa_90_0_header.c | 13 + src/world/area_kpa/kpa_90/kpa_90_1_music.c | 12 + src/world/area_kpa/kpa_90/kpa_90_2_main.c | 23 + src/world/area_kpa/kpa_91/A86A50.c | 8 - src/world/area_kpa/kpa_91/A88280.c | 5 - src/world/area_kpa/kpa_91/kpa_91.h | 28 +- src/world/area_kpa/kpa_91/kpa_91_0_header.c | 12 + src/world/area_kpa/kpa_91/kpa_91_1_music.c | 12 + src/world/area_kpa/kpa_91/kpa_91_2_main.c | 51 + src/world/area_kpa/kpa_91/kpa_91_3_npc.c | 286 ++ src/world/area_kpa/kpa_91/kpa_91_4_entity.c | 51 + src/world/area_kpa/kpa_94/A8C7C0.c | 4 - src/world/area_kpa/kpa_94/kpa_94.h | 8 +- src/world/area_kpa/kpa_94/kpa_94_0_header.c | 13 + src/world/area_kpa/kpa_94/kpa_94_1_music.c | 12 + src/world/area_kpa/kpa_94/kpa_94_2_main.c | 25 + src/world/area_kpa/kpa_95/A8CA80.c | 8 - src/world/area_kpa/kpa_95/A8CB60.c | 5 - src/world/area_kpa/kpa_95/kpa_95.h | 31 +- src/world/area_kpa/kpa_95/kpa_95_0_header.c | 12 + src/world/area_kpa/kpa_95/kpa_95_1_music.c | 12 + src/world/area_kpa/kpa_95/kpa_95_2_entity.c | 51 + src/world/area_kpa/kpa_95/kpa_95_3_main.c | 48 + src/world/area_kpa/kpa_95/kpa_95_4_npc.c | 334 +++ src/world/area_kpa/kpa_96/A927C0.c | 13 - src/world/area_kpa/kpa_96/kpa_96.h | 20 +- src/world/area_kpa/kpa_96/kpa_96_0_header.c | 12 + src/world/area_kpa/kpa_96/kpa_96_1_music.c | 12 + src/world/area_kpa/kpa_96/kpa_96_2_main.c | 32 + src/world/area_kpa/kpa_96/kpa_96_3_npc.c | 179 ++ .../area_mac/mac_00/mac_00_13_epilogue_npc.c | 4 +- src/world/area_mac/mac_00/mac_00_5_npc.c | 2 +- src/world/area_mac/mac_01/mac_01_13_foliage.c | 8 +- src/world/area_mac/mac_01/mac_01_9_npc.c | 2 +- src/world/area_mac/mac_02/mac_02_4_foliage.c | 16 +- src/world/area_mac/mac_03/mac_03_6_foliage.c | 12 +- src/world/area_mac/mac_04/mac_04_4_foliage.c | 12 +- src/world/area_mac/mac_04/mac_04_6_npc.c | 2 +- src/world/area_mac/mac_05/mac_05_4_npc.c | 2 +- src/world/area_mac/machi/machi_1_tables.c | 4 +- src/world/area_mac/machi/machi_5_npc.c | 4 +- src/world/area_mim/mim_11/mim_11_6_foliage.c | 8 +- src/world/area_sbk/sbk_06/sbk_06_3_foliage.c | 4 +- src/world/area_sbk/sbk_16/sbk_16_2_foliage.c | 8 +- src/world/area_sbk/sbk_24/sbk_24_4_foliage.c | 12 +- src/world/area_sbk/sbk_25/sbk_25_3_foliage.c | 8 +- src/world/area_sbk/sbk_26/sbk_26_3_foliage.c | 4 +- src/world/area_sbk/sbk_30/sbk_30_4_foliage.c | 4 +- src/world/area_sbk/sbk_34/sbk_34_3_foliage.c | 4 +- src/world/area_sbk/sbk_35/sbk_35_3_foliage.c | 12 +- src/world/area_sbk/sbk_36/sbk_36_2_foliage.c | 36 +- src/world/area_sbk/sbk_46/sbk_46_3_foliage.c | 12 +- src/world/area_sbk/sbk_55/sbk_55_3_foliage.c | 4 +- src/world/area_sbk/sbk_56/sbk_56_3_foliage.c | 40 +- src/world/area_sbk/sbk_66/sbk_66_3_foliage.c | 12 +- src/world/area_trd/trd_09/trd_09_3_npcs.c | 602 +---- src/world/area_tst/tst_04/tst_04_4_npc.c | 4 +- src/world/common/atomic/QuizmoData.inc.c | 2 +- src/world/common/complete/Quizmo.inc.c | 98 +- .../complete/ToadHouseBlanketAnim.inc.c | 2 +- src/world/common/enemy/ai/TackleAI.inc.c | 3 + .../common/enemy/complete/BombshellBill.h | 94 + src/world/common/enemy/complete/BulletBill.h | 94 + src/world/common/enemy/complete/DryBones.h | 79 + .../common/enemy/complete/DryBones.inc.c | 117 + .../common/enemy/complete/FlyingMagikoopa.h | 71 + .../enemy/complete/FlyingMagikoopa.inc.c | 122 + src/world/common/enemy/complete/HammerBros.h | 81 + .../common/enemy/complete/HammerBros.inc.c | 123 + src/world/common/enemy/complete/Koopatrol.h | 42 + .../enemy/complete/Koopatrol_Patrol.inc.c | 34 + .../enemy/complete/Koopatrol_Wander.inc.c | 35 + src/world/common/enemy/complete/Magikoopa.h | 96 +- .../common/enemy/complete/Magikoopa.inc.c | 148 ++ src/world/common/enemy/complete/SpikeTop.h | 47 + .../common/enemy/complete/SpikeTop.inc.c | 12 +- src/world/common/enemy/complete/YMagikoopa.h | 59 + src/world/common/npc/GoombaFamily.h | 59 +- .../common/npc/GoombaFamily_Wander.inc.c | 23 + src/world/common/npc/Toad.h | 88 +- src/world/common/npc/Toad_Guard.inc.c | 29 + src/world/common/todo/UnkFunc12.inc.c | 2 + .../dead/area_flo/flo_03/flo_03_4_foliage.c | 4 +- src/world/dead/area_flo/flo_07/flo_07_3_npc.c | 4 +- .../dead/area_flo/flo_08/flo_08_5_foliage.c | 4 +- .../dead/area_flo/flo_09/flo_09_4_foliage.c | 12 +- .../dead/area_flo/flo_10/flo_10_7_foliage.c | 4 +- src/world/dead/area_flo/flo_18/flo_18_4_npc.c | 2 +- .../dead/area_kzn/kzn_18/kzn_18_0_header.c | 2 +- src/world/partners.c | 231 +- src/world/world.c | 65 +- tools/saved_byte_renames.txt | 4 +- tools/star_rod_idx_to_c.py | 2 +- ver/us/asm/bss2.s | 8 +- ver/us/asm/bss2_2.s | 4 +- .../data/world/area_kmr/kmr_02/8B3AB0.data.s | 6 - .../data/world/area_kmr/kmr_02/8B3D10.data.s | 57 - .../data/world/area_kmr/kmr_02/8B5640.data.s | 471 ---- .../data/world/area_kmr/kmr_02/8C4A40.data.s | 9 - .../data/world/area_kmr/kmr_02/8C51D0.data.s | 66 - .../data/world/area_kmr/kmr_02/8C7010.data.s | 57 - .../data/world/area_kmr/kmr_02/8C7B70.data.s | 9 - .../data/world/area_kmr/kmr_20/8EE9D0.data.s | 6 - .../data/world/area_kmr/kmr_20/8EEBC0.data.s | 21 - .../data/world/area_kmr/kmr_20/8EFDA0.data.s | 15 - .../data/world/area_kmr/kmr_20/8F01E0.data.s | 39 - .../data/world/area_kmr/kmr_20/8F1500.data.s | 27 - .../data/world/area_kmr/kmr_20/8F1C00.data.s | 24 - .../data/world/area_kmr/kmr_20/8F2610.data.s | 51 - .../data/world/area_kmr/kmr_20/8F3130.data.s | 84 - .../data/world/area_kmr/kmr_20/8F61F0.data.s | 12 - .../data/world/area_kmr/kmr_20/8F66D0.data.s | 66 - .../data/world/area_kmr/kmr_20/8F9D30.data.s | 60 - .../data/world/area_kpa/kpa_01/A479B0.data.s | 6 - .../data/world/area_kpa/kpa_01/A47A60.data.s | 18 - .../data/world/area_kpa/kpa_01/A47D70.data.s | 33 - .../data/world/area_kpa/kpa_01/A48500.data.s | 6 - .../data/world/area_kpa/kpa_03/A4A480.data.s | 6 - .../data/world/area_kpa/kpa_03/A4A520.data.s | 18 - .../data/world/area_kpa/kpa_03/A4A750.data.s | 105 - .../data/world/area_kpa/kpa_04/A4C0D0.data.s | 6 - .../data/world/area_kpa/kpa_04/A4C1A0.data.s | 24 - .../data/world/area_kpa/kpa_08/A4DEC0.data.s | 6 - .../data/world/area_kpa/kpa_08/A4DF90.data.s | 15 - .../data/world/area_kpa/kpa_08/A4E250.data.s | 6 - .../data/world/area_kpa/kpa_08/A4E710.data.s | 51 - .../data/world/area_kpa/kpa_09/A502F0.data.s | 6 - .../data/world/area_kpa/kpa_09/A503C0.data.s | 15 - .../data/world/area_kpa/kpa_09/A506D0.data.s | 6 - .../data/world/area_kpa/kpa_09/A50B90.data.s | 33 - .../data/world/area_kpa/kpa_10/A51C90.data.s | 6 - .../data/world/area_kpa/kpa_10/A51D90.data.s | 39 - .../data/world/area_kpa/kpa_100/A931B0.data.s | 6 - .../data/world/area_kpa/kpa_100/A93270.data.s | 9 - .../data/world/area_kpa/kpa_100/A933D0.data.s | 6 - .../data/world/area_kpa/kpa_101/A93490.data.s | 6 - .../data/world/area_kpa/kpa_101/A93550.data.s | 9 - .../data/world/area_kpa/kpa_101/A936D0.data.s | 6 - .../data/world/area_kpa/kpa_102/A96CD0.data.s | 6 - .../data/world/area_kpa/kpa_102/A96DA0.data.s | 18 - .../data/world/area_kpa/kpa_102/A97690.data.s | 84 - .../data/world/area_kpa/kpa_11/A533B0.data.s | 6 - .../data/world/area_kpa/kpa_11/A534C0.data.s | 33 - .../data/world/area_kpa/kpa_11/A53D80.data.s | 6 - .../data/world/area_kpa/kpa_11/A53E30.data.s | 30 - .../data/world/area_kpa/kpa_111/A9A950.data.s | 6 - .../data/world/area_kpa/kpa_111/A9AA20.data.s | 15 - .../data/world/area_kpa/kpa_111/A9ACF0.data.s | 45 - .../data/world/area_kpa/kpa_111/A9C740.data.s | 6 - .../data/world/area_kpa/kpa_112/A9C990.data.s | 6 - .../data/world/area_kpa/kpa_112/A9CA60.data.s | 12 - .../data/world/area_kpa/kpa_113/A9D6D0.data.s | 6 - .../data/world/area_kpa/kpa_113/A9D7B0.data.s | 15 - .../data/world/area_kpa/kpa_113/A9DA60.data.s | 12 - .../data/world/area_kpa/kpa_113/A9DD00.data.s | 39 - .../data/world/area_kpa/kpa_114/A9E9D0.data.s | 6 - .../data/world/area_kpa/kpa_114/A9EAA0.data.s | 18 - .../data/world/area_kpa/kpa_115/AA0100.data.s | 6 - .../data/world/area_kpa/kpa_115/AA01E0.data.s | 15 - .../data/world/area_kpa/kpa_115/AA0430.data.s | 12 - .../data/world/area_kpa/kpa_115/AA0B20.data.s | 36 - .../data/world/area_kpa/kpa_116/AA1EE0.data.s | 6 - .../data/world/area_kpa/kpa_116/AA1FB0.data.s | 12 - .../data/world/area_kpa/kpa_118/AA23C0.data.s | 6 - .../data/world/area_kpa/kpa_118/AA2490.data.s | 12 - .../data/world/area_kpa/kpa_119/AA2660.data.s | 6 - .../data/world/area_kpa/kpa_119/AA2720.data.s | 6 - .../data/world/area_kpa/kpa_119/AA2760.data.s | 9 - .../data/world/area_kpa/kpa_12/A54DC0.data.s | 33 - .../data/world/area_kpa/kpa_12/A55620.data.s | 27 - .../data/world/area_kpa/kpa_121/AA28F0.data.s | 6 - .../data/world/area_kpa/kpa_121/AA29C0.data.s | 15 - .../data/world/area_kpa/kpa_13/A56390.data.s | 33 - .../data/world/area_kpa/kpa_13/A56BD0.data.s | 6 - .../data/world/area_kpa/kpa_13/A56CA0.data.s | 6 - .../data/world/area_kpa/kpa_130/AA3460.data.s | 6 - .../data/world/area_kpa/kpa_130/AA3530.data.s | 15 - .../data/world/area_kpa/kpa_130/AA3870.data.s | 90 - .../data/world/area_kpa/kpa_133/AA78F0.data.s | 6 - .../data/world/area_kpa/kpa_133/AA79E0.data.s | 30 - .../data/world/area_kpa/kpa_133/AA8290.data.s | 21 - .../data/world/area_kpa/kpa_133/AA8C70.data.s | 6 - .../data/world/area_kpa/kpa_133/AA8F10.data.s | 6 - .../data/world/area_kpa/kpa_134/AA96A0.data.s | 6 - .../data/world/area_kpa/kpa_134/AA9790.data.s | 21 - .../data/world/area_kpa/kpa_134/AAA060.data.s | 36 - .../data/world/area_kpa/kpa_134/AABF00.data.s | 12 - .../data/world/area_kpa/kpa_134/AAC3B0.data.s | 12 - .../data/world/area_kpa/kpa_90/A867B0.data.s | 6 - .../data/world/area_kpa/kpa_90/A86880.data.s | 12 - .../data/world/area_kpa/kpa_91/A88360.data.s | 6 - .../data/world/area_kpa/kpa_91/A88420.data.s | 9 - .../data/world/area_kpa/kpa_91/A88730.data.s | 135 - .../data/world/area_kpa/kpa_91/A8C230.data.s | 9 - .../data/world/area_kpa/kpa_94/A8C7C0.data.s | 6 - .../data/world/area_kpa/kpa_94/A8C890.data.s | 12 - .../data/world/area_kpa/kpa_95/A8E390.data.s | 6 - .../data/world/area_kpa/kpa_95/A8E450.data.s | 9 - .../data/world/area_kpa/kpa_95/A8E690.data.s | 12 - .../data/world/area_kpa/kpa_95/A8E970.data.s | 135 - .../data/world/area_kpa/kpa_96/A927F0.data.s | 6 - .../data/world/area_kpa/kpa_96/A928B0.data.s | 48 - .../kmr_02/8B0070/func_8024226C_8B22DC.s | 28 - .../kmr_02/8B0070/func_8024295C_8B29CC.s | 32 +- ver/us/splat.yaml | 419 +-- ver/us/symbol_addrs.txt | 148 +- 471 files changed, 16318 insertions(+), 5868 deletions(-) delete mode 100644 src/world/area_kmr/kmr_02/8B0070.c delete mode 100644 src/world/area_kmr/kmr_02/8B30E0.c delete mode 100644 src/world/area_kmr/kmr_02/8B33E0.c delete mode 100644 src/world/area_kmr/kmr_02/8B36B0.c delete mode 100644 src/world/area_kmr/kmr_02/8B37D0.c delete mode 100644 src/world/area_kmr/kmr_02/8B3A10.c create mode 100644 src/world/area_kmr/kmr_02/kmr_02_0_header.c create mode 100644 src/world/area_kmr/kmr_02/kmr_02_1_music.c create mode 100644 src/world/area_kmr/kmr_02/kmr_02_2_main.c create mode 100644 src/world/area_kmr/kmr_02/kmr_02_3_npc.c create mode 100644 src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c create mode 100644 src/world/area_kmr/kmr_02/kmr_02_5_entity.c create mode 100644 src/world/area_kmr/kmr_02/kmr_02_6_rooms_2.c create mode 100644 src/world/area_kmr/kmr_02/kmr_02_7_kammy.c create mode 100644 src/world/area_kmr/kmr_02/kmr_02_8_foliage.c create mode 100644 src/world/area_kmr/kmr_02/kmr_02_9_images.c create mode 100644 src/world/area_kmr/kmr_02/wander_territories.inc.c delete mode 100644 src/world/area_kmr/kmr_20/8EBE20.c delete mode 100644 src/world/area_kmr/kmr_20/8EBE50.c delete mode 100644 src/world/area_kmr/kmr_20/8ECBF0.c delete mode 100644 src/world/area_kmr/kmr_20/8ECC40.c delete mode 100644 src/world/area_kmr/kmr_20/8ECE80.c delete mode 100644 src/world/area_kmr/kmr_20/8ED0C0.c delete mode 100644 src/world/area_kmr/kmr_20/8ED440.c delete mode 100644 src/world/area_kmr/kmr_20/8ED5A0.c delete mode 100644 src/world/area_kmr/kmr_20/8EDB70.c delete mode 100644 src/world/area_kmr/kmr_20/8EDFC0.c create mode 100644 src/world/area_kmr/kmr_20/kmr_20_0_header.c create mode 100644 src/world/area_kmr/kmr_20/kmr_20_10_npc.c create mode 100644 src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c create mode 100644 src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c create mode 100644 src/world/area_kmr/kmr_20/kmr_20_13_records.c create mode 100644 src/world/area_kmr/kmr_20/kmr_20_1_music.c create mode 100644 src/world/area_kmr/kmr_20/kmr_20_2_main.c create mode 100644 src/world/area_kmr/kmr_20/kmr_20_3_rooms.c create mode 100644 src/world/area_kmr/kmr_20/kmr_20_4_documents.c create mode 100644 src/world/area_kmr/kmr_20/kmr_20_5_entity.c create mode 100644 src/world/area_kmr/kmr_20/kmr_20_6_trees.c create mode 100644 src/world/area_kmr/kmr_20/kmr_20_7_bushes.c create mode 100644 src/world/area_kmr/kmr_20/kmr_20_8_bed.c create mode 100644 src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c delete mode 100644 src/world/area_kpa/kpa_01/A46F60.c delete mode 100644 src/world/area_kpa/kpa_01/A470C0.c create mode 100644 src/world/area_kpa/kpa_01/kpa_01_0_header.c create mode 100644 src/world/area_kpa/kpa_01/kpa_01_1_music.c create mode 100644 src/world/area_kpa/kpa_01/kpa_01_2_main.c create mode 100644 src/world/area_kpa/kpa_01/kpa_01_3_npc.c create mode 100644 src/world/area_kpa/kpa_01/kpa_01_4_entity.c delete mode 100644 src/world/area_kpa/kpa_03/A485C0.c delete mode 100644 src/world/area_kpa/kpa_03/A48720.c delete mode 100644 src/world/area_kpa/kpa_03/A4A410.c create mode 100644 src/world/area_kpa/kpa_03/kpa_03_0_header.c create mode 100644 src/world/area_kpa/kpa_03/kpa_03_1_music.c create mode 100644 src/world/area_kpa/kpa_03/kpa_03_2_main.c create mode 100644 src/world/area_kpa/kpa_03/kpa_03_3_npc.c create mode 100644 src/world/area_kpa/kpa_03/kpa_03_4_entity.c delete mode 100644 src/world/area_kpa/kpa_04/A4BF60.c create mode 100644 src/world/area_kpa/kpa_04/kpa_04_0_header.c create mode 100644 src/world/area_kpa/kpa_04/kpa_04_1_music.c create mode 100644 src/world/area_kpa/kpa_04/kpa_04_2_main.c create mode 100644 src/world/area_kpa/kpa_04/kpa_04_3_statues.c delete mode 100644 src/world/area_kpa/kpa_08/A4CA20.c delete mode 100644 src/world/area_kpa/kpa_08/A4CAC0.c create mode 100644 src/world/area_kpa/kpa_08/kpa_08_0_header.c create mode 100644 src/world/area_kpa/kpa_08/kpa_08_1_music.c create mode 100644 src/world/area_kpa/kpa_08/kpa_08_2_main.c create mode 100644 src/world/area_kpa/kpa_08/kpa_08_3_entity.c create mode 100644 src/world/area_kpa/kpa_08/kpa_08_4_npc.c delete mode 100644 src/world/area_kpa/kpa_09/A4F000.c delete mode 100644 src/world/area_kpa/kpa_09/A4F0A0.c create mode 100644 src/world/area_kpa/kpa_09/kpa_09_0_header.c create mode 100644 src/world/area_kpa/kpa_09/kpa_09_1_music.c create mode 100644 src/world/area_kpa/kpa_09/kpa_09_2_main.c create mode 100644 src/world/area_kpa/kpa_09/kpa_09_3_entity.c create mode 100644 src/world/area_kpa/kpa_09/kpa_09_4_npc.c delete mode 100644 src/world/area_kpa/kpa_10/A51980.c create mode 100644 src/world/area_kpa/kpa_10/kpa_10_0_header.c create mode 100644 src/world/area_kpa/kpa_10/kpa_10_1_music.c create mode 100644 src/world/area_kpa/kpa_10/kpa_10_2_main.c create mode 100644 src/world/area_kpa/kpa_10/kpa_10_3_npc.c create mode 100644 src/world/area_kpa/kpa_10/kpa_10_4_entity.c delete mode 100644 src/world/area_kpa/kpa_100/A93160.c create mode 100644 src/world/area_kpa/kpa_100/kpa_100_0_header.c create mode 100644 src/world/area_kpa/kpa_100/kpa_100_1_music.c create mode 100644 src/world/area_kpa/kpa_100/kpa_100_2_main.c create mode 100644 src/world/area_kpa/kpa_100/kpa_100_3_entity.c delete mode 100644 src/world/area_kpa/kpa_101/A93440.c create mode 100644 src/world/area_kpa/kpa_101/kpa_101_0_header.c create mode 100644 src/world/area_kpa/kpa_101/kpa_101_1_music.c create mode 100644 src/world/area_kpa/kpa_101/kpa_101_2_main.c create mode 100644 src/world/area_kpa/kpa_101/kpa_101_3_entity.c delete mode 100644 src/world/area_kpa/kpa_102/A93740.c delete mode 100644 src/world/area_kpa/kpa_102/A93A50.c create mode 100644 src/world/area_kpa/kpa_102/kpa_102_0_header.c create mode 100644 src/world/area_kpa/kpa_102/kpa_102_1_music.c create mode 100644 src/world/area_kpa/kpa_102/kpa_102_2_main.c create mode 100644 src/world/area_kpa/kpa_102/kpa_102_3_npc.c delete mode 100644 src/world/area_kpa/kpa_11/A528C0.c delete mode 100644 src/world/area_kpa/kpa_11/A52BD0.c create mode 100644 src/world/area_kpa/kpa_11/kpa_11_0_header.c create mode 100644 src/world/area_kpa/kpa_11/kpa_11_1_music.c create mode 100644 src/world/area_kpa/kpa_11/kpa_11_2_main.c create mode 100644 src/world/area_kpa/kpa_11/kpa_11_3_entity.c create mode 100644 src/world/area_kpa/kpa_11/kpa_11_4_npc.c delete mode 100644 src/world/area_kpa/kpa_111/A99590.c create mode 100644 src/world/area_kpa/kpa_111/kpa_111_0_header.c create mode 100644 src/world/area_kpa/kpa_111/kpa_111_1_music.c create mode 100644 src/world/area_kpa/kpa_111/kpa_111_2_main.c create mode 100644 src/world/area_kpa/kpa_111/kpa_111_3_statues.c create mode 100644 src/world/area_kpa/kpa_111/kpa_111_4_npc.c create mode 100644 src/world/area_kpa/kpa_111/kpa_111_5_entity.c delete mode 100644 src/world/area_kpa/kpa_112/A9C990.c create mode 100644 src/world/area_kpa/kpa_112/kpa_112_0_header.c create mode 100644 src/world/area_kpa/kpa_112/kpa_112_1_music.c create mode 100644 src/world/area_kpa/kpa_112/kpa_112_2_main.c delete mode 100644 src/world/area_kpa/kpa_113/A9CC30.c delete mode 100644 src/world/area_kpa/kpa_113/A9CC70.c create mode 100644 src/world/area_kpa/kpa_113/kpa_113_0_header.c create mode 100644 src/world/area_kpa/kpa_113/kpa_113_1_music.c create mode 100644 src/world/area_kpa/kpa_113/kpa_113_2_main.c create mode 100644 src/world/area_kpa/kpa_113/kpa_113_3_entity.c create mode 100644 src/world/area_kpa/kpa_113/kpa_113_4_statues.c create mode 100644 src/world/area_kpa/kpa_113/kpa_113_5_npc.c delete mode 100644 src/world/area_kpa/kpa_114/A9E980.c create mode 100644 src/world/area_kpa/kpa_114/kpa_114_0_header.c create mode 100644 src/world/area_kpa/kpa_114/kpa_114_1_music.c create mode 100644 src/world/area_kpa/kpa_114/kpa_114_2_main.c create mode 100644 src/world/area_kpa/kpa_114/kpa_114_3_entity.c delete mode 100644 src/world/area_kpa/kpa_115/A9ED40.c create mode 100644 src/world/area_kpa/kpa_115/kpa_115_0_header.c create mode 100644 src/world/area_kpa/kpa_115/kpa_115_1_music.c create mode 100644 src/world/area_kpa/kpa_115/kpa_115_2_main.c create mode 100644 src/world/area_kpa/kpa_115/kpa_115_3_statues.c create mode 100644 src/world/area_kpa/kpa_115/kpa_115_4_npc.c delete mode 100644 src/world/area_kpa/kpa_116/AA1EE0.c create mode 100644 src/world/area_kpa/kpa_116/kpa_116_0_header.c create mode 100644 src/world/area_kpa/kpa_116/kpa_116_1_music.c create mode 100644 src/world/area_kpa/kpa_116/kpa_116_2_main.c create mode 100644 src/world/area_kpa/kpa_117/kpa_117_1_music.c rename src/world/area_kpa/kpa_117/{kpa_117_1_main.c => kpa_117_2_main.c} (100%) delete mode 100644 src/world/area_kpa/kpa_118/AA23C0.c create mode 100644 src/world/area_kpa/kpa_118/kpa_118_0_header.c create mode 100644 src/world/area_kpa/kpa_118/kpa_118_1_music.c create mode 100644 src/world/area_kpa/kpa_118/kpa_118_2_main.c delete mode 100644 src/world/area_kpa/kpa_119/AA2660.c create mode 100644 src/world/area_kpa/kpa_119/kpa_119_0_header.c create mode 100644 src/world/area_kpa/kpa_119/kpa_119_1_music.c create mode 100644 src/world/area_kpa/kpa_119/kpa_119_2_entity.c create mode 100644 src/world/area_kpa/kpa_119/kpa_119_3_main.c delete mode 100644 src/world/area_kpa/kpa_12/A54950.c delete mode 100644 src/world/area_kpa/kpa_12/A54990.c delete mode 100644 src/world/area_kpa/kpa_12/A54CA0.c create mode 100644 src/world/area_kpa/kpa_12/kpa_12_0_header.c create mode 100644 src/world/area_kpa/kpa_12/kpa_12_1_music.c create mode 100644 src/world/area_kpa/kpa_12/kpa_12_2_main.c create mode 100644 src/world/area_kpa/kpa_12/kpa_12_3_platforms.c delete mode 100644 src/world/area_kpa/kpa_121/AA28F0.c create mode 100644 src/world/area_kpa/kpa_121/kpa_121_0_header.c create mode 100644 src/world/area_kpa/kpa_121/kpa_121_1_music.c create mode 100644 src/world/area_kpa/kpa_121/kpa_121_2_main.c delete mode 100644 src/world/area_kpa/kpa_13/A55F20.c delete mode 100644 src/world/area_kpa/kpa_13/A55F60.c delete mode 100644 src/world/area_kpa/kpa_13/A56270.c create mode 100644 src/world/area_kpa/kpa_13/kpa_13_0_header.c create mode 100644 src/world/area_kpa/kpa_13/kpa_13_1_music.c create mode 100644 src/world/area_kpa/kpa_13/kpa_13_2_main.c create mode 100644 src/world/area_kpa/kpa_13/kpa_13_3_entity.c create mode 100644 src/world/area_kpa/kpa_13/kpa_13_4_platforms.c delete mode 100644 src/world/area_kpa/kpa_130/AA2D20.c create mode 100644 src/world/area_kpa/kpa_130/kpa_130_0_header.c create mode 100644 src/world/area_kpa/kpa_130/kpa_130_1_music.c create mode 100644 src/world/area_kpa/kpa_130/kpa_130_2_main.c create mode 100644 src/world/area_kpa/kpa_130/kpa_130_3_npc.c delete mode 100644 src/world/area_kpa/kpa_133/AA7480.c delete mode 100644 src/world/area_kpa/kpa_133/AA7790.c create mode 100644 src/world/area_kpa/kpa_133/kpa_133_0_header.c create mode 100644 src/world/area_kpa/kpa_133/kpa_133_1_music.c create mode 100644 src/world/area_kpa/kpa_133/kpa_133_2_main.c create mode 100644 src/world/area_kpa/kpa_133/kpa_133_3_entity.c create mode 100644 src/world/area_kpa/kpa_133/kpa_133_4_npc.c create mode 100644 src/world/area_kpa/kpa_133/kpa_133_5_water.c create mode 100644 src/world/area_kpa/kpa_133/kpa_133_6.c delete mode 100644 src/world/area_kpa/kpa_134/AA8FA0.c delete mode 100644 src/world/area_kpa/kpa_134/AA92B0.c delete mode 100644 src/world/area_kpa/kpa_134/AA94B0.c create mode 100644 src/world/area_kpa/kpa_134/kpa_134_0_header.c create mode 100644 src/world/area_kpa/kpa_134/kpa_134_1_music.c create mode 100644 src/world/area_kpa/kpa_134/kpa_134_2_main.c create mode 100644 src/world/area_kpa/kpa_134/kpa_134_3_chains.c create mode 100644 src/world/area_kpa/kpa_134/kpa_134_4_npc.c create mode 100644 src/world/area_kpa/kpa_134/kpa_134_5_panels.c create mode 100644 src/world/area_kpa/kpa_134/kpa_134_6_entity.c delete mode 100644 src/world/area_kpa/kpa_90/A867B0.c create mode 100644 src/world/area_kpa/kpa_90/kpa_90_0_header.c create mode 100644 src/world/area_kpa/kpa_90/kpa_90_1_music.c create mode 100644 src/world/area_kpa/kpa_90/kpa_90_2_main.c delete mode 100644 src/world/area_kpa/kpa_91/A86A50.c delete mode 100644 src/world/area_kpa/kpa_91/A88280.c create mode 100644 src/world/area_kpa/kpa_91/kpa_91_0_header.c create mode 100644 src/world/area_kpa/kpa_91/kpa_91_1_music.c create mode 100644 src/world/area_kpa/kpa_91/kpa_91_2_main.c create mode 100644 src/world/area_kpa/kpa_91/kpa_91_3_npc.c create mode 100644 src/world/area_kpa/kpa_91/kpa_91_4_entity.c delete mode 100644 src/world/area_kpa/kpa_94/A8C7C0.c create mode 100644 src/world/area_kpa/kpa_94/kpa_94_0_header.c create mode 100644 src/world/area_kpa/kpa_94/kpa_94_1_music.c create mode 100644 src/world/area_kpa/kpa_94/kpa_94_2_main.c delete mode 100644 src/world/area_kpa/kpa_95/A8CA80.c delete mode 100644 src/world/area_kpa/kpa_95/A8CB60.c create mode 100644 src/world/area_kpa/kpa_95/kpa_95_0_header.c create mode 100644 src/world/area_kpa/kpa_95/kpa_95_1_music.c create mode 100644 src/world/area_kpa/kpa_95/kpa_95_2_entity.c create mode 100644 src/world/area_kpa/kpa_95/kpa_95_3_main.c create mode 100644 src/world/area_kpa/kpa_95/kpa_95_4_npc.c delete mode 100644 src/world/area_kpa/kpa_96/A927C0.c create mode 100644 src/world/area_kpa/kpa_96/kpa_96_0_header.c create mode 100644 src/world/area_kpa/kpa_96/kpa_96_1_music.c create mode 100644 src/world/area_kpa/kpa_96/kpa_96_2_main.c create mode 100644 src/world/area_kpa/kpa_96/kpa_96_3_npc.c create mode 100644 src/world/common/enemy/complete/BombshellBill.h create mode 100644 src/world/common/enemy/complete/BulletBill.h create mode 100644 src/world/common/enemy/complete/DryBones.h create mode 100644 src/world/common/enemy/complete/DryBones.inc.c create mode 100644 src/world/common/enemy/complete/FlyingMagikoopa.h create mode 100644 src/world/common/enemy/complete/FlyingMagikoopa.inc.c create mode 100644 src/world/common/enemy/complete/HammerBros.h create mode 100644 src/world/common/enemy/complete/HammerBros.inc.c create mode 100644 src/world/common/enemy/complete/Koopatrol.h create mode 100644 src/world/common/enemy/complete/Koopatrol_Patrol.inc.c create mode 100644 src/world/common/enemy/complete/Koopatrol_Wander.inc.c create mode 100644 src/world/common/enemy/complete/Magikoopa.inc.c create mode 100644 src/world/common/enemy/complete/YMagikoopa.h create mode 100644 src/world/common/npc/GoombaFamily_Wander.inc.c create mode 100644 src/world/common/npc/Toad_Guard.inc.c delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_02/8B3AB0.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_02/8B3D10.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_02/8C51D0.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_02/8C7010.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_02/8C7B70.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_20/8EE9D0.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_20/8EEBC0.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_20/8EFDA0.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_20/8F01E0.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_20/8F1500.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_20/8F1C00.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_20/8F2610.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_20/8F3130.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_20/8F61F0.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_20/8F66D0.data.s delete mode 100644 ver/us/asm/data/world/area_kmr/kmr_20/8F9D30.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_01/A479B0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_01/A47A60.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_01/A47D70.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_01/A48500.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_03/A4A480.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_03/A4A520.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_04/A4C0D0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_04/A4C1A0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_08/A4DEC0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_08/A4DF90.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_08/A4E250.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_08/A4E710.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_09/A502F0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_09/A503C0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_09/A506D0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_09/A50B90.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_10/A51C90.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_100/A931B0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_100/A93270.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_100/A933D0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_101/A93490.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_101/A93550.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_101/A936D0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_102/A96CD0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_102/A96DA0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_11/A533B0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_11/A534C0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_11/A53D80.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_11/A53E30.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_111/A9A950.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_111/A9AA20.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_111/A9ACF0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_111/A9C740.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_112/A9C990.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_112/A9CA60.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_113/A9D6D0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_113/A9D7B0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_113/A9DA60.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_114/A9E9D0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_114/A9EAA0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_115/AA0100.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_115/AA01E0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_115/AA0430.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_115/AA0B20.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_116/AA1EE0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_116/AA1FB0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_118/AA23C0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_118/AA2490.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_119/AA2660.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_119/AA2720.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_119/AA2760.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_12/A54DC0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_12/A55620.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_121/AA28F0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_121/AA29C0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_13/A56390.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_13/A56BD0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_13/A56CA0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_130/AA3460.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_130/AA3530.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_130/AA3870.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_133/AA78F0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_133/AA79E0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_133/AA8290.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_133/AA8C70.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_133/AA8F10.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_134/AA96A0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_134/AA9790.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_134/AAA060.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_134/AABF00.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_134/AAC3B0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_90/A867B0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_90/A86880.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_91/A88360.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_91/A88420.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_91/A88730.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_91/A8C230.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_94/A8C7C0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_94/A8C890.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_95/A8E390.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_95/A8E450.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_95/A8E690.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_95/A8E970.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_96/A927F0.data.s delete mode 100644 ver/us/asm/data/world/area_kpa/kpa_96/A928B0.data.s delete mode 100644 ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s diff --git a/include/enums.h b/include/enums.h index 0a2afb1182..342c294413 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2717,6 +2717,8 @@ enum VisibilityGroup { VIS_GROUP_3 = 3, VIS_GROUP_4 = 4, VIS_GROUP_5 = 5, + VIS_GROUP_6 = 6, + VIS_GROUP_7 = 7, }; enum ItemSpawnModes { @@ -3239,6 +3241,20 @@ enum PartnerActions { PARTNER_ACTION_LAKILESTER_1 = 1, }; +enum PartnerStates { + PARTNER_CMD_NONE = 0, + PARTNER_CMD_INIT = 1, + PARTNER_CMD_INSTA_SWITCH = 2, // skips put away / take out scripts. assumes valid current partner. + PARTNER_CMD_SWITCH = 3, // assumes valid current partner. + PARTNER_CMD_PUT_AWAY = 4, // switches to null partner. + PARTNER_CMD_INSTA_PUT_AWAY = 5, + PARTNER_CMD_TAKE_OUT = 6, // assumes no current partner. + PARTNER_CMD_INSTA_TAKE_OUT = 7, + PARTNER_CMD_USE_ABILITY = 8, + PARTNER_CMD_RESET = 9, + PARTNER_CMD_ABORT = 10, +}; + /// @see gAreas enum Areas { AREA_KMR, diff --git a/include/map.h b/include/map.h index df605d0868..262679e47e 100644 --- a/include/map.h +++ b/include/map.h @@ -10,6 +10,7 @@ // temporary: some standard script names #define EVS_MakeEntities EVS_MakeEntities #define EVS_SetupMusic EVS_SetupMusic +#define EVS_SetupRooms EVS_SetupRooms #define EVS_SetupFoliage EVS_SetupFoliage #define EVS_BindExitTriggers EVS_BindExitTriggers #define EVS_EnterMap EVS_EnterMap diff --git a/include/npc.h b/include/npc.h index ec6214fe2e..b57d95bb11 100644 --- a/include/npc.h +++ b/include/npc.h @@ -13,6 +13,13 @@ #define NO_DROPS { { F16(100), F16(0), 0, F16(0) }, } +// rename this to NO_DROPS and the above to NO_STAT_DROPS after all map data done +#define NPC_NO_DROPS { \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + #define STANDARD_HEART_DROPS(attempts) { \ { F16(20), F16(70), attempts, F16(50) }, \ { F16(30), F16(60), attempts, F16(50) }, \ diff --git a/include/saved_byte_names.h b/include/saved_byte_names.h index 65f0b67c0e..a3876ee421 100644 --- a/include/saved_byte_names.h +++ b/include/saved_byte_names.h @@ -13,8 +13,8 @@ enum GameBytes { GB_Unused_EVT_09 = GameByte(0x009), GB_Unused_EVT_0A = GameByte(0x00A), GB_Unused_EVT_0B = GameByte(0x00B), - GB_Unused_KMR_00 = GameByte(0x00C), - GB_Unused_KMR_01 = GameByte(0x00D), + GB_KMR20_MarioReadDiaryFlags_00 = GameByte(0x00C), + GB_KMR20_MarioReadDiaryFlags_01 = GameByte(0x00D), GB_KMR20_MarioReadLetterFlags_00 = GameByte(0x00E), GB_KMR20_MarioReadLetterFlags_01 = GameByte(0x00F), GB_Unused_KMR_04 = GameByte(0x010), diff --git a/include/script_api/battle.h b/include/script_api/battle.h index 1a47256d8c..d0ae48432f 100644 --- a/include/script_api/battle.h +++ b/include/script_api/battle.h @@ -287,7 +287,6 @@ ApiStatus SetBattleCamParam(Evt* script, s32 isInitialCall); ApiStatus func_8026DF88(Evt* script, s32 isInitialCall); ApiStatus InitAnimatedModels(Evt* script, s32 isInitialCall); ApiStatus func_8024CE9C(Evt* script, s32 isInitialCall); -ApiStatus func_802CABE8(Evt* script, s32 isInitialCall); ApiStatus func_802CAE50(Evt* script, s32 isInitialCall); ApiStatus func_802807D0(Evt* script, s32 isInitialCall); ApiStatus PartnerYieldTurn(Evt* script, s32 isInitialCall); ///< YieldTurn copy diff --git a/include/script_api/common.h b/include/script_api/common.h index 85ca1e1e61..1a83d6567b 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -93,6 +93,7 @@ ApiStatus SetCamEnabled(Evt* script, s32 isInitialCall); ApiStatus SetCamFlag80(Evt* script, s32 isInitialCall); ApiStatus SetCamPerspective(Evt* script, s32 isInitialCall); ApiStatus SetCamViewport(Evt* script, s32 isInitialCall); +ApiStatus func_802CABE8(Evt* script, s32 isInitialCall); ApiStatus SetCamBGColor(Evt* script, s32 isInitialCall); ApiStatus SetCamTarget(Evt* script, s32 isInitialCall); ApiStatus InterpCamTargetPos(Evt* script, s32 isInitialCall); diff --git a/include/variables.h b/include/variables.h index c1d2c0c1b7..3df328d3e8 100644 --- a/include/variables.h +++ b/include/variables.h @@ -150,11 +150,11 @@ extern UNK_TYPE D_800E92D8; extern UNK_TYPE D_80147574; extern s8 D_8014C248[]; -extern UNK_FUN_PTR(D_8010C920); -extern UNK_FUN_PTR(D_8010C940); +extern UNK_FUN_PTR(PulseStoneNotificationCallback); +extern UNK_FUN_PTR(TalkNotificationCallback); extern Entity* TweesterTouchingPartner; extern Entity* TweesterTouchingPlayer; -extern UNK_FUN_PTR(D_8010C958); +extern UNK_FUN_PTR(InteractNotificationCallback); extern s32 PrevPlayerDirection; extern s32 PeachDisguiseNpcIndex; extern s32 D_8010C980; diff --git a/src/77480.c b/src/77480.c index f5a7ac5738..7d12e2bda9 100644 --- a/src/77480.c +++ b/src/77480.c @@ -11,7 +11,7 @@ extern f32 D_800F7B48; extern s32 D_800F7B4C; -extern UNK_FUN_PTR(D_8010C93C); +extern UNK_FUN_PTR(ISpyNotificationCallback); extern s8 D_8015A57A; extern s32 GoombarioGetTattleID; @@ -986,27 +986,27 @@ void player_render_interact_prompts(void) { void check_for_ispy(void) { PlayerStatus* playerStatus = &gPlayerStatus; - if (D_8015A57A != 0 && D_8010C93C == NULL) { + if (D_8015A57A != 0 && ISpyNotificationCallback == NULL) { if (!(playerStatus->animFlags & (PA_FLAGS_SPEECH_PROMPT_AVAILABLE | PA_FLAGS_INTERACT_PROMPT_AVAILABLE))) { dma_copy(E225B0_ROM_START, E225B0_ROM_END, E225B0_VRAM_DEF); - D_8010C93C = func_802B72C0_E22870; + ISpyNotificationCallback = func_802B72C0_E22870; } } - if (D_8010C93C != NULL) { - D_8010C93C(); + if (ISpyNotificationCallback != NULL) { + ISpyNotificationCallback(); } } void func_800E0330(void) { - if ((gPlayerStatusPtr->animFlags & PA_FLAGS_100) && (D_8010C93C != NULL)) { + if ((gPlayerStatusPtr->animFlags & PA_FLAGS_100) && (ISpyNotificationCallback != NULL)) { func_802B7000_E225B0(); } } void func_800E0374(void) { - D_8010C93C = NULL; + ISpyNotificationCallback = NULL; gPlayerStatusPtr->animFlags &= ~PA_FLAGS_100; } @@ -1014,7 +1014,7 @@ void check_for_pulse_stone(void) { PlayerStatus* playerStatus = &gPlayerStatus; s32 dx, dy; - if (D_8010C920 == NULL) { + if (PulseStoneNotificationCallback == NULL) { if (gPlayerStatus.animFlags & PA_FLAGS_100) { return; } @@ -1039,23 +1039,23 @@ void check_for_pulse_stone(void) { if (!(gPlayerStatus.animFlags & (PA_FLAGS_SPEECH_PROMPT_AVAILABLE | PA_FLAGS_INTERACT_PROMPT_AVAILABLE))) { dma_copy(E21870_ROM_START, E21870_ROM_END, E21870_VRAM_DEF); - D_8010C920 = func_802B7140; + PulseStoneNotificationCallback = func_802B7140; } } - if (D_8010C920 != NULL) { - D_8010C920(); + if (PulseStoneNotificationCallback != NULL) { + PulseStoneNotificationCallback(); } } void func_800E04D0(void) { - if ((gPlayerStatusPtr->animFlags & PA_FLAGS_40) && (D_8010C920 != 0)) { + if ((gPlayerStatusPtr->animFlags & PA_FLAGS_40) && (PulseStoneNotificationCallback != 0)) { func_802B71D4(); } } void func_800E0514(void) { - D_8010C920 = 0; + PulseStoneNotificationCallback = NULL; gPlayerStatusPtr->animFlags &= ~PA_FLAGS_40; } @@ -1074,38 +1074,38 @@ s32 has_valid_conversation_npc(void) { } void check_for_conversation_prompt(void) { - if (gPlayerStatus.animFlags & PA_FLAGS_100 || D_8010C958 || D_8010C920) { + if (gPlayerStatus.animFlags & PA_FLAGS_100 || InteractNotificationCallback || PulseStoneNotificationCallback) { return; } - if (D_8010C940 == NULL) { + if (TalkNotificationCallback == NULL) { if (gPlayerStatus.inputEnabledCounter || gPlayerStatus.flags & PS_FLAGS_PAUSED) { return; } if (has_valid_conversation_npc()) { - D_8010C940 = NULL; + TalkNotificationCallback = NULL; dma_copy(E20EB0_ROM_START, E20EB0_ROM_END, E20EB0_VRAM_DEF); - D_8010C940 = func_802B70B4_E201C4; + TalkNotificationCallback = func_802B70B4_E201C4; } else { - D_8010C940 = NULL; + TalkNotificationCallback = NULL; return; } } - if (D_8010C940 != NULL) { - D_8010C940(); + if (TalkNotificationCallback != NULL) { + TalkNotificationCallback(); } } void func_800E0658(void) { - if ((gPlayerStatusPtr->animFlags & PA_FLAGS_SPEECH_PROMPT_AVAILABLE) && (D_8010C940 != 0)) { + if ((gPlayerStatusPtr->animFlags & PA_FLAGS_SPEECH_PROMPT_AVAILABLE) && (TalkNotificationCallback != 0)) { func_802B71C8(); } } void func_800E069C(void) { - D_8010C940 = 0; + TalkNotificationCallback = NULL; gPlayerStatusPtr->animFlags &= ~PA_FLAGS_SPEECH_PROMPT_AVAILABLE; } @@ -1162,11 +1162,11 @@ void check_for_interactables(void) { Npc* npc = gPlayerStatus.encounteredNPC; s32 phi_s2; - if ((playerStatus->animFlags & PA_FLAGS_100) || D_8010C940 || D_8010C920) { + if ((playerStatus->animFlags & PA_FLAGS_100) || TalkNotificationCallback || PulseStoneNotificationCallback) { return; } - if (D_8010C958 == NULL) { + if (InteractNotificationCallback == NULL) { s32 curInteraction = gCollisionStatus.currentWall; if (playerStatus->inputEnabledCounter != 0) { @@ -1252,27 +1252,27 @@ void check_for_interactables(void) { return; } - if (D_8010C958 == NULL) { + if (InteractNotificationCallback == NULL) { dma_copy(E20110_ROM_START, E20110_ROM_END, E20110_VRAM_DEF); - D_8010C958 = func_802B70B4_E201C4; + InteractNotificationCallback = func_802B70B4_E201C4; } - if (D_8010C958 != NULL) { - D_8010C958(); + if (InteractNotificationCallback != NULL) { + InteractNotificationCallback(); } } void func_802B71E8_E202F8(void); void func_800E0AD0(void) { - if ((gPlayerStatusPtr->animFlags & PA_FLAGS_INTERACT_PROMPT_AVAILABLE) && (D_8010C958 != 0)) { + if ((gPlayerStatusPtr->animFlags & PA_FLAGS_INTERACT_PROMPT_AVAILABLE) && (InteractNotificationCallback != 0)) { func_802B71E8_E202F8(); } } void func_800E0B14(void) { - D_8010C958 = 0; + InteractNotificationCallback = NULL; gPlayerStatusPtr->animFlags &= ~PA_FLAGS_INTERACT_PROMPT_AVAILABLE; } diff --git a/src/7B440.c b/src/7B440.c index 17f7d936f0..8f6ffb7a7b 100644 --- a/src/7B440.c +++ b/src/7B440.c @@ -44,9 +44,9 @@ void reset_player_status(void) { PeachDisguiseNpcIndex = -1; TweesterTouchingPartner = NULL; - D_8010C920 = 0; - D_8010C940 = 0; - D_8010C958 = 0; + PulseStoneNotificationCallback = NULL; + TalkNotificationCallback = NULL; + InteractNotificationCallback = NULL; D_8010C92C = 0; PrevPlayerDirection = 0; D_8010C980 = 0; diff --git a/src/E20110.c b/src/E20110.c index ad7b6d9034..e91f9a9a99 100644 --- a/src/E20110.c +++ b/src/E20110.c @@ -45,7 +45,7 @@ void func_802B70B4_E201C4(void) { D_802B7CB8_E20DC8->scale = 0.4f; D_802B7CB8_E20DC8->unk_23 = 0; D_802B7CB8_E20DC8->unk_0C = -gCameras[gCurrentCameraID].currentYaw; - D_8010C958 = func_802B7728_E20838; + InteractNotificationCallback = func_802B7728_E20838; D_802B7CB8_E20DC8->unk_24 = 0xFF; D_802B7CB8_E20DC8->unk_1C = 0xFF; } @@ -226,7 +226,7 @@ void func_802B7728_E20838(void) { D_802B7CB8_E20DC8->unk_1C = 0; } if ((scale >= 70.0f && scale <= 110.0f) || (scale >= 250.0f && scale <= 290.0f)) { - D_8010C958 = func_802B79C8_E20AD8; + InteractNotificationCallback = func_802B79C8_E20AD8; } var_s0 = E20110_UnkAngleFunc1(scale); break; @@ -253,7 +253,7 @@ void func_802B7728_E20838(void) { void func_802B79C8_E20AD8(void) { func_802B75E8_E206F8(); gPlayerStatusPtr->interactingWithID = -1; - D_8010C958 = 0; + InteractNotificationCallback = NULL; gPlayerStatusPtr->encounteredNPC = NULL; gPlayerStatusPtr->animFlags &= ~PA_FLAGS_INTERACT_PROMPT_AVAILABLE; func_800EF3D4(0); diff --git a/src/E21870.c b/src/E21870.c index 8c59a663ed..cbf3fc0e8a 100644 --- a/src/E21870.c +++ b/src/E21870.c @@ -71,7 +71,7 @@ void func_802B7140(void) { D_802B7D18_E22588->pos.y = playerStatus->position.y + playerStatus->colliderHeight + 8.0f; D_802B7D18_E22588->pos.z = playerStatus->position.z; playerStatus->animFlags |= PA_FLAGS_40; - D_8010C920 = func_802B74F0; + PulseStoneNotificationCallback = func_802B74F0; } void func_802B71D4(void) { @@ -155,7 +155,7 @@ void func_802B74F0(void) { D_802B7D18_E22588->pos.z = playerStatus->position.z; if (!func_802B704C()) { - D_8010C920 = NULL; + PulseStoneNotificationCallback = NULL; playerStatus->animFlags &= ~PA_FLAGS_40; return; } diff --git a/src/E225B0.c b/src/E225B0.c index 9c31e8f3e4..b57b16cd67 100644 --- a/src/E225B0.c +++ b/src/E225B0.c @@ -23,7 +23,7 @@ BSS struct802B7C78 D_802B7CB0; struct802B7C78* D_802B7C78_E23228 = &D_802B7CB0; -extern void (*D_8010C93C)(void); +extern void (*ISpyNotificationCallback)(void); void func_802B735C_E2290C(void); @@ -95,7 +95,7 @@ void func_802B72C0_E22870(void) { D_802B7C78_E23228->unk_28 = 0xFF; gPlayerStatus.animFlags |= PA_FLAGS_100; - D_8010C93C = &func_802B735C_E2290C; + ISpyNotificationCallback = &func_802B735C_E2290C; } void func_802B735C_E2290C(void) { @@ -150,7 +150,7 @@ void func_802B735C_E2290C(void) { if (D_802B7C78_E23228->unk_18++ > 50) { gCurrentHiddenPanels.activateISpy = FALSE; - D_8010C93C = NULL; + ISpyNotificationCallback = NULL; playerStatus->animFlags &= ~PA_FLAGS_100; } break; diff --git a/src/battle/area_kmr_part_2/actor/goomnut_tree.c b/src/battle/area_kmr_part_2/actor/goomnut_tree.c index fc9ae72f77..f48bf082f0 100644 --- a/src/battle/area_kmr_part_2/actor/goomnut_tree.c +++ b/src/battle/area_kmr_part_2/actor/goomnut_tree.c @@ -218,7 +218,7 @@ EvtScript N(takeTurn_80223804) = { #include "common/FoliageTransform.inc.c" -EvtScript N(shakeTree) = { +EvtScript N(EVS_ShakeTree) = { EVT_SET_TIMESCALE(EVT_FLOAT(2.0)) EVT_USE_BUF(LVar0) EVT_BUF_READ4(LVar1, LVar2, LVar3, LVar4) @@ -332,7 +332,7 @@ ShakeTreeConfig N(tree) = { EvtScript N(shake_goomnut_tree) = { EVT_SET(LVar0, EVT_PTR(N(tree))) - EVT_EXEC_WAIT(N(shakeTree)) + EVT_EXEC_WAIT(N(EVS_ShakeTree)) EVT_RETURN EVT_END }; diff --git a/src/collision.c b/src/collision.c index 02d45e5eb7..c377de4267 100644 --- a/src/collision.c +++ b/src/collision.c @@ -931,6 +931,12 @@ f32 test_ray_collider_horizontal(s32 ignoreFlags, s32 colliderID, f32 x, f32 y, return ret; } +enum { + ENTITY_TEST_ANY = 0, + ENTITY_TEST_DOWN = 1, + ENTITY_TEST_LATERAL = 2, +}; + s32 test_ray_entities(f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f32 dirZ, f32* hitX, f32* hitY, f32* hitZ, f32* hitDepth, f32* hitNx, f32* hitNy, f32* hitNz) { f32 hitDepthDown, hitDepthHoriz; @@ -949,15 +955,15 @@ s32 test_ray_entities(f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f3 ColliderTriangle *triangle = &entityTriangle; entityIndex = -1; - type = 0; + type = ENTITY_TEST_ANY; hitDepthDown = hitDepthHoriz = *hitDepth; if (dirX == 0 && dirZ == 0 && dirY < 0) { hitDepthHoriz = 0; - type = 1; + type = ENTITY_TEST_DOWN; } else if (dirY == 0) { hitDepthDown = 0; - type = 2; + type = ENTITY_TEST_LATERAL; } gCollisionRayLength = -1; @@ -979,15 +985,15 @@ s32 test_ray_entities(f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f3 } switch (type) { - case 0: - case 1: + case ENTITY_TEST_ANY: + case ENTITY_TEST_DOWN: dist = entity->position.y; dist2 = hitDepthDown + entity->effectiveSize * 2; if (dist + dist2 < startY || startY < dist - dist2) { continue; } break; - case 2: + case ENTITY_TEST_LATERAL: dist = entity->position.y; dist2 = entity->effectiveSize * 2; if (dist + dist2 < startY || startY < dist - dist2) { @@ -1037,14 +1043,14 @@ s32 test_ray_entities(f32 startX, f32 startY, f32 startZ, f32 dirX, f32 dirY, f3 *hitDepth = gCollisionRayLength; switch (type) { - case 0: + case ENTITY_TEST_ANY: hitDepthDown = gCollisionRayLength; hitDepthHoriz = gCollisionRayLength; break; - case 1: + case ENTITY_TEST_DOWN: hitDepthDown = gCollisionRayLength; break; - case 2: + case ENTITY_TEST_LATERAL: hitDepthHoriz = gCollisionRayLength; break; } diff --git a/src/common/foliage.inc.c b/src/common/foliage.inc.c index f5472ed22a..dc86bb02f6 100644 --- a/src/common/foliage.inc.c +++ b/src/common/foliage.inc.c @@ -3,7 +3,7 @@ #include "FoliageTransform.inc.c" -EvtScript N(searchBush) = { +EvtScript N(EVS_SearchBush) = { EVT_USE_BUF(LVar0) EVT_BUF_READ4(LVar1, LVar2, LVar3, LVar4) EVT_CALL(GetPlayerPos, LVar5, LVarF, LVar7) @@ -67,7 +67,7 @@ EvtScript N(searchBush) = { EVT_END }; -EvtScript N(shakeTree) = { +EvtScript N(EVS_ShakeTree) = { EVT_SET_TIMESCALE(EVT_FLOAT(2.0)) EVT_USE_BUF(LVar0) EVT_BUF_READ4(LVar1, LVar2, LVar3, LVar4) diff --git a/src/e20eb0.c b/src/e20eb0.c index 2804aa3639..313d9bfb00 100644 --- a/src/e20eb0.c +++ b/src/e20eb0.c @@ -44,7 +44,7 @@ void func_802B70B4(void) { D_802B79A8_E21858->unk_18 = 0; D_802B79A8_E21858->unk_2A = 0; D_802B79A8_E21858->scale = 0.1f; - D_8010C940 = func_802B742C; + TalkNotificationCallback = func_802B742C; playerStatus->animFlags |= PA_FLAGS_SPEECH_PROMPT_AVAILABLE; temp = D_802B79A8_E21858; temp->unk_2A = 0; @@ -135,7 +135,7 @@ void func_802B742C(void) { } D_802B79A8_E21858->unk_10 = unk10; if ((unk10 >= 70.0f && unk10 <= 110.0f) || (unk10 >= 250.0f && unk10 <= 290.0f)) { - D_8010C940 = NULL; + TalkNotificationCallback = NULL; playerStatus->encounteredNPC = NULL; playerStatus->animFlags &= ~PA_FLAGS_SPEECH_PROMPT_AVAILABLE; return; diff --git a/src/encounter_api.c b/src/encounter_api.c index 35c56ff40e..2e7c20e53a 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -614,10 +614,10 @@ ApiStatus BindNpcDefeat(Evt* script, s32 isInitialCall) { ApiStatus SetSelfVar(Evt* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; Enemy* owner = script->owner1.enemy; - s32 var1 = evt_get_variable(script, *args++); - s32 var2 = evt_get_variable(script, *args); + s32 index = evt_get_variable(script, *args++); + s32 value = evt_get_variable(script, *args++); - owner->varTable[var1] = var2; + owner->varTable[index] = value; return ApiStatus_DONE2; } diff --git a/src/entity/HeartBlock.c b/src/entity/HeartBlock.c index bd80e3d6d8..280c27ef80 100644 --- a/src/entity/HeartBlock.c +++ b/src/entity/HeartBlock.c @@ -1,5 +1,6 @@ #include "common.h" #include "effects.h" +#include "message_ids.h" #include "ld_addrs.h" #include "entity.h" @@ -357,9 +358,9 @@ void entity_HeartBlock_change_render_script(Entity* entity) { } void entity_HeartBlock_show_tutorial_message(Entity* entity) { - if ((!gPlayerData.partners[PARTNER_GOOMBARIO].enabled) && get_global_flag(GF_Tutorial_HeartBlock) == 0) { + if (!gPlayerData.partners[PARTNER_GOOMBARIO].enabled && !get_global_flag(GF_Tutorial_HeartBlock)) { HeartBlockPrinterClosed = FALSE; - msg_get_printer_for_msg(0x1D0001, &HeartBlockPrinterClosed); + msg_get_printer_for_msg(MSG_Menus_Tutorial_HeartBlock, &HeartBlockPrinterClosed); set_time_freeze_mode(TIME_FREEZE_PARTIAL); gOverrideFlags |= GLOBAL_OVERRIDES_40; disable_player_input(); diff --git a/src/msg.c b/src/msg.c index 5028e6edb0..4d02d0e3c3 100644 --- a/src/msg.c +++ b/src/msg.c @@ -2154,7 +2154,7 @@ void draw_number(s32 value, s32 x, s32 y, s32 charset, s32 palette, s32 opacity, s32 texSize = gMsgNumbers[charset].texSize; y -= 2; - if (y > 240U) { + if (y < 0 || y > 240) { return; } @@ -2162,7 +2162,7 @@ void draw_number(s32 value, s32 x, s32 y, s32 charset, s32 palette, s32 opacity, for (i = 0; i < 10; i++) { u8 digit; - if (valueStr[i] == 0) { + if (valueStr[i] == '\0') { break; } diff --git a/src/npc.c b/src/npc.c index adb0a6b2c9..53a0248d4e 100644 --- a/src/npc.c +++ b/src/npc.c @@ -2117,7 +2117,7 @@ void func_8003D788(Npc* npc, s32 arg1) { f32 cosTheta; phi_a2 = 0; - if (gGameStatusPtr->areaID == 5) { + if (gGameStatusPtr->areaID == AREA_HOS) { phi_a2 = gGameStatusPtr->mapID == 2; } if (arg1 == 2) { diff --git a/src/world/area_dro/dro_01/dro_01_3_npc.c b/src/world/area_dro/dro_01/dro_01_3_npc.c index 301d9b8577..c74955ea01 100644 --- a/src/world/area_dro/dro_01/dro_01_3_npc.c +++ b/src/world/area_dro/dro_01/dro_01_3_npc.c @@ -302,7 +302,7 @@ StaticNpc N(PassiveNPCs)[] = { }, { .id = NPC_ChuckQuizmo, - .settings = &N(Quizmo_NpcSettings), + .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -400.0f, 0.0f, 100.0f }, .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, .initVarCount = 1, diff --git a/src/world/area_dro/dro_01/dro_01_7_foliage.c b/src/world/area_dro/dro_01/dro_01_7_foliage.c index b3c124317e..9e76f3e237 100644 --- a/src/world/area_dro/dro_01/dro_01_7_foliage.c +++ b/src/world/area_dro/dro_01/dro_01_7_foliage.c @@ -41,8 +41,8 @@ BombTrigger N(BombPos_Tree1) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_yasi, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_yasi, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_dro/dro_02/dro_02_5_npc.c b/src/world/area_dro/dro_02/dro_02_5_npc.c index ffd7bd2836..bb2197fb99 100644 --- a/src/world/area_dro/dro_02/dro_02_5_npc.c +++ b/src/world/area_dro/dro_02/dro_02_5_npc.c @@ -576,7 +576,7 @@ StaticNpc N(PassiveNPCs)[] = { }, { .id = NPC_ChuckQuizmo, - .settings = &N(Quizmo_NpcSettings), + .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -335.0f, 0.0f, 90.0f }, .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, .initVarCount = 1, diff --git a/src/world/area_flo/flo_03/flo_03_4_foliage.c b/src/world/area_flo/flo_03/flo_03_4_foliage.c index 6d7a967c87..daee487952 100644 --- a/src/world/area_flo/flo_03/flo_03_4_foliage.c +++ b/src/world/area_flo/flo_03/flo_03_4_foliage.c @@ -49,8 +49,8 @@ EvtScript N(EVS_SetupFoliage) = { EVT_SET(AF_FLO_TreeDrop_RedBerry1, FALSE) EVT_SET(AF_FLO_TreeDrop_RedBerry2, FALSE) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o242, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o242, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_flo/flo_07/flo_07_3_npc.c b/src/world/area_flo/flo_07/flo_07_3_npc.c index 06d25659d5..3f22057d2f 100644 --- a/src/world/area_flo/flo_07/flo_07_3_npc.c +++ b/src/world/area_flo/flo_07/flo_07_3_npc.c @@ -238,8 +238,8 @@ BombTrigger N(BombPos_CrystalTree) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_CrystalTree))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o5, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_CrystalTree)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o5, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_CrystalTree)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_flo/flo_08/flo_08_5_foliage.c b/src/world/area_flo/flo_08/flo_08_5_foliage.c index 7d83331add..e82938ec33 100644 --- a/src/world/area_flo/flo_08/flo_08_5_foliage.c +++ b/src/world/area_flo/flo_08/flo_08_5_foliage.c @@ -49,8 +49,8 @@ EvtScript N(EVS_SetupFoliage) = { EVT_SET(AF_FLO_TreeDrop_BlueBerry1, FALSE) EVT_SET(AF_FLO_TreeDrop_BlueBerry2, FALSE) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o172, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o172, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_flo/flo_09/flo_09_4_foliage.c b/src/world/area_flo/flo_09/flo_09_4_foliage.c index bff932467f..3d97c45632 100644 --- a/src/world/area_flo/flo_09/flo_09_4_foliage.c +++ b/src/world/area_flo/flo_09/flo_09_4_foliage.c @@ -136,14 +136,14 @@ EvtScript N(EVS_SetupFoliage) = { EVT_SET(AB_FLO_TreePuzzle_FirstCorrect, 0) EVT_SET(AB_FLO_TreePuzzle_SecondCorrect, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o10, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o10, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o3, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o3, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o13, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o13, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_flo/flo_10/flo_10_7_foliage.c b/src/world/area_flo/flo_10/flo_10_7_foliage.c index 0e86487b5b..2c3a427d3a 100644 --- a/src/world/area_flo/flo_10/flo_10_7_foliage.c +++ b/src/world/area_flo/flo_10/flo_10_7_foliage.c @@ -43,8 +43,8 @@ BombTrigger N(BombPos_Tree1) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o85, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o85, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_flo/flo_18/flo_18_4_npc.c b/src/world/area_flo/flo_18/flo_18_4_npc.c index fac6cc830d..1fc2e4c883 100644 --- a/src/world/area_flo/flo_18/flo_18_4_npc.c +++ b/src/world/area_flo/flo_18/flo_18_4_npc.c @@ -3,7 +3,7 @@ #include "world/common/todo/UnkFunc42.inc.c" #include "world/common/enemy/complete/Lakitu.h" -#include "world/common/enemy/complete/Magikoopa.h" +#include "world/common/enemy/complete/YMagikoopa.h" NpcSettings N(NpcSettings_Lakitu) = { .height = 32, diff --git a/src/world/area_flo/flo_22/flo_22_5_foliage.c b/src/world/area_flo/flo_22/flo_22_5_foliage.c index 8cbc4db91a..cb155a803c 100644 --- a/src/world/area_flo/flo_22/flo_22_5_foliage.c +++ b/src/world/area_flo/flo_22/flo_22_5_foliage.c @@ -40,11 +40,11 @@ BombTrigger N(BombPos_Tree2) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o27, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o27, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o30, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o30, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_flo/flo_24/flo_24_3_foliage.c b/src/world/area_flo/flo_24/flo_24_3_foliage.c index a78bd2957a..57e0cc5984 100644 --- a/src/world/area_flo/flo_24/flo_24_3_foliage.c +++ b/src/world/area_flo/flo_24/flo_24_3_foliage.c @@ -54,8 +54,8 @@ EvtScript N(EVS_SetupFoliage) = { EVT_SET(AF_FLO_TreeDrop_BubbleBerry1, FALSE) EVT_SET(AF_FLO_TreeDrop_BubbleBerry2, FALSE) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o124, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o124, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_flo/flo_25/flo_25_5_foliage.c b/src/world/area_flo/flo_25/flo_25_5_foliage.c index fc9c7b0ea4..ee33abf9c9 100644 --- a/src/world/area_flo/flo_25/flo_25_5_foliage.c +++ b/src/world/area_flo/flo_25/flo_25_5_foliage.c @@ -51,8 +51,8 @@ EvtScript N(EVS_SetupFoliage) = { EVT_SET(AF_FLO_TreeDrop_YellowBerry1, FALSE) EVT_SET(AF_FLO_TreeDrop_YellowBerry2, FALSE) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o42, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o42, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_iwa/iwa_10/iwa_10_8_foliage.c b/src/world/area_iwa/iwa_10/iwa_10_8_foliage.c index 92cd28b18f..3578fbd19b 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_8_foliage.c +++ b/src/world/area_iwa/iwa_10/iwa_10_8_foliage.c @@ -135,13 +135,13 @@ SearchBushConfig N(SearchBush_Bush4) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_k4, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_k4, 1, 0) EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_k5, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_k5, 1, 0) EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_k6, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_k6, 1, 0) EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush4))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_k7, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_k7, 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_jan/jan_00/jan_00_5_foliage.c b/src/world/area_jan/jan_00/jan_00_5_foliage.c index 1024d54870..eaaee95953 100644 --- a/src/world/area_jan/jan_00/jan_00_5_foliage.c +++ b/src/world/area_jan/jan_00/jan_00_5_foliage.c @@ -44,8 +44,8 @@ BombTrigger N(D_80247A1C_B27F5C) = { EvtScript N(EVS_80247A2C) = { EVT_SET(AF_JAN_0D, FALSE) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o282, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(D_80247A1C_B27F5C)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o282, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(D_80247A1C_B27F5C)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr.h b/src/world/area_kmr/kmr.h index 29d1a0e21d..10b0ffb773 100644 --- a/src/world/area_kmr/kmr.h +++ b/src/world/area_kmr/kmr.h @@ -26,6 +26,8 @@ enum { AF_KMR_07 = AreaFlag(7), AF_KMR_08 = AreaFlag(8), AF_KMR_09 = AreaFlag(9), + AF_KMR_0B = AreaFlag(11), + AF_KMR_0C = AreaFlag(12), AF_KMR_0D = AreaFlag(13), }; diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c deleted file mode 100644 index 8c84a95d31..0000000000 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ /dev/null @@ -1,306 +0,0 @@ -#include "kmr_02.h" -#include "effects.h" -#include "model.h" - -BSS u8 D_80257F20; // r -BSS u8 D_80257F21; // g -BSS u8 D_80257F22; // b -BSS u8 D_80257F23; // a -BSS u8 oldPrimR, oldPrimG, oldPrimB; -BSS u8 oldEnvR, oldEnvG, oldEnvB; - -static char* N(exit_str_0) = "kmr_05"; -static char* N(exit_str_1) = "kmr_00"; -static char* N(exit_str_2) = "kmr_09"; -static char* N(exit_str_3) = ""; - -#define CHUCK_QUIZMO_NPC_ID 8 - -#include "world/common/entity/Pipe.inc.c" - -extern s32* D_80244B2C_8B4B9C[]; -extern s32* D_802480AC_8B811C[]; - -NOP_FIX // TODO remove when D_80244B2C_8B4B9C is migrated -ApiStatus func_802402E0_8B0350(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 npcID = evt_get_variable(script, *args++); - s32 territoryIndex = evt_get_variable(script, *args++); - s32* var_s0 = D_80244B2C_8B4B9C[territoryIndex]; - Enemy* enemy = get_enemy(npcID); - s32 i; - - for (i = 0; i < (s32) (sizeof(enemy->territory->wander) / sizeof(i)); i++) { - s32* wander = (s32*) &enemy->territory->wander; - - wander[i] = var_s0[i]; - } - return ApiStatus_DONE2; -} -NOP_UNFIX // TODO remove when D_80244B2C_8B4B9C is migrated - -ApiStatus func_80240370_8B03E0(Evt* script, s32 isInitialCall) { - set_map_change_fade_rate(1); - return ApiStatus_DONE2; -} - -extern s32 N(Quizmo_Worker); -extern s32 N(Quizmo_AnswerResult); -extern EffectInstance* N(Quizmo_StageEffect); -extern EffectInstance* N(Quizmo_AudienceEffect); -extern EffectInstance* N(Quizmo_VannaTEffect); - -#include "world/common/atomic/Quizmo.inc.c" - -#include "world/common/enemy/ai/StationaryAI.inc.c" - -static char* N(exit_str_4) = "nok_02"; -static char* N(exit_str_5) = "kmr_03"; -static char* N(exit_str_6) = "\0\0\0\0"; - -#include "world/common/util/ChangeNpcToPartner.inc.c" - -ApiStatus func_80242014_8B2084(Evt* script, s32 isInitialCall) { - if (get_npc_unsafe(NPC_PARTNER)->flags & NPC_FLAG_1000) { - return ApiStatus_DONE2; - } else { - return ApiStatus_BLOCK; - } -} - -#include "world/common/todo/GetNpcCollisionHeight.inc.c" - -#include "world/common/todo/AddPlayerHandsOffset.inc.c" - -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024226C_8B22DC); - -extern s32 N(ItemChoice_HasSelectedItem); -extern s32 N(ItemChoice_SelectedItemID); - -ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args++); - N(ItemChoice_HasSelectedItem) = TRUE; - return ApiStatus_DONE2; -} - -BSS s32 kmr_02_D_80257F2C[11]; // unused? -BSS s32 kmr_02_D_80257F58[114]; - -ApiStatus func_802422F8_8B2368(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* ptr = (s32*) evt_get_variable(script, *args++); - s32 i; - - if (ptr != NULL) { - for (i = 0; ptr[i] != 0; i++) { - kmr_02_D_80257F58[i] = ptr[i]; - } - kmr_02_D_80257F58[i] = 0; - } else { - for (i = 0; i < 112; i++) { - kmr_02_D_80257F58[i] = i + 16; - kmr_02_D_80257F58[112] = 0; - } - } - return ApiStatus_DONE2; -} - -NOP_FIX // TODO remove when D_802480AC_8B811C is migrated -ApiStatus func_80242394_8B2404(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 npcID = evt_get_variable(script, *args++); - s32 territoryIndex = evt_get_variable(script, *args++); - s32* var_s0 = D_802480AC_8B811C[territoryIndex]; - Enemy* enemy = get_enemy(npcID); - s32 i; - - for (i = 0; i < (s32) (sizeof(enemy->territory->wander) / sizeof(i)); i++) { - s32* wander = (s32*) &enemy->territory->wander; - - wander[i] = var_s0[i]; - } - return ApiStatus_DONE2; -} -NOP_UNFIX // TODO remove when D_802480AC_8B811C is migrated - -extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/todo/LetterDelivery.inc.c" - -ApiStatus func_80242710_8B2780(Evt* script, s32 isInitialCall) { - script->varTable[0] = gPlayerData.curHP == gPlayerData.curMaxHP; - return ApiStatus_DONE2; -} - -extern u8 D_80257B00_8C7B70; -extern u16 D_80257D00_8C7D70; - -BSS MessageImageData D_80258120; - -ApiStatus func_80242734_8B27A4(void) { - D_80258120.raster = &D_80257B00_8C7B70; // TODO extract image - D_80258120.palette = &D_80257D00_8C7D70; // TODO extract pal - D_80258120.width = 32; // TOOD image header define - D_80258120.height = 32; // TOOD image header define - D_80258120.format = G_IM_FMT_CI; - D_80258120.bitDepth = 0; - set_message_images(&D_80258120); - return ApiStatus_DONE1; -} - -ApiStatus func_80242788_8B27F8(Evt* script, s32 isInitialCall) { - gPlayerData.partners[PARTNER_GOOMPA].enabled = FALSE; - func_800EB2A4(0); - return ApiStatus_DONE1; -} - -ApiStatus func_802427B0_8B2820(Evt* script, s32 isInitialCall) { - if (gGameStatusPtr->pressedButtons[0] & BUTTON_START) { - return ApiStatus_DONE2; - } else { - return ApiStatus_BLOCK; - } -} - -ApiStatus func_802427CC_8B283C(Evt* script, s32 isInitialCall) { - set_game_mode(GAME_MODE_PAUSE); - return ApiStatus_DONE1; -} - -ApiStatus func_802427EC_8B285C(Evt* script, s32 isInitialCall) { - close_status_menu(); - return ApiStatus_DONE2; -} - -ApiStatus func_8024280C_8B287C(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Npc* npc = resolve_npc(script, 0); - - npc->renderYaw += evt_get_float_variable(script, *args++); - return ApiStatus_DONE2; -} - -#define KAMMY_NPC 7 -#include "world/common/util/GetKammyBroomEmitterPos.inc.c" - -#include "world/common/todo/SyncStatusMenu.inc.c" - -#ifdef NON_EQUIVALENT -// control flow + data migration -ApiStatus func_8024295C_8B29CC(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 r = evt_get_variable(script, *args++); - s32 g = evt_get_variable(script, *args++); - s32 b = evt_get_variable(script, *args++); - s32 a = evt_get_variable(script, *args++); - s32 temp_s0_5 = evt_get_variable(script, *args++); - - if (isInitialCall) { - get_background_color_blend(&D_80257F20, &D_80257F21, &D_80257F22, &D_80257F23); - script->functionTemp[0] = 0; - } - - if (temp_s0_5 > 0) { - set_background_color_blend( - D_80257F20 + (((r - D_80257F20) * script->functionTemp[0]) / temp_s0_5), - D_80257F21 + (((g - D_80257F21) * script->functionTemp[0]) / temp_s0_5), - D_80257F22 + (((b - D_80257F22) * script->functionTemp[0]) / temp_s0_5), - D_80257F23 + (((a - D_80257F23) * script->functionTemp[0]) / temp_s0_5) - ); - - script->functionTemp[0]++; - if (temp_s0_5 < script->functionTemp[0]) { - return ApiStatus_BLOCK; - } - } else { - set_background_color_blend(r, g, b, a); - } - return ApiStatus_DONE2; -} -#else -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024295C_8B29CC); -#endif - -ApiStatus func_80242BA8_8B2C18(Evt* script, s32 isInitialCall) { - *gBgRenderTypePtr = 1; - return ApiStatus_DONE2; -} - -ApiStatus func_80242BC0_8B2C30(Evt* script, s32 isInitialCall) { - Bytecode* args; - - s32 newEnvR, newEnvB, newEnvG; - s32 newPrimR, newPrimG, newPrimB; - s32 duration; - - args = script->ptrReadPos; - newPrimR = evt_get_variable(script, *args++); - newPrimG = evt_get_variable(script, *args++); - newPrimB = evt_get_variable(script, *args++); - newEnvR = evt_get_variable(script, *args++); - newEnvG = evt_get_variable(script, *args++); - newEnvB = evt_get_variable(script, *args++); - duration = evt_get_variable(script, *args++); - if (isInitialCall) { - get_model_env_color_parameters(&oldPrimR, &oldPrimG, &oldPrimB, &oldEnvR, &oldEnvG, &oldEnvB); - script->functionTemp[0] = 0; - } - if (duration > 0) { - set_model_env_color_parameters( - oldPrimR + ((newPrimR - oldPrimR) * script->functionTemp[0]) / duration, - oldPrimG + ((newPrimG - oldPrimG) * script->functionTemp[0]) / duration, - oldPrimB + ((newPrimB - oldPrimB) * script->functionTemp[0]) / duration, - oldEnvR + ( (newEnvR - oldEnvR) * script->functionTemp[0]) / duration, - oldEnvG + ( (newEnvG - oldEnvG) * script->functionTemp[0]) / duration, - oldEnvB + ( (newEnvB - oldEnvB) * script->functionTemp[0]) / duration); - script->functionTemp[0]++; - if (duration < script->functionTemp[0]) { - return 2; - } - } else { - set_model_env_color_parameters(newPrimR, newPrimG, newPrimB, newEnvR, newEnvG, newEnvB); - return 2; - } - return 0; -} - -ApiStatus func_80242F08_8B2F78(Evt* script, s32 isInitialCall) { - mdl_set_all_fog_mode(3); - return ApiStatus_DONE2; -} - -ApiStatus func_80242F28_8B2F98(Evt* script, s32 isInitialCall) { - func_8011B950(0x9C, -1, 1, 1); - set_background_color_blend(0, 0, 0, 255); - gCameras[CAM_DEFAULT].bgColor[0] = 0; - gCameras[CAM_DEFAULT].bgColor[1] = 0; - gCameras[CAM_DEFAULT].bgColor[2] = 0; - return ApiStatus_DONE2; -} - -extern s16 D_8024E538_8BE5A8[]; - -ApiStatus func_80242F7C_8B2FEC(Evt* script, s32 isInitialCall) { - Npc* npc; - - if (isInitialCall) { - script->functionTemp[1] = 0.0f; - script->functionTempPtr[2] = get_npc_safe(script->owner2.npcID); - script->functionTemp[3] = D_8024E538_8BE5A8[script->owner2.npcID]; - } - - if (script->functionTemp[3] != 0) { - script->functionTemp[3]--; - return ApiStatus_BLOCK; - } - npc = script->functionTempPtr[2]; - npc->verticalRenderOffset = sin_deg(script->functionTempF[1]) * 1.5f; - script->functionTempF[1] = clamp_angle(script->functionTempF[1] + 18.0f); - return ApiStatus_BLOCK; -} - -ApiStatus func_80243034_8B30A4(Evt* script, s32 isInitialCall) { - get_item_entity(script->varTable[0])->scale = 0.6f; - return ApiStatus_DONE2; -} diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c deleted file mode 100644 index 51391bcdfb..0000000000 --- a/src/world/area_kmr/kmr_02/8B30E0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "kmr_02.h" - -#include "world/common/atomic/ToadHouse.inc.c" diff --git a/src/world/area_kmr/kmr_02/8B33E0.c b/src/world/area_kmr/kmr_02/8B33E0.c deleted file mode 100644 index c31d60f7ef..0000000000 --- a/src/world/area_kmr/kmr_02/8B33E0.c +++ /dev/null @@ -1,43 +0,0 @@ -#include "kmr_02.h" - -ApiStatus func_80243370_8B33E0(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - s32 cond = FALSE; - s32 i; - - for (i = 0; i < ARRAY_COUNT(playerData->equippedBadges); i++) { - if (playerData->equippedBadges[i] != 0) { - cond = TRUE; - break; - } - } - - script->varTable[0] = cond; - return ApiStatus_DONE2; -} - -#include "world/common/todo/SetEntityPositionF.inc.c" - -#include "world/common/todo/GetEntityPosition.inc.c" - -static char* N(exit_str_6) = "tik_01"; - -ApiStatus func_80243514_8B3584(Evt* script, s32 isInitialCall) { - Entity* entity = get_entity_by_index(script->varTable[10]); - - if (isInitialCall) { - script->functionTemp[0] = 0; - script->functionTemp[1] = 60; - } - - entity->scale.x = (60 - script->functionTemp[1]) / 60.0f; - entity->scale.y = (60 - script->functionTemp[1]) / 60.0f; - entity->scale.z = (60 - script->functionTemp[1]) / 60.0f; - entity->rotation.y = (1.0f - cos_rad(entity->scale.y * PI)) * 990.0 * 0.5f; - script->functionTemp[1]--; - - if (script->functionTemp[1] == -1) { - return ApiStatus_DONE2; - } - return ApiStatus_BLOCK; -} diff --git a/src/world/area_kmr/kmr_02/8B36B0.c b/src/world/area_kmr/kmr_02/8B36B0.c deleted file mode 100644 index 472bcd71e7..0000000000 --- a/src/world/area_kmr/kmr_02/8B36B0.c +++ /dev/null @@ -1,26 +0,0 @@ -#include "kmr_02.h" - -#include "world/common/todo/CheckPartnerFlags1000.inc.c" - -extern s32* D_8025578C_8C57FC[4]; // EnemyTerritoryWander - -NOP_FIX // TODO remove when D_8025578C_8C57FC is migrated -ApiStatus func_8024366C_8B36DC(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 npcID = evt_get_variable(script, *args++); - s32 territoryIndex = evt_get_variable(script, *args++); - s32* var_s0 = D_8025578C_8C57FC[territoryIndex]; - Enemy* enemy = get_enemy(npcID); - s32 i; - - for (i = 0; i < (s32) (sizeof(enemy->territory->wander) / sizeof(i)); i++) { - s32* wander = (s32*) &enemy->territory->wander; - - wander[i] = var_s0[i]; - } - return ApiStatus_DONE2; -} -NOP_UNFIX // TODO remove when D_8025578C_8C57FC is migrated - - -#include "world/common/todo/UnkFunc42.inc.c" diff --git a/src/world/area_kmr/kmr_02/8B37D0.c b/src/world/area_kmr/kmr_02/8B37D0.c deleted file mode 100644 index ca86c074d3..0000000000 --- a/src/world/area_kmr/kmr_02/8B37D0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "kmr_02.h" - -#include "common/foliage.inc.c" diff --git a/src/world/area_kmr/kmr_02/8B3A10.c b/src/world/area_kmr/kmr_02/8B3A10.c deleted file mode 100644 index 3f2057cbfe..0000000000 --- a/src/world/area_kmr/kmr_02/8B3A10.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "kmr_02.h" - -BSS char D_80258140[0x200]; -BSS char D_80258340[0x3D90]; -BSS char D_8025C0D0; - -#define PARTY_IMAGE "party_kurio" -#include "world/common/todo/LoadPartyImage.inc.c" diff --git a/src/world/area_kmr/kmr_02/kmr_02.h b/src/world/area_kmr/kmr_02/kmr_02.h index 221b80bb2e..f795805d48 100644 --- a/src/world/area_kmr/kmr_02/kmr_02.h +++ b/src/world/area_kmr/kmr_02/kmr_02.h @@ -2,9 +2,75 @@ /// @brief Goomba Region - Goomba Village #include "common.h" -#include "../kmr.h" #include "message_ids.h" #include "map.h" + #include "../kmr.h" +#include "mapfs/kmr_02_shape.h" +#include "mapfs/kmr_02_hit.h" + +#include "sprite/npc/Goompa.h" +#include "sprite/npc/ChuckQuizmo.h" +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/WorldGoombario.h" +#include "sprite/npc/Goombaria.h" +#include "sprite/npc/Gooma.h" +#include "sprite/npc/Goompapa.h" +#include "sprite/npc/Goomama.h" +#include "sprite/npc/Toad.h" +#include "sprite/npc/WorldEldstar.h" +#include "sprite/npc/WorldKammy.h" + +enum { + NPC_Goompa = 0, + NPC_Goombaria = 1, + NPC_Goombario = 2, + NPC_Goompapa = 3, + NPC_Goomama = 4, + NPC_Gooma = 5, + NPC_Toad = 6, + NPC_Kammy = 7, + NPC_ChuckQuizmo = 8, + NPC_Eldstar_01 = 11, + NPC_Eldstar_02 = 12, + NPC_Parakarry = 13, +}; + +enum { + MV_Unk_00 = MapVar(0), + MV_Unk_01 = MapVar(1), + MV_Unk_04 = MapVar(4), + MV_Unk_05 = MapVar(5), +}; + +enum { + MF_SpawnFlag_BushCoin = MapFlag(10), + MF_SpawnFlag_Goomnut = MapFlag(11), +}; #define NAMESPACE kmr_02 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_FadeOutMusic); +extern EvtScript N(EVS_PlayRestingSong); +extern EvtScript N(EVS_PushNewPartnerSong); +extern EvtScript N(EVS_PopSong); +extern EvtScript N(EVS_SetupRooms); +extern EvtScript N(EVS_SetupToadHouse); +extern EvtScript N(EVS_SetWallsDown_ToadHouse); +extern EvtScript N(EVS_Scene_KammyStrikes); +extern EvtScript N(EVS_NpcAux_Kammy); +extern EvtScript N(EVS_SummonGateBlock); +extern EvtScript N(EVS_NpcInteract_ToadHouse); +extern EvtScript N(EVS_SetupFoliage); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(EpilogueNPCs); +extern NpcGroupList N(NpcGroup1); +extern NpcGroupList N(PrologueNPCs); +extern NpcGroupList N(DefaultNPCs); + +extern IMG_BIN N(heart_block_img)[]; +extern PAL_BIN N(heart_block_pal)[]; + +API_CALLABLE(N(LoadPartyImage)); diff --git a/src/world/area_kmr/kmr_02/kmr_02_0_header.c b/src/world/area_kmr/kmr_02/kmr_02_0_header.c new file mode 100644 index 0000000000..db79588ef0 --- /dev/null +++ b/src/world/area_kmr/kmr_02/kmr_02_0_header.c @@ -0,0 +1,23 @@ +#include "kmr_02.h" + +EntryList N(Entrances) = { + [kmr_02_ENTRY_0] { 391.0, 0.0, 286.0, 315.0 }, + [kmr_02_ENTRY_1] { -371.0, 0.0, 304.0, 45.0 }, + [kmr_02_ENTRY_2] { -473.0, 0.0, 4.0, 90.0 }, + [kmr_02_ENTRY_3] { 0.0, 35.0, 355.0, 180.0 }, + [kmr_02_ENTRY_4] { 60.0, 0.0, 10.0, 0.0 }, + [kmr_02_ENTRY_5] { -230.0, 36.0, -332.0, 0.0 }, + [kmr_02_ENTRY_6] { 0.0, 0.0, 0.0, 0.0 }, + [kmr_02_ENTRY_7] { 0.0, 0.0, 0.0, 0.0 }, + [kmr_02_ENTRY_8] { 0.0, 0.0, 0.0, 0.0 }, + [kmr_02_ENTRY_9] { 0.0, 0.0, 0.0, 0.0 }, + [kmr_02_ENTRY_A] { 200.0, 50.0, 70.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kmr_02 }, +}; diff --git a/src/world/area_kmr/kmr_02/kmr_02_1_music.c b/src/world/area_kmr/kmr_02/kmr_02_1_music.c new file mode 100644 index 0000000000..a7f4c3668e --- /dev/null +++ b/src/world/area_kmr/kmr_02/kmr_02_1_music.c @@ -0,0 +1,43 @@ +#include "kmr_02.h" + +EvtScript N(EVS_FadeOutMusic) = { + EVT_CALL(FadeInMusic, 0, SONG_GOOMBA_VILLAGE, 0, 3000, 0, 127) + EVT_CALL(ClearAmbientSounds, 250) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH0_MET_INNKEEPER) + EVT_CALL(SetMusicTrack, 0, SONG_GOOMBA_VILLAGE, 0, 8) + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(kmr_02_ENTRY_1) + EVT_CASE_OR_EQ(kmr_02_ENTRY_5) + EVT_CALL(ClearAmbientSounds, 250) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PushNewPartnerSong) = { + EVT_CALL(PushSong, SONG_NEW_PARTNER, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PopSong) = { + EVT_CALL(FadeOutMusic, 0, 500) + EVT_WAIT(15) + EVT_CALL(PopSong) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayRestingSong) = { + EVT_CALL(SetMusicTrack, 0, SONG_TAKING_REST, 0, 8) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_02/kmr_02_2_main.c b/src/world/area_kmr/kmr_02/kmr_02_2_main.c new file mode 100644 index 0000000000..5d26afb9b3 --- /dev/null +++ b/src/world/area_kmr/kmr_02/kmr_02_2_main.c @@ -0,0 +1,191 @@ +#include "kmr_02.h" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +#define NAME_SUFFIX _Main +#include "world/common/npc/GoombaFamily_Wander.inc.c" +#include "wander_territories.inc.c" +#define NAME_SUFFIX + +EvtScript N(EVS_ExitWalk_kmr_05_1) = EVT_EXIT_WALK(60, kmr_02_ENTRY_2, "kmr_05", kmr_05_ENTRY_1); +EvtScript N(EVS_ExitWalk_kmr_00_0) = EVT_EXIT_WALK(60, kmr_02_ENTRY_1, "kmr_00", kmr_00_ENTRY_0); +EvtScript N(EVS_ExitWalk_kmr_09_0) = EVT_EXIT_WALK(60, kmr_02_ENTRY_0, "kmr_09", kmr_09_ENTRY_0); + +MAP_RODATA_PAD(1, exits); + +EvtScript N(EVS_SetupGoombaRoadGate) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH0_TWINK_GAVE_LUCKY_STAR) + EVT_CALL(RotateGroup, MODEL_g197, 120, 0, -1, 0) + EVT_CALL(RotateGroup, MODEL_g196, 120, 0, 1, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o757, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kmr_05_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kmr_00_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili2, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kmr_09_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili3, 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_EXEC(N(EVS_SetupGoombaRoadGate)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, kmr_02_ENTRY_0) + EVT_EXEC(N(EVS_SetupGoombaRoadGate)) + EVT_END_IF + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kmr_02_ENTRY_2) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_IF_EQ(GF_KMR02_ReturnedWithGoompa, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(20) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 4, MSG_CH0_001C) + EVT_CALL(EnablePartnerAI) + EVT_SET(GF_KMR02_ReturnedWithGoompa, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_CASE_EQ(kmr_02_ENTRY_3) + EVT_IF_EQ(GF_KMR02_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_KMR02_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(kmr_02_ENTRY_5) + EVT_EXEC(N(EVS_SetWallsDown_ToadHouse)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kmr_02_ENTRY_A) + // beta entrance for 'post' pipe + EVT_EXEC(EnterPostPipe) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_DEFAULT + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ShowMessage_ItsLocked) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenGoombaRoadGate) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_tt2, SOUND_1D2, 0) + EVT_CALL(MakeLerp, 0, 120, 20, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g197, LVar0, 0, -1, 0) + EVT_CALL(RotateGroup, MODEL_g196, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o757, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +API_CALLABLE(N(SetMapChangeFadeSlowest)) { + set_map_change_fade_rate(1); //normally 20 + return ApiStatus_DONE2; +} + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_GOOMBA_VILLAGE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(GetLoadType, LVar0) + EVT_IF_EQ(LVar0, LOAD_FROM_FILE_SELECT) + EVT_GOTO(10) + EVT_END_IF + // check for cutscene entry + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, kmr_02_ENTRY_4) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(EpilogueNPCs))) + EVT_EXEC(N(EVS_FadeOutMusic)) + EVT_RETURN + EVT_LABEL(10) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_UNUSED_FFFFFF8C) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(NpcGroup1))) + EVT_CASE_LT(STORY_UNUSED_FFFFFF8C) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(PrologueNPCs))) + EVT_CASE_DEFAULT + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_END_SWITCH + EVT_LABEL(20) + EVT_CALL(ClearDefeatedEnemies) + EVT_EXEC_WAIT(N(EVS_SetupRooms)) + EVT_EXEC_WAIT(N(EVS_SetupToadHouse)) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_SetupFoliage)) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_FELL_OFF_CLIFF) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShowMessage_ItsLocked)), TRIGGER_WALL_PRESS_A, COLLIDER_mm1, 1, 0) + EVT_CASE_LT(STORY_CH0_TWINK_GAVE_LUCKY_STAR) + EVT_CASE_DEFAULT + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OpenGoombaRoadGate)), TRIGGER_WALL_PRESS_A, COLLIDER_tt2, 1, 0) + EVT_END_SWITCH + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) + EVT_CALL(EnableGroup, MODEL_2, FALSE) + EVT_CALL(EnableGroup, MODEL_4, FALSE) + EVT_CASE_LT(STORY_CH0_TWINK_GAVE_LUCKY_STAR) + EVT_CALL(EnableGroup, MODEL_1, FALSE) + EVT_CALL(EnableGroup, MODEL_4, FALSE) + EVT_CASE_DEFAULT + EVT_CALL(EnableGroup, MODEL_1, FALSE) + EVT_CALL(EnableGroup, MODEL_2, FALSE) + EVT_END_SWITCH + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o757, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_IF_NE(GB_StoryProgress, STORY_CH0_WAKE_UP) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kmr_02_ENTRY_5) + EVT_WAIT(30) + EVT_CALL(N(SetMapChangeFadeSlowest)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c new file mode 100644 index 0000000000..6c6651888d --- /dev/null +++ b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c @@ -0,0 +1,2353 @@ +#include "kmr_02.h" +#include "effects.h" +#include "model.h" + +extern EvtScript N(EVS_NpcAI_Eldstar_02); +extern EvtScript N(EVS_NpcAI_Eldstar_02_NoAI); + +BSS u8 N(savedColR); // r +BSS u8 N(savedColG); // g +BSS u8 N(savedColB); // b +BSS u8 N(savedColA); // a + +BSS u8 oldPrimR, oldPrimG, oldPrimB; +BSS u8 oldEnvR, oldEnvG, oldEnvB; + +#define QUIZMO_PRE_STATIC_PAD TRUE +#define CHUCK_QUIZMO_NPC_ID NPC_ChuckQuizmo +#include "world/common/complete/Quizmo.inc.c" + +#include "world/common/npc/Toad_Guard.inc.c" + +#include "world/common/util/ChangeNpcToPartner.inc.c" + +API_CALLABLE(N(func_80242014_8B2084)) { + if (get_npc_unsafe(NPC_PARTNER)->flags & NPC_FLAG_1000) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} + +#include "world/common/npc/GoombaFamily_Wander.inc.c" +#include "world/common/npc/GoombaFamily.inc.c" + +StationaryAISettings N(AISettings_Kammy) = { + .playerSearchInterval = -1, + .chaseRadius = 300.0f, + .unk_20 = 30, +}; + +EvtScript N(EVS_NpcAI_Kammy) = { + EVT_CALL(N(StationaryAI_Main), EVT_PTR(N(AISettings_Kammy))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Kammy) = { + .height = 40, + .radius = 30, + .level = 26, + .ai = &N(EVS_NpcAI_Kammy), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +#include "world/common/npc/StarSpirit.inc.c" + +MAP_STATIC_PAD(1,key_choice); +#include "world/common/complete/KeyItemChoice.inc.c" + +#define NAME_SUFFIX _Npc +#include "wander_territories.inc.c" +#define NAME_SUFFIX + +EvtScript N(D_8024810C_8B817C) = { + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(20) + EVT_RETURN + EVT_END +}; + +#include "world/common/complete/LetterDelivery.inc.c" + +s32 N(LetterList_GoompapaTrade)[] = { + ITEM_LETTER10, + ITEM_NONE +}; + +EvtScript N(EVS_LetterTrade_Goompapa) = { + EVT_CALL(N(LetterDelivery_Init), + NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, + ITEM_LETTER10, ITEM_LETTER13, + MSG_CH0_006F, MSG_CH0_0070, MSG_CH0_0071, MSG_CH0_0072, + EVT_PTR(N(LetterList_GoompapaTrade))) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) + EVT_RETURN + EVT_END +}; + +s32 N(LetterList_Goompapa)[] = { + ITEM_LETTER24, + ITEM_NONE +}; + +EvtScript N(EVS_LetterCheck_Goompapa) = { + EVT_CALL(N(LetterDelivery_Init), + NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, + ITEM_LETTER24, ITEM_NONE, + MSG_CH0_0073, MSG_CH0_0074, MSG_CH0_0075, MSG_CH0_0076, + EVT_PTR(N(LetterList_Goompapa))) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LetterReward_Goompapa) = { + EVT_IF_EQ(LVarC, 2) + EVT_GIVE_BADGE_REWARD(ITEM_LUCKY_DAY) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(LetterList_Goompa)[] = { + ITEM_LETTER02, + ITEM_NONE +}; + +EvtScript N(EVS_LetterCheck_Goompa) = { + EVT_CALL(N(LetterDelivery_Init), + NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, + ITEM_LETTER02, ITEM_NONE, + MSG_CH0_0045, MSG_CH0_0046, MSG_CH0_0047, MSG_CH0_0048, + EVT_PTR(N(LetterList_Goompa))) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LetterReward_Goompa) = { + EVT_IF_EQ(LVarC, 2) + EVT_GIVE_STAR_PIECE() + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_GoombaFamily_NoAI) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Goombario) = { + EVT_CALL(func_800445D4, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(100) + EVT_EXEC_WAIT(N(EVS_NpcAI_GoombaFamily_Wander)) + EVT_CASE_OR_EQ(101) + EVT_CASE_OR_EQ(102) + EVT_CASE_OR_EQ(3) + EVT_CASE_OR_EQ(103) + EVT_EXEC_WAIT(N(EVS_NpcAI_GoombaFamily_Wander)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Goombario) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) + EVT_IF_EQ(GF_KMR02_Met_Goombario, FALSE) + EVT_SET(GF_KMR02_Met_Goombario, TRUE) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 0, EVT_FLOAT(-275.0), EVT_FLOAT(15.2), EVT_FLOAT(-7.5)) + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 5, MSG_CH0_004D) + EVT_THREAD + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_END_THREAD + EVT_ELSE + EVT_IF_EQ(GF_KMR02_Goombario_SwapDialogue, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 5, MSG_CH0_004E) + EVT_SET(GF_KMR02_Goombario_SwapDialogue, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 5, MSG_CH0_004F) + EVT_SET(GF_KMR02_Goombario_SwapDialogue, FALSE) + EVT_END_IF + EVT_END_IF + EVT_CASE_EQ(STORY_CH0_GATE_CRUSHED) + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0051) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Goombario) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Goombario))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Goombario))) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) + EVT_CASE_LT(STORY_CH0_FELL_OFF_CLIFF) + EVT_CALL(N(SetWanderTerritory_Npc), NPC_Goombario, 2) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_SwitchedWander_Npc))) + EVT_CASE_LT(STORY_CH0_GOOMBARIO_JOINED_PARTY) + EVT_CALL(SetNpcPos, NPC_SELF, 66, 0, -126) + EVT_CASE_GE(STORY_CH0_GOOMBARIO_JOINED_PARTY) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Goombaria_NoAI) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HandOverDolly) = { + EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) + EVT_CALL(N(AddPlayerHandsOffset), LVar3, LVar4, LVar5) + EVT_CALL(MakeItemEntity, ITEM_DOLLY, LVar3, LVar4, LVar5, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_60005) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(RemoveItemEntity, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Goombaria_Kiss) = { + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_LeanOver) + EVT_CALL(GetNpcPos, NPC_Goombaria, LVar0, LVar1, LVar2) + EVT_WAIT(5) + EVT_ADD(LVar1, 10) + EVT_CALL(GetAngleToNPC, NPC_Goombaria, LVarA) + EVT_IF_GE(LVarA, 180) + EVT_ADD(LVar0, 20) + EVT_END_IF + EVT_PLAY_EFFECT(EFFECT_RECOVER, 2, LVar0, LVar1, LVar2, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_214, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Goombaria_RequestDolly) = { + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0096) + EVT_WAIT(10) + EVT_IF_EQ(GF_KMR02_KeptDolly, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0097) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0098) + EVT_END_IF + EVT_WAIT(10) + EVT_CALL(ShowChoice, MSG_Choice_0011) + EVT_WAIT(10) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(FindKeyItem, ITEM_DOLLY, LVar0) + EVT_CALL(RemoveKeyItemAt, LVar0) + EVT_EXEC_WAIT(N(EVS_HandOverDolly)) + EVT_CALL(ContinueSpeech, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_009A) + EVT_WAIT(10) + EVT_GIVE_STAR_PIECE() + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_009B) + EVT_WAIT(10) + EVT_EXEC(N(EVS_Goombaria_Kiss)) + EVT_CALL(GetNpcPos, NPC_Goombaria, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Goombaria, LVar0, LVar1, LVar2, 10) + EVT_WAIT(10) + EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 1, 1, 1, 0) + EVT_WAIT(35) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Idle) + EVT_CALL(NpcFacePlayer, NPC_Goombaria, 3) + EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_WAIT(20) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0099) + EVT_SET(GF_KMR02_KeptDolly, TRUE) + EVT_WAIT(10) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Goombaria) = { + EVT_CALL(HasKeyItem, ITEM_DOLLY, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_EXEC_WAIT(N(EVS_Goombaria_RequestDolly)) + EVT_RETURN + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_MET_GOOMPA) + EVT_SWITCH(AB_KMR_2) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0088) + EVT_SET(AB_KMR_2, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0089) + EVT_SET(AB_KMR_2, 2) + EVT_CASE_EQ(2) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_008A) + EVT_SET(AB_KMR_2, 1) + EVT_END_SWITCH + EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_008B) + EVT_CASE_LT(STORY_CH0_FELL_OFF_CLIFF) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_008C) + EVT_CASE_LT(STORY_CH0_DEFEATED_GOOMBA_KING) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_008D) + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_008E) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_NE(LVar0, PARTNER_GOOMBARIO) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_008F) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_008F) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, NPC_Goombaria, MSG_CH0_0090) + EVT_CALL(SpeakToNpc, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, NPC_PARTNER, MSG_CH0_0091) + EVT_CALL(EnablePartnerAI) + EVT_END_IF + EVT_CASE_GE(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_NE(LVar0, PARTNER_GOOMBARIO) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0092) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0093) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, NPC_Goombaria, MSG_CH0_0094) + EVT_CALL(SpeakToNpc, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, NPC_PARTNER, MSG_CH0_0095) + EVT_CALL(EnablePartnerAI) + EVT_END_IF + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Goombaria) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Goombaria))) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_MET_GOOMPA) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Goombaria_NoAI))) + EVT_CALL(SetNpcPos, NPC_SELF, 5, 0, -154) + EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Goombaria_NoAI))) + EVT_CALL(SetNpcPos, NPC_SELF, 215, 0, 215) + EVT_CASE_LT(STORY_CH0_FELL_OFF_CLIFF) + EVT_CALL(N(SetWanderTerritory_Npc), NPC_Goombaria, 3) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_SwitchedWander_Npc))) + EVT_CASE_LT(STORY_CH0_GOOMBARIO_JOINED_PARTY) + EVT_CALL(SetNpcPos, NPC_SELF, 94, 0, -109) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_CASE_GE(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_CASE_DEFAULT + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +API_CALLABLE(N(IsPlayerHPFull)) { + script->varTable[0] = (gPlayerData.curHP == gPlayerData.curMaxHP); + return ApiStatus_DONE2; +} + +BSS MessageImageData N(HeartBlockMsgImg); + +#include "world/area_kmr/kmr_02/heart_block.png.h" + +API_CALLABLE(N(LoadHeartBlockMsgImg)) { + N(HeartBlockMsgImg).raster = N(heart_block_img); + N(HeartBlockMsgImg).palette = N(heart_block_pal); + N(HeartBlockMsgImg).width = N(heart_block_img_width); + N(HeartBlockMsgImg).height = N(heart_block_img_height); + N(HeartBlockMsgImg).format = G_IM_FMT_CI; + N(HeartBlockMsgImg).bitDepth = G_IM_SIZ_4b; + set_message_images(&N(HeartBlockMsgImg)); + return ApiStatus_DONE1; +} + +API_CALLABLE(N(RemoveGoompaPartner)) { + gPlayerData.partners[PARTNER_GOOMPA].enabled = FALSE; + func_800EB2A4(PARTNER_NONE); + return ApiStatus_DONE1; +} + +API_CALLABLE(N(WaitForStartInput)) { + if (gGameStatusPtr->pressedButtons[0] & BUTTON_START) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} + +API_CALLABLE(N(OpenPauseMenu)) { + set_game_mode(GAME_MODE_PAUSE); + return ApiStatus_DONE1; +} + +API_CALLABLE(N(CloseStatusMenu)) { + close_status_menu(); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_PromptForBadgeTutorial) = { + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_002D) + EVT_CALL(ShowChoice, MSG_Choice_0013) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_002E) + EVT_CALL(ShowChoice, MSG_Choice_0013) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_002F) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_0030) + EVT_WAIT(10) + EVT_CALL(N(WaitForStartInput)) + EVT_CALL(EndSpeech, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0) + EVT_WAIT(10) + EVT_SET(GF_Tutorial_Badges, TRUE) + EVT_CALL(N(OpenPauseMenu)) + EVT_CALL(N(CloseStatusMenu)) + EVT_SET(GF_Tutorial_Badges, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ReturnToVillage) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(func_80242014_8B2084)) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_001D) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_PARTNER, -295, -30, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyWalk) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_269, 0) + EVT_WAIT(15) + EVT_CALL(PlaySoundAtCollider, COLLIDER_mm1, SOUND_1D2, 0) + EVT_CALL(MakeLerp, 0, 120, 20, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_m_d1, LVar0, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m_d2, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_mm1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_mm2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnablePartnerAI) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_SadIdle) + EVT_CALL(EnableNpcAI, NPC_Goombario, FALSE) + EVT_CALL(EnableNpcAI, NPC_Goombaria, FALSE) + EVT_CALL(EnableNpcAI, NPC_Gooma, FALSE) + EVT_CALL(EnableNpcAI, NPC_Goomama, FALSE) + EVT_CALL(SetNpcPos, NPC_Goombario, -95, 0, -86) + EVT_CALL(SetNpcPos, NPC_Goombaria, -92, 0, -46) + EVT_CALL(SetNpcFlagBits, NPC_Goombario, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_100, TRUE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -189, 0, -40) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -189, 0, -40) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -350) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.3)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_CALL(SetNpcSpeed, NPC_Goombario, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Run) + EVT_CALL(NpcMoveTo, NPC_Goombario, -109, -61, 0) + EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_SadRun) + EVT_CALL(NpcMoveTo, NPC_Goombaria, -142, -95, 0) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_SadIdle) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -238, -33, 0) + EVT_END_THREAD + EVT_CALL(N(func_80242014_8B2084)) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyWalk) + EVT_CALL(NpcMoveTo, NPC_PARTNER, -168, -15, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyIdle) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToNpc, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, NPC_PARTNER, MSG_CH0_001E) + EVT_WAIT(10) + EVT_CALL(SpeakToNpc, NPC_Goombaria, ANIM_Goombaria_SadTalk, ANIM_Goombaria_SadIdle, 0, NPC_PARTNER, MSG_CH0_001F) + EVT_WAIT(10) + EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_Goompa_WearyTalk, ANIM_Goompa_WearyIdle, 0, NPC_Goombario, MSG_CH0_0020) + EVT_WAIT(10) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -79, 0, -10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -22, 0, 12) + EVT_CALL(SetCamDistance, CAM_DEFAULT, -350) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.4)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -79, -10, 0) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Run) + EVT_CALL(NpcMoveTo, NPC_Goombario, -45, 40, 0) + EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_SadRun) + EVT_CALL(NpcMoveTo, NPC_Goombaria, -23, -21, 0) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_SadIdle) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyWalk) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 30, 35, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyIdle) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_WearyTalk, ANIM_Goompa_WearyIdle, 0, MSG_CH0_0021) + EVT_WAIT(10) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(4.0)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyWalk) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 41, -147, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyIdle) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_OPEN, 0) + EVT_SET(LVar0, 0) + EVT_LOOP(10) + EVT_ADD(LVar0, 3) + EVT_CALL(RotateModel, MODEL_syoumen_enter, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, TRUE) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_WearyWalk) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 127, -157, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Idle) + EVT_LOOP(10) + EVT_ADD(LVar0, -3) + EVT_CALL(RotateModel, MODEL_syoumen_enter, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(NpcFacePlayer, NPC_Goombaria, 3) + EVT_CALL(NpcFacePlayer, NPC_Goombario, 3) + EVT_CALL(PlayerFaceNpc, NPC_Goombario, 3) + EVT_IF_EQ(GF_KMR04_Tree3_Dolly, TRUE) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 30) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(-350.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_WAIT(30) + EVT_CALL(PlayerFaceNpc, NPC_Goombario, TRUE) + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0022) + EVT_WAIT(10) + EVT_CALL(ShowChoice, MSG_Choice_0011) + EVT_WAIT(10) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(CloseMessage) + EVT_CALL(FindKeyItem, ITEM_DOLLY, LVar0) + EVT_CALL(RemoveKeyItemAt, LVar0) + EVT_CALL(PlayerFaceNpc, NPC_Goombaria, TRUE) + EVT_CALL(PlayerMoveTo, -50, -24, 0) + EVT_CALL(InterpPlayerYaw, 94, 0) + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_HandOverDolly)) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_SadTalk, ANIM_Goombaria_SadIdle, 0, MSG_CH0_0024) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Inspect) + EVT_CALL(InterpNpcYaw, NPC_Goombaria, 90, 1) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Goombaria, 270, 1) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Idle) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0025) + EVT_WAIT(10) + EVT_GIVE_STAR_PIECE() + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0026) + EVT_WAIT(10) + EVT_EXEC(N(EVS_Goombaria_Kiss)) + EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Goombaria, -30, 0, -19, 10) + EVT_WAIT(10) + EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 1, 1, 1, 0) + EVT_WAIT(35) + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Walk) + EVT_CALL(NpcMoveTo, NPC_Goombaria, -23, -21, 0) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Idle) + EVT_CALL(NpcFacePlayer, NPC_Goombaria, 3) + EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_CALL(PlayerMoveTo, -85, -10, 0) + EVT_CALL(PlayerFaceNpc, NPC_Goombaria, TRUE) + EVT_WAIT(20) + EVT_CASE_EQ(1) + EVT_CALL(ContinueSpeech, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0023) + EVT_SET(GF_KMR02_KeptDolly, TRUE) + EVT_WAIT(10) + EVT_END_SWITCH + EVT_THREAD + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), 30, EVT_FLOAT(-275.0), EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_WAIT(60) + EVT_ELSE + EVT_THREAD + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), 30, EVT_FLOAT(-275.0), EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_WAIT(60) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0027) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0028) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0029) + EVT_WAIT(10) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_OPEN, 0) + EVT_SET(LVar0, 0) + EVT_LOOP(10) + EVT_ADD(LVar0, 3) + EVT_CALL(RotateModel, MODEL_syoumen_enter, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_THREAD + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(2.0), 40, EVT_FLOAT(-350.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) + EVT_END_THREAD + EVT_CALL(SetNpcPos, NPC_PARTNER, 127, 0, -157) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Run) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 32, -151, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE) + EVT_CALL(GetAngleBetweenNPCs, NPC_Goombaria, NPC_PARTNER, LVar0) + EVT_CALL(InterpNpcYaw, NPC_Goombaria, LVar0, 0) + EVT_CALL(GetAngleBetweenNPCs, NPC_Goombario, NPC_PARTNER, LVar0) + EVT_CALL(InterpNpcYaw, NPC_Goombario, LVar0, 0) + EVT_CALL(PlayerFaceNpc, NPC_PARTNER, 3) + EVT_SET(LVar0, 30) + EVT_LOOP(10) + EVT_ADD(LVar0, -3) + EVT_CALL(RotateModel, MODEL_syoumen_enter, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_002A) + EVT_WAIT(10) + EVT_CALL(SpeakToNpc, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, NPC_PARTNER, MSG_CH0_002B) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Run) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 3, 9, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE) + EVT_CALL(PlayerFaceNpc, NPC_PARTNER, 3) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_002C) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Walk) + EVT_CALL(NpcMoveTo, NPC_PARTNER, -60, -14, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE) + EVT_WAIT(10) + EVT_GIVE_BADGE_REWARD(ITEM_POWER_JUMP) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Walk) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 3, 9, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, FALSE) + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_PromptForBadgeTutorial)) + EVT_CALL(EnableNpcAI, NPC_Goombario, FALSE) + EVT_CALL(EnableNpcAI, NPC_Goombaria, FALSE) + EVT_CALL(EnableNpcAI, NPC_Gooma, FALSE) + EVT_CALL(EnableNpcAI, NPC_Goomama, FALSE) + EVT_CALL(N(LoadHeartBlockMsgImg)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_0031) + EVT_WAIT(10) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), 30, EVT_FLOAT(-275.0), EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_0032) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(NpcFacePlayer, NPC_Goombaria, 3) + EVT_END_THREAD + EVT_CALL(NpcFacePlayer, NPC_Goombario, 3) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0033) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(GetAngleBetweenNPCs, NPC_Goombaria, NPC_PARTNER, LVar0) + EVT_CALL(InterpNpcYaw, NPC_Goombaria, LVar0, 3) + EVT_END_THREAD + EVT_CALL(GetAngleBetweenNPCs, NPC_Goombario, NPC_PARTNER, LVar0) + EVT_CALL(InterpNpcYaw, NPC_Goombario, LVar0, 3) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_0034) + EVT_WAIT(10) + EVT_CALL(NpcFacePlayer, NPC_Goombario, 3) + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0035) + EVT_WAIT(10) + EVT_CALL(NpcFacePlayer, NPC_Goombaria, 3) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0036) + EVT_WAIT(10) + EVT_CALL(GetAngleBetweenNPCs, NPC_Goombario, NPC_PARTNER, LVar0) + EVT_CALL(InterpNpcYaw, NPC_Goombario, LVar0, 3) + EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, NPC_Goombario, MSG_CH0_0037) + EVT_WAIT(10) + EVT_CALL(SetNpcJumpscale, NPC_Goombario, EVT_FLOAT(1.2)) + EVT_CALL(GetNpcPos, NPC_Goombario, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Goombario, LVar0, LVar1, LVar2, 7) + EVT_CALL(SpeakToNpc, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, NPC_PARTNER, MSG_CH0_0038) + EVT_CALL(N(LoadPartyImage)) + EVT_EXEC(N(EVS_PushNewPartnerSong)) + EVT_WAIT(10) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0189, 160, 40) + EVT_EXEC(N(EVS_PopSong)) + EVT_WAIT(10) + EVT_CALL(SpeakToNpc, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, NPC_Goombario, MSG_CH0_0039) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_003A) + EVT_WAIT(10) + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Run) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 41, -143, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_OPEN, 0) + EVT_SET(LVar0, 0) + EVT_LOOP(10) + EVT_ADD(LVar0, 3) + EVT_CALL(RotateModel, MODEL_syoumen_enter, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Gooma, ANIM_Gooma_Run) + EVT_CALL(NpcMoveTo, NPC_Gooma, 127, -157, 0) + EVT_CALL(SetNpcAnimation, NPC_Gooma, ANIM_Gooma_Idle) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_40, TRUE) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Run) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 80, -154, 0) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 111, -200, 0) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) + EVT_LOOP(10) + EVT_ADD(LVar0, -3) + EVT_CALL(RotateModel, MODEL_syoumen_enter, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit5, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_CALL(N(RemoveGoompaPartner)) + EVT_CALL(N(IsPlayerHPFull)) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_003B) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_003C) + EVT_END_IF + EVT_CALL(N(ChangeNpcToPartner), NPC_Goombario, PARTNER_GOOMBARIO) + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_Goombario, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcFlagBits, NPC_Goombario, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcPos, NPC_Gooma, 115, 0, -309) + EVT_CALL(SetNpcFlagBits, NPC_Gooma, NPC_FLAG_40, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_ENABLE_HIT_SCRIPT, FALSE) + EVT_CALL(SetNpcPos, NPC_Goompa, 184, 0, -149) + EVT_CALL(EnableNpcShadow, NPC_Goompa, TRUE) + EVT_CALL(SetNpcPos, NPC_SELF, 200, 0, 100) + EVT_CALL(RestartNpcAI, NPC_Goombaria) + EVT_CALL(EnableNpcAI, NPC_Gooma, TRUE) + EVT_CALL(EnableNpcAI, NPC_Goomama, TRUE) + EVT_THREAD + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_END_THREAD + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_100, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_SET(GB_StoryProgress, STORY_CH0_GOOMBARIO_JOINED_PARTY) + EVT_UNBIND + EVT_CALL(SetNpcFlagBits, NPC_Goomama, NPC_FLAG_4, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Goompa) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_KootFavorCheck_Goompa) = { + EVT_IF_EQ(GB_KootFavor_Current, 3) + EVT_IF_EQ(GF_KMR02_Gift_TheTape, FALSE) + EVT_SET(GF_KMR02_Gift_TheTape, TRUE) + EVT_EXEC_WAIT(N(D_8024810C_8B817C)) + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_0049) + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_004A) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 297, LVar1, -84) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_CALL(GetNpcPos, NPC_Goompa, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Goompa, ANIM_Goompa_Walk) + EVT_CALL(SetNpcSpeed, NPC_Goompa, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_Goompa, 260, -94, 0) + EVT_CALL(NpcMoveTo, NPC_Goompa, 344, -113, 0) + EVT_CALL(NpcMoveTo, NPC_Goompa, 381, -93, 0) + EVT_CALL(SetNpcAnimation, NPC_Goompa, ANIM_Goompa_Idle) + EVT_WAIT(30) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(GetPlayerPos, 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_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_Goompa, ANIM_Goompa_Walk) + EVT_CALL(NpcMoveTo, NPC_Goompa, 344, -113, 0) + EVT_CALL(NpcMoveTo, NPC_Goompa, 260, -94, 0) + EVT_CALL(NpcMoveTo, NPC_Goompa, LVar0, LVar2, 0) + EVT_CALL(SetNpcPos, NPC_Goompa, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_100, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_004B) + EVT_GIVE_KEY_REWARD(ITEM_KOOT_THE_TAPE) + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_004C) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; + +API_CALLABLE(N(AddGoompaRenderYaw)) { + Bytecode* args = script->ptrReadPos; + Npc* npc = resolve_npc(script, NPC_Goompa); + + npc->renderYaw += evt_get_float_variable(script, *args++); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_Goompa_TurnAround) = { + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40000, TRUE) + EVT_LOOP(5) + EVT_CALL(N(AddGoompaRenderYaw), EVT_FLOAT(-18.0)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Goompa_Idle) + EVT_CALL(N(AddGoompaRenderYaw), EVT_FLOAT(-180.0)) + EVT_LOOP(5) + EVT_CALL(N(AddGoompaRenderYaw), EVT_FLOAT(-18.0)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Goompa_TurnBack) = { + EVT_LOOP(5) + EVT_CALL(N(AddGoompaRenderYaw), EVT_FLOAT(18.0)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Goompa_Rummage) + EVT_CALL(N(AddGoompaRenderYaw), EVT_FLOAT(180.0)) + EVT_LOOP(5) + EVT_CALL(N(AddGoompaRenderYaw), EVT_FLOAT(18.0)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40000, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Goompa) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) + EVT_IF_EQ(GF_KMR02_Met_Goompa, FALSE) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 0, EVT_FLOAT(-275.0), EVT_FLOAT(20.0), EVT_FLOAT(-8.5)) + EVT_EXEC_WAIT(N(EVS_Goompa_TurnAround)) + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_0019) + EVT_EXEC_WAIT(N(EVS_Goompa_TurnBack)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 499, 0, -378) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 499, 70, -378) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 370) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_SET(GF_KMR02_Met_Goompa, TRUE) + EVT_SET(GB_StoryProgress, STORY_CH0_MET_GOOMPA) + EVT_CALL(SetNpcPos, NPC_Goombaria, 215, 0, 215) + EVT_CALL(BindNpcAI, NPC_Goombaria, EVT_PTR(N(EVS_NpcAI_GoombaFamily_NoAI))) + EVT_IF_EQ(GF_KMR02_Met_Goompapa, TRUE) + EVT_CALL(SetNpcPos, NPC_Goompapa, 265, 0, 245) + EVT_CALL(BindNpcAI, NPC_Goompapa, EVT_PTR(N(EVS_NpcAI_GoombaFamily_NoAI))) + EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_Idle) + EVT_END_IF + EVT_ELSE + EVT_EXEC_WAIT(N(EVS_Goompa_TurnAround)) + EVT_IF_EQ(GF_KMR02_Goompa_SwapDialogue, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_001A) + EVT_SET(GF_KMR02_Goompa_SwapDialogue, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_001B) + EVT_SET(GF_KMR02_Goompa_SwapDialogue, FALSE) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_Goompa_TurnBack)) + EVT_END_IF + EVT_CASE_LT(STORY_CH0_DEFEATED_GOOMBA_KING) + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_003D) + EVT_CASE_LT(STORY_CH0_MET_STAR_SPIRITS) + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_003E) + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_003F) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_NE(LVar0, PARTNER_GOOMBARIO) + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_0040) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_0041) + EVT_END_IF + EVT_CASE_GE(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_NE(LVar0, PARTNER_GOOMBARIO) + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_0042) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_0043) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, NPC_Goompa, MSG_CH0_0044) + EVT_CALL(EnablePartnerAI) + EVT_END_IF + EVT_END_SWITCH + EVT_EXEC_WAIT(N(EVS_LetterCheck_Goompa)) + EVT_EXEC_WAIT(N(EVS_LetterReward_Goompa)) + EVT_IF_NE(LVarC, 0) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_KootFavorCheck_Goompa)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Goompa) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Goompa))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Goompa))) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_mm2, COLLIDER_FLAGS_UPPER_MASK) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) + EVT_CALL(SetNpcPos, NPC_SELF, 535, 25, -369) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Goompa_Rummage) + EVT_CALL(InterpNpcYaw, NPC_SELF, 200, 0) + EVT_CASE_LT(STORY_CH0_FELL_OFF_CLIFF) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_ENABLE_HIT_SCRIPT, TRUE) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CASE_LT(STORY_CH0_GOOMBARIO_JOINED_PARTY) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ReturnToVillage)), TRIGGER_WALL_PRESS_A, COLLIDER_mm1, 1, 0) + EVT_CASE_GE(STORY_CH0_GOOMBARIO_JOINED_PARTY) + EVT_CALL(SetNpcPos, NPC_Goompa, 172, 0, -183) + EVT_CALL(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_40, FALSE) + EVT_CALL(RotateModel, MODEL_m_d1, 120, 0, -1, 0) + EVT_CALL(RotateModel, MODEL_m_d2, 120, 0, 1, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_mm1, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_mm2, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024BEF8_8BBF68) = { + EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_Walk) + EVT_CALL(NpcMoveTo, NPC_Goompapa, 272, 281, 20) + EVT_CALL(GetNpcYaw, NPC_Goompapa, LVar3) + EVT_SET(LVar4, LVar3) + EVT_ADD(LVar4, 180) + EVT_CALL(InterpNpcYaw, NPC_Goompapa, LVar4, 0) + EVT_WAIT(7) + EVT_CALL(InterpNpcYaw, NPC_Goompapa, LVar3, 0) + EVT_WAIT(7) + EVT_CALL(NpcMoveTo, NPC_Goompapa, 266, 228, 20) + EVT_CALL(GetNpcYaw, NPC_Goompapa, LVar3) + EVT_SET(LVar4, LVar3) + EVT_ADD(LVar4, 180) + EVT_CALL(InterpNpcYaw, NPC_Goompapa, LVar4, 0) + EVT_WAIT(7) + EVT_CALL(InterpNpcYaw, NPC_Goompapa, LVar3, 0) + EVT_WAIT(7) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Goompapa) = { + EVT_LABEL(0) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_MET_GOOMPA) + EVT_EXEC_WAIT(N(D_8024BEF8_8BBF68)) + EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) + EVT_IF_EQ(GF_KMR02_Met_Goompapa, FALSE) + EVT_EXEC_WAIT(N(D_8024BEF8_8BBF68)) + EVT_END_IF + EVT_CASE_LT(STORY_CH0_SMASHED_GATE_BLOCK) + EVT_CASE_DEFAULT + EVT_EXEC_WAIT(N(EVS_NpcAI_GoombaFamily_Wander)) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Goompapa) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_MET_GOOMPA) + EVT_IF_EQ(GF_KMR02_Met_Goompapa, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0052) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0053) + EVT_SET(GF_KMR02_Met_Goompapa, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0054) + EVT_END_IF + EVT_CASE_EQ(STORY_CH0_MET_GOOMPA) + EVT_IF_EQ(GF_KMR02_Met_Goompapa, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_Idle) + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0056) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0057) + EVT_CALL(BindNpcAI, NPC_Goompapa, EVT_PTR(N(EVS_NpcAI_GoombaFamily_NoAI))) + EVT_SET(GF_KMR02_Met_Goompapa, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0055) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0058) + EVT_THREAD + EVT_CALL(FadeOutMusic, 0, 500) + EVT_WAIT(45) + EVT_CALL(FadeInMusic, 0, SONG_KAMMY_KOOPA_THEME, 0, 500, 0, 127) + EVT_END_THREAD + EVT_EXEC_WAIT(N(EVS_Scene_KammyStrikes)) + EVT_CASE_LT(STORY_CH0_FELL_OFF_CLIFF) + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0063) + EVT_CASE_LT(STORY_CH0_DEFEATED_GOOMBA_KING) + EVT_IF_EQ(GF_KMR02_Goompapa_SaidFarewell, FALSE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, NPC_Goompapa, MSG_CH0_0064) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldGoombario_Idle) + EVT_WAIT(10) + EVT_CALL(EnablePartnerAI) + EVT_CALL(SpeakToNpc, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, NPC_PARTNER, MSG_CH0_0065) + EVT_SET(GF_KMR02_Goompapa_SaidFarewell, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0068) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_WorldGoombario_Idle) + EVT_END_IF + EVT_CASE_LT(STORY_CH1_KOOPER_JOINED_PARTY) + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0069) + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_006A) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_NE(LVar0, PARTNER_GOOMBARIO) + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_006B) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_006C) + EVT_END_IF + EVT_CASE_GE(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_NE(LVar0, PARTNER_GOOMBARIO) + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_006D) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_006E) + EVT_END_IF + EVT_END_SWITCH + EVT_EXEC_WAIT(N(EVS_LetterTrade_Goompapa)) + EVT_IF_NE(LVarC, 0) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_LetterCheck_Goompapa)) + EVT_EXEC_WAIT(N(EVS_LetterReward_Goompapa)) + EVT_IF_NE(LVarC, 0) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Goompapa) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Goompapa))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Goompapa))) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_MET_GOOMPA) + EVT_CASE_EQ(STORY_CH0_MET_GOOMPA) + EVT_IF_EQ(GF_KMR02_Met_Goompapa, TRUE) + EVT_CALL(SetNpcPos, NPC_Goompapa, 265, 0, 245) + EVT_CALL(BindNpcAI, NPC_Goompapa, EVT_PTR(N(EVS_NpcAI_GoombaFamily_NoAI))) + EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_Idle) + EVT_END_IF + EVT_CASE_LT(STORY_CH0_FELL_OFF_CLIFF) + EVT_CALL(N(SetWanderTerritory_Npc), NPC_Goompapa, 0) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_SwitchedWander_Npc))) + EVT_CASE_LT(STORY_CH0_SMASHED_GATE_BLOCK) + EVT_CALL(SetNpcPos, NPC_SELF, 258, 0, 258) + EVT_CALL(InterpNpcYaw, NPC_SELF, 106, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Goomama) = { + EVT_CALL(func_800445D4, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(100) + EVT_EXEC_WAIT(N(EVS_NpcAI_GoombaFamily_Wander)) + EVT_CASE_OR_EQ(101) + EVT_CASE_OR_EQ(102) + EVT_CASE_OR_EQ(3) + EVT_CASE_OR_EQ(103) + EVT_EXEC_WAIT(N(EVS_NpcAI_GoombaFamily_Wander)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Goomama) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) + EVT_IF_EQ(GF_KMR02_Met_Goomama, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Goomama, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_CH0_0077) + EVT_SET(GF_KMR02_Met_Goomama, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goomama, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_CH0_0078) + EVT_END_IF + EVT_CASE_LT(STORY_CH0_LEFT_THE_PLAYGROUND) + EVT_CALL(SpeakToPlayer, NPC_Goomama, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_CH0_0079) + EVT_CASE_LT(STORY_CH0_DEFEATED_GOOMBA_KING) + EVT_IF_EQ(GF_KMR02_Goomama_SaidFarewell, FALSE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 5, MSG_CH0_007A) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, ANIM_Goompa_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Goomama, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_CH0_007B) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 5, MSG_CH0_007C) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Goomama, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_CH0_007D) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 5, MSG_CH0_007E) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Goomama, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_CH0_007F) + EVT_WAIT(10) + EVT_SET(GF_KMR02_Goomama_SaidFarewell, TRUE) + EVT_CALL(EnablePartnerAI) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goomama, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_CH0_0080) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_CALL(SpeakToPlayer, NPC_Goomama, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_CH0_0081) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_EQ(LVar0, PARTNER_GOOMBARIO) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, NPC_Goomama, MSG_CH0_0082) + EVT_CALL(EnablePartnerAI) + EVT_END_IF + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_NE(LVar0, PARTNER_GOOMBARIO) + EVT_CALL(SpeakToPlayer, NPC_Goomama, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_CH0_0083) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goomama, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_CH0_0084) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, NPC_Goomama, MSG_CH0_0085) + EVT_CALL(EnablePartnerAI) + EVT_END_IF + EVT_CASE_GE(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_NE(LVar0, PARTNER_GOOMBARIO) + EVT_CALL(SpeakToPlayer, NPC_Goomama, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_CH0_0086) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Goomama, ANIM_Goomama_Talk, ANIM_Goomama_Idle, 0, MSG_CH0_0087) + EVT_END_IF + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Goomama) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_MET_INNKEEPER) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Goomama))) + EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) + EVT_CASE_LT(STORY_CH0_FELL_OFF_CLIFF) + EVT_CALL(N(SetWanderTerritory_Npc), NPC_Goomama, 1) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_SwitchedWander_Npc))) + EVT_CASE_LT(STORY_CH0_LEFT_THE_PLAYGROUND) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Goomama))) + EVT_CASE_LT(STORY_CH0_GOOMBARIO_JOINED_PARTY) + EVT_CALL(SetNpcPos, NPC_SELF, 200, 0, 100) + EVT_WAIT(1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_4, TRUE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Goomama))) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Goomama))) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_CASE_DEFAULT + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Goomama))) + EVT_END_SWITCH + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Goomama))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Gooma) = { + EVT_CALL(func_800445D4, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(100) + EVT_LABEL(0) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH0_GOOMBARIO_JOINED_PARTY) + EVT_EXEC_WAIT(N(EVS_NpcAI_GoombaFamily_Wander)) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_GOTO(0) + EVT_CASE_OR_EQ(101) + EVT_CASE_OR_EQ(102) + EVT_CASE_OR_EQ(3) + EVT_CASE_OR_EQ(103) + EVT_EXEC_WAIT(N(EVS_NpcAI_GoombaFamily_Wander)) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Gooma) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) + EVT_IF_EQ(GF_KMR02_Met_Gooma, FALSE) + EVT_SET(GF_KMR02_Met_Gooma, TRUE) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 0, EVT_FLOAT(-275.5), EVT_FLOAT(15.5), EVT_FLOAT(-10.0)) + EVT_CALL(SpeakToPlayer, NPC_Gooma, ANIM_Gooma_Talk, ANIM_Gooma_Idle, 5, MSG_CH0_009C) + EVT_THREAD + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_END_THREAD + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Gooma, ANIM_Gooma_Talk, ANIM_Gooma_Idle, 5, MSG_CH0_009D) + EVT_END_IF + EVT_CASE_LT(STORY_CH0_FELL_OFF_CLIFF) + EVT_CALL(SpeakToPlayer, NPC_Gooma, ANIM_Gooma_Talk, ANIM_Gooma_Idle, 0, MSG_CH0_009E) + EVT_CASE_LT(STORY_CH0_DEFEATED_GOOMBA_KING) + EVT_IF_EQ(GF_KMR02_Gooma_HealthAdvice, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Gooma, ANIM_Gooma_Talk, ANIM_Gooma_Idle, 0, MSG_CH0_009F) + EVT_SET(GF_KMR02_Gooma_HealthAdvice, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Gooma, ANIM_Gooma_Talk, ANIM_Gooma_Idle, 0, MSG_CH0_00A0) + EVT_END_IF + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_CALL(SpeakToPlayer, NPC_Gooma, ANIM_Gooma_Talk, ANIM_Gooma_Idle, 0, MSG_CH0_00A1) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_NE(LVar0, PARTNER_GOOMBARIO) + EVT_CALL(SpeakToPlayer, NPC_Gooma, ANIM_Gooma_Talk, ANIM_Gooma_Idle, 0, MSG_CH0_00A2) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Gooma, ANIM_Gooma_Talk, ANIM_Gooma_Idle, 0, MSG_CH0_00A3) + EVT_END_IF + EVT_CASE_GE(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_NE(LVar0, PARTNER_GOOMBARIO) + EVT_CALL(SpeakToPlayer, NPC_Gooma, ANIM_Gooma_Talk, ANIM_Gooma_Idle, 0, MSG_CH0_00A4) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Gooma, ANIM_Gooma_Talk, ANIM_Gooma_Idle, 0, MSG_CH0_00A5) + EVT_END_IF + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Gooma) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Gooma))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Gooma))) + EVT_RETURN + EVT_END +}; + +#define KAMMY_NPC NPC_Kammy +#include "world/common/util/GetKammyBroomEmitterPos.inc.c" + +EvtScript N(EVS_NpcAux_Kammy) = { + EVT_CALL(GetNpcPos, NPC_Kammy, LVar6, LVar7, LVar8) + EVT_LABEL(0) + EVT_CALL(N(GetKammyBroomEmitterPos)) + EVT_CALL(GetNpcPos, NPC_Kammy, LVar9, LVarA, LVarB) + EVT_SET(LVar3, LVar9) + EVT_SET(LVar4, LVarA) + EVT_SET(LVar5, LVarB) + EVT_SUBF(LVar3, LVar6) + EVT_SUBF(LVar4, LVar7) + EVT_SUBF(LVar5, LVar8) + EVT_SETF(LVar6, LVar9) + EVT_SETF(LVar7, LVarA) + EVT_SETF(LVar8, LVarB) + EVT_IF_NE(LVar3, 0) + EVT_IF_NE(LVar5, 0) + EVT_PLAY_EFFECT(EFFECT_PURPLE_RING, 0, LVar0, LVar1, LVar2, LVar3, LVar4, LVar5, EVT_FLOAT(1.0)) + EVT_END_IF + EVT_END_IF + EVT_WAIT(3) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +s32 N(KammyHoverOffsets)[] = { + 1, 2, 3, 2, 1, + -1, -2, -3, -2, -1, +}; + +EvtScript N(EVS_NpcIdle_Kammy) = { + EVT_LABEL(0) + EVT_USE_BUF(EVT_PTR(N(KammyHoverOffsets))) + EVT_LOOP(ARRAY_COUNT(N(KammyHoverOffsets))) + EVT_BUF_READ1(LVar1) + EVT_CALL(GetNpcPos, NPC_SELF, LVar2, LVar3, LVar4) + EVT_ADD(LVar3, LVar1) + EVT_CALL(SetNpcPos, NPC_SELF, LVar2, LVar3, LVar4) + EVT_WAIT(3) + EVT_END_LOOP + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Kammy) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Kammy))) + EVT_CALL(BindNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_Kammy))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad) = { + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_0012) + EVT_RETURN + EVT_END +}; + +#include "world/common/todo/SyncStatusMenu.inc.c" + +#ifdef NON_EQUIVALENT +// control flow + data migration +ApiStatus func_8024295C_8B29CC(Evt* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 targetColR = evt_get_variable(script, *args++); + s32 targetColG = evt_get_variable(script, *args++); + s32 targetColB = evt_get_variable(script, *args++); + s32 targetColA = evt_get_variable(script, *args++); + s32 duration = evt_get_variable(script, *args++); + + if (isInitialCall) { + get_background_color_blend(&N(savedColR), &N(savedColG), &N(savedColB), &N(savedColA)); + script->functionTemp[0] = 0; + } + + if (duration > 0) { + set_background_color_blend( + N(savedColR) + (((targetColR - N(savedColR)) * script->functionTemp[0]) / duration), + N(savedColG) + (((targetColG - N(savedColG)) * script->functionTemp[0]) / duration), + N(savedColB) + (((targetColB - N(savedColB)) * script->functionTemp[0]) / duration), + N(savedColA) + (((targetColA - N(savedColA)) * script->functionTemp[0]) / duration) + ); + + script->functionTemp[0]++; + if (duration < script->functionTemp[0]) { + return ApiStatus_BLOCK; + } + } else { + set_background_color_blend(targetColR, targetColG, targetColB, targetColA); + } + return ApiStatus_DONE2; +} +#else +API_CALLABLE(func_8024295C_8B29CC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024295C_8B29CC); +#endif + +API_CALLABLE(N(func_80242BA8_8B2C18)) { + *gBgRenderTypePtr = 1; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80242BC0_8B2C30)) { + Bytecode* args; + + s32 newEnvR, newEnvB, newEnvG; + s32 newPrimR, newPrimG, newPrimB; + s32 duration; + + args = script->ptrReadPos; + newPrimR = evt_get_variable(script, *args++); + newPrimG = evt_get_variable(script, *args++); + newPrimB = evt_get_variable(script, *args++); + newEnvR = evt_get_variable(script, *args++); + newEnvG = evt_get_variable(script, *args++); + newEnvB = evt_get_variable(script, *args++); + duration = evt_get_variable(script, *args++); + if (isInitialCall) { + get_model_env_color_parameters(&oldPrimR, &oldPrimG, &oldPrimB, &oldEnvR, &oldEnvG, &oldEnvB); + script->functionTemp[0] = 0; + } + if (duration > 0) { + set_model_env_color_parameters( + oldPrimR + ((newPrimR - oldPrimR) * script->functionTemp[0]) / duration, + oldPrimG + ((newPrimG - oldPrimG) * script->functionTemp[0]) / duration, + oldPrimB + ((newPrimB - oldPrimB) * script->functionTemp[0]) / duration, + oldEnvR + ( (newEnvR - oldEnvR) * script->functionTemp[0]) / duration, + oldEnvG + ( (newEnvG - oldEnvG) * script->functionTemp[0]) / duration, + oldEnvB + ( (newEnvB - oldEnvB) * script->functionTemp[0]) / duration); + script->functionTemp[0]++; + if (duration < script->functionTemp[0]) { + return 2; + } + } else { + set_model_env_color_parameters(newPrimR, newPrimG, newPrimB, newEnvR, newEnvG, newEnvB); + return 2; + } + return 0; +} + +API_CALLABLE(N(func_80242F08_8B2F78)) { + mdl_set_all_fog_mode(3); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80242F28_8B2F98)) { + func_8011B950(MODEL_kinopi, -1, 1, 1); + set_background_color_blend(0, 0, 0, 255); + gCameras[CAM_DEFAULT].bgColor[0] = 0; + gCameras[CAM_DEFAULT].bgColor[1] = 0; + gCameras[CAM_DEFAULT].bgColor[2] = 0; + return ApiStatus_DONE2; +} + +EvtScript N(EVS_Scene_EldstarsPlea) = { + EVT_CALL(FadeOutMusic, 0, 500) + EVT_CALL(SetNpcFlagBits, NPC_Goombario, NPC_FLAG_NO_DROPS, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_NO_DROPS, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goompapa, NPC_FLAG_NO_DROPS, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goomama, NPC_FLAG_NO_DROPS, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_NO_DROPS, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Gooma, NPC_FLAG_NO_DROPS, TRUE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(-375.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(-9.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(N(func_80242BA8_8B2C18)) + EVT_CALL(func_8024295C_8B29CC, 0, 0, 0, 255, 0) + EVT_CALL(N(func_80242F08_8B2F78)) + EVT_CALL(N(func_80242BC0_8B2C30), 30, 30, 30, 0, 0, 0, 0) + EVT_CALL(SetGroupEnabled, MODEL_Root, 0) + EVT_CALL(SetGroupEnabled, MODEL_kinopi, 1) + EVT_CALL(EnableModel, MODEL_o561, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(FullyRestoreHPandFP) + EVT_CALL(N(SyncStatusMenu)) + EVT_CALL(InterpPlayerYaw, 143, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80009) + EVT_CALL(GetPlayerPos, -220, 33, -342) + EVT_WAIT(90) + EVT_CALL(PlaySoundAtNpc, NPC_Eldstar_02, SOUND_2041, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, -198, 115, -272, 10) + EVT_CALL(SetNpcPos, NPC_Eldstar_02, -198, 140, -272) + EVT_SET(MV_Unk_01, 120) + EVT_SETF(MV_Unk_00, 0) + EVT_CALL(BindNpcAI, NPC_Eldstar_02, EVT_PTR(N(EVS_NpcAI_Eldstar_02))) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 120, 80, EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(func_802CFD30, NPC_Eldstar_02, FOLD_TYPE_7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, 0, 2880, 80, EASING_QUADRATIC_OUT) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_Eldstar_02, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, 140, 60, 80, EASING_QUADRATIC_OUT) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcPos, NPC_Eldstar_02, -198, LVar0, -272) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(2) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(100) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(-250.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(30.0), EVT_FLOAT(-22.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(-160.0), EVT_FLOAT(-310.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_Eldstar_02, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 0, MSG_CH0_0009) + EVT_CALL(MakeLerp, 120, 60, 20, EASING_LINEAR) + EVT_LABEL(5) + EVT_CALL(UpdateLerp) + EVT_SET(MV_Unk_01, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(5) + EVT_END_IF + EVT_SETF(MV_Unk_00, 50) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(-375.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(-9.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(-190.0), EVT_FLOAT(-310.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(MakeLerp, 60, 0, 40, EASING_LINEAR) + EVT_LABEL(6) + EVT_CALL(UpdateLerp) + EVT_CALL(func_802CFD30, 12, 7, LVar0, 0, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(6) + EVT_END_IF + EVT_END_THREAD + EVT_CALL(BindNpcAI, NPC_Eldstar_02, EVT_PTR(N(EVS_NpcAI_Eldstar_02_NoAI))) + EVT_CALL(GetNpcPos, NPC_Eldstar_02, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 20) + EVT_WAIT(15) + EVT_CALL(PlaySoundAtNpc, NPC_Eldstar_02, SOUND_2041, 0) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 10) + EVT_CALL(SetNpcPos, NPC_Eldstar_02, NPC_DISPOSE_LOCATION) + EVT_WAIT(60) + EVT_EXEC(N(EVS_FadeOutMusic)) + EVT_THREAD + EVT_CALL(N(func_80242F08_8B2F78)) + EVT_CALL(N(func_80242BC0_8B2C30), 255, 255, 255, 0, 0, 0, 50) + EVT_END_THREAD + EVT_WAIT(110) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80024) + EVT_WAIT(30) + EVT_CALL(SetGroupEnabled, MODEL_Root, 1) + EVT_CALL(N(func_80242F28_8B2F98)) + EVT_CALL(EnableModel, MODEL_o561, FALSE) + EVT_CALL(EnableGroup, MODEL_2, FALSE) + EVT_CALL(EnableGroup, MODEL_4, FALSE) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump, -180, 19, -335, 10) + EVT_CALL(InterpPlayerYaw, 143, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_WAIT(20) + EVT_CALL(InterpPlayerYaw, 143, 3) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 323, 3) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 143, 3) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 323, 3) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 143, 3) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 323, 3) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetNpcPos, NPC_Toad, -197, 39, -188) + EVT_CALL(SetNpcAnimation, NPC_Toad, ANIM_Toad_Red_Walk) + EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_GRAVITY, TRUE) + EVT_THREAD + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit7, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 90, 10, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o275, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_WAIT(10) + EVT_CALL(MakeLerp, 90, 0, 10, EASING_LINEAR) + EVT_LABEL(11) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o275, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(11) + EVT_END_IF + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit7, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_END_THREAD + EVT_CALL(NpcMoveTo, NPC_Toad, -192, -230, 20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000A) + EVT_WAIT(5) + EVT_CALL(NpcMoveTo, NPC_Toad, -160, -310, 33) + EVT_CALL(SetNpcAnimation, NPC_Toad, ANIM_Toad_Red_Idle) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000C) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001E) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000D) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_WAIT(20) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 0, EVT_FLOAT(-300.0), EVT_FLOAT(20.0), EVT_FLOAT(-10.0)) + EVT_WAIT(15) + EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Goompa, EMOTE_EXCLAMATION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80016) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(40) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000E) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000F) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Question) + EVT_WAIT(20) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(ShowEmote, NPC_Goompa, EMOTE_QUESTION, 0, 60, FALSE, 0, 0, 0, 0) + EVT_WAIT(55) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_0010) + EVT_WAIT(15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_0011) + EVT_WAIT(5) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(-375.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(-9.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(BindNpcInteract, NPC_Toad, EVT_PTR(N(EVS_NpcInteract_Toad))) + EVT_SET(GB_StoryProgress, STORY_CH0_MET_INNKEEPER) + EVT_WAIT(1) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +s16 N(D_8024E538_8BE5A8)[] = { + 1, 3, 5, 7, 7, 5, 3 +}; + +API_CALLABLE(N(func_80242F7C_8B2FEC)) { + Npc* npc; + + if (isInitialCall) { + script->functionTemp[1] = 0.0f; + script->functionTempPtr[2] = get_npc_safe(script->owner2.npcID); + script->functionTemp[3] = N(D_8024E538_8BE5A8)[script->owner2.npcID]; + } + + if (script->functionTemp[3] != 0) { + script->functionTemp[3]--; + return ApiStatus_BLOCK; + } + npc = script->functionTempPtr[2]; + npc->verticalRenderOffset = sin_deg(script->functionTempF[1]) * 1.5f; + script->functionTempF[1] = clamp_angle(script->functionTempF[1] + 18.0f); + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_NpcAI_Eldstar_02_NoAI) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_Eldstar_02) = { + EVT_THREAD + EVT_CALL(N(func_80242F7C_8B2FEC)) + EVT_END_THREAD + EVT_CALL(RandInt, 100, LVar0) + EVT_ADD(LVar0, 1) + EVT_WAIT(LVar0) + EVT_MALLOC_ARRAY(1, LVarA) + EVT_USE_ARRAY(LVarA) + EVT_THREAD + EVT_USE_ARRAY(LVarA) + EVT_LABEL(0) + EVT_CALL(RandInt, 30, LVar0) + EVT_ADD(LVar0, 30) + EVT_SETF(ArrayVar(0), EVT_FLOAT(10.0)) + EVT_WAIT(LVar0) + EVT_CALL(RandInt, 100, LVar1) + EVT_IF_LT(LVar1, 80) + EVT_SET(LVar1, 1) + EVT_ELSE + EVT_SET(LVar1, 2) + EVT_END_IF + EVT_LOOP(LVar1) + EVT_SETF(ArrayVar(0), EVT_FLOAT(90.0)) + EVT_ADDF(ArrayVar(0), MV_Unk_00) + EVT_WAIT(1) + EVT_SETF(ArrayVar(0), EVT_FLOAT(100.0)) + EVT_ADDF(ArrayVar(0), MV_Unk_00) + EVT_WAIT(1) + EVT_SETF(ArrayVar(0), EVT_FLOAT(130.0)) + EVT_ADDF(ArrayVar(0), MV_Unk_00) + EVT_WAIT(1) + EVT_SETF(ArrayVar(0), EVT_FLOAT(120.0)) + EVT_ADDF(ArrayVar(0), MV_Unk_00) + EVT_WAIT(1) + EVT_SETF(ArrayVar(0), EVT_FLOAT(110.0)) + EVT_ADDF(ArrayVar(0), MV_Unk_00) + EVT_WAIT(1) + EVT_SETF(ArrayVar(0), EVT_FLOAT(100.0)) + EVT_ADDF(ArrayVar(0), MV_Unk_00) + EVT_WAIT(1) + EVT_END_LOOP + EVT_GOTO(0) + EVT_END_THREAD + EVT_SETF(LVar0, EVT_FLOAT(100.0)) + EVT_LABEL(1) + EVT_LOOP(50) + EVT_CALL(func_802CFD30, -1, 13, 0, ArrayVar(0), 0, MV_Unk_01) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(50) + EVT_CALL(func_802CFD30, -1, 13, 0, ArrayVar(0), 0, MV_Unk_01) + EVT_WAIT(1) + EVT_END_LOOP + EVT_GOTO(1) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_GoombaFamily)[] = { + { + .id = NPC_Goompa, + .settings = &N(NpcSettings_GoombaFamily_Wander), + .pos = { 506.0f, 30.0f, -364.0f }, + .yaw = 45, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Goompa), + .drops = GOOMPA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 506, 30, -364 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 412, 28, -453 }, + .detectSize = { 100 }, + } + }, + .animations = GOOMPA_ANIMS, + .tattle = MSG_NpcTattle_Goompa, + }, + { + .id = NPC_Goombaria, + .settings = &N(NpcSettings_GoombaFamily_Wander), + .pos = { 92.0f, 0.0f, 76.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Goombaria), + .drops = GOOMBARIA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 92, 0, 76 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 124, 0, -35 }, + .detectSize = { 100 }, + } + }, + .animations = GOOMBARIA_ANIMS, + .tattle = MSG_NpcTattle_Goombaria, + }, + { + .id = NPC_Goombario, + .settings = &N(NpcSettings_GoombaFamily_Wander), + .pos = { -50.0f, 0.0f, -30.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Goombario), + .drops = GOOMBARIO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -50, 0, -30 }, + .wanderSize = { 70 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -50, 0, -30 }, + .detectSize = { 100 }, + } + }, + .animations = GOOMBARIO_ANIMS, + }, + { + .id = NPC_Gooma, + .settings = &N(NpcSettings_GoombaFamily_Wander), + .pos = { 100.0f, 0.0f, -256.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Gooma), + .drops = GOOMA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 100, 0, -256 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 100, 0, -256 }, + .detectSize = { 30 }, + } + }, + .animations = GOOMA_ANIMS, + .tattle = MSG_NpcTattle_Gooma, + }, + { + .id = NPC_Goompapa, + .settings = &N(NpcSettings_GoombaFamily_Wander), + .pos = { 163.0f, 0.0f, 283.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Goompapa), + .drops = GOOMPAPA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 163, 0, 283 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 267, 0, 245 }, + .detectSize = { 100 }, + } + }, + .animations = GOOMPAPA_ANIMS, + .tattle = MSG_NpcTattle_Goompapa, + }, +}; + +StaticNpc N(NpcData_Goomama) = { + .id = NPC_Goomama, + .settings = &N(NpcSettings_GoombaFamily_Wander), + .pos = { -200.0f, 0.0f, 100.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Goomama), + .drops = GOOMAMA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -200, 0, 100 }, + .wanderSize = { 70 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -200, 0, 100 }, + .detectSize = { 100 }, + } + }, + .animations = GOOMAMA_ANIMS, + .tattle = MSG_NpcTattle_Goomama, +}; + +EvtScript N(EVS_NpcInit_Toad) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadHouse))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Toad) = { + .id = NPC_Toad, + .settings = &N(NpcSettings_Toad_Guard), + .pos = { -138.0f, 19.0f, -297.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Toad), + .drops = TOAD_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = TOAD_RED_ANIMS, + .tattle = MSG_NpcTattle_KMR_ToadHouseToad, +}; + +s32 N(ExtraAnims_Kammy)[] = { + ANIM_WorldKammy_Anim15, + ANIM_WorldKammy_Anim10, + ANIM_WorldKammy_Anim0E, + ANIM_WorldKammy_Anim0F, + ANIM_WorldKammy_Anim16, + ANIM_WorldKammy_Anim13, + -1 +}; + +StaticNpc N(NpcData_Kammy) = { + .id = NPC_Kammy, + .settings = &N(NpcSettings_Kammy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Kammy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 100 }, + } + }, + .animations = { + .idle = ANIM_WorldKammy_Anim01, + .walk = ANIM_WorldKammy_Anim02, + .run = ANIM_WorldKammy_Anim03, + .chase = ANIM_WorldKammy_Anim03, + .anim_4 = ANIM_WorldKammy_Anim01, + .anim_5 = ANIM_WorldKammy_Anim01, + .death = ANIM_WorldKammy_Anim00, + .hit = ANIM_WorldKammy_Anim00, + .anim_8 = ANIM_WorldKammy_Anim03, + .anim_9 = ANIM_WorldKammy_Anim03, + .anim_A = ANIM_WorldKammy_Anim03, + .anim_B = ANIM_WorldKammy_Anim03, + .anim_C = ANIM_WorldKammy_Anim03, + .anim_D = ANIM_WorldKammy_Anim03, + .anim_E = ANIM_WorldKammy_Anim03, + .anim_F = ANIM_WorldKammy_Anim03, + }, + .extraAnimations = N(ExtraAnims_Kammy), +}; + +StaticNpc N(NpcData_ChuckQuizmo) = { + .id = NPC_ChuckQuizmo, + .settings = &N(NpcSettings_ChuckQuizmo), + .pos = { -300.0f, 0.0f, 175.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_400000, + .initVarCount = 1, + .initVar = { .bytes = { 0, QUIZ_AREA_KMR, QUIZ_COUNT_KMR, QUIZ_MAP_KMR_02 }}, + .drops = QUIZMO_DROPS, + .animations = QUIZMO_ANIMS, + .tattle = MSG_NpcTattle_ChuckQuizmo, +}; + +EvtScript N(EVS_NpcInit_Eldstar_01) = { + EVT_IF_NE(GB_StoryProgress, STORY_CH0_WAKE_UP) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kmr_02_ENTRY_5) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_Scene_EldstarsPlea))) + EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcPos, NPC_Toad, NPC_DISPOSE_LOCATION) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Eldstar_02) = { + EVT_IF_NE(GB_StoryProgress, STORY_CH0_WAKE_UP) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kmr_02_ENTRY_5) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Eldstar_02_NoAI))) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(ExtraAnims_Eldstar)[] = { + ANIM_WorldEldstar_Idle, + ANIM_WorldEldstar_Wave, + ANIM_Goompa_Still, // ?? + -1 +}; + +StaticNpc N(NpcData_Eldstar_Prologue)[] = { + { + .id = NPC_Eldstar_01, + .settings = &N(NpcSettings_StarSpirit), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_200000, + .init = &N(EVS_NpcInit_Eldstar_01), + .drops = ELDSTAR_DROPS, + .animations = ELDSTAR_ANIMS, + .extraAnimations = N(ExtraAnims_Eldstar), + }, + { + .id = NPC_Eldstar_02, + .settings = &N(NpcSettings_StarSpirit), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Eldstar_02), + .drops = ELDSTAR_DROPS, + .animations = ELDSTAR_ANIMS, + .extraAnimations = N(ExtraAnims_Eldstar), + }, +}; + +EvtScript N(EVS_Goombario_JumpAround) = { + EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Jump) + EVT_CALL(SetNpcJumpscale, NPC_Goombario, EVT_FLOAT(2.0)) + EVT_CALL(GetNpcPos, NPC_Goombario, LVarA, LVarB, LVarC) + EVT_CALL(NpcJump0, NPC_Goombario, LVarA, LVarB, LVarC, 5) + EVT_CALL(SetNpcSpeed, NPC_Goombario, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Run) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Goombaria_JumpAround) = { + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Jump) + EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(2.0)) + EVT_CALL(GetNpcPos, NPC_Goombaria, LVarA, LVarB, LVarC) + EVT_CALL(NpcJump0, NPC_Goombaria, LVarA, LVarB, LVarC, 5) + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Run) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Goombario_RunAround) = { + EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Run) + EVT_CALL(SetNpcSpeed, NPC_Goombario, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Goombario, 11, 63, 0) + EVT_CALL(NpcMoveTo, NPC_Goombario, -42, 17, 0) + EVT_EXEC_WAIT(N(EVS_Goombario_JumpAround)) + EVT_CALL(SetNpcSpeed, NPC_Goombario, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Goombario, 11, -71, 0) + EVT_CALL(NpcMoveTo, NPC_Goombario, 117, -54, 0) + EVT_CALL(NpcMoveTo, NPC_Goombario, 151, 56, 0) + EVT_EXEC_WAIT(N(EVS_Goombario_JumpAround)) + EVT_CALL(NpcMoveTo, NPC_Goombario, 70, 51, 0) + EVT_CALL(NpcMoveTo, NPC_Goombario, 11, 63, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Goombaria_RunAround) = { + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Run) + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Goombaria, 84, 69, 0) + EVT_EXEC_WAIT(N(EVS_Goombaria_JumpAround)) + EVT_CALL(NpcMoveTo, NPC_Goombaria, 10, 48, 0) + EVT_CALL(NpcMoveTo, NPC_Goombaria, -48, -58, 0) + EVT_CALL(NpcMoveTo, NPC_Goombaria, 42, -102, 0) + EVT_EXEC_WAIT(N(EVS_Goombaria_JumpAround)) + EVT_CALL(NpcMoveTo, NPC_Goombaria, 133, -20, 0) + EVT_CALL(NpcMoveTo, NPC_Goombaria, 136, 33, 0) + EVT_CALL(NpcMoveTo, NPC_Goombaria, 84, 69, 0) + EVT_RETURN + EVT_END +}; + +API_CALLABLE(N(ShrinkItemEntity)) { + get_item_entity(script->varTable[0])->scale = 0.6f; + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcIdle_Eldstar_Epilogue) = { + EVT_EXEC(N(EVS_Goombaria_RunAround)) + EVT_EXEC_WAIT(N(EVS_Goombario_RunAround)) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Idle) + EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Idle) + EVT_CALL(SetNpcSpeed, NPC_Parakarry, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcPos, NPC_Parakarry, 210, 115, 70) + EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, MSG_Outro_000F) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Goombaria, EMOTE_EXCLAMATION, 0, 30, TRUE, 0, 0, 0, 0) + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_Goombario, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Goombario, EMOTE_EXCLAMATION, 0, 30, TRUE, 0, 0, 0, 0) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Goombario, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_Goombaria, 90, 0) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_Walk) + EVT_CALL(NpcFlyTo, NPC_Parakarry, 46, 15, 66, 50, 0, EASING_LINEAR) + EVT_CALL(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_Idle) + EVT_CALL(InterpNpcYaw, NPC_Goombaria, 270, 0) + EVT_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 46, 0, 10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 46, 0, 10) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(-300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-6.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 5, MSG_Outro_0010) + EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, MSG_Outro_0011) + EVT_THREAD + EVT_CALL(DropTinyItemEntity, ITEM_LETTER25, NPC_DISPOSE_LOCATION, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_CALL(N(ShrinkItemEntity)) + EVT_LOOP(20) + EVT_CALL(GetNpcPos, NPC_Parakarry, LVar1, LVar2, LVar3) + EVT_ADD(LVar1, -12) + EVT_ADD(LVar2, 4) + EVT_ADD(LVar3, 5) + EVT_CALL(SetItemPos, LVar0, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(35) + EVT_CALL(RemoveItemEntity, LVar0) + EVT_END_THREAD + EVT_CALL(NpcMoveTo, NPC_Parakarry, 30, 66, 20) + EVT_WAIT(35) + EVT_CALL(NpcMoveTo, NPC_Parakarry, 46, 66, 20) + EVT_CALL(SetNpcYaw, NPC_Parakarry, 270) + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 5, MSG_Outro_0012) + EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, MSG_Outro_0013) + EVT_CALL(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_Walk) + EVT_CALL(SetNpcSpeed, NPC_Parakarry, EVT_FLOAT(3.0)) + EVT_CALL(NpcFlyTo, NPC_Parakarry, 210, 115, 70, 50, 0, EASING_LINEAR) + EVT_CALL(SetNpcPos, NPC_Parakarry, NPC_DISPOSE_LOCATION) + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 5, MSG_Outro_0014) + EVT_THREAD + EVT_CALL(MakeLerp, 460, 310, 25, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar0, LVar0) + EVT_DIVF(LVar0, 10) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, 0, 10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, 10) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(-300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-6.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Read) + EVT_END_THREAD + EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(1.0)) + EVT_CALL(NpcMoveTo, NPC_Goombaria, 46, 66, 0) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 5, MSG_Outro_0015) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Read, ANIM_WorldGoombario_Read, 5, MSG_Outro_0016) + EVT_WAIT(20) + EVT_CALL(FadeOutMusic, 0, 1000) + EVT_CALL(GotoMap, EVT_PTR("nok_02"), nok_02_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Eldstar_Epilogue) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 60, 0, 10) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 60, 0, 10) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcPos, NPC_Goombario, 11, 0, 63) + EVT_CALL(SetNpcPos, NPC_Goombaria, 84, 0, 69) + EVT_CALL(SetNpcPos, NPC_Parakarry, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcFlagBits, NPC_Goombario, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Parakarry, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goombario, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Parakarry, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerPos, NPC_DISPOSE_LOCATION) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Eldstar_Epilogue))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Goombario_Epilogue) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Goombaria_Epilogue) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Parakarry_Epilogue) = { + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Epilogue)[] = { + { + .id = NPC_Eldstar_01, + .settings = &N(NpcSettings_StarSpirit), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_200000, + .init = &N(EVS_NpcInit_Eldstar_Epilogue), + .drops = ELDSTAR_DROPS, + .animations = ELDSTAR_ANIMS, + .extraAnimations = N(ExtraAnims_Eldstar), + }, + { + .id = NPC_Parakarry, + .settings = &N(NpcSettings_GoombaFamily), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000, + .init = &N(EVS_NpcInit_Parakarry_Epilogue), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_WorldParakarry_Idle, + .walk = ANIM_WorldParakarry_Walk, + .run = ANIM_WorldParakarry_Run, + .chase = ANIM_WorldParakarry_Run, + .anim_4 = ANIM_WorldParakarry_Idle, + .anim_5 = ANIM_WorldParakarry_Idle, + .death = ANIM_WorldParakarry_Still, + .hit = ANIM_WorldParakarry_Still, + .anim_8 = ANIM_WorldParakarry_Idle, + .anim_9 = ANIM_WorldParakarry_Idle, + .anim_A = ANIM_WorldParakarry_Idle, + .anim_B = ANIM_WorldParakarry_Idle, + .anim_C = ANIM_WorldParakarry_Idle, + .anim_D = ANIM_WorldParakarry_Idle, + .anim_E = ANIM_WorldParakarry_Idle, + .anim_F = ANIM_WorldParakarry_Idle, + }, + }, + { + .id = NPC_Goombario, + .settings = &N(NpcSettings_GoombaFamily), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_200000, + .init = &N(EVS_NpcInit_Goombario_Epilogue), + .drops = GOOMBARIO_DROPS, + .animations = GOOMBARIO_ANIMS, + }, + { + .id = NPC_Goombaria, + .settings = &N(NpcSettings_GoombaFamily), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_200000, + .init = &N(EVS_NpcInit_Goombaria_Epilogue), + .drops = GOOMBARIA_DROPS, + .animations = GOOMBARIA_ANIMS, + }, +}; + +NpcGroupList N(PrologueNPCs) = { + NPC_GROUP(N(NpcData_Eldstar_Prologue)), + NPC_GROUP(N(NpcData_GoombaFamily)), + NPC_GROUP(N(NpcData_Toad)), + NPC_GROUP(N(NpcData_Kammy)), + NPC_GROUP(N(NpcData_Goomama)), + {} +}; + +NpcGroupList N(NpcGroup1) = { + NPC_GROUP(N(NpcData_GoombaFamily)), + NPC_GROUP(N(NpcData_Toad)), + NPC_GROUP(N(NpcData_Goomama)), + {} +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_GoombaFamily)), + NPC_GROUP(N(NpcData_Toad)), + NPC_GROUP(N(NpcData_ChuckQuizmo)), + NPC_GROUP(N(NpcData_Goomama)), + {} +}; + +NpcGroupList N(EpilogueNPCs) = { + NPC_GROUP(N(NpcData_Epilogue)), + {} +}; diff --git a/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c b/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c new file mode 100644 index 0000000000..3f3ad2da3f --- /dev/null +++ b/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c @@ -0,0 +1,312 @@ +#include "kmr_02.h" + +#define NAME_SUFFIX _Rooms1 +#include "world/common/npc/GoombaFamily_Wander.inc.c" +#define NAME_SUFFIX + +EvtScript N(EVS_OpenDoor_House) = { + EVT_CALL(RotateModel, MODEL_syoumen_enter, LVar0, 0, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_DropDoor_House) = { + EVT_CALL(RotateModel, MODEL_syoumen_enter, LVar0, EVT_FLOAT(54.56), 0, EVT_FLOAT(31.5)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_House) = { + EVT_CALL(RotateModel, MODEL_door_ki, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o122, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o123, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o121, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o137, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o140, LVar0, -1, 0, 0) + EVT_IF_EQ(LVar0, 90) + EVT_CALL(EnableModel, MODEL_door_ki, FALSE) + EVT_CALL(EnableModel, MODEL_o122, FALSE) + EVT_CALL(EnableModel, MODEL_o123, FALSE) + EVT_CALL(EnableModel, MODEL_o121, FALSE) + EVT_CALL(EnableModel, MODEL_o137, FALSE) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_door_ki, TRUE) + EVT_CALL(EnableModel, MODEL_o122, TRUE) + EVT_CALL(EnableModel, MODEL_o123, TRUE) + EVT_CALL(EnableModel, MODEL_o121, TRUE) + EVT_CALL(EnableModel, MODEL_o137, TRUE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_Goombario_NoAI) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_Goombario) = { + EVT_EXEC_WAIT(N(EVS_NpcAI_GoombaFamily_Wander_Rooms1)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_House) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(SetGroupEnabled, MODEL_of, 1) + EVT_CASE_EQ(1) + EVT_CASE_EQ(2) + EVT_IF_EQ(GB_StoryProgress, STORY_CH0_MET_GOOMPA) + EVT_IF_EQ(GF_KMR02_Met_Goompapa, TRUE) + EVT_IF_EQ(GF_KMR02_Goombario_RelayedMessage, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(BindNpcAI, NPC_Goombario, EVT_PTR(N(EVS_NpcAI_Goombario_NoAI))) + EVT_CALL(SetNpcPos, NPC_Goombario, -54, 0, -55) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_CASE_EQ(3) + EVT_CALL(SetGroupEnabled, MODEL_of, 0) + EVT_IF_EQ(GB_StoryProgress, STORY_CH0_MET_GOOMPA) + EVT_IF_EQ(GF_KMR02_Met_Goompapa, TRUE) + EVT_IF_EQ(GF_KMR02_Goombario_RelayedMessage, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Walk) + EVT_CALL(NpcMoveTo, NPC_Goombario, 8, -94, 20) + EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0050) + EVT_CALL(BindNpcAI, NPC_Goombario, EVT_PTR(N(EVS_NpcAI_Goombario))) + EVT_SET(GF_KMR02_Goombario_RelayedMessage, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenDoor_Verdana) = { + EVT_CALL(RotateModel, MODEL_ura_exit, LVar0, 0, -1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_Verdana) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_Verdana) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CASE_EQ(1) + EVT_WAIT(30) + EVT_CALL(SetGroupEnabled, MODEL_monohoshi, 0) + EVT_CASE_EQ(2) + EVT_IF_GT(GB_StoryProgress, STORY_CH0_GATE_CRUSHED) + EVT_IF_LT(GB_StoryProgress, STORY_CH0_TWINK_GAVE_LUCKY_STAR) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Inspect_DangerSealed, 160, 40) + EVT_SET(LVar0, -1) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(SetGroupEnabled, MODEL_monohoshi, 1) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 499, 0, -378) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 499, 70, -378) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 370) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) + EVT_CASE_LT(STORY_CH0_FELL_OFF_CLIFF) + EVT_CALL(SetGroupEnabled, MODEL_monohoshi, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CASE_LT(STORY_CH0_TWINK_GAVE_LUCKY_STAR) + EVT_CALL(SetGroupEnabled, MODEL_monohoshi, 0) + EVT_CASE_GE(STORY_CH0_TWINK_GAVE_LUCKY_STAR) + EVT_CALL(EnableModel, MODEL_o437, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o625, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_SWITCH + EVT_CASE_EQ(3) + EVT_IF_GE(GB_StoryProgress, STORY_CH0_GATE_CRUSHED) + EVT_IF_LT(GB_StoryProgress, STORY_CH0_TWINK_GAVE_LUCKY_STAR) + EVT_WAIT(12) + EVT_IF_EQ(GB_StoryProgress, STORY_CH0_GATE_CRUSHED) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_LOOP(3) + EVT_CALL(SetGroupEnabled, MODEL_monohoshi, 1) + EVT_WAIT(10) + EVT_CALL(SetGroupEnabled, MODEL_monohoshi, 0) + EVT_WAIT(10) + EVT_END_LOOP + EVT_CALL(FadeOutMusic, 0, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80016) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(InterpPlayerYaw, 233, 1) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 53, 1) + EVT_WAIT(15) + EVT_CALL(InterpPlayerYaw, 233, 1) + EVT_WAIT(3) + EVT_CALL(InterpPlayerYaw, 53, 1) + EVT_WAIT(3) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80017) + EVT_WAIT(30) + EVT_SET(GB_StoryProgress, STORY_CH0_FELL_OFF_CLIFF) + EVT_END_IF + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80018) + EVT_WAIT(5) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_SUB(LVar1, 150) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtPlayer, SOUND_161, 0) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80019) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_THREAD + EVT_LOOP(0) + EVT_SUB(LVar1, 16) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_IF_GT(GB_StoryProgress, STORY_CH0_GATE_CRUSHED) + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_THREAD + EVT_LOOP(0) + EVT_SUB(LVar1, 16) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_END_IF + EVT_WAIT(20) + EVT_CALL(GotoMap, EVT_PTR("kmr_03"), kmr_03_ENTRY_2) + EVT_WAIT(100) + EVT_END_IF + EVT_END_IF + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +MAP_RODATA_PAD(1,unk); + +s32 N(InsideNPCs_House)[] = { + NPC_Gooma, + NPC_Goompa, + -1 +}; + +EvtScript N(EVS_SetupRooms) = { + // goomba family home, main room + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_5), + EVT_PTR(N(EVS_OpenDoor_House)), + EVT_PTR(N(EVS_MoveWalls_House)), + EVT_PTR(N(EVS_DropDoor_House)), + EVT_PTR(N(EVS_ToggleVis_House)), + COLLIDER_deilit5, + COLLIDER_deilit6, + MODEL_kuribou_house, + EVT_PTR(N(InsideNPCs_House))) + // verdana + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_7), + EVT_PTR(N(EVS_OpenDoor_Verdana)), + EVT_PTR(N(EVS_MoveWalls_Verdana)), + NULL, + EVT_PTR(N(EVS_ToggleVis_Verdana)), + COLLIDER_deilit4, + COLLIDER_deilit4_1, + MODEL_kuribou_house, + EVT_PTR(N(InsideNPCs_House))) + EVT_SET(LVar0, 3) + EVT_EXEC(N(EVS_ToggleVis_House)) + EVT_CALL(SetGroupEnabled, MODEL_monohoshi, 0) + EVT_RETURN + EVT_END +}; + +extern EvtScript N(EVS_ToadHouse_SetDialogue); +extern EvtScript N(EVS_ToadHouse_GetInBed); +extern EvtScript N(EVS_ToadHouse_ReturnFromRest); + +#include "world/common/complete/ToadHouseBlanketAnim.inc.c" +#include "world/common/atomic/ToadHouse.inc.c" +#include "world/common/atomic/ToadHouse.data.inc.c" + +EvtScript N(EVS_ToadHouse_SetDialogue) = { + EVT_IF_EQ(GF_KMR02_ToadHouse_Intro, FALSE) + EVT_SET(LVar0, MSG_CH0_0013) + EVT_SET(LVar8, MSG_CH0_0013) + EVT_SET(GF_KMR02_ToadHouse_Intro, TRUE) + EVT_ELSE + EVT_SET(LVar0, MSG_CH0_0014) + EVT_SET(LVar8, MSG_CH0_0015) + EVT_END_IF + EVT_SET(LVar1, MSG_CH0_0016) + EVT_SET(LVar2, MSG_CH0_0017) + EVT_SET(LVar3, MSG_CH0_0018) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadHouse_GetInBed) = { + EVT_EXEC(N(EVS_PlayRestingSong)) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(N(ToadHouse_CamSetFOV), 0, 40) + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 34, -8) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 220) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-46.0), EVT_FLOAT(-311.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(-262.4), EVT_FLOAT(-324.6)) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 1, 10) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -212, -376, 0) + EVT_CALL(InterpPlayerYaw, 191, 1) + EVT_CALL(SetPlayerPos, -212, 21, -376) + EVT_WAIT(5) + EVT_CALL(InterpPlayerYaw, 114, 1) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(func_802D286C, 0x00000800) + EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 7, 1, 1, 0) + EVT_WAIT(61) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_THREAD + EVT_WAIT(70) + EVT_CALL(N(ToadHouse_CamSetFOV), 0, 25) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadHouse_ReturnFromRest) = { + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(HidePlayerShadow, FALSE) + EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(SetPlayerPos, -183, 19, -341) + EVT_CALL(PlayerMoveTo, -132, -325, 20) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ToadHouse) = { + EVT_EXEC_WAIT(N(EVS_NpcInteract_ToadHouseKeeper)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_02/kmr_02_5_entity.c b/src/world/area_kmr/kmr_02/kmr_02_5_entity.c new file mode 100644 index 0000000000..04d4c927f6 --- /dev/null +++ b/src/world/area_kmr/kmr_02/kmr_02_5_entity.c @@ -0,0 +1,147 @@ +#include "kmr_02.h" +#include "entity.h" +#include "effects.h" + +API_CALLABLE(N(PlayerHasBadgeEquipped)) { + PlayerData* playerData = &gPlayerData; + s32 hasBadgeEquipped = FALSE; + s32 i; + + for (i = 0; i < ARRAY_COUNT(playerData->equippedBadges); i++) { + if (playerData->equippedBadges[i] != 0) { + hasBadgeEquipped = TRUE; + break; + } + } + + script->varTable[0] = hasBadgeEquipped; + return ApiStatus_DONE2; +} + +#include "world/common/todo/SetEntityPositionF.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" + +EvtScript N(EVS_GotoMap_tik_01_2) = { + EVT_CALL(GotoMap, EVT_PTR("tik_01"), tik_01_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +API_CALLABLE(N(AnimateBlockScale)) { + Entity* entity = get_entity_by_index(script->varTable[10]); + + if (isInitialCall) { + script->functionTemp[0] = 0; + script->functionTemp[1] = 60; + } + + entity->scale.x = (60 - script->functionTemp[1]) / 60.0f; + entity->scale.y = (60 - script->functionTemp[1]) / 60.0f; + entity->scale.z = (60 - script->functionTemp[1]) / 60.0f; + entity->rotation.y = (1.0f - cos_rad(entity->scale.y * PI)) * 990.0 * 0.5f; + script->functionTemp[1]--; + + if (script->functionTemp[1] == -1) { + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_OnSmash_GateBlock) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0066) + EVT_WAIT(10) + EVT_CALL(N(PlayerHasBadgeEquipped)) + EVT_IF_EQ(LVar0, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0067) + EVT_WAIT(10) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt2, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GB_StoryProgress, STORY_CH0_SMASHED_GATE_BLOCK) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SummonGateBlock) = { + EVT_CALL(PlaySoundAt, SOUND_207A, 0, 373, 88, 255) + EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 0, 373, 88, 255, 1, 100) + EVT_WAIT(20) + EVT_CALL(PlaySoundAt, SOUND_207B, 0, 326, 150, 261) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, 326, 150, 261, 1, 60) + EVT_WAIT(20) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, 326, 150, 261, 1, 60) + EVT_WAIT(10) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, 326, 150, 261, 1, 60) + EVT_WAIT(5) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, 326, 150, 261, 1, 60) + EVT_WAIT(3) + EVT_PLAY_EFFECT(EFFECT_GATHER_ENERGY_PINK, 1, 326, 150, 261, 1, 60) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer1Block), 326, 120, 261, 148, MAKE_ENTITY_END) + EVT_SET(LVarA, LVar0) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnSmash_GateBlock))) + EVT_CALL(N(AnimateBlockScale)) + EVT_SET(LVar9, LVarA) + EVT_CALL(N(GetEntityPosition), LVar9, LVar2, LVar3, LVar4) + EVT_CALL(MakeLerp, LVar3, 300, 20, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetEntityPositionF), LVar9, LVar2, LVar0, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_207C, 0, LVar2, LVar0, LVar4) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0F) + EVT_THREAD + EVT_WAIT(15) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, LVar2, 0, LVar4, 0) + EVT_END_THREAD + EVT_CALL(PlaySoundAt, SOUND_207D, 0, LVar2, LVar0, LVar4) + EVT_CALL(MakeLerp, 300, 0, 20, EASING_CUBIC_IN) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetEntityPositionF), LVar9, LVar2, LVar0, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(EnableGroup, MODEL_2, TRUE) + EVT_CALL(EnableGroup, MODEL_1, FALSE) + EVT_CALL(PlaySoundAt, SOUND_DD, 0, LVar2, LVar0, LVar4) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH0_GATE_CRUSHED) + EVT_CASE_LT(STORY_CH0_SMASHED_GATE_BLOCK) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer1Block_WideX), 326, 0, 261, 270, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnSmash_GateBlock))) + EVT_CASE_LT(STORY_CH0_TWINK_GAVE_LUCKY_STAR) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt2, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_SWITCH + EVT_IF_EQ(GF_KMR02_WarpPipe, FALSE) + EVT_IF_EQ(GF_TIK01_WarpPipes, TRUE) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, kmr_02_ENTRY_3) + EVT_SET(GF_KMR02_WarpPipe, TRUE) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueWarpPipe), 0, 0, 355, 0, kmr_02_ENTRY_3, EVT_PTR(N(EVS_GotoMap_tik_01_2)), EVT_INDEX_OF_GAME_FLAG(GF_KMR02_WarpPipe), MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 250, 60, 75, -15, MAKE_ENTITY_END) + EVT_IF_GE(GB_StoryProgress, STORY_CH0_TWINK_GAVE_LUCKY_STAR) + EVT_CALL(MakeItemEntity, ITEM_SHOOTING_STAR, 510, 0, -340, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KMR02_Item_ShootingStar) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_02/kmr_02_6_rooms_2.c b/src/world/area_kmr/kmr_02/kmr_02_6_rooms_2.c new file mode 100644 index 0000000000..9066aba673 --- /dev/null +++ b/src/world/area_kmr/kmr_02/kmr_02_6_rooms_2.c @@ -0,0 +1,103 @@ +#include "kmr_02.h" + +EvtScript N(EVS_OpenDoor_ToadHouse) = { + EVT_CALL(RotateModel, MODEL_o275, LVar0, 0, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_ToadHouse) = { + EVT_SET(LVar1, LVar0) + EVT_ADD(LVar1, LVar0) + EVT_CALL(RotateModel, MODEL_k_k_1, LVar1, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_k_k_2, LVar1, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_k_k_3, LVar1, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o272, LVar1, 0, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_ToadHouse) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(SetGroupEnabled, MODEL_kino_in, 1) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o767, COLLIDER_FLAGS_UPPER_MASK) + EVT_CASE_EQ(1) + EVT_CASE_EQ(2) + EVT_THREAD + EVT_WAIT(5) + EVT_END_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(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CASE_EQ(3) + EVT_CALL(SetGroupEnabled, MODEL_kino_in, 0) + EVT_CALL(EnableModel, MODEL_o422, TRUE) + EVT_CALL(EnableModel, MODEL_o424, TRUE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetWallsDown_ToadHouse) = { + EVT_CALL(SetGroupEnabled, MODEL_kino_in, 1) + EVT_CALL(RotateModel, MODEL_k_k_1, 180, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_k_k_2, 180, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_k_k_3, 180, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o272, 180, 0, 1, 0) + EVT_CALL(EnableModel, MODEL_o561, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o767, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadSignSwinging) = { + EVT_LABEL(9) + EVT_CALL(MakeLerp, 10, -10, 30, EASING_COS_IN_OUT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_kanban, LVar0, EVT_FLOAT(35.498), 0, EVT_FLOAT(-9.511)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(MakeLerp, -10, 10, 30, EASING_COS_IN_OUT) + EVT_LABEL(11) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_kanban, LVar0, EVT_FLOAT(35.498), 0, EVT_FLOAT(-9.511)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(11) + EVT_END_IF + EVT_GOTO(9) + EVT_RETURN + EVT_END +}; + +s32 N(InsideNPCs_ToadHouse)[] = { + NPC_Toad, + -1 +}; + +EvtScript N(EVS_SetupToadHouse) = { + EVT_CALL(RotateModel, MODEL_o320, 180, 0, 1, 0) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, kmr_02_ENTRY_5) + EVT_CALL(SetGroupEnabled, MODEL_kino_in, 0) + EVT_END_IF + // toad house + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_0), + EVT_PTR(N(EVS_OpenDoor_ToadHouse)), + EVT_PTR(N(EVS_MoveWalls_ToadHouse)), + NULL, + EVT_PTR(N(EVS_ToggleVis_ToadHouse)), + COLLIDER_deilit7, + COLLIDER_deilit8, + MODEL_kinopi, + EVT_PTR(N(InsideNPCs_ToadHouse))) + EVT_EXEC(N(EVS_ToadSignSwinging)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c new file mode 100644 index 0000000000..fcde6d951e --- /dev/null +++ b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c @@ -0,0 +1,351 @@ +#include "kmr_02.h" + +#include "world/common/todo/CheckPartnerFlags1000.inc.c" + +#define NAME_SUFFIX _6 +#include "world/common/npc/GoombaFamily_Wander.inc.c" +#include "wander_territories.inc.c" +#define NAME_SUFFIX + +#include "world/common/todo/UnkFunc42.inc.c" + +Vec3f N(FlightPath_KammyAppear)[] = { + { 473.0, 150.0, 301.0 }, + { 234.0, 80.0, 200.0 }, + { 46.0, 150.0, 180.0 }, +}; + +Vec3f N(FlightPath_ToGate1)[] = { + { 46.0, 150.0, 180.0 }, + { -93.0, 262.0, 114.0 }, + { 118.0, 121.0, 141.0 }, + { 340.0, 141.0, 406.0 }, + { 550.0, 108.0, 320.0 }, +}; + +Vec3f N(FlightPath_ToGate2)[] = { + { 465.0, 108.0, 320.0 }, + { 433.0, 78.0, 306.0 }, + { 399.0, 56.0, 288.0 }, +}; + +Vec3f N(FlightPath_ToGate3)[] = { + { 399.0, 56.0, 288.0 }, + { 390.0, 53.0, 284.0 }, + { 380.0, 50.0, 282.0 }, +}; + +Vec3f N(FlightPath_KammyDepart)[] = { + { 380.0, 50.0, 282.0 }, + { 290.0, 100.0, 240.0 }, + { 204.0, 142.0, 202.0 }, + { -391.0, 520.0, -212.0 }, +}; + +EvtScript N(EVS_PlayKammyFlightSounds) = { + EVT_LOOP(0) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_295, 0) + EVT_WAIT(4) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeNpcsFaceKammy) = { + EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) + EVT_LABEL(0) + EVT_CALL(GetNpcPos, NPC_Kammy, LVar3, LVar4, LVar5) + EVT_CALL(N(UnkFunc42)) + EVT_CALL(InterpNpcYaw, NPC_Kammy, LVarA, 0) + EVT_SET(LVar0, LVar3) + EVT_SET(LVar1, LVar4) + EVT_SET(LVar2, LVar5) + EVT_CALL(GetAngleBetweenNPCs, NPC_Goombaria, NPC_Kammy, LVarA) + EVT_CALL(InterpNpcYaw, NPC_Goombaria, LVarA, 0) + EVT_CALL(GetAngleBetweenNPCs, NPC_Goompapa, NPC_Kammy, LVarB) + EVT_CALL(InterpNpcYaw, NPC_Goompapa, LVarB, 0) + EVT_CALL(GetAngleBetweenNPCs, NPC_Goombario, NPC_Kammy, LVarB) + EVT_CALL(InterpNpcYaw, NPC_Goombario, LVarB, 0) + EVT_CALL(GetAngleBetweenNPCs, NPC_Goomama, NPC_Kammy, LVarB) + EVT_CALL(InterpNpcYaw, NPC_Goomama, LVarB, 0) + EVT_CALL(PlayerFaceNpc, NPC_Kammy, FALSE) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_KammyStrikes) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goompapa, NPC_FLAG_100, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(EnableNpcAI, NPC_Goombario, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Goombario, ANIM_WorldGoombario_Idle) + EVT_CALL(EnableNpcAI, NPC_Goomama, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Goomama, ANIM_Goomama_Idle) + EVT_CALL(EnableNpcAI, NPC_Kammy, TRUE) + EVT_CALL(SetNpcAux, NPC_Kammy, EVT_PTR(N(EVS_NpcAux_Kammy))) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH0_0059, 160, 40) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim15) + EVT_THREAD + EVT_EXEC_GET_TID(N(EVS_PlayKammyFlightSounds), MV_Unk_04) + EVT_EXEC_GET_TID(N(EVS_MakeNpcsFaceKammy), MV_Unk_05) + EVT_CALL(LoadPath, 40, EVT_PTR(N(FlightPath_KammyAppear)), ARRAY_COUNT(N(FlightPath_KammyAppear)), EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_Kammy, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000A) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 3, 0) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 166, 756) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 159, 0) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, EVT_FLOAT(109.7)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 1220) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(LoadPath, 120, EVT_PTR(N(FlightPath_ToGate1)), ARRAY_COUNT(N(FlightPath_ToGate1)), EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_Kammy, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_WAIT(10) + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 8, -10) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 41, 729) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 300, 245) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 440) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(PlayerFaceNpc, NPC_Kammy, FALSE) + EVT_CALL(GetAngleBetweenNPCs, NPC_Goompapa, NPC_Kammy, LVar0) + EVT_CALL(InterpNpcYaw, NPC_Goompapa, LVar0, 0) + EVT_CALL(GetAngleBetweenNPCs, NPC_Goombaria, NPC_Kammy, LVar0) + EVT_CALL(InterpNpcYaw, NPC_Goombaria, LVar0, 0) + EVT_CALL(SetPlayerPos, 220, 0, 213) + EVT_CALL(SetNpcPos, NPC_Goompapa, 255, 0, 232) + EVT_CALL(SetNpcPos, NPC_Goombaria, 190, 0, 212) + EVT_CALL(LoadPath, 10, EVT_PTR(N(FlightPath_ToGate2)), ARRAY_COUNT(N(FlightPath_ToGate2)), EASING_LINEAR) + EVT_LABEL(30) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_Kammy, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(30) + EVT_END_IF + EVT_KILL_THREAD(MV_Unk_04) + EVT_KILL_THREAD(MV_Unk_05) + EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_32B, 0) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim10) + EVT_WAIT(1) + EVT_CALL(SetNpcRotation, NPC_Kammy, 0, 0, -5) + EVT_WAIT(1) + EVT_CALL(SetNpcRotation, NPC_Kammy, 0, 0, -10) + EVT_WAIT(1) + EVT_CALL(SetNpcRotation, NPC_Kammy, 0, 0, -15) + EVT_WAIT(1) + EVT_CALL(SetNpcRotation, NPC_Kammy, 0, 0, -10) + EVT_WAIT(1) + EVT_CALL(SetNpcRotation, NPC_Kammy, 0, 0, -15) + EVT_WAIT(1) + EVT_CALL(SetNpcRotation, NPC_Kammy, 0, 0, -10) + EVT_WAIT(1) + EVT_CALL(SetNpcRotation, NPC_Kammy, 0, 0, -15) + EVT_WAIT(1) + EVT_CALL(SetNpcRotation, NPC_Kammy, 0, 0, -10) + EVT_WAIT(1) + EVT_CALL(SetNpcRotation, NPC_Kammy, 0, 0, -15) + EVT_WAIT(3) + EVT_CALL(SetNpcRotation, NPC_Kammy, 0, 0, 0) + EVT_END_THREAD + EVT_CALL(LoadPath, 10, EVT_PTR(N(FlightPath_ToGate3)), ARRAY_COUNT(N(FlightPath_ToGate3)), EASING_LINEAR) + EVT_LABEL(40) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_Kammy, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(40) + EVT_END_IF + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 512, MSG_CH0_005A) + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 7, -10) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 41, 729) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 220, 213) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 275) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_LookUpTalk, ANIM_Goombaria_LookUp, 5, MSG_CH0_005B) + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(6.0), EVT_FLOAT(-6.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-1731.4), EVT_FLOAT(974.9)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(399.0), EVT_FLOAT(277.1)) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, EVT_FLOAT(60.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 512, MSG_CH0_005C) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_LookUp) + EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_LookUp) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(600.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(398.9), EVT_FLOAT(242.7)) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, EVT_FLOAT(10.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim0E) + EVT_WAIT(10) + EVT_CALL(GetNpcPos, NPC_Kammy, LVar0, LVar1, LVar2) + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_SummonGateBlock)) + EVT_THREAD + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80012) + EVT_CALL(func_802D286C, 256) + EVT_CALL(func_802D2520, ANIM_Mario_80012, 5, 0, 1, 1, 0) + EVT_WAIT(13) + EVT_CALL(func_802D2520, ANIM_Mario_80012, 0, 0, 0, 0, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80013) + EVT_CALL(func_802D286C, 256) + EVT_CALL(func_802D2520, ANIM_Mario_80013, 5, 0, 1, 1, 0) + EVT_WAIT(13) + EVT_CALL(func_802D2520, ANIM_Mario_80013, 0, 0, 0, 0, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.8)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 25) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Shock) + EVT_CALL(func_802CFE2C, NPC_Goombaria, 0x100) + EVT_CALL(func_802CFD30, NPC_Goombaria, FOLD_TYPE_5, 0, 1, 1, 0) + EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(1.5)) + EVT_CALL(GetNpcPos, NPC_Goombaria, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Goombaria, LVar0, LVar1, LVar2, 25) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_LookUp) + EVT_CALL(func_802CFD30, 1, 0, 0, 0, 0, 0) + EVT_END_THREAD + EVT_CALL(func_802CFE2C, NPC_Goompapa, 0x100) + EVT_CALL(func_802CFD30, NPC_Goompapa, FOLD_TYPE_5, 0, 1, 1, 0) + EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_Shock) + EVT_CALL(SetNpcJumpscale, NPC_Goompapa, EVT_FLOAT(1.2)) + EVT_CALL(GetNpcPos, NPC_Goompapa, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Goompapa, LVar0, LVar1, LVar2, 25) + EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_LookUp) + EVT_CALL(func_802CFD30, 3, 0, 0, 0, 0, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim13) + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(6.0), EVT_FLOAT(-6.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-1731.4), EVT_FLOAT(974.9)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(399.0), EVT_FLOAT(277.1)) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, EVT_FLOAT(60.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(275.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(5) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 512, MSG_CH0_005D) + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 3, 0) + EVT_CALL(SetCamPosA, CAM_DEFAULT, 166, 756) + EVT_CALL(SetCamPosB, CAM_DEFAULT, 159, 0) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, EVT_FLOAT(109.7)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 1220) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_LOOP(150) + EVT_CALL(PlayerFaceNpc, NPC_Kammy, FALSE) + EVT_CALL(GetAngleBetweenNPCs, NPC_Goombaria, NPC_Kammy, LVar0) + EVT_CALL(InterpNpcYaw, NPC_Goombaria, LVar0, 0) + EVT_CALL(GetAngleBetweenNPCs, NPC_Goompapa, NPC_Kammy, LVar0) + EVT_CALL(InterpNpcYaw, NPC_Goompapa, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_Kammy, ANIM_WorldKammy_Anim15) + EVT_EXEC_GET_TID(N(EVS_MakeNpcsFaceKammy), MV_Unk_05) + EVT_WAIT(40) + EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim16, ANIM_WorldKammy_Anim13, 0x200, MSG_CH0_005E) + EVT_CALL(FadeOutMusic, 0, 3000) + EVT_EXEC_GET_TID(N(EVS_PlayKammyFlightSounds), MV_Unk_04) + EVT_CALL(LoadPath, 90, EVT_PTR(N(FlightPath_KammyDepart)), ARRAY_COUNT(N(FlightPath_KammyDepart)), EASING_QUADRATIC_IN) + EVT_LABEL(70) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_Kammy, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(70) + EVT_END_IF + EVT_KILL_THREAD(MV_Unk_04) + EVT_KILL_THREAD(MV_Unk_05) + EVT_WAIT(20) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_Angry) + EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Idle) + EVT_CALL(SetNpcPos, NPC_Goombaria, 166, 0, 188) + EVT_CALL(SetPlayerPos, 231, 0, 196) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(GetAngleToPlayer, NPC_Goombaria, LVar0) + EVT_CALL(InterpNpcYaw, NPC_Goombaria, LVar0, 0) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, EVT_FLOAT(-300.0), EVT_FLOAT(12.0), EVT_FLOAT(-8.5)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_AngryTalk, ANIM_Goompapa_Angry, 0, MSG_CH0_005F) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_Idle) + EVT_WAIT(15) + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0060) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0061) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0062) + EVT_WAIT(10) + EVT_CALL(SetNpcSpeed, NPC_Goombario, EVT_FLOAT(2.0)) + EVT_CALL(EnableNpcAI, NPC_Goombario, TRUE) + EVT_CALL(EnableNpcAI, NPC_Goomama, TRUE) + EVT_CALL(GetNpcPos, NPC_Goombaria, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcPos, NPC_Goombaria, LVar0, LVar1, LVar2) + EVT_CALL(EnableNpcShadow, NPC_Goombaria, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_40, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Goompa, NPC_FLAG_ENABLE_HIT_SCRIPT, TRUE) + EVT_CALL(SetNpcPos, NPC_Goompa, NPC_DISPOSE_LOCATION) + EVT_CALL(EnableNpcShadow, NPC_Goompa, FALSE) + EVT_SET(GB_StoryProgress, STORY_CH0_GATE_CRUSHED) + EVT_THREAD + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_END_THREAD + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_Idle) + EVT_CALL(N(SetWanderTerritory_6), NPC_Goomama, 1) + EVT_CALL(BindNpcAI, NPC_Goomama, EVT_PTR(N(EVS_NpcIdle_SwitchedWander_6))) + EVT_CALL(N(SetWanderTerritory_6), NPC_Goombario, 2) + EVT_CALL(BindNpcAI, NPC_Goombario, EVT_PTR(N(EVS_NpcIdle_SwitchedWander_6))) + EVT_CALL(N(SetWanderTerritory_6), NPC_Goombaria, 3) + EVT_CALL(BindNpcAI, NPC_Goombaria, EVT_PTR(N(EVS_NpcIdle_SwitchedWander_6))) + EVT_CALL(SetNpcFlagBits, NPC_Goombaria, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Goompapa, NPC_FLAG_100, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_02/kmr_02_8_foliage.c b/src/world/area_kmr/kmr_02/kmr_02_8_foliage.c new file mode 100644 index 0000000000..a2fbe844cf --- /dev/null +++ b/src/world/area_kmr/kmr_02/kmr_02_8_foliage.c @@ -0,0 +1,110 @@ +#include "kmr_02.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_kusa1); + +FoliageVectorList N(Bush1_Effects) = { + .count = 1, + .vectors = { + { -418.0f, 16.0f, 237.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush1) = { + .bush = &N(Bush1_BushModels), + .vectors = &N(Bush1_Effects), +}; + +FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_kusa2); + +FoliageDropList N(Bush2_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 124, 16, 443 }, + .spawnMode = ITEM_SPAWN_MODE_TOSS, + .pickupFlag = GF_KMR02_Bush2_Coin, + .spawnFlag = MF_SpawnFlag_BushCoin, + }, + } +}; + +FoliageVectorList N(Bush2_Effects) = { + .count = 1, + .vectors = { + { 124.0f, 16.0f, 443.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush2) = { + .bush = &N(Bush2_BushModels), + .drops = &N(Bush2_Drops), + .vectors = &N(Bush2_Effects), +}; + +FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_kusa3); + +FoliageVectorList N(Bush3_Effects) = { + .count = 1, + .vectors = { + { -34.0f, 21.0f, -188.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush3) = { + .bush = &N(Bush3_BushModels), + .vectors = &N(Bush3_Effects), +}; + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_midori); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_kiki); + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_GOOMNUT, + .pos = { 309, 145, 66 }, + .spawnMode = ITEM_SPAWN_MODE_FALL, + .pickupFlag = GF_KMR02_Tree1_Goomnut, + .spawnFlag = MF_SpawnFlag_Goomnut, + }, + } +}; + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { 355.0f, 160.0f, 65.0f }, + { 440.0f, 160.0f, 137.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .drops = &N(Tree1_Drops), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { 387.0f, 0.0f, 92.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o356, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o357, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o414, 1, 0) + EVT_SET(GF_KMR02_Tree1_Goomnut, FALSE) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o570, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_02/kmr_02_9_images.c b/src/world/area_kmr/kmr_02/kmr_02_9_images.c new file mode 100644 index 0000000000..bb03c4fd40 --- /dev/null +++ b/src/world/area_kmr/kmr_02/kmr_02_9_images.c @@ -0,0 +1,7 @@ +#include "kmr_02.h" + +#include "world/area_kmr/kmr_02/heart_block.png.inc.c" +#include "world/area_kmr/kmr_02/heart_block.pal.inc.c" + +#define PARTY_IMAGE "party_kurio" +#include "world/common/todo/LoadPartyImage.inc.c" diff --git a/src/world/area_kmr/kmr_02/wander_territories.inc.c b/src/world/area_kmr/kmr_02/wander_territories.inc.c new file mode 100644 index 0000000000..233e5ff309 --- /dev/null +++ b/src/world/area_kmr/kmr_02/wander_territories.inc.c @@ -0,0 +1,80 @@ +EnemyTerritoryWander N(WanderTerritory0) = { + .centerPos = { 0, 0, 0 }, + .wanderSize = { 150, 0 }, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0, 0 }, + .detectShape = SHAPE_CYLINDER, + .isFlying = TRUE, +}; + +EnemyTerritoryWander N(WanderTerritory1) = { + .centerPos = { 0, 0, 0 }, + .wanderSize = { 150, 0 }, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0, 0 }, + .detectShape = SHAPE_CYLINDER, + .isFlying = TRUE, +}; + +EnemyTerritoryWander N(WanderTerritory2) = { + .centerPos = { 0, 0, 0 }, + .wanderSize = { 150, 0 }, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0, 0 }, + .detectShape = SHAPE_CYLINDER, + .isFlying = TRUE, +}; + +EnemyTerritoryWander N(WanderTerritory3) = { + .centerPos = { 0, 0, 0 }, + .wanderSize = { 150, 0 }, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0, 0 }, + .detectShape = SHAPE_CYLINDER, + .isFlying = TRUE, +}; + +EnemyTerritoryWander* N(WanderTerritories)[] = { + &N(WanderTerritory0), + &N(WanderTerritory1), + &N(WanderTerritory2), + &N(WanderTerritory3), +}; + +API_CALLABLE(N(SetWanderTerritory)) { + Bytecode* args = script->ptrReadPos; + s32 npcID = evt_get_variable(script, *args++); + s32 territoryIndex = evt_get_variable(script, *args++); + s32* wanderData = (s32*) N(WanderTerritories)[territoryIndex]; + Enemy* enemy = get_enemy(npcID); + s32 i; + + for (i = 0; i < (s32) (sizeof(enemy->territory->wander) / sizeof(i)); i++) { + s32* wander = (s32*) &enemy->territory->wander; + + wander[i] = wanderData[i]; + } + return ApiStatus_DONE2; +} + +MobileAISettings N(AISettings_SwitchedWander) = { + .moveSpeed = 2.0f, + .moveTime = 15, + .waitTime = 30, + .playerSearchInterval = -1, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcIdle_SwitchedWander) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_SwitchedWander))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c index 7315f64823..ac9cf93d56 100644 --- a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c +++ b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c @@ -163,7 +163,7 @@ EvtScript N(EVS_NpcInit_Goompa) = { EVT_END }; -StaticNpc N(NpcData_Goompa) = { +StaticNpc N(NpcData_GoombaFamily) = { .id = NPC_Goompa, .settings = &N(NpcSettings_Goompa), .pos = { -50.0f, 0.0f, 80.0f }, @@ -197,6 +197,6 @@ StaticNpc N(NpcData_Goompa) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_Goompa), BTL_KMR_PART_1_FORMATION_02), + NPC_GROUP(N(NpcData_GoombaFamily), BTL_KMR_PART_1_FORMATION_02), {} }; diff --git a/src/world/area_kmr/kmr_03/kmr_03_5_foliage.c b/src/world/area_kmr/kmr_03/kmr_03_5_foliage.c index 83fa62ee41..ff011f77b8 100644 --- a/src/world/area_kmr/kmr_03/kmr_03_5_foliage.c +++ b/src/world/area_kmr/kmr_03/kmr_03_5_foliage.c @@ -76,10 +76,10 @@ BombTrigger N(BombPos_Tree1) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_km, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_km, 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_ki, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_ki, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c index 55b3dcd526..85afbbc263 100644 --- a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c +++ b/src/world/area_kmr/kmr_04/kmr_04_3_npc.c @@ -290,7 +290,7 @@ StaticNpc N(NpcData_JrTroopa) = { }, }; -StaticNpc N(NpcData_Goompa) = { +StaticNpc N(NpcData_GoombaFamily) = { .id = NPC_Goompa, .settings = &N(NpcSettings_Goompa), .pos = { -58.0f, 0.0f, 130.0f }, @@ -302,6 +302,6 @@ StaticNpc N(NpcData_Goompa) = { NpcGroupList N(DefaultNPCs) = { NPC_GROUP(N(NpcData_JrTroopa), BTL_KMR_PART_3_FORMATION_02), - NPC_GROUP(N(NpcData_Goompa)), + NPC_GROUP(N(NpcData_GoombaFamily)), {} }; diff --git a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c index 73e2f2828e..6338a135b8 100644 --- a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c +++ b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c @@ -526,37 +526,37 @@ BombTrigger N(BombPos_Tree3) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o402, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o402, 1, 0) EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o415, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o415, 1, 0) EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o409, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o409, 1, 0) EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush4))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o412, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o412, 1, 0) EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush5))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o399, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o399, 1, 0) EVT_IF_GE(GB_StoryProgress, STORY_CH0_FOUND_HAMMER) EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush6))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o410, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o410, 1, 0) EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush6))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o410_1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o410_1, 1, 0) EVT_ELSE EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush7))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o410, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o410, 1, 0) EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush8))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o410_1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o410_1, 1, 0) EVT_END_IF EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush9))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o413, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o413, 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o407, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o407, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o271, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o271, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o341, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o341, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_05/kmr_05_5_foliage.c b/src/world/area_kmr/kmr_05/kmr_05_5_foliage.c index 9c4afc7024..192145060f 100644 --- a/src/world/area_kmr/kmr_05/kmr_05_5_foliage.c +++ b/src/world/area_kmr/kmr_05/kmr_05_5_foliage.c @@ -81,8 +81,8 @@ BombTrigger N(BombPos_Tree1) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o1238, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o1238, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_10/kmr_10_5_foliage.c b/src/world/area_kmr/kmr_10/kmr_10_5_foliage.c index 5f8b231425..764b2029da 100644 --- a/src/world/area_kmr/kmr_10/kmr_10_5_foliage.c +++ b/src/world/area_kmr/kmr_10/kmr_10_5_foliage.c @@ -61,10 +61,10 @@ BombTrigger N(BombPos_Tree1) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_k1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_k1, 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_ki_a, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_ki_a, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_11/kmr_11_2_main.c b/src/world/area_kmr/kmr_11/kmr_11_2_main.c index 15b6a7d975..e5b23b6388 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_2_main.c +++ b/src/world/area_kmr/kmr_11/kmr_11_2_main.c @@ -138,7 +138,7 @@ EvtScript N(EVS_Main) = { EVT_WAIT(1) EVT_END_IF EVT_SET(LVar0, EVT_PTR(N(SearchBush_SwitchBush))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush_Scripted)), TRIGGER_WALL_PRESS_A, COLLIDER_kusa4, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Scripted)), TRIGGER_WALL_PRESS_A, COLLIDER_kusa4, 1, 0) EVT_CALL(SetGroupEnabled, MODEL_event_cam, 0) EVT_CALL(TranslateGroup, MODEL_g172, NPC_DISPOSE_LOCATION) EVT_CALL(TranslateGroup, MODEL_g173, NPC_DISPOSE_LOCATION) diff --git a/src/world/area_kmr/kmr_11/kmr_11_7_foliage.c b/src/world/area_kmr/kmr_11/kmr_11_7_foliage.c index 23a5e5cf7e..bb4c5821cd 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_7_foliage.c +++ b/src/world/area_kmr/kmr_11/kmr_11_7_foliage.c @@ -117,17 +117,17 @@ BombTrigger N(BombPos_Tree2) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_kusa1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_kusa1, 1, 0) EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_kusa2, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_kusa2, 1, 0) EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush4))) - EVT_BIND_TRIGGER(EVT_PTR(N(searchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o419, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o419, 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_tree1, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_tree1, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_tree2, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_tree2, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_20/8EBE20.c b/src/world/area_kmr/kmr_20/8EBE20.c deleted file mode 100644 index 812c49f927..0000000000 --- a/src/world/area_kmr/kmr_20/8EBE20.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "kmr_20.h" - -static char* N(exit_str_0) = "mac_00"; -static char* N(exit_str_1) = "osr_00"; -static char* N(exit_str_2) = "mac_00\0"; -static char* N(exit_str_3) = "kmr_02"; -static char* N(exit_str_4) = "mac_00\0\0"; -static char* N(exit_str_5) = ""; - -ApiStatus func_80240000_8EBE20(Evt* script, s32 isInitialCall) { - snd_ambient_slow_fade_out(0, 500); - return ApiStatus_DONE2; -} diff --git a/src/world/area_kmr/kmr_20/8EBE50.c b/src/world/area_kmr/kmr_20/8EBE50.c deleted file mode 100644 index 6d67580b47..0000000000 --- a/src/world/area_kmr/kmr_20/8EBE50.c +++ /dev/null @@ -1,292 +0,0 @@ -#include "kmr_20.h" -#include "hud_element.h" -#include "ld_addrs.h" - -extern HudScript HES_Item_Unused_08B; -extern HudScript HES_Item_Unused_08B_disabled; -extern HudScript HES_Item_Unused_08C; -extern HudScript HES_Item_Unused_08C_disabled; - -extern s32 D_80244D24_8F0B44[12]; // TODO remove hard-coded count when migrated -extern s32 D_80244D54_8F0B74[12]; -extern s32 D_80244D84_8F0BA4[]; -extern s32 D_80244DB4_8F0BD4[]; -extern s32 D_80244FA0_8F0DC0[12]; // TODO remove hard-coded count when migrated -extern s32 D_80244FD0_8F0DF0[]; - -BSS PopupMenu D_80253060; -BSS u8 D_80253390[0x3D86]; -BSS u16 D_80257118[0x100]; -BSS char D_80257318[0x8]; // padding -BSS u8 D_80257320[0x3D86]; -BSS u16 D_8025B0A8[0x100]; -BSS s32 D_8025B2A8; // worker ID -BSS s32 D_8025B2AC; // opacity -BSS MessageImageData D_8025B2B0[2]; - -#include "world/common/entity/Pipe.inc.c" - -ApiStatus func_80240310_8EC130(Evt* script, s32 isInitialCall) { - set_map_transition_effect(4); - return ApiStatus_DONE2; -} - -ApiStatus func_80240330_8EC150(Evt* script, s32 isInitialCall) { - au_ambience_set_volume(0, 1000, 63); - return ApiStatus_DONE2; -} - -ApiStatus func_80240358_8EC178(Evt* script, s32 isInitialCall) { - au_ambience_set_volume(0, 1000, 127); - return ApiStatus_DONE2; -} - -#include "common/foliage.inc.c" - -void func_802405BC_8EC3DC(void) { - D_8025B2AC += 20; - if (D_8025B2AC > 255) { - D_8025B2AC = 255; - } - - draw_ci_image_with_clipping(D_8025B2B0[0].raster, D_8025B2B0[0].width, D_8025B2B0[0].height, D_8025B2B0[0].format, - D_8025B2B0[0].bitDepth, D_8025B2B0[0].palette, 85, 97, 0, 0, - SCREEN_WIDTH, SCREEN_HEIGHT, D_8025B2AC); - draw_ci_image_with_clipping(D_8025B2B0[1].raster, D_8025B2B0[1].width, D_8025B2B0[1].height, D_8025B2B0[1].format, - D_8025B2B0[1].bitDepth, D_8025B2B0[1].palette, 160, 102, 0, 0, - SCREEN_WIDTH, SCREEN_HEIGHT, D_8025B2AC); -} - -ApiStatus func_802406BC_8EC4DC(Evt* script, s32 isInitialCall) { - script->functionTemp[3] = 0; - return ApiStatus_DONE2; -} - -ApiStatus func_802406C8_8EC4E8(Evt* script, s32 isInitialCall) { - PopupMenu* menu = &D_80253060; - s32 temp; - s32 userIndex; - s32 temp_s0; - s32 temp_s1; - s32 cond; - s32 numEntries; - s32 gb; - s32 i; - - if (isInitialCall) { - script->functionTemp[0] = 0; - } - - switch (script->functionTemp[0]) { - case 0: - numEntries = 0; - - for (i = 0; i < ARRAY_COUNT(D_80244D24_8F0B44); i++) { - cond = FALSE; - temp_s0 = D_80244D24_8F0B44[i]; - switch (temp_s0) { - case -1: - if (gPlayerData.quizzesCorrect != 0) { - cond = TRUE; - } - break; - case -2: - if (evt_get_variable(NULL, GameFlag(282)) != 0) { - cond = TRUE; - } - break; - case -3: - temp = FALSE; - if (evt_get_variable(NULL, GameByte(0)) >= 6) { - temp = (evt_get_variable(NULL, GameFlag(368)) != 0); - } - if (temp) { - cond = TRUE; - } - break; - default: - if (evt_get_variable(NULL, GameByte(0)) >= temp_s0) { - cond = TRUE; - } - break; - } - - if (cond) { - menu->ptrIcon[numEntries] = &HES_Item_Unused_08B; - menu->userIndex[numEntries] = i; - menu->enabled[numEntries] = TRUE; - menu->nameMsg[numEntries] = D_80244D54_8F0B74[i]; - menu->descMsg[numEntries] = 0; - temp = get_global_byte((i / 8) + 14) & (1 << (i % 8)); - gb = temp; - menu->value[numEntries] = 0; - if (gb) { - menu->value[numEntries] = 1; - menu->ptrIcon[numEntries] = &HES_Item_Unused_08B_disabled; - } - numEntries++; - } - } - - if (numEntries == 0) { - script->varTable[0] = 0; - return ApiStatus_DONE2; - } - menu->popupType = POPUP_MENU_READ_POSTCARD; - menu->numEntries = numEntries; - menu->initialPos = script->functionTemp[3]; - create_popup_menu(menu); - status_menu_respond_to_changes(); - close_status_menu(); - script->functionTemp[1] = 0; - script->functionTemp[0] = 1; - break; - case 1: - if (script->functionTemp[1] == 0) { - script->functionTemp[2] = menu->result; - if (script->functionTemp[2] != 0) { - hide_popup_menu(); - } else { - break; - } - } - - script->functionTemp[1]++; - if (script->functionTemp[1] >= 15) { - destroy_popup_menu(); - if (script->functionTemp[2] == 0xFF) { - script->varTable[0] = -1; - return ApiStatus_DONE2; - } - script->functionTemp[3] = script->functionTemp[2] - 1; - userIndex = menu->userIndex[script->functionTemp[2] - 1]; - script->varTable[0] = D_80244D84_8F0BA4[userIndex]; - temp_s1 = (userIndex / 8) + 14; - set_global_byte(temp_s1, get_global_byte(temp_s1) | (1 << (userIndex % 8))); - if (userIndex == 3) { - evt_set_variable(NULL, GameFlag(103), 1); - } - - dma_copy(charset_ROM_START + D_80244DB4_8F0BD4[0], - charset_ROM_START + D_80244DB4_8F0BD4[0] + sizeof(D_80253390), - D_80253390); - dma_copy(charset_ROM_START + D_80244DB4_8F0BD4[1], - charset_ROM_START + D_80244DB4_8F0BD4[1] + sizeof(D_80257118), - D_80257118); - D_8025B2B0[0].width = 150; - D_8025B2B0[0].palette = D_80257118; - D_8025B2B0[0].height = 105; - D_8025B2B0[0].raster = D_80253390; - D_8025B2B0[0].format = G_IM_FMT_CI; - D_8025B2B0[0].bitDepth = 0; - - dma_copy(charset_ROM_START + D_80244DB4_8F0BD4[(userIndex * 2) + 2], - charset_ROM_START + D_80244DB4_8F0BD4[(userIndex * 2) + 2] + sizeof(D_80257320), - D_80257320); - dma_copy(charset_ROM_START + D_80244DB4_8F0BD4[(userIndex * 2) + 3], - charset_ROM_START + D_80244DB4_8F0BD4[(userIndex * 2) + 3] + sizeof(D_8025B0A8), - D_8025B0A8); - D_8025B2B0[1].width = 70; - D_8025B2B0[1].raster = D_80257320; - D_8025B2B0[1].palette = D_8025B0A8; - D_8025B2B0[1].height = 95; - D_8025B2B0[1].format = G_IM_FMT_CI; - D_8025B2B0[1].bitDepth = 1; - - D_8025B2A8 = create_worker_frontUI(NULL, func_802405BC_8EC3DC); - D_8025B2AC = 0; - return ApiStatus_DONE2; - } - break; - } - return ApiStatus_BLOCK; -} - -ApiStatus func_80240B20_8EC940(Evt* script, s32 isInitialCall) { - free_worker(D_8025B2A8); - return ApiStatus_DONE2; -} - -ApiStatus func_80240B48_8EC968(Evt* script, s32 isInitialCall) { - script->functionTemp[3] = 0; - return ApiStatus_DONE2; -} - -ApiStatus func_80240B54_8EC974(Evt* script, s32 isInitialCall) { - PopupMenu* menu = &D_80253060; - s32 userIndex; - s32 numEntries; - s32 gb; - s32 a1; - s32 i; - - if (isInitialCall) { - script->functionTemp[0] = 0; - } - - switch (script->functionTemp[0]) { - case 0: - numEntries = 0; - for (i = 0; i < ARRAY_COUNT(D_80244FA0_8F0DC0); i++) { - if (evt_get_variable(NULL, GameByte(0)) >= D_80244FA0_8F0DC0[i]) { - menu->ptrIcon[numEntries] = &HES_Item_Unused_08C; - menu->userIndex[numEntries] = i; - menu->enabled[numEntries] = TRUE; - menu->nameMsg[numEntries] = 0; - menu->descMsg[numEntries] = 0; - gb = get_global_byte((i / 8) + 12); - menu->value[numEntries] = 0; - a1 = gb & (1 << (i % 8)); - if (a1) { - menu->value[numEntries] = 1; - menu->ptrIcon[numEntries] = &HES_Item_Unused_08C_disabled; - } - numEntries++; - } - } - - if (numEntries == 0) { - script->varTable[0] = 0; - return ApiStatus_DONE2; - } - menu->popupType = POPUP_MENU_READ_DIARY_PAGE; - menu->numEntries = numEntries; - menu->initialPos = script->functionTemp[3]; - create_popup_menu(menu); - status_menu_respond_to_changes(); - close_status_menu(); - script->functionTemp[1] = 0; - script->functionTemp[0] = 1; - break; - case 1: - if (script->functionTemp[1] == 0) { - script->functionTemp[2] = menu->result; - if (script->functionTemp[2] != 0) { - hide_popup_menu(); - } else { - break; - } - } - script->functionTemp[1]++; - if (script->functionTemp[1] >= 15) { - destroy_popup_menu(); - if (script->functionTemp[2] == 0xFF) { - script->varTable[0] = -1; - return ApiStatus_DONE2; - } - script->functionTemp[3] = script->functionTemp[2] - 1; - userIndex = menu->userIndex[script->functionTemp[2] - 1]; - script->varTable[0] = D_80244FD0_8F0DF0[userIndex]; - a1 = get_global_byte((userIndex / 8) + 12) | (1 << (userIndex % 8)); - set_global_byte((userIndex / 8) + 12, a1); - return ApiStatus_DONE2; - } - break; - } - return ApiStatus_BLOCK; -} - -ApiStatus func_80240DA4_8ECBC4(Evt* script, s32 isInitialCall) { - au_ambience_set_volume(0, 1000, 1); - return ApiStatus_DONE2; -} diff --git a/src/world/area_kmr/kmr_20/8ECBF0.c b/src/world/area_kmr/kmr_20/8ECBF0.c deleted file mode 100644 index 0d2d9b5262..0000000000 --- a/src/world/area_kmr/kmr_20/8ECBF0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "kmr_20.h" - -ApiStatus func_80240DD0_8ECBF0(Evt* script, s32 isInitialCall) { - au_ambience_set_volume(0, 1000, 0x3F); - return ApiStatus_DONE2; -} - -#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_kmr/kmr_20/8ECC40.c b/src/world/area_kmr/kmr_20/8ECC40.c deleted file mode 100644 index b4da5b8f27..0000000000 --- a/src/world/area_kmr/kmr_20/8ECC40.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "kmr_20.h" - -#define NAMESPACE dup_kmr_20 -#include "common/foliage.inc.c" -#define NAMESPACE kmr_20 - diff --git a/src/world/area_kmr/kmr_20/8ECE80.c b/src/world/area_kmr/kmr_20/8ECE80.c deleted file mode 100644 index 9c95b979d7..0000000000 --- a/src/world/area_kmr/kmr_20/8ECE80.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "kmr_20.h" - -#define NAMESPACE dup2_kmr_20 -#include "common/foliage.inc.c" -#define NAMESPACE kmr_20 - diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c deleted file mode 100644 index 57c371ca1a..0000000000 --- a/src/world/area_kmr/kmr_20/8ED0C0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "kmr_20.h" - -#include "world/common/atomic/ToadHouse.inc.c" - -ApiStatus func_8024159C_8ED3BC(Evt* script, s32 isInitialCall) { - au_ambience_set_volume(0, 1000, 1); - return ApiStatus_DONE2; -} - -ApiStatus func_802415C4_8ED3E4(Evt* script, s32 isInitialCall) { - au_ambience_set_volume(0, 1000, 0x3F); - return ApiStatus_DONE2; -} - -#include "world/common/todo/WaitForPlayerToLand.inc.c" diff --git a/src/world/area_kmr/kmr_20/8ED440.c b/src/world/area_kmr/kmr_20/8ED440.c deleted file mode 100644 index ed95482771..0000000000 --- a/src/world/area_kmr/kmr_20/8ED440.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "kmr_20.h" -#include "animation_script.h" - -#include "world/common/todo/StashVars.inc.c" - -#include "world/common/todo/GetItemName.inc.c" - -extern AnimScript Entity_SimpleSpring_AnimLaunch; - -ApiStatus func_80241738_8ED558(Evt* script, s32 isInitialCall) { - Entity* entity = get_entity_by_index(0); - - if (entity == NULL) { - return ApiStatus_BLOCK; - } - - play_model_animation(entity->virtualModelIndex, Entity_SimpleSpring_AnimLaunch); - return ApiStatus_DONE2; -} diff --git a/src/world/area_kmr/kmr_20/8ED5A0.c b/src/world/area_kmr/kmr_20/8ED5A0.c deleted file mode 100644 index 616b166a6a..0000000000 --- a/src/world/area_kmr/kmr_20/8ED5A0.c +++ /dev/null @@ -1,33 +0,0 @@ -#include "kmr_20.h" -#include "model.h" - -#define NAMESPACE dup_kmr_20 -#include "world/common/entity/Pipe.inc.c" -#define NAMESPACE kmr_20 - -#define NAMESPACE dup3_kmr_20 -#include "common/foliage.inc.c" -#define NAMESPACE kmr_20 - -ApiStatus func_80241C9C_8EDABC(Evt* script, s32 isInitialCall) { - func_8011B950(269, -1, 1, 1); - set_background_color_blend(0, 0, 0, 255); - - gCameras[CAM_DEFAULT].bgColor[0] = 0; - gCameras[CAM_DEFAULT].bgColor[1] = 0; - gCameras[CAM_DEFAULT].bgColor[2] = 0; - - return ApiStatus_DONE2; -} - -ApiStatus func_80241CF0_8EDB10(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - gCameras[CAM_DEFAULT].moveSpeed = evt_get_float_variable(script, *args++); - return ApiStatus_DONE2; -} - -ApiStatus func_80241D1C_8EDB3C(Evt* script, s32 isInitialCall) { - au_ambience_set_volume(0, 1000, 0x3F); - return ApiStatus_DONE2; -} diff --git a/src/world/area_kmr/kmr_20/8EDB70.c b/src/world/area_kmr/kmr_20/8EDB70.c deleted file mode 100644 index 05db486be1..0000000000 --- a/src/world/area_kmr/kmr_20/8EDB70.c +++ /dev/null @@ -1,62 +0,0 @@ -#include "kmr_20.h" -#include "model.h" - -#define NAMESPACE dup2_kmr_20 -#include "world/common/entity/Pipe.inc.c" -#define NAMESPACE kmr_20 - -ApiStatus func_80242030_8EDE50(Evt* script, s32 isInitialCall) { - func_8011B950(269, -1, 0, 1); - set_background_color_blend(0, 0, 0, 0); - - gCameras[CAM_DEFAULT].bgColor[0] = 0; - gCameras[CAM_DEFAULT].bgColor[1] = 0; - gCameras[CAM_DEFAULT].bgColor[2] = 0; - - return ApiStatus_DONE2; -} - -ApiStatus func_80242084_8EDEA4(Evt* script, s32 isInitialCall) { - if (isInitialCall) { - script->functionTemp[1] = 0; - } - - script->functionTemp[1] += 16; - - if (script->functionTemp[1] > 255) { - script->functionTemp[1] = 255; - } - - set_screen_overlay_params_front(0, script->functionTemp[1]); - - if (script->functionTemp[1] == 255) { - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} - -ApiStatus func_802420EC_8EDF0C(Evt* script, s32 isInitialCall) { - if (isInitialCall) { - script->functionTemp[1] = 255; - } - - script->functionTemp[1] -= 16; - if (script->functionTemp[1] <= 0) { - script->functionTemp[1] = 0; - return ApiStatus_DONE2; - } - - set_screen_overlay_params_front(0, script->functionTemp[1]); - return ApiStatus_BLOCK; -} - -ApiStatus func_80242144_8EDF64(Evt* script, s32 isInitialCall) { - au_ambience_set_volume(0, 1000, 0x3F); - return ApiStatus_DONE2; -} - -ApiStatus func_8024216C_8EDF8C(Evt* script, s32 isInitialCall) { - au_ambience_set_volume(0, 1000, 0x7F); - return ApiStatus_DONE2; -} diff --git a/src/world/area_kmr/kmr_20/8EDFC0.c b/src/world/area_kmr/kmr_20/8EDFC0.c deleted file mode 100644 index 5e3a1b3376..0000000000 --- a/src/world/area_kmr/kmr_20/8EDFC0.c +++ /dev/null @@ -1,198 +0,0 @@ -#include "kmr_20.h" - -typedef struct UnkKmr20 { - /* 0x00 */ u16 unk_00; - /* 0x02 */ s16 unk_02; - /* 0x04 */ s32 unk_04; - /* 0x08 */ s16 unk_08; - /* 0x0A */ s16 unk_0A; - /* 0x0C */ char unk_0C[0xC]; - /* 0x18 */ s16 unk_18; - /* 0x1A */ s16 unk_1A; - /* 0x1C */ s16 unk_1C; - /* 0x1E */ char unk_1E[0x2]; - /* 0x20 */ s32 unk_20; - /* 0x24 */ u16 equippedBadges; - /* 0x26 */ s16 unk_26; - /* 0x28 */ s16 unk_28; -} UnkKmr20; - -extern Gfx D_80252D50_8FEB70[]; -extern s32 D_80252DC0_8FEBE0[]; - -void func_802421A0_8EDFC0(UnkKmr20* arg0, s32 opacity) { - s32 width; - - if (opacity > 0) { - gSPDisplayList(gMasterGfxPos++, D_80252D50_8FEB70); - gDPPipeSync(gMasterGfxPos++); - gDPSetPrimColor(gMasterGfxPos++, 0, 0, 16, 120, 24, opacity * 0.65); - gDPFillRectangle(gMasterGfxPos++, 33, 43, 287, 192); - gDPPipeSync(gMasterGfxPos++); - - msg_draw_frame(30, 40, 260, 155, 6, 0, 1, opacity * 0.55, opacity); - draw_msg(MSG_CH0_00FC, 206 - get_msg_width(MSG_CH0_00FC, 0), 50, opacity, 0, 1); - draw_number(gPlayerData.totalCoinsEarned, 216, 51, 1, 0, opacity, 2); - draw_msg(MSG_CH0_00FD, 206 - get_msg_width(MSG_CH0_00FD, 0), 65, opacity, 0, 1); - draw_number(arg0->equippedBadges, 231, 66, 1, 0, opacity, 3); - draw_msg(MSG_MenuTip_0034, 232, 63, opacity, 0, 0); - draw_number(80, 244, 66, 1, 0, opacity, 2); - if (gPlayerData.starPiecesCollected == 0) { - draw_msg(MSG_CH0_00FA, 109, 80, opacity, 0, 1); - } else { - draw_msg(MSG_CH0_00FB, 206 - get_msg_width(MSG_CH0_00FB, 0), 80, opacity, 0, 1); - draw_number(gPlayerData.starPiecesCollected, 231, 81, 1, 0, opacity, 3); - draw_msg(MSG_MenuTip_0034, 232, 78, opacity, 0, 0); - draw_number(160, 244, 80, 1, 0, opacity, 2); - } - - width = get_msg_width(MSG_CH0_00FE, 0); - if (arg0->unk_26 == 0) { - draw_msg(MSG_CH0_00FA, 110, 95, opacity, 0, 1); - } else { - if (arg0->unk_26 == -1) { - draw_msg(MSG_CH0_00FE, 206 - width, 95, opacity, 0, 1); - draw_number(0, 231, 96, 1, 0, opacity, 3); - } else { - draw_msg(MSG_CH0_00FE, 206 - width, 95, opacity, 0, 1); - draw_number(arg0->unk_26, 231, 96, 1, 0, opacity, 3); - } - draw_msg(MSG_MenuTip_0034, 232, 93, opacity, 0, 0); - draw_number(arg0->unk_28, 244, 95, 1, 0, opacity, 2); - } - - if (gPlayerData.quizzesAnswered == 0) { - draw_msg(MSG_CH0_00FA, 109, 110, opacity, 0, 1); - } else { - draw_msg(MSG_CH0_00FF, 206 - get_msg_width(MSG_CH0_00FF, 0), 110, opacity, 0, 1); - draw_number(gPlayerData.quizzesCorrect, 231, 111, 1, 0, opacity, 3); - draw_msg(MSG_MenuTip_0034, 232, 108, opacity, 0, 0); - draw_number(gPlayerData.quizzesAnswered, 244, 111, 1, 0, opacity, 2); - } - - draw_msg(MSG_CH0_00F4, 206 - get_msg_width(MSG_CH0_00F4, 0), 125, opacity, 0, 1); - draw_number(gPlayerData.battlesCount, 216, 126, 1, 0, opacity, 2); - width = get_msg_width(MSG_CH0_00F7, 0); - draw_msg(MSG_CH0_00F7, 206 - width, 140, opacity, 0, 1); - draw_number(gPlayerData.playerFirstStrikes, 216, 141, 1, 0, opacity, 2); - draw_msg(MSG_CH0_00F8, 206 - get_msg_width(MSG_CH0_00F8, 0), 155, opacity, 0, 1); - draw_number(gPlayerData.enemyFirstStrikes, 216, 156, 1, 0, opacity, 2); - - if (gPlayerData.powerBounces == 0) { - draw_msg(MSG_CH0_00FA, 109, 170, opacity, 0, 1); - } else { - draw_msg(MSG_CH0_00F9, 206 - get_msg_width(MSG_CH0_00F9, 0), 170, opacity, 0, 1); - draw_number(gPlayerData.powerBounces, 216, 171, 1, 0, opacity, 2); - } - } -} - -void func_80242870_8EE690(void* data) { - UnkKmr20* temp_v0 = (UnkKmr20*) evt_get_variable(NULL, MapVar(10)); - s32 temp_f2; - - switch (temp_v0->unk_00) { - case 0: - temp_v0->unk_18 = 0; - temp_v0->unk_08 = 0; - temp_v0->unk_0A = 0; - temp_v0->unk_04 = 0; - temp_v0->unk_00 = 1; - snd_start_sound(SOUND_21C, 0, 0); - // fallthrough - case 1: - temp_v0->unk_04++; - temp_f2 = update_lerp(0, 32.0f, 255.0f, temp_v0->unk_04, 3); - temp_v0->unk_1A = temp_f2; - temp_v0->unk_1C = temp_f2; - if (temp_v0->unk_04 >= 3) { - temp_v0->unk_00 = 2; - temp_v0->unk_1A = 255; - temp_v0->unk_1C = 255; - } - break; - case 2: - temp_v0->unk_1A = 255; - temp_v0->unk_1C = 255; - if (gGameStatusPtr->currentButtons[0] & (BUTTON_A | BUTTON_B)) { - temp_v0->unk_00 = 3; - } - if (temp_v0->unk_00 != 3) { - break; - } - case 3: - temp_v0->unk_04 = 0; - temp_v0->unk_00 = 4; - snd_start_sound(SOUND_MENU_BACK, 0, 0); - // fallthrough - case 4: - temp_v0->unk_04++; - temp_v0->unk_1A = update_lerp(0, temp_v0->unk_1C, 0.0f, temp_v0->unk_04, 3); - if (temp_v0->unk_04 >= 3) { - temp_v0->unk_00 = 5; - } - break; - } - func_802421A0_8EDFC0(temp_v0, temp_v0->unk_1A); -} - -void func_80242A04_8EE824(void) { - RenderTask rt; - - rt.renderMode = RENDER_MODE_2D; - rt.appendGfxArg = NULL; - rt.appendGfx = func_80242870_8EE690; - rt.distance = 0; - queue_render_task(&rt); -} - -void func_80242A3C_8EE85C(UnkKmr20* arg0) { - PlayerData* playerData = &gPlayerData; - s32 count; - s32 i; - - count = 0; - for (i = 0; i < ARRAY_COUNT(playerData->badges); i++) { - if (playerData->badges[i] != 0) { - count++; - } - } - arg0->equippedBadges = count; - - count = 0; - for (i = 0; TRUE; i++) { - if (D_80252DC0_8FEBE0[i] != 0) { - if (evt_get_variable(NULL, D_80252DC0_8FEBE0[i]) != 0) { - count++; - } - } else { - break; - } - } - arg0->unk_28 = i; - arg0->unk_26 = count; - if (arg0->unk_26 == 0 && evt_get_variable(NULL, GameFlag(328)) != 0) { - arg0->unk_26 = -1; - } -} - -ApiStatus func_80242B04_8EE924(Evt* script, s32 isInitialCall) { - UnkKmr20* temp_v0; - - if (isInitialCall) { - temp_v0 = script->functionTempPtr[0] = heap_malloc(sizeof(*temp_v0)); - temp_v0->unk_00 = 0; - temp_v0->unk_1A = 255; - temp_v0->unk_20 = create_worker_world(0, func_80242A04_8EE824); - evt_set_variable(script, MapVar(10), (s32) temp_v0); - func_80242A3C_8EE85C(temp_v0); - } - - temp_v0 = script->functionTempPtr[0]; - if (temp_v0->unk_00 == 5) { - free_worker(temp_v0->unk_20); - heap_free(temp_v0); - return ApiStatus_DONE1; - } - return ApiStatus_BLOCK; -} diff --git a/src/world/area_kmr/kmr_20/kmr_20.h b/src/world/area_kmr/kmr_20/kmr_20.h index c6aa8fb438..9b4907d299 100644 --- a/src/world/area_kmr/kmr_20/kmr_20.h +++ b/src/world/area_kmr/kmr_20/kmr_20.h @@ -2,11 +2,60 @@ /// @brief Goomba Region - Mario's House #include "common.h" -#include "../kmr.h" #include "message_ids.h" #include "map.h" + #include "../kmr.h" +#include "mapfs/kmr_20_shape.h" +#include "mapfs/kmr_20_hit.h" + +#include "sprite/npc/Luigi.h" +#include "sprite/npc/Toad.h" +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/ShyGuy.h" + +enum { + NPC_Scene_Parakarry = 0, + NPC_Scene_Luigi = 1, + + NPC_Luigi_0 = 0, + NPC_Luigi_1 = 1, + NPC_ShyGuy = 2, +}; + +enum { + MV_RecordsDataPtr = MapVar(10), +}; + +enum { + MF_LuigiWaiting = MapFlag(10), + MF_ReadyForPlayerEntry = MapFlag(11), + MF_Unk_0C = MapFlag(12), + MF_LuigiInBasement = MapFlag(13), +}; #define NAMESPACE kmr_20 +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_FadeOutAmbientSounds); +extern EvtScript N(EVS_PlayRestingSong); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupRooms); +extern EvtScript N(EVS_Setup_Interactables); +extern EvtScript N(EVS_SetupBed); +extern EvtScript N(EVS_Scene_BeginGame); +extern EvtScript N(EVS_Scene_SettingOff); +extern EvtScript N(EVS_Scene_BeginEpilogue); +extern EvtScript N(EVS_Scene_EpilogueGetLetter); +extern EvtScript N(EVS_Scene_LuigiWaitingAround); +extern EvtScript N(EVS_Scene_CaughtLuigiInBasement); +extern EvtScript N(EVS_Inspect_Records); +extern EvtScript N(EVS_SecretPanel_Flip); +extern EvtScript N(EVS_SetupTrees); +extern EvtScript N(EVS_SetupBushes); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(SceneNPCs); +extern NpcGroupList N(DefaultNPCs); + +API_CALLABLE(N(func_80241C9C_8EDABC)); void msg_draw_frame(s32 posX, s32 posY, s32 sizeX, s32 sizeY, s32 style, s32 palette, s32 fading, s32 bgAlpha, s32 frameAlpha); diff --git a/src/world/area_kmr/kmr_20/kmr_20_0_header.c b/src/world/area_kmr/kmr_20/kmr_20_0_header.c new file mode 100644 index 0000000000..5a699a294e --- /dev/null +++ b/src/world/area_kmr/kmr_20/kmr_20_0_header.c @@ -0,0 +1,17 @@ +#include "kmr_20.h" + +EntryList N(Entrances) = { + [kmr_20_ENTRY_0] { 240.0, 30.0, -80.0, 90.0 }, + [kmr_20_ENTRY_1] { 240.0, 30.0, -70.0, 90.0 }, + [kmr_20_ENTRY_2] { 100.0, 44.0, -40.0, 90.0 }, + [kmr_20_ENTRY_3] { 100.0, 44.0, -40.0, 90.0 }, + [kmr_20_ENTRY_4] { 594.0, 30.0, -216.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_kmr_20 }, +}; diff --git a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c new file mode 100644 index 0000000000..c9cb697a4d --- /dev/null +++ b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c @@ -0,0 +1,821 @@ +#include "kmr_20.h" +#include "effects.h" +#include "animation_script.h" + +extern AnimScript Entity_SimpleSpring_AnimLaunch; + +NpcSettings N(NpcSettings_Luigi) = { + .height = 24, + .radius = 24, + .level = 99, +}; + +NpcSettings N(NpcSettings_ShyGuy) = { + .height = 23, + .radius = 22, + .level = 14, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, + .actionFlags = AI_ACTION_JUMP_WHEN_SEE_PLAYER, +}; + +#include "world/common/complete/GiveReward.inc.c" + +API_CALLABLE(N(PlaySpringLaunchAnimation)) { + Entity* entity = get_entity_by_index(0); + + if (entity == NULL) { + return ApiStatus_BLOCK; + } + + play_model_animation(entity->virtualModelIndex, Entity_SimpleSpring_AnimLaunch); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_HandItemOver) = { + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(20) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_KootFavorCheck_Luigi) = { + EVT_IF_NE(GB_KootFavor_Current, 5) + EVT_RETURN + EVT_END_IF + EVT_IF_NE(GF_KMR20_Gift_LuigisAutograph, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Idle) + EVT_EXEC_WAIT(N(EVS_HandItemOver)) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_0103) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_WAIT(40) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_0104) + EVT_CALL(GetNpcYaw, NPC_SELF, LVar0) + EVT_SET(LVar1, LVar0) + EVT_ADD(LVar1, 180) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar1, 5) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_IdleBack) + EVT_WAIT(40) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Idle) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 5) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_0105) + EVT_WAIT(10) + EVT_SET(LVar0, ITEM_KOOT_MERLUVLEE_AUTOGRAPH) + EVT_SET(LVar1, 1) + EVT_EXEC_WAIT(N(GiveKeyReward)) + EVT_CALL(AddKeyItem, LVar0) + EVT_SET(GF_KMR20_Gift_LuigisAutograph, TRUE) + EVT_IF_GE(GB_StoryProgress, STORY_CH3_STAR_SPRIT_DEPARTED) + EVT_IF_LT(GB_StoryProgress, STORY_CH4_DEFEATED_GENERAL_GUY) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Run) + EVT_WAIT(1) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_LuigiWaitingAround) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_IdleSit) + EVT_CALL(SetNpcPos, NPC_Luigi_1, 379, 20, -60) + EVT_CALL(InterpNpcYaw, NPC_Luigi_1, 39, 0) + EVT_CALL(SetNpcCollisionSize, NPC_Luigi_1, 43, 24) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 495, 30, -115) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 495, 0, -115) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(620.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Luigi_1, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 25) + EVT_ADD(LVar2, 2) + EVT_LOOP(3) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 2, LVar0, LVar1, LVar2) + EVT_WAIT(13) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 2, LVar0, LVar1, LVar2) + EVT_WAIT(22) + EVT_END_LOOP + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 2, LVar0, LVar1, LVar2) + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(3) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_IdleSit) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_TalkSit) + EVT_WAIT(25) + EVT_END_LOOP + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_IdleSit) + EVT_END_THREAD + EVT_WAIT(70) + EVT_CALL(GetNpcPos, NPC_Luigi_1, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(80) + EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkSit, ANIM_Luigi_IdleSit, 5, MSG_CH0_00DB) + EVT_WAIT(20) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_263, 0) + EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, -30, 40, TRUE, 0, 0, 0, 0) + EVT_WAIT(25) + EVT_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 495, 30, -115) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 495, 0, -115) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(620.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_WAIT(20) + EVT_SET(MF_ReadyForPlayerEntry, TRUE) + EVT_WAIT(15) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_ENABLE_HIT_SCRIPT, FALSE) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_EXCLAMATION, -30, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) + EVT_CALL(GetNpcPos, NPC_Luigi_1, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Luigi_1, LVar0, LVar1, LVar2, 10) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) + EVT_WAIT(15) + EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_00DC) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Run) + EVT_CALL(NpcMoveTo, NPC_Luigi_1, 531, -128, 50) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(10) + EVT_CALL(GetNpcPos, NPC_Luigi_1, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 1, LVar0, LVar1, LVar2, 0, 0) + EVT_WAIT(6) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(PlayerMoveTo, 556, -158, 30) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 554, -195, 28) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) + EVT_END_THREAD + EVT_WAIT(3) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 495, 30, -115) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 495, 0, -115) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(620.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(15) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 564, 0, -176) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 556, 0, -158) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(270.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(40) + EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 5, MSG_CH0_00DD) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_StillBack) + EVT_WAIT(30) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_263, 0) + EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, -30, 30, TRUE, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Run) + EVT_CALL(NpcMoveTo, NPC_Luigi_1, 524, -152, 10) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) + EVT_WAIT(15) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 39, 0) + EVT_WAIT(45) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 219, 0) + EVT_END_THREAD + EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_ELLIPSIS, 20, 85, TRUE, 0, 0, 0, 0) + EVT_WAIT(15) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_263, 0) + EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_QUESTION, -20, 70, TRUE, 0, 0, 0, 0) + EVT_WAIT(110) + EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 5, MSG_CH0_00DE) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(PARTNER_GOOMBARIO) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_HURT, PARTNER_ANIM_RUN, 5, MSG_CH0_00DF) + EVT_CASE_EQ(PARTNER_KOOPER) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_HURT, PARTNER_ANIM_RUN, 5, MSG_CH0_00E0) + EVT_CASE_EQ(PARTNER_BOMBETTE) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_HURT, PARTNER_ANIM_RUN, 5, MSG_CH0_00E1) + EVT_CASE_EQ(PARTNER_PARAKARRY) + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_HURT, PARTNER_ANIM_RUN, 5, MSG_CH0_00E2) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_PARTNER, PARTNER_ANIM_WALK, PARTNER_ANIM_9, 5, MSG_CH0_00DB) + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 5, MSG_CH0_00E3) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_ENABLE_HIT_SCRIPT, TRUE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_WAIT(15) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAux_Luigi_WhistleAtopObstacle) = { + EVT_LABEL(20) + EVT_CALL(GetNpcVar, NPC_SELF, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(21) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_IdleSit) + EVT_CALL(GetNpcPos, NPC_SELF, LVarA, LVarB, LVarC) + EVT_ADD(LVarB, 25) + EVT_ADD(LVarC, 2) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 2, LVarA, LVarB, LVarC) + EVT_WAIT(13) + EVT_CALL(GetNpcVar, NPC_SELF, 0, LVar0) + EVT_CALL(GetNpcPos, NPC_SELF, LVarA, LVarB, LVarC) + EVT_ADD(LVarB, 25) + EVT_ADD(LVarC, 2) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 2, LVarA, LVarB, LVarC) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(21) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_TalkSit) + EVT_WAIT(22) + EVT_GOTO(20) + EVT_LABEL(21) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Luigi_InBasement) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Idle) + EVT_LABEL(10) + EVT_WAIT(1) + EVT_IF_EQ(MF_Unk_0C, FALSE) + EVT_GOTO(10) + EVT_END_IF + EVT_LABEL(20) + EVT_IF_EQ(MF_Unk_0C, FALSE) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(GetNpcVar, NPC_SELF, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(21) + EVT_END_IF + EVT_CALL(GetNpcPos, NPC_SELF, LVarA, LVarB, LVarC) + EVT_ADD(LVarA, 6) + EVT_ADD(LVarB, 58) + EVT_ADD(LVarC, 2) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 0, LVarA, LVarB, LVarC) + EVT_WAIT(20) + EVT_CALL(GetNpcPos, NPC_SELF, LVarA, LVarB, LVarC) + EVT_SUB(LVarA, 4) + EVT_ADD(LVarB, 55) + EVT_SUB(LVarC, 1) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 0, LVarA, LVarB, LVarC) + EVT_IF_EQ(MF_Unk_0C, FALSE) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(GetNpcVar, NPC_SELF, 0, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(21) + EVT_END_IF + EVT_WAIT(28) + EVT_GOTO(20) + EVT_LABEL(21) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Luigi_InBedroom) = { + EVT_LABEL(10) + EVT_SET(LVar0, MF_Unk_0C) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_2, FALSE) + EVT_ELSE + EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_2, TRUE) + EVT_END_IF + EVT_WAIT(3) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_CaughtLuigiInBasement) = { + EVT_SET(GF_KMR20_CaughtLuigiInBasement, TRUE) + EVT_SET(AF_KMR_0C, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Luigi_0, ANIM_Luigi_Idle) + EVT_CALL(SetNpcVar, NPC_Luigi_0, 0, 1) + EVT_WAIT(1) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(2) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(GetNpcPos, NPC_SELF, LVarA, LVarB, LVarC) + EVT_ADD(LVarB, 45) + EVT_ADD(LVarC, 1) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 0, LVarA, LVarB, LVarC) + EVT_WAIT(25) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 0, LVarA, LVarB, LVarC) + EVT_WAIT(25) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 0, LVarA, LVarB, LVarC) + EVT_WAIT(25) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 0, LVarA, LVarB, LVarC) + EVT_WAIT(25) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 0, LVarA, LVarB, LVarC) + EVT_WAIT(25) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 0, LVarA, LVarB, LVarC) + EVT_WAIT(25) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 0, LVarA, LVarB, LVarC) + EVT_WAIT(25) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 0, LVarA, LVarB, LVarC) + EVT_WAIT(25) + EVT_PLAY_EFFECT(EFFECT_MUSIC_NOTE, 0, LVarA, LVarB, LVarC) + EVT_END_THREAD + EVT_WAIT(20) + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Luigi_0, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_WAIT(25) + EVT_CALL(SpeakToPlayer, NPC_Luigi_0, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 5, MSG_CH0_00E9) + EVT_WAIT(15) + EVT_CALL(InterpNpcYaw, NPC_Luigi_0, 270, 0) + EVT_WAIT(25) + EVT_CALL(InterpNpcYaw, NPC_Luigi_0, 90, 0) + EVT_WAIT(6) + EVT_CALL(InterpNpcYaw, NPC_Luigi_0, 270, 0) + EVT_WAIT(5) + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Luigi_0, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Luigi_0, LVar0, LVar1, LVar2, 9) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Luigi_0, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 5, MSG_CH0_00EA) + EVT_CALL(InterpNpcYaw, NPC_Luigi_0, 90, 0) + EVT_WAIT(5) + EVT_CALL(EnableModel, MODEL_o200, FALSE) + EVT_CALL(InterpNpcYaw, NPC_Luigi_0, 270, 0) + EVT_WAIT(5) + EVT_CALL(SpeakToPlayer, NPC_Luigi_0, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 5, MSG_CH0_00EB) + EVT_WAIT(3) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Luigi_0, ANIM_Luigi_Run) + EVT_CALL(NpcMoveTo, NPC_Luigi_0, -130, -17, 15) + EVT_CALL(NpcJump0, NPC_Luigi_0, -145, -54, -45, 10) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_0, SOUND_2086, 0) + EVT_CALL(N(PlaySpringLaunchAnimation)) + EVT_THREAD + EVT_WAIT(3) + EVT_EXEC(N(EVS_SecretPanel_Flip)) + EVT_END_THREAD + EVT_CALL(NpcJump0, NPC_Luigi_0, -145, 30, -45, 20) + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_100, FALSE) + EVT_CALL(NpcMoveTo, NPC_Luigi_0, 20, -80, 15) + EVT_CALL(SetNpcAnimation, NPC_Luigi_0, ANIM_Luigi_Idle) + EVT_CALL(SetNpcPos, NPC_Luigi_0, 48, 30, -5) + EVT_CALL(InterpNpcYaw, NPC_Luigi_0, 270, 0) + EVT_END_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(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Luigi_ReadingMail) = { + EVT_LABEL(10) + EVT_IF_EQ(MF_Unk_0C, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, FALSE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, 0) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(GF_KMR20_CaughtLuigiReadingLetter, TRUE) + EVT_WAIT(20) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, -30, 15, TRUE, 0, 0, 0, 0) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Idle) + EVT_WAIT(10) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Run) + EVT_CALL(NpcMoveTo, NPC_SELF, 37, -72, 16) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(NpcMoveTo, NPC_SELF, 42, -6, 10) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Idle) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Luigi) = { + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Run) + EVT_CALL(SetSelfVar, 0, 0) + EVT_LABEL(10) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Run) + EVT_CALL(NpcMoveTo, NPC_SELF, 635, -108, 0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_GOTO(100) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Run) + EVT_CALL(NpcMoveTo, NPC_SELF, 528, 20, 0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_GOTO(100) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Run) + EVT_CALL(NpcMoveTo, NPC_SELF, 635, -108, 0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_GOTO(100) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Run) + EVT_CALL(NpcMoveTo, NPC_SELF, 528, 20, 0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_GOTO(100) + EVT_END_IF + EVT_GOTO(10) + EVT_LABEL(100) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Idle) + EVT_CALL(InterpNpcYaw, NPC_SELF, 39, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Luigi) = { + EVT_IF_EQ(MF_LuigiWaiting, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_00E5) + EVT_ELSE + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_00E6) + EVT_CASE_LT(STORY_CH1_STAR_SPRIT_DEPARTED) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_00E7) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_00E8) + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_00ED) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_KMR20_ChasedOffShyGuy, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_00EE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_00EF) + EVT_END_IF + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_00F0) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_00F1) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_00F2) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 16, MSG_CH0_00F3) + EVT_END_SWITCH + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_KootFavorCheck_Luigi)) + EVT_IF_NE(MF_LuigiWaiting, TRUE) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_END_CASE_GROUP + EVT_CASE_LT(STORY_EPILOGUE) + EVT_CALL(InterpNpcYaw, NPC_SELF, 39, 5) + EVT_END_SWITCH + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Luigi_0) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Idle) + EVT_CALL(SetNpcCollisionSize, NPC_SELF, 45, 24) + EVT_IF_EQ(MF_LuigiWaiting, TRUE) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_RETURN + EVT_END_IF + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Luigi))) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CASE_LT(STORY_CH1_STAR_SPRIT_DEPARTED) + EVT_CALL(SetNpcPos, NPC_SELF, -145, 30, -50) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Luigi_InBedroom))) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_IF_EQ(GF_KMR20_CaughtLuigiInBasement, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, -83, -80, -54) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Luigi_InBasement))) + EVT_SET(MF_LuigiInBasement, TRUE) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_Luigi_0, 48, 30, -5) + EVT_CALL(InterpNpcYaw, NPC_Luigi_0, 90, 0) + EVT_END_IF + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_IF_EQ(GF_KMR20_CaughtLuigiReadingLetter, FALSE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_ReadLetter) + EVT_CALL(SetNpcPos, NPC_SELF, -102, 30, -85) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Luigi_ReadingMail))) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, 42, 30, -6) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_END_IF + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Luigi_1) = { + EVT_CALL(SetNpcVar, NPC_SELF, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Idle) + EVT_CALL(SetNpcCollisionSize, NPC_SELF, 45, 24) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Luigi))) + EVT_IF_EQ(MF_LuigiWaiting, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH1_MERLIN_REVEALED_KOOPA_BROS) + EVT_CALL(SetNpcPos, NPC_SELF, 500, 0, -200) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_CASE_LT(STORY_CH1_STAR_SPRIT_DEPARTED) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_CALL(SetNpcPos, NPC_SELF, 300, 50, 150) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_IdleSit) + EVT_CALL(SetNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_Luigi_WhistleAtopObstacle))) + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_CALL(SetNpcPos, NPC_SELF, 560, 0, -75) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Luigi))) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_CALL(SetNpcPos, NPC_SELF, 300, 50, 150) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_IdleSit) + EVT_CALL(SetNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_Luigi_WhistleAtopObstacle))) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_CALL(SetNpcPos, NPC_SELF, 300, 115, 150) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_IdleSit) + EVT_CALL(SetNpcAux, NPC_SELF, EVT_PTR(N(EVS_NpcAux_Luigi_WhistleAtopObstacle))) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_CALL(SetNpcPos, NPC_SELF, 306, 30, -145) + EVT_CALL(InterpNpcYaw, NPC_SELF, 39, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_400000, 1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Luigi_0) = { + .id = NPC_Luigi_0, + .settings = &N(NpcSettings_Luigi), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Luigi_0), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Luigi_Still, + .walk = ANIM_Luigi_Still, + .run = ANIM_Luigi_Still, + .chase = ANIM_Luigi_Still, + .anim_4 = ANIM_Luigi_Still, + .anim_5 = ANIM_Luigi_Still, + .death = ANIM_Luigi_Still, + .hit = ANIM_Luigi_Still, + .anim_8 = ANIM_Luigi_Still, + .anim_9 = ANIM_Luigi_Still, + .anim_A = ANIM_Luigi_Still, + .anim_B = ANIM_Luigi_Still, + .anim_C = ANIM_Luigi_Still, + .anim_D = ANIM_Luigi_Still, + .anim_E = ANIM_Luigi_Still, + .anim_F = ANIM_Luigi_Still, + }, + .tattle = MSG_NpcTattle_Luigi, +}; + +StaticNpc N(NpcData_Luigi_1) = { + .id = NPC_Luigi_1, + .settings = &N(NpcSettings_Luigi), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Luigi_1), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Luigi_Still, + .walk = ANIM_Luigi_Still, + .run = ANIM_Luigi_Still, + .chase = ANIM_Luigi_Still, + .anim_4 = ANIM_Luigi_Still, + .anim_5 = ANIM_Luigi_Still, + .death = ANIM_Luigi_Still, + .hit = ANIM_Luigi_Still, + .anim_8 = ANIM_Luigi_Still, + .anim_9 = ANIM_Luigi_Still, + .anim_A = ANIM_Luigi_Still, + .anim_B = ANIM_Luigi_Still, + .anim_C = ANIM_Luigi_Still, + .anim_D = ANIM_Luigi_Still, + .anim_E = ANIM_Luigi_Still, + .anim_F = ANIM_Luigi_Still, + }, + .tattle = MSG_NpcTattle_Luigi, +}; + +EvtScript N(EVS_NpcIdle_ShyGuy) = { + EVT_CALL(SetNpcPos, NPC_SELF, 500, 0, -195) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) + EVT_LOOP(0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, 482, 0, -286, 15) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, 726, 0, -153, 15) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, 603, 0, 0, 15) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, 557, 0, 130, 15) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, 357, 0, 87, 15) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, 344, 30, -8, 15) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, 276, 138, 22, 15) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, 360, 61, -117, 15) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, 427, 55, -182, 15) + EVT_WAIT(5) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_ShyGuy) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim0C) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ShyGuy_Red_Anim03) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203F, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, 495, 0, -108, 15) + EVT_WAIT(3) + EVT_CALL(NpcMoveTo, NPC_SELF, 550, -170, 15) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, 594, 30, -220, 15) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_ENTER_PIPE, 0) + EVT_CALL(func_802CFE2C, NPC_SELF, 0x00000800) + EVT_CALL(func_802CFD30, NPC_SELF, FOLD_TYPE_5, 2, 1, 1, 0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_SUB(LVar1, 10) + EVT_LOOP(30) + EVT_SUB(LVar1, 1) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_ShyGuy) = { + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_203E, 0) + EVT_SET(GF_KMR20_ChasedOffShyGuy, TRUE) + EVT_CALL(SetNpcVar, NPC_Luigi_1, 0, 1) + EVT_WAIT(2) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_IGNORE_JUMP | ENEMY_FLAGS_IGNORE_HAMMER | ENEMY_FLAGS_8000000 | ENEMY_FLAGS_10000000, 1) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ShyGuy))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ShyGuy) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH3_STAR_SPRIT_DEPARTED) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_RETURN + EVT_END_IF + EVT_IF_GE(GB_StoryProgress, STORY_CH4_DEFEATED_GENERAL_GUY) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_RETURN + EVT_END_IF + EVT_IF_NE(GF_KMR20_ChasedOffShyGuy, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_RETURN + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_ShyGuy))) + EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_ShyGuy))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_ShyGuy) = { + .id = NPC_ShyGuy, + .settings = &N(NpcSettings_ShyGuy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000 | ENEMY_FLAGS_IGNORE_TOUCH | ENEMY_FLAGS_10000000, + .init = &N(EVS_NpcInit_ShyGuy), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ShyGuy_Red_Anim01, + .walk = ANIM_ShyGuy_Red_Anim02, + .run = ANIM_ShyGuy_Red_Anim03, + .chase = ANIM_ShyGuy_Red_Anim03, + .anim_4 = ANIM_ShyGuy_Red_Anim01, + .anim_5 = ANIM_ShyGuy_Red_Anim01, + .death = ANIM_ShyGuy_Red_Anim0C, + .hit = ANIM_ShyGuy_Red_Anim0C, + .anim_8 = ANIM_ShyGuy_Red_Anim15, + .anim_9 = ANIM_ShyGuy_Red_Anim12, + .anim_A = ANIM_ShyGuy_Red_Anim11, + .anim_B = ANIM_ShyGuy_Red_Anim10, + .anim_C = ANIM_ShyGuy_Red_Anim05, + .anim_D = ANIM_ShyGuy_Red_Anim01, + .anim_E = ANIM_ShyGuy_Red_Anim01, + .anim_F = ANIM_ShyGuy_Red_Anim01, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Luigi_0)), + NPC_GROUP(N(NpcData_Luigi_1)), + NPC_GROUP(N(NpcData_ShyGuy)), + {} +}; diff --git a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c new file mode 100644 index 0000000000..af4bc57a31 --- /dev/null +++ b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c @@ -0,0 +1,445 @@ +#include "kmr_20.h" +#include "model.h" + +#define NAME_SUFFIX _Intro +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +API_CALLABLE(N(func_80241C9C_8EDABC)) { + func_8011B950(MODEL_g62, -1, 1, 1); + set_background_color_blend(0, 0, 0, 255); + + gCameras[CAM_DEFAULT].bgColor[0] = 0; + gCameras[CAM_DEFAULT].bgColor[1] = 0; + gCameras[CAM_DEFAULT].bgColor[2] = 0; + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80241CF0_8EDB10)) { + Bytecode* args = script->ptrReadPos; + + gCameras[CAM_DEFAULT].moveSpeed = evt_get_float_variable(script, *args++); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetAmbienceVolumeHalf_Intro)) { + au_ambience_set_volume(0, 1000, 63); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_Luigi_PlayWalkSounds_Intro) = { + EVT_CALL(GetNpcAnimation, NPC_Scene_Luigi, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(ANIM_Luigi_Walk) + EVT_CASE_OR_EQ(ANIM_Luigi_WalkLetter) + EVT_CASE_OR_EQ(ANIM_Luigi_WalkBack) + EVT_SET(LVar1, 10) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(ANIM_Luigi_Run) + EVT_CASE_OR_EQ(ANIM_Luigi_RunLetter) + EVT_CASE_OR_EQ(ANIM_Luigi_RunBack) + EVT_SET(LVar1, 5) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_B0000019, 0) + EVT_WAIT(LVar1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Player_EnterPipe_Intro) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_SET(LVar0, kmr_20_ENTRY_4) + EVT_CALL(N(Pipe_GetEntryPos_Intro)) + EVT_CALL(PlayerMoveTo, LVar1, LVar3, 3) + EVT_SET(LVar0, kmr_20_ENTRY_4) + EVT_CALL(N(Pipe_GetEntryPos_Intro)) + EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) + EVT_WAIT(2) + EVT_CALL(PlaySoundAtPlayer, SOUND_ENTER_PIPE, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_THREAD + EVT_WAIT(4) + EVT_LOOP(40) + EVT_SUB(LVar1, 1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(func_802D286C, 0x00000800) + EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 2, 1, 1, 0) + EVT_WAIT(25) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Luigi_EnterPipe_Intro) = { + EVT_CALL(SetNpcFlagBits, NPC_Scene_Luigi, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Scene_Luigi, NPC_FLAG_ENABLE_HIT_SCRIPT, TRUE) + EVT_CALL(EnableNpcShadow, NPC_Scene_Luigi, FALSE) + EVT_SET(LVar0, kmr_20_ENTRY_4) + EVT_CALL(N(Pipe_GetEntryPos_Intro)) + EVT_CALL(NpcMoveTo, NPC_Scene_Luigi, LVar1, LVar3, 3) + EVT_SET(LVar0, kmr_20_ENTRY_4) + EVT_CALL(N(Pipe_GetEntryPos_Intro)) + EVT_CALL(SetNpcPos, NPC_Scene_Luigi, LVar1, LVar2, LVar3) + EVT_WAIT(2) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_ENTER_PIPE, 0) + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Still) + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Scene_Luigi, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 7) + EVT_CALL(SetNpcPos, NPC_Scene_Luigi, LVar0, LVar1, LVar2) + EVT_LOOP(40) + EVT_SUB(LVar1, 1) + EVT_CALL(SetNpcPos, NPC_Scene_Luigi, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(func_802CFE2C, NPC_Scene_Luigi, 0x00000800) + EVT_CALL(func_802CFD30, NPC_Scene_Luigi, FOLD_TYPE_5, 2, 1, 1, 0) + EVT_WAIT(25) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FocusCam_Unused) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 250, 30, -80) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(N(func_80241CF0_8EDB10), EVT_FLOAT(1.8)) + EVT_CALL(InterpCamTargetPos, 0, 1, 250, 30, -80, 10) + EVT_CALL(N(func_80241CF0_8EDB10), 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TetherCamToLuigi) = { + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetNpcVar, NPC_Scene_Luigi, 0, 1) + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_Scene_Luigi, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 20) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_Scene_Luigi, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenAndCloseDoor_Intro_Impl) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_o246, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 80, 14, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g14, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(30) + EVT_CALL(MakeLerp, 80, 0, 8, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g14, 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_o246, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenAndCloseDoor_Intro) = { + EVT_CALL(EnableGroup, MODEL_g72, TRUE) + EVT_EXEC_WAIT(N(EVS_OpenAndCloseDoor_Intro_Impl)) + EVT_CALL(EnableGroup, MODEL_g72, FALSE) + EVT_RETURN + EVT_END +}; + +s32 N(D_8024FD28_8FBB48)[] = { + 3, + 34, 35, 36, +}; + +s32 N(D_8024FD38_8FBB58)[] = { + 3, + 422, 37, -195, + 422, 48, -195, + 422, 12, -195, +}; + +s32* N(UnknownLists)[] = { + N(D_8024FD28_8FBB48), 0, + N(D_8024FD38_8FBB58), 0, +}; + +EvtScript N(EVS_Scene_BeginGame) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_THREAD + EVT_WAIT(5) + EVT_CALL(SetMusicTrack, 0, SONG_MAIL_CALL, 0, 8) + EVT_END_THREAD + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(SetPlayerPos, -50, 30, -80) + EVT_CALL(SetNpcPos, NPC_Scene_Luigi, 220, 30, -80) + EVT_CALL(SetNpcPos, NPC_Scene_Parakarry, 720, 220, -150) + EVT_CALL(SetNpcYaw, NPC_Scene_Parakarry, 270) + EVT_CALL(EnableGroup, MODEL_g94, FALSE) + EVT_CALL(EnableGroup, MODEL_g100, TRUE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 550, 0, 20) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 550, 0, 20) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 550) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-14.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 450) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.7)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(MakeLerp, 0, 70, 60, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g108, LVar0, 0, 0) + EVT_SETF(LVar2, 0) + EVT_SUBF(LVar2, LVar0) + EVT_CALL(TranslateGroup, MODEL_g106, LVar2, 0, 0) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(MakeLerp, 0, 50, 40, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g109, LVar0, 0, 0) + EVT_SETF(LVar2, 0) + EVT_SUBF(LVar2, LVar0) + EVT_CALL(TranslateGroup, MODEL_g107, LVar2, 0, 0) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(50) + EVT_CALL(MakeLerp, 0, 50, 40, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g105, LVar0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_g102, LVar0, 0, 0) + EVT_SETF(LVar2, 0) + EVT_SUBF(LVar2, LVar0) + EVT_CALL(TranslateGroup, MODEL_g103, LVar2, 0, 0) + EVT_CALL(TranslateGroup, MODEL_g104, LVar2, 0, 0) + EVT_CALL(TranslateGroup, MODEL_g101, LVar2, 0, 0) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(120) + EVT_CALL(NpcFlyTo, NPC_Scene_Parakarry, 430, 20, -165, 60, -10, EASING_LINEAR) + EVT_CALL(InterpNpcYaw, NPC_Scene_Parakarry, 45, 10) + EVT_WAIT(20) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Parakarry, SOUND_E0, 0) + EVT_THREAD + EVT_CALL(TranslateModel, MODEL_o222, 2, 0, 0) + EVT_CALL(TranslateModel, MODEL_o223, 2, 0, 0) + EVT_CALL(TranslateModel, MODEL_o224, 2, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, MODEL_o222, -3, 0, 0) + EVT_CALL(TranslateModel, MODEL_o223, -3, 0, 0) + EVT_CALL(TranslateModel, MODEL_o224, -3, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, MODEL_o222, 2, 0, 0) + EVT_CALL(TranslateModel, MODEL_o223, 2, 0, 0) + EVT_CALL(TranslateModel, MODEL_o224, 2, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, MODEL_o222, -3, 0, 0) + EVT_CALL(TranslateModel, MODEL_o223, -3, 0, 0) + EVT_CALL(TranslateModel, MODEL_o224, -3, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, MODEL_o222, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o223, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o224, 0, 0, 0) + EVT_END_THREAD + EVT_WAIT(35) + EVT_CALL(InterpNpcYaw, NPC_Scene_Parakarry, 220, 5) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Scene_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 5, MSG_Intro_001E) + EVT_WAIT(10) + EVT_CALL(NpcFlyTo, NPC_Scene_Parakarry, 360, 260, 60, 60, -10, EASING_LINEAR) + EVT_WAIT(30) + EVT_EXEC(N(EVS_OpenAndCloseDoor_Intro)) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Run) + EVT_EXEC_GET_TID(N(EVS_Luigi_PlayWalkSounds_Intro), LVarA) + EVT_CALL(SetNpcSpeed, NPC_Scene_Luigi, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_Scene_Luigi, 450, -80, 0) + EVT_CALL(NpcMoveTo, NPC_Scene_Luigi, 430, -165, 0) + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Idle) + EVT_KILL_THREAD(LVarA) + EVT_WAIT(20) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_E0, 0) + EVT_THREAD + EVT_CALL(TranslateModel, MODEL_o222, 1, 0, 0) + EVT_CALL(TranslateModel, MODEL_o223, 1, 0, 0) + EVT_CALL(TranslateModel, MODEL_o224, 1, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, MODEL_o222, -2, 0, 0) + EVT_CALL(TranslateModel, MODEL_o223, -2, 0, 0) + EVT_CALL(TranslateModel, MODEL_o224, -2, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, MODEL_o222, 1, 0, 0) + EVT_CALL(TranslateModel, MODEL_o223, 1, 0, 0) + EVT_CALL(TranslateModel, MODEL_o224, 1, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, MODEL_o222, -2, 0, 0) + EVT_CALL(TranslateModel, MODEL_o223, -2, 0, 0) + EVT_CALL(TranslateModel, MODEL_o224, -2, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, MODEL_o222, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o223, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o224, 0, 0, 0) + EVT_END_THREAD + EVT_WAIT(2) + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_IdleLetter) + EVT_WAIT(40) + EVT_CALL(InterpNpcYaw, NPC_Scene_Luigi, 270, 5) + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_RunLetter) + EVT_EXEC_GET_TID(N(EVS_Luigi_PlayWalkSounds_Intro), LVarA) + EVT_CALL(NpcMoveTo, NPC_Scene_Luigi, 450, -80, 0) + EVT_CALL(NpcMoveTo, NPC_Scene_Luigi, 290, -70, 0) + EVT_KILL_THREAD(LVarA) + EVT_CALL(EnableGroup, MODEL_g20, TRUE) + EVT_CALL(EnableGroup, MODEL_g21, TRUE) + EVT_CALL(EnableGroup, MODEL_g49, TRUE) + EVT_CALL(EnableModel, MODEL_g56, TRUE) + EVT_CALL(N(func_80241C9C_8EDABC)) + EVT_CALL(RotateGroup, MODEL_g60, 90, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_g34, 90, -1, 0, 0) + EVT_CALL(EnableGroup, MODEL_g60, FALSE) + EVT_CALL(EnableGroup, MODEL_g34, FALSE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 250, 30, -80) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 250, 30, -80) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(N(SetAmbienceVolumeHalf_Intro)) + EVT_EXEC(N(EVS_OpenAndCloseDoor_Intro_Impl)) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_WalkLetter) + EVT_EXEC_GET_TID(N(EVS_Luigi_PlayWalkSounds_Intro), LVarA) + EVT_CALL(SetNpcSpeed, NPC_Scene_Luigi, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_Scene_Luigi, 240, -80, 0) + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_IdleLetter) + EVT_KILL_THREAD(LVarA) + EVT_CALL(SpeakToPlayer, NPC_Scene_Luigi, ANIM_Luigi_TalkLetter, ANIM_Luigi_IdleLetter, 0, MSG_Intro_001F) + EVT_WAIT(10) + EVT_EXEC(N(EVS_TetherCamToLuigi)) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_WalkLetter) + EVT_EXEC_GET_TID(N(EVS_Luigi_PlayWalkSounds_Intro), LVarA) + EVT_CALL(NpcMoveTo, NPC_Scene_Luigi, 230, -130, 0) + EVT_CALL(NpcMoveTo, NPC_Scene_Luigi, 110, -110, 0) + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_IdleLetter) + EVT_KILL_THREAD(LVarA) + EVT_CALL(SetNpcVar, NPC_Scene_Luigi, 0, 0) + EVT_END_THREAD + EVT_WAIT(20) + EVT_CALL(func_802D1270, 70, -80, EVT_FLOAT(2.0)) + EVT_CALL(func_802D1270, 70, -110, EVT_FLOAT(2.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Scene_Luigi, ANIM_Luigi_TalkLetter, ANIM_Luigi_IdleLetter, 0, MSG_Intro_0020) + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_OpenLetter) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_IdleRead) + EVT_CALL(SpeakToPlayer, NPC_Scene_Luigi, ANIM_Luigi_TalkRead, ANIM_Luigi_IdleRead, 0, MSG_Intro_0021) + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_ReadLetter) + EVT_WAIT(10) + EVT_CALL(SetMusicTrack, 0, SONG_PRISONER_PEACH_THEME, 0, 8) + EVT_WAIT(5) + EVT_CALL(ClearAmbientSounds, 250) + EVT_CALL(GotoMapSpecial, EVT_PTR("osr_00"), osr_00_ENTRY_3, TRANSITION_7) + EVT_WAIT(15) + EVT_CALL(ClearAmbientSounds, 250) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_SettingOff) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcPos, NPC_Scene_Luigi, 220, 30, -70) + EVT_CALL(SetNpcYaw, NPC_Scene_Luigi, 90) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 320, 30, -70) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 320, 30, -70) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(60) + EVT_CALL(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 1, 8) + EVT_EXEC(N(EVS_OpenAndCloseDoor_Intro)) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcSpeed, NPC_Scene_Luigi, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Run) + EVT_EXEC_GET_TID(N(EVS_Luigi_PlayWalkSounds_Intro), LVarA) + EVT_CALL(NpcMoveTo, NPC_Scene_Luigi, 320, -70, 0) + EVT_CALL(NpcMoveTo, NPC_Scene_Luigi, 460, -70, 0) + EVT_CALL(NpcMoveTo, NPC_Scene_Luigi, 570, -170, 0) + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Idle) + EVT_KILL_THREAD(LVarA) + EVT_END_THREAD + EVT_CALL(func_802D1270, 320, -70, EVT_FLOAT(3.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(func_802D1270, 460, -70, EVT_FLOAT(3.0)) + EVT_CALL(func_802D1270, 570, -170, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump, 594, 30, -216, 15) + EVT_EXEC_WAIT(N(EVS_Player_EnterPipe_Intro)) + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_JumpStance) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Jump) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_JUMP_2081, 0) + EVT_WAIT(7) + EVT_WAIT(7) + EVT_CALL(SetNpcAnimation, NPC_Scene_Luigi, ANIM_Luigi_Idle) + EVT_CALL(PlaySoundAtNpc, NPC_Scene_Luigi, SOUND_SOFT_LAND, 0) + EVT_END_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Scene_Luigi, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Scene_Luigi, 594, 30, -216, 15) + EVT_EXEC_WAIT(N(EVS_Luigi_EnterPipe_Intro)) + EVT_EXEC(N(EVS_FadeOutAmbientSounds)) + EVT_CALL(GotoMap, EVT_PTR("mac_00"), mac_00_ENTRY_5) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c new file mode 100644 index 0000000000..08369859a1 --- /dev/null +++ b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c @@ -0,0 +1,332 @@ +#include "kmr_20.h" +#include "model.h" + +#define NAME_SUFFIX _Epilogue +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" +#define NAME_SUFFIX + +API_CALLABLE(N(func_80242030_8EDE50)) { + func_8011B950(MODEL_g62, -1, 0, 1); + set_background_color_blend(0, 0, 0, 0); + + gCameras[CAM_DEFAULT].bgColor[0] = 0; + gCameras[CAM_DEFAULT].bgColor[1] = 0; + gCameras[CAM_DEFAULT].bgColor[2] = 0; + + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80242084_8EDEA4)) { + if (isInitialCall) { + script->functionTemp[1] = 0; + } + + script->functionTemp[1] += 16; + + if (script->functionTemp[1] > 255) { + script->functionTemp[1] = 255; + } + + set_screen_overlay_params_front(0, script->functionTemp[1]); + + if (script->functionTemp[1] == 255) { + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(func_802420EC_8EDF0C)) { + if (isInitialCall) { + script->functionTemp[1] = 255; + } + + script->functionTemp[1] -= 16; + if (script->functionTemp[1] <= 0) { + script->functionTemp[1] = 0; + return ApiStatus_DONE2; + } + + set_screen_overlay_params_front(0, script->functionTemp[1]); + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(SetAmbienceVolumeHalf_Epilogue)) { + au_ambience_set_volume(0, 1000, 63); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetAmbienceVolumeFull_Epilogue)) { + au_ambience_set_volume(0, 1000, 127); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_Luigi_PlayWalkSounds_Epilogue) = { + EVT_CALL(GetNpcAnimation, NPC_Luigi_1, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(ANIM_Luigi_Walk) + EVT_CASE_OR_EQ(ANIM_Luigi_WalkLetter) + EVT_CASE_OR_EQ(ANIM_Luigi_WalkBack) + EVT_SET(LVar1, 10) + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(ANIM_Luigi_Run) + EVT_CASE_OR_EQ(ANIM_Luigi_RunLetter) + EVT_CASE_OR_EQ(ANIM_Luigi_RunBack) + EVT_SET(LVar1, 5) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_B0000019, 0) + EVT_WAIT(LVar1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenFrontDoor) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_o246, SOUND_BASIC_DOOR_OPEN, 0) + EVT_CALL(MakeLerp, 0, 90, 10, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g14, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_CloseFrontDoor) = { + EVT_CALL(MakeLerp, 90, 0, 10, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g14, 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_o246, SOUND_BASIC_DOOR_CLOSE, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenAndCloseDoor_Epilogue) = { + EVT_CALL(EnableGroup, MODEL_g72, TRUE) + EVT_EXEC_WAIT(N(EVS_OpenFrontDoor)) + EVT_WAIT(30) + EVT_EXEC_WAIT(N(EVS_CloseFrontDoor)) + EVT_CALL(EnableGroup, MODEL_g72, TRUE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Player_EnterPipe_Epilogue) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_SET(LVar0, 4) + EVT_CALL(N(Pipe_GetEntryPos_Epilogue)) + EVT_CALL(PlayerMoveTo, LVar1, LVar3, 3) + EVT_SET(LVar0, 4) + EVT_CALL(N(Pipe_GetEntryPos_Epilogue)) + EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) + EVT_WAIT(2) + EVT_CALL(PlaySoundAtPlayer, SOUND_ENTER_PIPE, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_THREAD + EVT_WAIT(4) + EVT_LOOP(40) + EVT_SUB(LVar1, 1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(func_802D286C, 0x00000800) + EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 2, 1, 1, 0) + EVT_WAIT(25) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Luigi_EnterPipe_Epilogue) = { + EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_ENABLE_HIT_SCRIPT, TRUE) + EVT_CALL(EnableNpcShadow, NPC_Luigi_1, FALSE) + EVT_SET(LVar0, 4) + EVT_CALL(N(Pipe_GetEntryPos_Epilogue)) + EVT_CALL(NpcMoveTo, NPC_Luigi_1, LVar1, LVar3, 3) + EVT_SET(LVar0, 4) + EVT_CALL(N(Pipe_GetEntryPos_Epilogue)) + EVT_CALL(SetNpcPos, NPC_Luigi_1, LVar1, LVar2, LVar3) + EVT_WAIT(2) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_ENTER_PIPE, 0) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Still) + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Luigi_1, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 7) + EVT_CALL(SetNpcPos, NPC_Luigi_1, LVar0, LVar1, LVar2) + EVT_LOOP(40) + EVT_SUB(LVar1, 1) + EVT_CALL(SetNpcPos, NPC_Luigi_1, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(func_802CFE2C, NPC_Luigi_1, 0x00000800) + EVT_CALL(func_802CFD30, NPC_Luigi_1, FOLD_TYPE_5, 2, 1, 1, 0) + EVT_WAIT(25) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_BeginEpilogue) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(SetAmbienceVolumeHalf_Epilogue)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80024) + EVT_CALL(SetPlayerPos, 95, 44, -40) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 150, 44, -40) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 150, 44, -40) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-6.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkSit, ANIM_Luigi_IdleSit, 0, MSG_Outro_000D) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80025) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkSit, ANIM_Luigi_IdleSit, 0, MSG_Outro_000E) + EVT_WAIT(30) + EVT_CALL(GotoMap, EVT_PTR("kmr_02"), kmr_02_ENTRY_4) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_EpilogueGetLetter) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(SetAmbienceVolumeHalf_Epilogue)) + EVT_CALL(SetPlayerPos, 95, 44, -40) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80024) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 150, 44, -40) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 150, 44, -40) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-6.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(35) + EVT_CALL(PlaySoundAt, SOUND_E0, 0, 430, 0, -185) + EVT_WAIT(25) + EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) + EVT_CALL(ShowEmote, NPC_Luigi_0, EMOTE_QUESTION, 0, 20, FALSE, 0, 0, 0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_263, 0) + EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkSit, ANIM_Luigi_IdleSit, 0, MSG_Outro_0021) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Luigi_1, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Luigi_1, 180, 30, -20, 10) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_JUMP_2081, 0) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Fall) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Land) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_SOFT_LAND, 0) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Walk) + EVT_EXEC_GET_TID(N(EVS_Luigi_PlayWalkSounds_Epilogue), LVarA) + EVT_CALL(NpcMoveTo, NPC_Luigi_1, 240, -20, 30) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_WalkBack) + EVT_CALL(NpcMoveTo, NPC_Luigi_1, 240, -80, 30) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) + EVT_KILL_THREAD(LVarA) + EVT_WAIT(10) + EVT_EXEC(N(EVS_OpenFrontDoor)) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Walk) + EVT_EXEC_GET_TID(N(EVS_Luigi_PlayWalkSounds_Epilogue), LVarA) + EVT_CALL(NpcMoveTo, NPC_Luigi_1, 300, -80, 30) + EVT_EXEC_WAIT(N(EVS_CloseFrontDoor)) + EVT_KILL_THREAD(LVarA) + EVT_WAIT(90) + EVT_CALL(SetNpcYaw, NPC_Luigi_1, 270) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_WalkLetter) + EVT_EXEC_GET_TID(N(EVS_Luigi_PlayWalkSounds_Epilogue), LVarA) + EVT_EXEC(N(EVS_OpenFrontDoor)) + EVT_CALL(NpcMoveTo, NPC_Luigi_1, 240, -80, 30) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_IdleLetter) + EVT_KILL_THREAD(LVarA) + EVT_EXEC_WAIT(N(EVS_CloseFrontDoor)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkLetter, ANIM_Luigi_IdleLetter, 0, MSG_Outro_0022) + EVT_WAIT(30) + EVT_CALL(N(func_80242084_8EDEA4)) + EVT_CALL(EnableGroup, MODEL_g20, FALSE) + EVT_CALL(EnableGroup, MODEL_g21, FALSE) + EVT_CALL(EnableGroup, MODEL_g49, FALSE) + EVT_CALL(EnableModel, MODEL_g56, FALSE) + EVT_CALL(N(func_80242030_8EDE50)) + EVT_CALL(RotateGroup, MODEL_g60, 0, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_g34, 0, -1, 0, 0) + EVT_CALL(EnableGroup, MODEL_g60, TRUE) + EVT_CALL(EnableGroup, MODEL_g34, TRUE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 340, 30, -70) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 340, 30, -70) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetPlayerPos, 240, 30, -75) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) + EVT_CALL(SetNpcPos, NPC_Luigi_1, 200, 30, -75) + EVT_WAIT(30) + EVT_CALL(N(func_802420EC_8EDF0C)) + EVT_CALL(N(SetAmbienceVolumeFull_Epilogue)) + EVT_WAIT(30) + EVT_CALL(SetMusicTrack, 0, SONG_PEACHS_CASTLE_PARTY, 0, 8) + EVT_EXEC(N(EVS_OpenAndCloseDoor_Epilogue)) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcSpeed, NPC_Luigi_1, EVT_FLOAT(3.0)) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Run) + EVT_EXEC_GET_TID(N(EVS_Luigi_PlayWalkSounds_Epilogue), LVarA) + EVT_CALL(NpcMoveTo, NPC_Luigi_1, 320, -70, 0) + EVT_CALL(NpcMoveTo, NPC_Luigi_1, 460, -70, 0) + EVT_CALL(NpcMoveTo, NPC_Luigi_1, 570, -170, 0) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) + EVT_KILL_THREAD(LVarA) + EVT_END_THREAD + EVT_CALL(func_802D1270, 320, -70, EVT_FLOAT(3.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(func_802D1270, 460, -70, EVT_FLOAT(3.0)) + EVT_CALL(func_802D1270, 570, -170, EVT_FLOAT(3.0)) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump, 594, 30, -216, 15) + EVT_EXEC_WAIT(N(EVS_Player_EnterPipe_Epilogue)) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_JumpStance) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_JUMP_2081, 0) + EVT_WAIT(7) + EVT_WAIT(7) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) + EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_SOFT_LAND, 0) + EVT_END_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Luigi_1, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Luigi_1, 594, 30, -216, 15) + EVT_EXEC_WAIT(N(EVS_Luigi_EnterPipe_Epilogue)) + EVT_EXEC(N(EVS_FadeOutAmbientSounds)) + EVT_CALL(GotoMap, EVT_PTR("mac_00"), mac_00_ENTRY_7) + EVT_WAIT(100) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +MAP_RODATA_PAD(1,unk) diff --git a/src/world/area_kmr/kmr_20/kmr_20_13_records.c b/src/world/area_kmr/kmr_20/kmr_20_13_records.c new file mode 100644 index 0000000000..3db17e1f2e --- /dev/null +++ b/src/world/area_kmr/kmr_20/kmr_20_13_records.c @@ -0,0 +1,255 @@ +#include "kmr_20.h" + +#include "world/area_kmr/kmr_20/records_screen.gfx.inc.c" + +enum { + RECORDS_STATE_BEGIN_FADE_IN = 0, + RECORDS_STATE_FADING_IN = 1, + RECORDS_STATE_IDLE = 2, + RECORDS_STATE_BEGIN_FADE_OUT = 3, + RECORDS_STATE_FADING_OUT = 4, + RECORDS_STATE_DONE = 5, +}; + +typedef struct GameRecords { + /* 0x00 */ u16 state; + /* 0x02 */ char unk_02[0x2]; + /* 0x04 */ s32 lerpTime; + /* 0x08 */ s16 unk_08; + /* 0x0A */ s16 unk_0A; + /* 0x0C */ char unk_0C[0xC]; + /* 0x18 */ s16 unk_18; + /* 0x1A */ s16 alpha; + /* 0x1C */ s16 lastAlpha; + /* 0x1E */ char unk_1E[0x2]; + /* 0x20 */ s32 workerID; + /* 0x24 */ u16 equippedBadges; + /* 0x26 */ s16 recipesFoundCount; + /* 0x28 */ s16 totalRecipesCount; +} GameRecords; + +s32 N(RecipeFoundVars)[] = { + GF_MAC02_DiscoveredRecipe_00, GF_MAC02_DiscoveredRecipe_01, + GF_MAC02_DiscoveredRecipe_02, GF_MAC02_DiscoveredRecipe_03, + GF_MAC02_DiscoveredRecipe_04, GF_MAC02_DiscoveredRecipe_05, + GF_MAC02_DiscoveredRecipe_06, GF_MAC02_DiscoveredRecipe_07, + GF_MAC02_DiscoveredRecipe_08, GF_MAC02_DiscoveredRecipe_09, + GF_MAC02_DiscoveredRecipe_0A, GF_MAC02_DiscoveredRecipe_0B, + GF_MAC02_DiscoveredRecipe_0C, GF_MAC02_DiscoveredRecipe_0D, + GF_MAC02_DiscoveredRecipe_0E, GF_MAC02_DiscoveredRecipe_0F, + GF_MAC02_DiscoveredRecipe_10, GF_MAC02_DiscoveredRecipe_11, + GF_MAC02_DiscoveredRecipe_13, GF_MAC02_DiscoveredRecipe_14, + GF_MAC02_DiscoveredRecipe_15, GF_MAC02_DiscoveredRecipe_16, + GF_MAC02_DiscoveredRecipe_17, GF_MAC02_DiscoveredRecipe_18, + GF_MAC02_DiscoveredRecipe_19, GF_MAC02_DiscoveredRecipe_1A, + GF_MAC02_DiscoveredRecipe_1B, GF_MAC02_DiscoveredRecipe_1C, + GF_MAC02_DiscoveredRecipe_1D, GF_MAC02_DiscoveredRecipe_1E, + GF_MAC02_DiscoveredRecipe_1F, GF_MAC02_DiscoveredRecipe_20, + GF_MAC02_DiscoveredRecipe_21, GF_MAC02_DiscoveredRecipe_22, + GF_MAC02_DiscoveredRecipe_23, GF_MAC02_DiscoveredRecipe_24, + GF_MAC02_DiscoveredRecipe_25, GF_MAC02_DiscoveredRecipe_26, + GF_MAC02_DiscoveredRecipe_27, GF_MAC02_DiscoveredRecipe_28, + GF_MAC02_DiscoveredRecipe_29, GF_MAC02_DiscoveredRecipe_2A, + GF_MAC02_DiscoveredRecipe_2B, GF_MAC02_DiscoveredRecipe_2C, + GF_MAC02_DiscoveredRecipe_2D, GF_MAC02_DiscoveredRecipe_2F, + GF_MAC02_DiscoveredRecipe_30, GF_MAC02_DiscoveredRecipe_31, + GF_MAC02_DiscoveredRecipe_32, GF_MAC02_DiscoveredRecipe_33, + 0 +}; + +void N(appendGfx_records_impl)(GameRecords* records, s32 alpha) { + s32 width; + + if (alpha > 0) { + gSPDisplayList(gMasterGfxPos++, N(records_screen_gfx)); + gDPPipeSync(gMasterGfxPos++); + gDPSetPrimColor(gMasterGfxPos++, 0, 0, 16, 120, 24, alpha * 0.65); + gDPFillRectangle(gMasterGfxPos++, 33, 43, 287, 192); + gDPPipeSync(gMasterGfxPos++); + + msg_draw_frame(30, 40, 260, 155, MSG_STYLE_INSPECT, MSG_PAL_WHITE, TRUE, alpha * 0.55, alpha); + draw_msg(MSG_CH0_00FC, 206 - get_msg_width(MSG_CH0_00FC, 0), 50, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(gPlayerData.totalCoinsEarned, 216, 51, 1, MSG_PAL_WHITE, alpha, 2); + draw_msg(MSG_CH0_00FD, 206 - get_msg_width(MSG_CH0_00FD, 0), 65, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(records->equippedBadges, 231, 66, 1, MSG_PAL_WHITE, alpha, 3); + draw_msg(MSG_MenuTip_0034, 232, 63, alpha, MSG_PAL_WHITE, 0); + draw_number(80, 244, 66, 1, MSG_PAL_WHITE, alpha, 2); + if (gPlayerData.starPiecesCollected == 0) { + draw_msg(MSG_CH0_00FA, 109, 80, alpha, MSG_PAL_WHITE, 1); + } else { + draw_msg(MSG_CH0_00FB, 206 - get_msg_width(MSG_CH0_00FB, 0), 80, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(gPlayerData.starPiecesCollected, 231, 81, 1, MSG_PAL_WHITE, alpha, 3); + draw_msg(MSG_MenuTip_0034, 232, 78, alpha, MSG_PAL_WHITE, 0); + draw_number(160, 244, 80, 1, MSG_PAL_WHITE, alpha, 2); + } + + width = get_msg_width(MSG_CH0_00FE, 0); + if (records->recipesFoundCount == 0) { + draw_msg(MSG_CH0_00FA, 110, 95, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + } else { + if (records->recipesFoundCount == -1) { + draw_msg(MSG_CH0_00FE, 206 - width, 95, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(0, 231, 96, 1, MSG_PAL_WHITE, alpha, 3); + } else { + draw_msg(MSG_CH0_00FE, 206 - width, 95, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(records->recipesFoundCount, 231, 96, 1, MSG_PAL_WHITE, alpha, 3); + } + draw_msg(MSG_MenuTip_0034, 232, 93, alpha, MSG_PAL_WHITE, 0); + draw_number(records->totalRecipesCount, 244, 95, 1, MSG_PAL_WHITE, alpha, 2); + } + + if (gPlayerData.quizzesAnswered == 0) { + draw_msg(MSG_CH0_00FA, 109, 110, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + } else { + draw_msg(MSG_CH0_00FF, 206 - get_msg_width(MSG_CH0_00FF, 0), 110, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(gPlayerData.quizzesCorrect, 231, 111, 1, MSG_PAL_WHITE, alpha, 3); + draw_msg(MSG_MenuTip_0034, 232, 108, alpha, MSG_PAL_WHITE, 0); + draw_number(gPlayerData.quizzesAnswered, 244, 111, 1, MSG_PAL_WHITE, alpha, 2); + } + + draw_msg(MSG_CH0_00F4, 206 - get_msg_width(MSG_CH0_00F4, 0), 125, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(gPlayerData.battlesCount, 216, 126, 1, MSG_PAL_WHITE, alpha, 2); + width = get_msg_width(MSG_CH0_00F7, 0); + draw_msg(MSG_CH0_00F7, 206 - width, 140, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(gPlayerData.playerFirstStrikes, 216, 141, 1, MSG_PAL_WHITE, alpha, 2); + draw_msg(MSG_CH0_00F8, 206 - get_msg_width(MSG_CH0_00F8, 0), 155, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(gPlayerData.enemyFirstStrikes, 216, 156, 1, MSG_PAL_WHITE, alpha, 2); + + if (gPlayerData.powerBounces == 0) { + draw_msg(MSG_CH0_00FA, 109, 170, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + } else { + draw_msg(MSG_CH0_00F9, 206 - get_msg_width(MSG_CH0_00F9, 0), 170, alpha, MSG_PAL_WHITE, DRAW_MSG_STYLE_MENU); + draw_number(gPlayerData.powerBounces, 216, 171, 1, MSG_PAL_WHITE, alpha, 2); + } + } +} + +void N(appendGfx_records)(void* data) { + GameRecords* records = (GameRecords*) evt_get_variable(NULL, MV_RecordsDataPtr); + + switch (records->state) { + case RECORDS_STATE_BEGIN_FADE_IN: + records->unk_18 = 0; + records->unk_08 = 0; + records->unk_0A = 0; + records->lerpTime = 0; + records->state = RECORDS_STATE_FADING_IN; + snd_start_sound(SOUND_21C, 0, 0); + // fallthrough + case RECORDS_STATE_FADING_IN: + records->lerpTime++; + records->alpha = update_lerp(0, 32.0f, 255.0f, records->lerpTime, 3); + records->lastAlpha = records->alpha; + if (records->lerpTime >= 3) { + records->state = RECORDS_STATE_IDLE; + records->alpha = 255; + records->lastAlpha = records->alpha; + } + break; + case RECORDS_STATE_IDLE: + records->alpha = 255; + records->lastAlpha = records->alpha; + if (gGameStatusPtr->currentButtons[0] & (BUTTON_A | BUTTON_B)) { + records->state = RECORDS_STATE_BEGIN_FADE_OUT; + } + if (records->state != RECORDS_STATE_BEGIN_FADE_OUT) { + break; + } + case RECORDS_STATE_BEGIN_FADE_OUT: + records->lerpTime = 0; + records->state = RECORDS_STATE_FADING_OUT; + snd_start_sound(SOUND_MENU_BACK, 0, 0); + // fallthrough + case RECORDS_STATE_FADING_OUT: + records->lerpTime++; + records->alpha = update_lerp(0, records->lastAlpha, 0.0f, records->lerpTime, 3); + if (records->lerpTime >= 3) { + records->state = RECORDS_STATE_DONE; + } + break; + } + N(appendGfx_records_impl)(records, records->alpha); +} + +void N(worker_draw_game_records)(void) { + RenderTask rt; + + rt.renderMode = RENDER_MODE_2D; + rt.appendGfxArg = NULL; + rt.appendGfx = N(appendGfx_records); + rt.distance = 0; + queue_render_task(&rt); +} + +void N(calculate_records)(GameRecords* records) { + PlayerData* playerData = &gPlayerData; + s32 count; + s32 i; + + count = 0; + for (i = 0; i < ARRAY_COUNT(playerData->badges); i++) { + if (playerData->badges[i] != 0) { + count++; + } + } + records->equippedBadges = count; + + count = 0; + for (i = 0; TRUE; i++) { + if (N(RecipeFoundVars)[i] != 0) { + if (evt_get_variable(NULL, N(RecipeFoundVars)[i]) != 0) { + count++; + } + } else { + break; + } + } + records->totalRecipesCount = i; + records->recipesFoundCount = count; + if (records->recipesFoundCount == 0 && evt_get_variable(NULL, GF_MAC02_DiscoveredRecipe_12)) { + records->recipesFoundCount = -1; + } +} + +API_CALLABLE(N(ShowGameRecords)) { + GameRecords* records; + + if (isInitialCall) { + records = script->functionTempPtr[0] = heap_malloc(sizeof(*records)); + records->state = RECORDS_STATE_BEGIN_FADE_IN; + records->alpha = 255; + records->workerID = create_worker_world(0, N(worker_draw_game_records)); + evt_set_variable(script, MV_RecordsDataPtr, (s32) records); + N(calculate_records)(records); + } + + records = script->functionTempPtr[0]; + if (records->state == RECORDS_STATE_DONE) { + free_worker(records->workerID); + heap_free(records); + return ApiStatus_DONE1; + } + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_Inspect_Records) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(GetPlayerPos, LVarA, LVarB, LVarC) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVarA, 30, LVarC) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVarA, 30, LVarC) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(320.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.2)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(N(ShowGameRecords)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.2)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_20/kmr_20_1_music.c b/src/world/area_kmr/kmr_20/kmr_20_1_music.c new file mode 100644 index 0000000000..d51e011531 --- /dev/null +++ b/src/world/area_kmr/kmr_20/kmr_20_1_music.c @@ -0,0 +1,43 @@ +#include "kmr_20.h" + +API_CALLABLE(N(FadeOutAmbientSounds)){ + snd_ambient_slow_fade_out(0, 500); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SetupMusic) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_INTRO) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_END_CASE_GROUP + EVT_CASE_GE(STORY_EPILOGUE) + EVT_CALL(FadeOutMusic, 0, 500) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_MARIO_BROS_HOUSE, 0, 8) + EVT_END_SWITCH + EVT_THREAD + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kmr_20_ENTRY_0) + EVT_WAIT(300) + EVT_CALL(PlayAmbientSounds, AMBIENT_BIRDS) + EVT_CASE_DEFAULT + EVT_CALL(PlayAmbientSounds, AMBIENT_BIRDS) + EVT_END_SWITCH + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PlayRestingSong) = { + EVT_CALL(SetMusicTrack, 0, SONG_TAKING_REST, 0, 8) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FadeOutAmbientSounds) = { + EVT_CALL(N(FadeOutAmbientSounds)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_20/kmr_20_2_main.c b/src/world/area_kmr/kmr_20/kmr_20_2_main.c new file mode 100644 index 0000000000..fa33659509 --- /dev/null +++ b/src/world/area_kmr/kmr_20/kmr_20_2_main.c @@ -0,0 +1,106 @@ +#include "kmr_20.h" + +#include "world/common/entity/Pipe.inc.c" +#include "world/common/entity/Pipe.data.inc.c" + +API_CALLABLE(N(func_80240310_8EC130)){ + set_map_transition_effect(TRANSITION_4); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_GotoMap_mac_00_4) = { + EVT_EXEC(N(EVS_FadeOutAmbientSounds)) + EVT_CALL(GotoMap, EVT_PTR("mac_00"), mac_00_ENTRY_4) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_mac_00_4) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_SET(LVarA, kmr_20_ENTRY_4) + EVT_SET(LVarB, COLLIDER_o244) + EVT_SET(LVarC, EVT_PTR(N(EVS_GotoMap_mac_00_4))) + EVT_EXEC_WAIT(N(EVS_Pipe_ExitVertical)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_mac_00_4)), TRIGGER_FLOOR_TOUCH, COLLIDER_o244, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_MARIOS_HOUSE) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kmr_20_ENTRY_2) + EVT_SET(GB_StoryProgress, STORY_EPILOGUE) + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kmr_20_ENTRY_4) + EVT_SET(MF_LuigiWaiting, FALSE) + EVT_IF_EQ(GF_KMR20_ReunitedWithLuigi, FALSE) + EVT_SET(GF_KMR20_ReunitedWithLuigi, TRUE) + EVT_IF_LT(GB_StoryProgress, STORY_CH3_INVITED_TO_BOOS_MANSION) + EVT_SET(MF_LuigiWaiting, TRUE) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_SET(MF_Unk_0C, FALSE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_LT(LVar0, kmr_20_ENTRY_4) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(SceneNPCs))) + EVT_ELSE + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(EnableGroup, MODEL_g100, FALSE) + EVT_EXEC(N(EVS_SetupTrees)) + EVT_EXEC(N(EVS_SetupBushes)) + EVT_EXEC(N(EVS_SetupRooms)) + EVT_EXEC(N(EVS_Setup_Interactables)) + EVT_IF_LT(GB_StoryProgress, STORY_EPILOGUE) + EVT_EXEC(N(EVS_SetupBed)) + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kmr_20_ENTRY_0) + EVT_CALL(N(func_80240310_8EC130)) + EVT_EXEC(N(EVS_Scene_BeginGame)) + EVT_WAIT(5) + EVT_CASE_EQ(kmr_20_ENTRY_1) + EVT_EXEC(N(EVS_Scene_SettingOff)) + EVT_CASE_EQ(kmr_20_ENTRY_2) + EVT_WAIT(60) + EVT_EXEC(N(EVS_Scene_BeginEpilogue)) + EVT_CASE_EQ(kmr_20_ENTRY_3) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_EXEC(N(EVS_Scene_EpilogueGetLetter)) + EVT_CASE_EQ(kmr_20_ENTRY_4) + EVT_SET(GF_MAP_MariosHouse, TRUE) + EVT_IF_EQ(MF_LuigiWaiting, TRUE) + EVT_EXEC(N(EVS_Scene_LuigiWaitingAround)) + EVT_THREAD + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerPos, NPC_DISPOSE_LOCATION) + EVT_LABEL(0) + EVT_IF_EQ(MF_ReadyForPlayerEntry, FALSE) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_SET(LVarA, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(N(EVS_Pipe_EnterVertical)) + EVT_END_THREAD + EVT_ELSE + EVT_SET(LVarA, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(N(EVS_Pipe_EnterVertical)) + EVT_END_IF + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_20/kmr_20_3_rooms.c b/src/world/area_kmr/kmr_20/kmr_20_3_rooms.c new file mode 100644 index 0000000000..f6b193bf13 --- /dev/null +++ b/src/world/area_kmr/kmr_20/kmr_20_3_rooms.c @@ -0,0 +1,102 @@ +#include "kmr_20.h" + +API_CALLABLE(N(SetAmbienceVolumeHalf_Rooms)){ + au_ambience_set_volume(0, 1000, 63); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetAmbienceVolumeFull_Rooms)){ + au_ambience_set_volume(0, 1000, 127); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SetDoorRot_House) = { + EVT_CALL(RotateGroup, MODEL_g14, LVar0, 0, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveWalls_House) = { + EVT_CALL(RotateGroup, MODEL_g60, LVar0, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_g34, LVar0, -1, 0, 0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(90) + EVT_SET(MF_Unk_0C, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_2, FALSE) + EVT_CALL(EnableGroup, MODEL_g60, FALSE) + EVT_CALL(EnableGroup, MODEL_g34, FALSE) + EVT_CASE_EQ(0) + EVT_IF_EQ(MF_Unk_0C, TRUE) + EVT_CALL(EnableGroup, MODEL_g72, TRUE) + EVT_SET(MF_Unk_0C, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_0, NPC_FLAG_2, TRUE) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_CALL(EnableGroup, MODEL_g60, TRUE) + EVT_CALL(EnableGroup, MODEL_g34, TRUE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToggleVis_House) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(N(SetAmbienceVolumeHalf_Rooms)) + EVT_CALL(EnableGroup, MODEL_g20, TRUE) + EVT_CALL(EnableGroup, MODEL_g21, TRUE) + EVT_CALL(EnableGroup, MODEL_g49, TRUE) + EVT_CALL(EnableModel, MODEL_g56, TRUE) + EVT_CASE_EQ(1) + EVT_CASE_EQ(2) + EVT_CASE_EQ(3) + EVT_CALL(N(SetAmbienceVolumeFull_Rooms)) + EVT_CALL(EnableGroup, MODEL_g20, FALSE) + EVT_CALL(EnableGroup, MODEL_g21, FALSE) + EVT_CALL(EnableGroup, MODEL_g49, FALSE) + EVT_CALL(EnableModel, MODEL_g56, FALSE) + EVT_CALL(EnableGroup, MODEL_g72, FALSE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +s32 N(InteriorNPCs_House)[] = { + NPC_Luigi_0, + -1 +}; + +EvtScript N(EVS_SetupRooms) = { + EVT_CALL(MakeDoorAdvanced, + VIS_GROUP_PAIR(VIS_GROUP_0, VIS_GROUP_0), + EVT_PTR(N(EVS_SetDoorRot_House)), + EVT_PTR(N(EVS_MoveWalls_House)), + NULL, + EVT_PTR(N(EVS_ToggleVis_House)), + COLLIDER_o246, + COLLIDER_o245, + MODEL_g62, + EVT_PTR(N(InteriorNPCs_House))) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(kmr_20_ENTRY_2) + EVT_CASE_OR_EQ(kmr_20_ENTRY_3) + EVT_CALL(EnableGroup, MODEL_g20, TRUE) + EVT_CALL(EnableGroup, MODEL_g21, TRUE) + EVT_CALL(EnableGroup, MODEL_g49, TRUE) + EVT_CALL(EnableModel, MODEL_g56, TRUE) + EVT_CALL(EnableGroup, MODEL_g72, FALSE) + EVT_CALL(N(func_80241C9C_8EDABC)) + EVT_CALL(RotateGroup, MODEL_g60, 90, 1, 0, 0) + EVT_CALL(RotateGroup, MODEL_g34, 90, -1, 0, 0) + EVT_CALL(EnableGroup, MODEL_g60, FALSE) + EVT_CALL(EnableGroup, MODEL_g34, FALSE) + EVT_CALL(N(SetAmbienceVolumeHalf_Rooms)) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_SET(LVar0, 3) + EVT_EXEC(N(EVS_ToggleVis_House)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_20/kmr_20_4_documents.c b/src/world/area_kmr/kmr_20/kmr_20_4_documents.c new file mode 100644 index 0000000000..61a61b311b --- /dev/null +++ b/src/world/area_kmr/kmr_20/kmr_20_4_documents.c @@ -0,0 +1,538 @@ +#include "kmr_20.h" +#include "hud_element.h" +#include "ld_addrs.h" + +#define PACKED_BYTE(base, i) \ + (i / 8) + EVT_INDEX_OF_GAME_BYTE(base) + +#define GET_PACKED_FLAG(base, i) \ + get_global_byte((i / 8) + EVT_INDEX_OF_GAME_BYTE(base)) & (1 << (i % 8)) + +#define SET_PACKED_FLAG(base, i) \ + get_global_byte((i / 8) + EVT_INDEX_OF_GAME_BYTE(base)) | (1 << (i % 8)) + +extern HudScript HES_Item_Unused_08B; +extern HudScript HES_Item_Unused_08B_disabled; +extern HudScript HES_Item_Unused_08C; +extern HudScript HES_Item_Unused_08C_disabled; + +BSS PopupMenu N(ChooseDocumentPopupMenu); +BSS IMG_BIN N(LetterBackgroundImg)[0x3D86]; +BSS PAL_BIN N(LetterBackgroundPal)[0x100]; +BSS char N(static_pad)[0x8]; // padding +BSS IMG_BIN N(LetterPhotoImg)[0x3D86]; +BSS PAL_BIN N(N(LetterPhotoPal))[0x100]; +BSS s32 N(LetterWorkerID); +BSS s32 N(LetterAlpha); +BSS MessageImageData N(LetterImgData)[2]; + +#define NAME_SUFFIX _Unused +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +void N(worker_draw_letter)(void) { + N(LetterAlpha) += 20; + if (N(LetterAlpha) > 255) { + N(LetterAlpha) = 255; + } + + draw_ci_image_with_clipping(N(LetterImgData)[0].raster, + N(LetterImgData)[0].width, N(LetterImgData)[0].height, + N(LetterImgData)[0].format, N(LetterImgData)[0].bitDepth, + N(LetterImgData)[0].palette, + 85, 97, + 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, + N(LetterAlpha)); + + draw_ci_image_with_clipping(N(LetterImgData)[1].raster, + N(LetterImgData)[1].width, N(LetterImgData)[1].height, + N(LetterImgData)[1].format, N(LetterImgData)[1].bitDepth, + N(LetterImgData)[1].palette, + 160, 102, + 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, + N(LetterAlpha)); +} + +s32 N(LetterStoryRequirements)[] = { + STORY_INTRO, + STORY_CH4_PULLED_SWITCH_SWITCH, + STORY_CH1_STAR_SPIRIT_RESCUED, + STORY_CH2_STAR_SPIRIT_RESCUED, + STORY_CH3_STAR_SPIRIT_RESCUED, + STORY_CH3_STAR_SPIRIT_RESCUED, + STORY_CH4_STAR_SPIRIT_RESCUED, + STORY_CH4_GAVE_CAKE_TO_GOURMET_GUY, + STORY_CH5_RETURNED_TO_TOAD_TOWN, + STORY_CH6_STAR_SPRIT_DEPARTED, + STORY_CH4_GOT_TAYCE_TS_CAKE, + STORY_CH7_STAR_SPIRIT_RESCUED, +}; + +s32 N(LetterSenderStringIDs)[] = { + MSG_Document_Letter_Mario01_From, + MSG_Document_Letter_Mario02_From, + MSG_Document_Letter_Mario03_From, + MSG_Document_Letter_Mario04_From, + MSG_Document_Letter_Mario05_From, + MSG_Document_Letter_Mario06_From, + MSG_Document_Letter_Mario07_From, + MSG_Document_Letter_Mario08_From, + MSG_Document_Letter_Mario09_From, + MSG_Document_Letter_Mario10_From, + MSG_Document_Letter_Mario11_From, + MSG_Document_Letter_Mario12_From, +}; + +s32 N(LetterBodyStringIDs)[] = { + MSG_Document_Letter_Mario01_Body, + MSG_Document_Letter_Mario02_Body, + MSG_Document_Letter_Mario03_Body, + MSG_Document_Letter_Mario04_Body, + MSG_Document_Letter_Mario05_Body, + MSG_Document_Letter_Mario06_Body, + MSG_Document_Letter_Mario07_Body, + MSG_Document_Letter_Mario08_Body, + MSG_Document_Letter_Mario09_Body, + MSG_Document_Letter_Mario10_Body, + MSG_Document_Letter_Mario11_Body, + MSG_Document_Letter_Mario12_Body, +}; + +//TODO shiftability -- these are offsets relative to 0x10F1B0 +s32 N(LetterDmaOffsets)[] = { + 0x0000B290, 0x0000D158, + 0x0000D178, 0x0000EB78, + 0x0000ED78, 0x00010778, + 0x00010978, 0x00012378, + 0x00012578, 0x00013F78, + 0x00014178, 0x00015B78, + 0x00015D78, 0x00017778, + 0x00017978, 0x00019378, + 0x00019578, 0x0001AF78, + 0x0001B178, 0x0001CB78, + 0x0001CD78, 0x0001E778, + 0x0001E978, 0x00020378, + 0x00020578, 0x00021F78, +}; + +API_CALLABLE(N(InitLetters)){ + script->functionTemp[3] = 0; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(ReadLetters)){ + PopupMenu* menu = &N(ChooseDocumentPopupMenu); + s32 temp; + s32 userIndex; + s32 storyReq; + s32 flags; + s32 cond; + s32 numEntries; + s32 i; + + if (isInitialCall) { + script->functionTemp[0] = 0; + } + + switch (script->functionTemp[0]) { + case 0: + numEntries = 0; + + for (i = 0; i < ARRAY_COUNT(N(LetterStoryRequirements)); i++) { + cond = FALSE; + storyReq = N(LetterStoryRequirements)[i]; + switch (storyReq) { + case STORY_CH4_PULLED_SWITCH_SWITCH: + if (gPlayerData.quizzesCorrect != 0) { + cond = TRUE; + } + break; + case STORY_CH4_GAVE_CAKE_TO_GOURMET_GUY: + if (evt_get_variable(NULL, GF_MAC02_TayceT_HasCookbook) != 0) { + cond = TRUE; + } + break; + case STORY_CH4_GOT_TAYCE_TS_CAKE: + temp = FALSE; + if (evt_get_variable(NULL, GB_StoryProgress) >= STORY_CH4_BEGAN_PEACH_MISSION) { + temp = (evt_get_variable(NULL, GF_MAC01_BoughtBadgeFromRowf) != 0); + } + if (temp) { + cond = TRUE; + } + break; + default: + if (evt_get_variable(NULL, GB_StoryProgress) >= storyReq) { + cond = TRUE; + } + break; + } + + if (cond) { + menu->ptrIcon[numEntries] = &HES_Item_Unused_08B; + menu->userIndex[numEntries] = i; + menu->enabled[numEntries] = TRUE; + menu->nameMsg[numEntries] = N(LetterSenderStringIDs)[i]; + menu->descMsg[numEntries] = 0; + temp = GET_PACKED_FLAG(GB_KMR20_MarioReadLetterFlags_00, i); + + menu->value[numEntries] = 0; + if (temp) { + menu->value[numEntries] = 1; + menu->ptrIcon[numEntries] = &HES_Item_Unused_08B_disabled; + } + numEntries++; + } + } + + if (numEntries == 0) { + script->varTable[0] = 0; + return ApiStatus_DONE2; + } + menu->popupType = POPUP_MENU_READ_POSTCARD; + menu->numEntries = numEntries; + menu->initialPos = script->functionTemp[3]; + create_popup_menu(menu); + status_menu_respond_to_changes(); + close_status_menu(); + script->functionTemp[1] = 0; + script->functionTemp[0] = 1; + break; + case 1: + if (script->functionTemp[1] == 0) { + script->functionTemp[2] = menu->result; + if (script->functionTemp[2] != 0) { + hide_popup_menu(); + } else { + break; + } + } + + script->functionTemp[1]++; + if (script->functionTemp[1] >= 15) { + destroy_popup_menu(); + if (script->functionTemp[2] == 255) { + script->varTable[0] = -1; + return ApiStatus_DONE2; + } + script->functionTemp[3] = script->functionTemp[2] - 1; + userIndex = menu->userIndex[script->functionTemp[2] - 1]; + script->varTable[0] = N(LetterBodyStringIDs)[userIndex]; + + flags = SET_PACKED_FLAG(GB_KMR20_MarioReadLetterFlags_00, userIndex); + set_global_byte(PACKED_BYTE(GB_KMR20_MarioReadLetterFlags_00, userIndex), flags); + if (userIndex == 3) { + evt_set_variable(NULL, GF_KMR20_ReadThankYouLetterFromKoopaVillage, TRUE); + } + + dma_copy(charset_ROM_START + N(LetterDmaOffsets)[0], + charset_ROM_START + N(LetterDmaOffsets)[0] + sizeof(N(LetterBackgroundImg)), + N(LetterBackgroundImg)); + dma_copy(charset_ROM_START + N(LetterDmaOffsets)[1], + charset_ROM_START + N(LetterDmaOffsets)[1] + sizeof(N(LetterBackgroundPal)), + N(LetterBackgroundPal)); + + N(LetterImgData)[0].raster = N(LetterBackgroundImg); + N(LetterImgData)[0].palette = N(LetterBackgroundPal); + N(LetterImgData)[0].width = 150; + N(LetterImgData)[0].height = 105; + N(LetterImgData)[0].format = G_IM_FMT_CI; + N(LetterImgData)[0].bitDepth = G_IM_SIZ_4b; + + dma_copy(charset_ROM_START + N(LetterDmaOffsets)[(userIndex * 2) + 2], + charset_ROM_START + N(LetterDmaOffsets)[(userIndex * 2) + 2] + sizeof(N(LetterPhotoImg)), + N(LetterPhotoImg)); + dma_copy(charset_ROM_START + N(LetterDmaOffsets)[(userIndex * 2) + 3], + charset_ROM_START + N(LetterDmaOffsets)[(userIndex * 2) + 3] + sizeof(N(N(LetterPhotoPal))), + N(N(LetterPhotoPal))); + + N(LetterImgData)[1].raster = N(LetterPhotoImg); + N(LetterImgData)[1].palette = N(N(LetterPhotoPal)); + N(LetterImgData)[1].width = 70; + N(LetterImgData)[1].height = 95; + N(LetterImgData)[1].format = G_IM_FMT_CI; + N(LetterImgData)[1].bitDepth = G_IM_SIZ_8b; + + N(LetterWorkerID) = create_worker_frontUI(NULL, N(worker_draw_letter)); + N(LetterAlpha) = 0; + return ApiStatus_DONE2; + } + break; + } + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(CleanupLetters)){ + free_worker(N(LetterWorkerID)); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_Inspect_Letters) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_IF_LT(GB_StoryProgress, STORY_CH0_TWINK_GAVE_LUCKY_STAR) + EVT_SET(GF_KMR20_CheckedDeskForMail, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH0_0102, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_ELSE + EVT_IF_EQ(GF_KMR20_CheckedDeskForMail, FALSE) + EVT_SET(GF_KMR20_CheckedDeskForMail, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH0_0101, 160, 40) + EVT_WAIT(5) + EVT_END_IF + EVT_END_IF + EVT_CALL(N(InitLetters)) + EVT_LABEL(0) + EVT_CALL(N(ReadLetters)) + EVT_IF_EQ(LVar0, -1) + EVT_GOTO(10) + EVT_END_IF + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(ShowMessageAtScreenPos, LVar0, 160, 40) + EVT_CALL(N(CleanupLetters)) + EVT_GOTO(0) + EVT_LABEL(10) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +s32 N(DiaryStoryRequirements)[] = { + STORY_CH3_GOT_SUPER_BOOTS, + STORY_CH3_GOT_SUPER_BOOTS, + STORY_CH4_STAR_SPRIT_DEPARTED, + STORY_CH4_STAR_SPRIT_DEPARTED, + STORY_CH5_TRADED_VASE_FOR_SEED, + STORY_CH5_TRADED_VASE_FOR_SEED, + STORY_CH6_RETURNED_TO_TOAD_TOWN, + STORY_CH6_RETURNED_TO_TOAD_TOWN, + STORY_CH7_STAR_SPRIT_DEPARTED, + STORY_CH7_STAR_SPRIT_DEPARTED, + STORY_EPILOGUE, + STORY_EPILOGUE, +}; + +s32 N(DiaryEntryStringIDs)[] = { + MSG_Document_LuigisDiary_01, + MSG_Document_LuigisDiary_02, + MSG_Document_LuigisDiary_03, + MSG_Document_LuigisDiary_04, + MSG_Document_LuigisDiary_05, + MSG_Document_LuigisDiary_06, + MSG_Document_LuigisDiary_07, + MSG_Document_LuigisDiary_08, + MSG_Document_LuigisDiary_09, + MSG_Document_LuigisDiary_10, + MSG_Document_LuigisDiary_11, + MSG_Document_LuigisDiary_12, +}; + +API_CALLABLE(N(InitDiary)){ + script->functionTemp[3] = 0; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(ReadDiary)){ + PopupMenu* menu = &N(ChooseDocumentPopupMenu); + s32 userIndex; + s32 numEntries; + s32 flags; + s32 i; + + if (isInitialCall) { + script->functionTemp[0] = 0; + } + + switch (script->functionTemp[0]) { + case 0: + numEntries = 0; + for (i = 0; i < ARRAY_COUNT(N(DiaryStoryRequirements)); i++) { + if (evt_get_variable(NULL, GB_StoryProgress) >= N(DiaryStoryRequirements)[i]) { + menu->ptrIcon[numEntries] = &HES_Item_Unused_08C; + menu->userIndex[numEntries] = i; + menu->enabled[numEntries] = TRUE; + menu->nameMsg[numEntries] = 0; + menu->descMsg[numEntries] = 0; + flags = GET_PACKED_FLAG(GB_KMR20_MarioReadDiaryFlags_00, i); + + menu->value[numEntries] = 0; + if (flags) { + menu->value[numEntries] = 1; + menu->ptrIcon[numEntries] = &HES_Item_Unused_08C_disabled; + } + numEntries++; + } + } + + if (numEntries == 0) { + script->varTable[0] = 0; + return ApiStatus_DONE2; + } + menu->popupType = POPUP_MENU_READ_DIARY_PAGE; + menu->numEntries = numEntries; + menu->initialPos = script->functionTemp[3]; + create_popup_menu(menu); + status_menu_respond_to_changes(); + close_status_menu(); + script->functionTemp[1] = 0; + script->functionTemp[0] = 1; + break; + case 1: + if (script->functionTemp[1] == 0) { + script->functionTemp[2] = menu->result; + if (script->functionTemp[2] != 0) { + hide_popup_menu(); + } else { + break; + } + } + script->functionTemp[1]++; + if (script->functionTemp[1] >= 15) { + destroy_popup_menu(); + if (script->functionTemp[2] == 255) { + script->varTable[0] = -1; + return ApiStatus_DONE2; + } + script->functionTemp[3] = script->functionTemp[2] - 1; + userIndex = menu->userIndex[script->functionTemp[2] - 1]; + script->varTable[0] = N(DiaryEntryStringIDs)[userIndex]; + // separate lines required to match, cant combine macro + flags = SET_PACKED_FLAG(GB_KMR20_MarioReadDiaryFlags_00, userIndex); + set_global_byte(PACKED_BYTE(GB_KMR20_MarioReadDiaryFlags_00, userIndex), flags); + return ApiStatus_DONE2; + } + break; + } + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(MuteAmbienceVolume_Documents)){ + au_ambience_set_volume(0, 1000, 1); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_Inspect_LuigisDiary) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_IF_LT(GB_StoryProgress, STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_IF_EQ(AF_KMR_0C, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH0_00EC, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(GF_KMR20_FoundLuigisDiary, FALSE) + EVT_SET(GF_KMR20_FoundLuigisDiary, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH0_0100, 160, 40) + EVT_WAIT(5) + EVT_END_IF + EVT_CALL(N(InitDiary)) + EVT_LABEL(0) + EVT_CALL(N(ReadDiary)) + EVT_IF_EQ(LVar0, -1) + EVT_GOTO(10) + EVT_END_IF + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(ShowMessageAtScreenPos, LVar0, 160, 40) + EVT_GOTO(0) + EVT_LABEL(10) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Shake_Mailbox) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_o305, SOUND_E0, 0) + EVT_CALL(TranslateModel, MODEL_o222, 2, 0, 0) + EVT_CALL(TranslateModel, MODEL_o223, 3, 0, 0) + EVT_CALL(TranslateModel, MODEL_o224, 1, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, MODEL_o222, -3, 0, 0) + EVT_CALL(TranslateModel, MODEL_o223, -3, 0, 0) + EVT_CALL(TranslateModel, MODEL_o224, -2, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, MODEL_o222, 2, 0, 0) + EVT_CALL(TranslateModel, MODEL_o223, 3, 0, 0) + EVT_CALL(TranslateModel, MODEL_o224, 1, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, MODEL_o222, -2, 0, 0) + EVT_CALL(TranslateModel, MODEL_o223, -3, 0, 0) + EVT_CALL(TranslateModel, MODEL_o224, -1, 0, 0) + EVT_WAIT(1) + EVT_CALL(TranslateModel, MODEL_o222, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o223, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o224, 0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SecretPanel_Flip) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o252, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AB, 0) + EVT_CALL(MakeLerp, 0, 2160, 60, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g61, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AC, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o252, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Setup_SecretPanel) = { + EVT_CALL(GetPlayerActionState, LVar0) + EVT_IF_NE(LVar0, ACTION_STATE_SPIN_POUND) + EVT_IF_NE(LVar0, ACTION_STATE_TORNADO_POUND) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(MuteAmbienceVolume_Documents)) + EVT_IF_LT(GB_StoryProgress, STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_IF_EQ(AF_KMR_0C, TRUE) + EVT_CALL(EnableModel, MODEL_o200, FALSE) + EVT_END_IF + EVT_END_IF + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetPlayerActionState, LVar0) + EVT_IF_EQ(LVar0, ACTION_STATE_IDLE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(EVS_SecretPanel_Flip)) + EVT_WAIT(1) + EVT_CALL(SetPlayerPos, -150, 30, -35) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetPlayerActionState, LVar0) + EVT_IF_EQ(LVar0, ACTION_STATE_IDLE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, FALSE) + EVT_IF_EQ(MF_LuigiInBasement, TRUE) + EVT_SET(MF_LuigiInBasement, FALSE) + EVT_EXEC(N(EVS_Scene_CaughtLuigiInBasement)) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Setup_Interactables) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_Letters)), TRIGGER_WALL_PRESS_A, COLLIDER_o251, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_LuigisDiary)), TRIGGER_WALL_PRESS_A, COLLIDER_o240, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Shake_Mailbox)), TRIGGER_WALL_PRESS_A, COLLIDER_o305, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Setup_SecretPanel)), TRIGGER_FLOOR_TOUCH, COLLIDER_o252, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_Records)), TRIGGER_WALL_PRESS_A, COLLIDER_o355, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_20/kmr_20_5_entity.c b/src/world/area_kmr/kmr_20/kmr_20_5_entity.c new file mode 100644 index 0000000000..4c8ebccf50 --- /dev/null +++ b/src/world/area_kmr/kmr_20/kmr_20_5_entity.c @@ -0,0 +1,146 @@ +#include "kmr_20.h" +#include "entity.h" + +API_CALLABLE(N(SetAmbienceVolumeHalf_Entity)){ + au_ambience_set_volume(0, 1000, 63); + return ApiStatus_DONE2; +} + +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" + +EvtScript N(EVS_SecretPanel_FlipBack) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o252, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AB, 0) + EVT_CALL(N(SetAmbienceVolumeHalf_Entity)) + EVT_CALL(MakeLerp, 0, -2160, 60, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateGroup, MODEL_g61, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtCollider, COLLIDER_o252, SOUND_20AC, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o252, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TetherCamToPlayer) = { + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseSpring_Basement) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) + EVT_WAIT(1) + EVT_EXEC_GET_TID(N(EVS_TetherCamToPlayer), LVarA) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.7)) + EVT_IF_EQ(AF_KMR_0B, FALSE) + EVT_CALL(PlayerJump, -110, -80, -35, 20) + EVT_SET(AF_KMR_0B, TRUE) + EVT_ELSE + EVT_CALL(N(UnsetCamera0MoveFlag1)) + EVT_EXEC(N(EVS_SecretPanel_FlipBack)) + EVT_CALL(PlayerJump, -150, 30, -90, 30) + EVT_CALL(InterpPlayerYaw, 180, 0) + EVT_SET(AF_KMR_0B, FALSE) + EVT_END_IF + EVT_WAIT(30) + EVT_KILL_THREAD(LVarA) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Luigi_JumpFromBlock) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetEnemyFlagBits, NPC_Luigi_1, ENEMY_FLAGS_100, 0) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcVar, NPC_Luigi_1, 0, 1) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) + EVT_CALL(SetNpcJumpscale, NPC_Luigi_1, 1) + EVT_CALL(GetNpcPos, NPC_Luigi_1, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Luigi_1, LVar0, 0, LVar2, 25) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) + EVT_CALL(SetNpcVar, NPC_Luigi_1, 0, 2) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Luigi_JumpFromHighBlock) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetEnemyFlagBits, NPC_Luigi_1, ENEMY_FLAGS_100, 0) + EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcVar, NPC_Luigi_1, 0, 1) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) + EVT_CALL(SetNpcJumpscale, NPC_Luigi_1, 1) + EVT_CALL(GetNpcPos, NPC_Luigi_1, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 50) + EVT_CALL(NpcJump0, NPC_Luigi_1, LVar0, 0, LVar2, 25) + EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) + EVT_CALL(SetNpcVar, NPC_Luigi_1, 0, 2) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BlastRock) = { + EVT_CALL(SetNpcAux, NPC_Luigi_1, 0) + EVT_EXEC(N(EVS_Luigi_JumpFromBlock)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SmashBlock) = { + EVT_CALL(SetNpcAux, NPC_Luigi_1, 0) + EVT_THREAD + EVT_EXEC_WAIT(N(EVS_Luigi_JumpFromBlock)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BreakBlock_Brick) = { + EVT_CALL(SetNpcAux, NPC_Luigi_1, 0) + EVT_THREAD + EVT_EXEC_WAIT(N(EVS_Luigi_JumpFromHighBlock)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_ScriptSpring), -150, -80, -50, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_UseSpring_Basement))) + EVT_CALL(SetEntityCullMode, 1) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH1_STAR_SPRIT_DEPARTED) + EVT_CASE_LT(STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BombableRock), 300, 0, 150, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_BlastRock))) + EVT_CASE_LT(STORY_CH3_STAR_SPIRIT_RESCUED) + EVT_CASE_LT(STORY_CH4_STAR_SPRIT_DEPARTED) + EVT_CASE_LT(STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_CASE_LT(STORY_CH6_STAR_SPIRIT_RESCUED) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Hammer3Block), 300, 0, 150, 55, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_SmashBlock))) + EVT_CASE_LT(STORY_CH7_STAR_SPRIT_DEPARTED) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 300, 90, 150, 55, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_BreakBlock_Brick))) + EVT_CASE_LT(STORY_EPILOGUE) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_20/kmr_20_6_trees.c b/src/world/area_kmr/kmr_20/kmr_20_6_trees.c new file mode 100644 index 0000000000..4dd4376b2b --- /dev/null +++ b/src/world/area_kmr/kmr_20/kmr_20_6_trees.c @@ -0,0 +1,35 @@ +#include "kmr_20.h" + +#define NAME_SUFFIX _Trees +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o325); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o326); + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { -138.0f, 114.0f, 232.0f }, + { -53.0f, 114.0f, 222.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -106.0f, 0.0f, 201.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupTrees) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o341, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_20/kmr_20_7_bushes.c b/src/world/area_kmr/kmr_20/kmr_20_7_bushes.c new file mode 100644 index 0000000000..45c07ea846 --- /dev/null +++ b/src/world/area_kmr/kmr_20/kmr_20_7_bushes.c @@ -0,0 +1,90 @@ +#include "kmr_20.h" + +#define NAME_SUFFIX _Bushes +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o227); + +FoliageVectorList N(Bush1_Effects) = { + .count = 1, + .vectors = { + { -33.0f, 13.0f, -233.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush1) = { + .bush = &N(Bush1_BushModels), + .vectors = &N(Bush1_Effects), +}; + +FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o371); + +FoliageVectorList N(Bush2_Effects) = { + .count = 1, + .vectors = { + { 83.0f, 16.0f, 40.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush2) = { + .bush = &N(Bush2_BushModels), + .vectors = &N(Bush2_Effects), +}; + +FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o372); + +FoliageVectorList N(Bush3_Effects) = { + .count = 1, + .vectors = { + { 513.0f, 16.0f, 100.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush3) = { + .bush = &N(Bush3_BushModels), + .vectors = &N(Bush3_Effects), +}; + +FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o373); + +FoliageVectorList N(Bush4_Effects) = { + .count = 1, + .vectors = { + { 644.0f, 14.0f, 57.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush4) = { + .bush = &N(Bush4_BushModels), + .vectors = &N(Bush4_Effects), +}; + +FoliageModelList N(Bush5_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o374); + +FoliageVectorList N(Bush5_Effects) = { + .count = 1, + .vectors = { + { 708.0f, 16.0f, -233.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush5) = { + .bush = &N(Bush5_BushModels), + .vectors = &N(Bush5_Effects), +}; + +EvtScript N(EVS_SetupBushes) = { + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o337, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o350, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o348, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush4))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o347, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush5))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o349, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_20/kmr_20_8_bed.c b/src/world/area_kmr/kmr_20/kmr_20_8_bed.c new file mode 100644 index 0000000000..2a8f9df4cb --- /dev/null +++ b/src/world/area_kmr/kmr_20/kmr_20_8_bed.c @@ -0,0 +1,195 @@ +#include "kmr_20.h" + +extern EvtScript N(EVS_ToadHouse_SetDialogue); +extern EvtScript N(EVS_ToadHouse_GetInBed); +extern EvtScript N(EVS_ToadHouse_ReturnFromRest); + +#include "world/common/complete/ToadHouseBlanketAnim.inc.c" +#include "world/common/atomic/ToadHouse.inc.c" +#include "world/common/atomic/ToadHouse.data.inc.c" + +API_CALLABLE(N(MuteAmbienceVolume_Bed)) { + au_ambience_set_volume(0, 1000, 1); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetAmbienceVolumeHalf_Bed)) { + au_ambience_set_volume(0, 1000, 63); + return ApiStatus_DONE2; +} + +#include "world/common/todo/WaitForPlayerToLand.inc.c" + +EvtScript N(EVS_ToadHouse_SetDialogue) = { + EVT_SET(LVar0, MSG_CH0_0106) + EVT_SET(LVar8, MSG_CH0_0107) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 0) + EVT_SET(LVar3, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadHouse_GetInBed) = { + EVT_EXEC(N(EVS_PlayRestingSong)) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -28, -100, 0) + EVT_CALL(InterpPlayerYaw, 300, 0) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_THREAD + EVT_WAIT(6) + EVT_CALL(N(ToadHouse_CamSetFOV), 0, 40) + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 35, -10) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 135) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -170, 0) + EVT_CALL(SetCamPosB, CAM_DEFAULT, -109, -76) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 0, 120) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(EnableGroup, MODEL_o170, FALSE) + EVT_CALL(EnableGroup, MODEL_o172, FALSE) + EVT_CALL(EnableGroup, MODEL_o175, FALSE) + EVT_CALL(EnableGroup, MODEL_o177, FALSE) + EVT_CALL(EnableGroup, MODEL_o178, FALSE) + EVT_CALL(EnableGroup, MODEL_o183, FALSE) + EVT_CALL(EnableGroup, MODEL_o188, FALSE) + EVT_CALL(EnableGroup, MODEL_o189, FALSE) + EVT_CALL(EnableGroup, MODEL_o186, FALSE) + EVT_CALL(EnableGroup, MODEL_o190, FALSE) + EVT_CALL(EnableGroup, MODEL_o191, FALSE) + EVT_END_THREAD + EVT_CALL(GetPlayerPos, LVar4, LVar5, LVar6) + EVT_CALL(MakeLerp, 30, 85, 6, EASING_LINEAR) + EVT_LOOP(6) + EVT_WAIT(1) + EVT_CALL(UpdateLerp) + EVT_CALL(SetPlayerPos, LVar4, LVar0, LVar6) + EVT_END_LOOP + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(func_802D286C, 0x00000800) + EVT_CALL(func_802D2520, 0x00010002, 5, 7, 1, 1, 0) + EVT_THREAD + EVT_WAIT(60) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_END_THREAD + EVT_CALL(N(MuteAmbienceVolume_Bed)) + EVT_WAIT(75) + EVT_THREAD + EVT_WAIT(65) + EVT_CALL(N(ToadHouse_CamSetFOV), 0, 25) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(EnableGroup, MODEL_o170, TRUE) + EVT_CALL(EnableGroup, MODEL_o172, TRUE) + EVT_CALL(EnableGroup, MODEL_o175, TRUE) + EVT_CALL(EnableGroup, MODEL_o177, TRUE) + EVT_CALL(EnableGroup, MODEL_o178, TRUE) + EVT_CALL(EnableGroup, MODEL_o183, TRUE) + EVT_CALL(EnableGroup, MODEL_o188, TRUE) + EVT_CALL(EnableGroup, MODEL_o189, TRUE) + EVT_CALL(EnableGroup, MODEL_o186, TRUE) + EVT_CALL(EnableGroup, MODEL_o190, TRUE) + EVT_CALL(EnableGroup, MODEL_o191, TRUE) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadHouse_ReturnFromRest) = { + EVT_CALL(N(SetAmbienceVolumeHalf_Bed)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(HidePlayerShadow, FALSE) + EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(SetPlayerPos, -45, 30, -70) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, -75, 30, -70) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_WAIT(5) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseBed) = { + EVT_CALL(N(WaitForPlayerToLand)) + EVT_IF_EQ(LVar0, 1) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(ToadHouse_InitScreenOverlay), 0, 0, 0) + EVT_EXEC_WAIT(N(EVS_ToadHouse_SetDialogue)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END_IF + EVT_SET(LVar9, LVar1) + EVT_SET(LVarA, LVar2) + EVT_SET(LVarB, LVar3) + EVT_CALL(N(ToadHouse_DoesPlayerNeedSleep)) + EVT_IF_EQ(LVar1, 0) + EVT_SET(LVar8, LVar0) + EVT_END_IF + EVT_CALL(ShowMessageAtScreenPos, LVar8, 160, 40) + EVT_CALL(ShowChoice, MSG_Choice_0007) + EVT_WAIT(10) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(CloseMessage) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(CloseMessage) + EVT_CALL(SetPlayerJumpscale, 1) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(N(ToadHouse_DisableStatusMenu)) + EVT_IF_NE(LVar4, 0) + EVT_EXEC(N(8024AC8C)) + EVT_END_IF + EVT_CALL(N(ToadHouse_PutPartnerAway), LVarA) + EVT_WAIT(20) + EVT_EXEC_GET_TID(N(EVS_ToadHouse_GetInBed), LVar9) + EVT_CALL(N(ToadHouse_AwaitScriptComplete), LVar9) + EVT_THREAD + EVT_CALL(MakeLerp, 0, 255, 60, EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(ToadHouse_UpdateScreenOverlay), 3, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(FullyRestoreHPandFP) + EVT_CALL(FullyRestoreSP) + EVT_IF_NE(LVar4, 0) + EVT_EXEC(N(8024AC14)) + EVT_END_IF + EVT_CALL(N(ToadHouse_GetPartnerBackOut), LVarA) + EVT_WAIT(30) + EVT_CALL(MakeLerp, 255, 0, 30, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(N(ToadHouse_UpdateScreenOverlay), 0, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(90) + EVT_EXEC_GET_TID(N(EVS_ToadHouse_ReturnFromRest), LVar9) + EVT_CALL(N(ToadHouse_AwaitScriptComplete), LVar9) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(N(ToadHouse_ShowStatusMenu)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupBed) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseBed)), TRIGGER_WALL_PRESS_A, COLLIDER_o352, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c b/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c new file mode 100644 index 0000000000..ba82e9d375 --- /dev/null +++ b/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c @@ -0,0 +1,91 @@ +#include "kmr_20.h" + +NpcSettings N(NpcSettings_Scenes) = { + .height = 24, + .radius = 24, + .level = 99, +}; + +EvtScript N(EVS_NpcInit_Luigi_Scenes) = { + EVT_CALL(SetNpcCollisionSize, NPC_SELF, 46, 26) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(kmr_20_ENTRY_2) + EVT_CASE_OR_EQ(kmr_20_ENTRY_3) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_IdleSit) + EVT_CALL(SetNpcPos, NPC_SELF, 196, 44, -37) + EVT_CALL(SetNpcYaw, NPC_SELF, 270) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Scenes)[] = { + { + .id = NPC_Scene_Parakarry, + .settings = &N(NpcSettings_Scenes), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_200000 | ENEMY_FLAGS_400000, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_WorldParakarry_Idle, + .walk = ANIM_WorldParakarry_Walk, + .run = ANIM_WorldParakarry_Run, + .chase = ANIM_WorldParakarry_Run, + .anim_4 = ANIM_WorldParakarry_Idle, + .anim_5 = ANIM_WorldParakarry_Idle, + .death = ANIM_WorldParakarry_Still, + .hit = ANIM_WorldParakarry_Still, + .anim_8 = ANIM_WorldParakarry_Idle, + .anim_9 = ANIM_WorldParakarry_Idle, + .anim_A = ANIM_WorldParakarry_Idle, + .anim_B = ANIM_WorldParakarry_Idle, + .anim_C = ANIM_WorldParakarry_Idle, + .anim_D = ANIM_WorldParakarry_Idle, + .anim_E = ANIM_WorldParakarry_Idle, + .anim_F = ANIM_WorldParakarry_Idle, + }, + }, + { + .id = NPC_Scene_Luigi, + .settings = &N(NpcSettings_Scenes), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_GRAVITY, + .init = &N(EVS_NpcInit_Luigi_Scenes), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Luigi_Still, + .walk = ANIM_Luigi_Still, + .run = ANIM_Luigi_Still, + .chase = ANIM_Luigi_Still, + .anim_4 = ANIM_Luigi_Still, + .anim_5 = ANIM_Luigi_Still, + .death = ANIM_Luigi_Still, + .hit = ANIM_Luigi_Still, + .anim_8 = ANIM_Luigi_Still, + .anim_9 = ANIM_Luigi_Still, + .anim_A = ANIM_Luigi_Still, + .anim_B = ANIM_Luigi_Still, + .anim_C = ANIM_Luigi_Still, + .anim_D = ANIM_Luigi_Still, + .anim_E = ANIM_Luigi_Still, + .anim_F = ANIM_Luigi_Still, + }, + }, +}; + +NpcGroupList N(SceneNPCs) = { + NPC_GROUP(N(NpcData_Scenes)), + {} +}; diff --git a/src/world/area_kpa/kpa.h b/src/world/area_kpa/kpa.h index 75c8bd6844..7a2307505c 100644 --- a/src/world/area_kpa/kpa.h +++ b/src/world/area_kpa/kpa.h @@ -2,24 +2,86 @@ #define _WORLD_AREA_KPA_KPA_H_ enum { - AB_KPA_0 = AreaByte(0), - AB_KPA_1 = AreaByte(1), - AB_KPA_2 = AreaByte(2), - AB_KPA_3 = AreaByte(3), - AB_KPA_4 = AreaByte(4), - AB_KPA_5 = AreaByte(5), - AB_KPA_6 = AreaByte(6), - AB_KPA_7 = AreaByte(7), - AB_KPA_8 = AreaByte(8), - AB_KPA_9 = AreaByte(9), - AB_KPA_A = AreaByte(10), - AB_KPA_B = AreaByte(11), - AB_KPA_C = AreaByte(12), - AB_KPA_D = AreaByte(13), - AB_KPA_E = AreaByte(14), - AB_KPA_F = AreaByte(15), + AB_KPA_0 = AreaByte(0), + AB_KPA_1 = AreaByte(1), + AB_KPA_2 = AreaByte(2), + AB_KPA_3 = AreaByte(3), + AB_KPA_4 = AreaByte(4), + AB_KPA_5 = AreaByte(5), + AB_KPA_6 = AreaByte(6), + AB_KPA_7 = AreaByte(7), + AB_KPA_8 = AreaByte(8), + AB_KPA_9 = AreaByte(9), + AB_KPA_A = AreaByte(10), + AB_KPA_B = AreaByte(11), + AB_KPA_C = AreaByte(12), + AB_KPA_D = AreaByte(13), + AB_KPA_E = AreaByte(14), + AB_KPA_F = AreaByte(15), }; -#define AF_KPA(index) AreaFlag(index) +enum { + AF_KPA_03 = AreaFlag(3), + AF_KPA_04 = AreaFlag(4), + AF_KPA_05 = AreaFlag(5), + AF_KPA_06 = AreaFlag(6), + AF_KPA133_HitWaterSwitch = AreaFlag(8), + AF_KPA134_HitWaterSwitch = AreaFlag(9), +}; + +extern MapSettings kpa_01_settings; +extern MapSettings kpa_03_settings; +extern MapSettings kpa_04_settings; +extern MapSettings kpa_08_settings; +extern MapSettings kpa_09_settings; +extern MapSettings kpa_10_settings; +extern MapSettings kpa_11_settings; +extern MapSettings kpa_12_settings; +extern MapSettings kpa_13_settings; +extern MapSettings kpa_14_settings; +extern MapSettings kpa_15_settings; +extern MapSettings kpa_16_settings; +extern MapSettings kpa_17_settings; +extern MapSettings kpa_32_settings; +extern MapSettings kpa_33_settings; +extern MapSettings kpa_40_settings; +extern MapSettings kpa_41_settings; +extern MapSettings kpa_50_settings; +extern MapSettings kpa_51_settings; +extern MapSettings kpa_52_settings; +extern MapSettings kpa_53_settings; +extern MapSettings kpa_60_settings; +extern MapSettings kpa_61_settings; +extern MapSettings kpa_62_settings; +extern MapSettings kpa_63_settings; +extern MapSettings kpa_70_settings; +extern MapSettings kpa_81_settings; +extern MapSettings kpa_82_settings; +extern MapSettings kpa_83_settings; +extern MapSettings kpa_90_settings; +extern MapSettings kpa_91_settings; +extern MapSettings kpa_94_settings; +extern MapSettings kpa_95_settings; +extern MapSettings kpa_96_settings; +extern MapSettings kpa_100_settings; +extern MapSettings kpa_101_settings; +extern MapSettings kpa_102_settings; +extern MapSettings kpa_111_settings; +extern MapSettings kpa_112_settings; +extern MapSettings kpa_113_settings; +extern MapSettings kpa_114_settings; +extern MapSettings kpa_115_settings; +extern MapSettings kpa_116_settings; +extern MapSettings kpa_117_settings; +extern MapSettings kpa_118_settings; +extern MapSettings kpa_119_settings; +extern MapSettings kpa_121_settings; +extern MapSettings kpa_130_settings; +extern MapSettings kpa_133_settings; +extern MapSettings kpa_134_settings; + +s32 kpa_100_map_init(void); +s32 kpa_101_map_init(void); +s32 kpa_114_map_init(void); #endif diff --git a/src/world/area_kpa/kpa_01/A46F60.c b/src/world/area_kpa/kpa_01/A46F60.c deleted file mode 100644 index 739f73ecce..0000000000 --- a/src/world/area_kpa/kpa_01/A46F60.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "kpa_01.h" - -static char* N(exit_str_0) = "kpa_14"; -static char* N(exit_str_1) = "kpa_03"; - -#include "world/common/atomic/CreateDarkness.inc.c" diff --git a/src/world/area_kpa/kpa_01/A470C0.c b/src/world/area_kpa/kpa_01/A470C0.c deleted file mode 100644 index 2391aaa6f0..0000000000 --- a/src/world/area_kpa/kpa_01/A470C0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "kpa_01.h" - -#include "world/common/enemy/ai/TackleAI.inc.c" - -#include "world/common/todo/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_kpa/kpa_01/kpa_01.h b/src/world/area_kpa/kpa_01/kpa_01.h index 8cbc0a22c8..999351fd77 100644 --- a/src/world/area_kpa/kpa_01/kpa_01.h +++ b/src/world/area_kpa/kpa_01/kpa_01.h @@ -2,8 +2,21 @@ /// @brief Bowser's Castle - Dark Cave 1 #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_01_shape.h" +#include "mapfs/kpa_01_hit.h" + +enum { + NPC_BonyBeetle_01 = 0, + NPC_BonyBeetle_02 = 1, +}; + #define NAMESPACE kpa_01 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_01/kpa_01_0_header.c b/src/world/area_kpa/kpa_01/kpa_01_0_header.c new file mode 100644 index 0000000000..ec592f9c90 --- /dev/null +++ b/src/world/area_kpa/kpa_01/kpa_01_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_01.h" + +EntryList N(Entrances) = { + [kpa_01_ENTRY_0] { 690.0, -378.0, 337.0, 90.0 }, + [kpa_01_ENTRY_1] { -511.0, 149.0, 57.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_01 }, +}; diff --git a/src/world/area_kpa/kpa_01/kpa_01_1_music.c b/src/world/area_kpa/kpa_01/kpa_01_1_music.c new file mode 100644 index 0000000000..b5d31a7cf1 --- /dev/null +++ b/src/world/area_kpa/kpa_01/kpa_01_1_music.c @@ -0,0 +1,9 @@ +#include "kpa_01.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE_CAVES, 0, 8) + EVT_CALL(ClearAmbientSounds, 250) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_01/kpa_01_2_main.c b/src/world/area_kpa/kpa_01/kpa_01_2_main.c new file mode 100644 index 0000000000..0475262835 --- /dev/null +++ b/src/world/area_kpa/kpa_01/kpa_01_2_main.c @@ -0,0 +1,67 @@ +#include "kpa_01.h" + +#include "world/common/atomic/CreateDarkness.inc.c" + +EvtScript N(EVS_SetupDarkness) = { + EVT_THREAD + EVT_CALL(N(DarkRoomUpdate)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitDoor_kpa_14_1) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar0, kpa_01_ENTRY_0) + EVT_SET(LVar1, COLLIDER_tte) + EVT_SET(LVar2, MODEL_o205) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("kpa_14"), kpa_14_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_kpa_03_0) = EVT_EXIT_WALK(60, kpa_01_ENTRY_1, "kpa_03", kpa_03_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_kpa_14_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_03_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_01_ENTRY_0) + EVT_SET(LVar0, kpa_01_ENTRY_0) + EVT_SET(LVar1, MODEL_exit2) + EVT_SET(LVar2, MODEL_o205) + EVT_SET(LVar3, DOOR_SWING_IN) + EVT_EXEC(EnterSingleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_01_ENTRY_1) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupDarkness)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_01/kpa_01_3_npc.c b/src/world/area_kpa/kpa_01/kpa_01_3_npc.c new file mode 100644 index 0000000000..f19d9fc7db --- /dev/null +++ b/src/world/area_kpa/kpa_01/kpa_01_3_npc.c @@ -0,0 +1,53 @@ +#include "kpa_01.h" + +#include "world/common/enemy/complete/SpikeTop.inc.c" + +StaticNpc N(NpcData_BonyBeetle_01) = { + .id = NPC_BonyBeetle_01, + .settings = &N(NpcSettings_BonyBeetle), + .pos = { 1740.0f, -215.0f, 60.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .drops = BONY_BEETLE_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 1740, -215, 60 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 1740, -215, 60 }, + .detectSize = { 300 }, + } + }, + .animations = BONY_BEETLE_ANIMS, +}; + +StaticNpc N(NpcData_BonyBeetle_02) = { + .id = NPC_BonyBeetle_02, + .settings = &N(NpcSettings_BonyBeetle), + .pos = { 243.0f, 5.0f, 230.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .drops = BONY_BEETLE_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 243, 5, 230 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 243, 5, 230 }, + .detectSize = { 300 }, + } + }, + .animations = BONY_BEETLE_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_BonyBeetle_01), BTL_KPA_FORMATION_00, BTL_KPA_STAGE_03), + NPC_GROUP(N(NpcData_BonyBeetle_02), BTL_KPA_FORMATION_01, BTL_KPA_STAGE_03), + {} +}; diff --git a/src/world/area_kpa/kpa_01/kpa_01_4_entity.c b/src/world/area_kpa/kpa_01/kpa_01_4_entity.c new file mode 100644 index 0000000000..8663241a3f --- /dev/null +++ b/src/world/area_kpa/kpa_01/kpa_01_4_entity.c @@ -0,0 +1,9 @@ +#include "kpa_01.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 220, 208, -125, 0, ITEM_POW_BLOCK, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KPA01_ItemBlock_POWBlock) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_03/A485C0.c b/src/world/area_kpa/kpa_03/A485C0.c deleted file mode 100644 index 978918d75a..0000000000 --- a/src/world/area_kpa/kpa_03/A485C0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "kpa_03.h" - -static char* N(exit_str_0) = "kpa_01"; -static char* N(exit_str_1) = "kpa_04"; - -#include "world/common/atomic/CreateDarkness.inc.c" diff --git a/src/world/area_kpa/kpa_03/A48720.c b/src/world/area_kpa/kpa_03/A48720.c deleted file mode 100644 index 453ed60749..0000000000 --- a/src/world/area_kpa/kpa_03/A48720.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "kpa_03.h" - -#include "world/common/enemy/ai/TackleAI.inc.c" - -#include "world/common/todo/AwaitPlayerNearNpc.inc.c" - -#include "world/common/enemy/ai/MagikoopaAI.inc.c" diff --git a/src/world/area_kpa/kpa_03/A4A410.c b/src/world/area_kpa/kpa_03/A4A410.c deleted file mode 100644 index 0da852a561..0000000000 --- a/src/world/area_kpa/kpa_03/A4A410.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "kpa_03.h" - -ApiStatus func_80241E50_A4A410(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - - if (playerStatus->lastGoodPosition.y >= 0) { - evt_set_variable(script, MapVar(0), FALSE); - } - if (playerStatus->lastGoodPosition.y <= -280) { - evt_set_variable(script, MapVar(0), TRUE); - } - return ApiStatus_BLOCK; -} diff --git a/src/world/area_kpa/kpa_03/kpa_03.h b/src/world/area_kpa/kpa_03/kpa_03.h index 202415c6b1..be0588bebf 100644 --- a/src/world/area_kpa/kpa_03/kpa_03.h +++ b/src/world/area_kpa/kpa_03/kpa_03.h @@ -2,8 +2,34 @@ /// @brief Bowser's Castle - Dark Cave 2 #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_03_shape.h" +#include "mapfs/kpa_03_hit.h" + +#include "sprite/npc/BuzzyBeetle.h" +#include "sprite/npc/Magikoopa.h" +#include "sprite/npc/WorldKoopatrol.h" +#include "sprite/npc/BonyBeetle.h" + +enum { + NPC_Koopatrol_01 = 0, + NPC_Koopatrol_02 = 1, + NPC_BonyBeetle_01 = 2, + NPC_BonyBeetle_02 = 3, + NPC_Magikoopa_01 = 4, + NPC_Magikoopa_01_Spell = 5, +}; + +enum { + MV_PlayerHeightLevel = MapVar(0), +}; + #define NAMESPACE kpa_03 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_03/kpa_03_0_header.c b/src/world/area_kpa/kpa_03/kpa_03_0_header.c new file mode 100644 index 0000000000..7e9d0e4a6e --- /dev/null +++ b/src/world/area_kpa/kpa_03/kpa_03_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_03.h" + +EntryList N(Entrances) = { + [kpa_03_ENTRY_0] { 1888.0, -410.0, -93.0, 270.0 }, + [kpa_03_ENTRY_1] { -1575.0, -105.0, -158.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_03 }, +}; diff --git a/src/world/area_kpa/kpa_03/kpa_03_1_music.c b/src/world/area_kpa/kpa_03/kpa_03_1_music.c new file mode 100644 index 0000000000..7c9777daec --- /dev/null +++ b/src/world/area_kpa/kpa_03/kpa_03_1_music.c @@ -0,0 +1,8 @@ +#include "kpa_03.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE_CAVES, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_03/kpa_03_2_main.c b/src/world/area_kpa/kpa_03/kpa_03_2_main.c new file mode 100644 index 0000000000..3cbab04548 --- /dev/null +++ b/src/world/area_kpa/kpa_03/kpa_03_2_main.c @@ -0,0 +1,42 @@ +#include "kpa_03.h" + +#include "world/common/atomic/CreateDarkness.inc.c" + +EvtScript N(EVS_SetupDarkness) = { + EVT_THREAD + EVT_CALL(N(DarkRoomUpdate)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_kpa_01_1) = EVT_EXIT_WALK(60, kpa_03_ENTRY_0, "kpa_01", kpa_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_kpa_04_0) = EVT_EXIT_WALK(60, kpa_03_ENTRY_1, "kpa_04", kpa_04_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_01_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_04_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupDarkness)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_03/kpa_03_3_npc.c b/src/world/area_kpa/kpa_03/kpa_03_3_npc.c new file mode 100644 index 0000000000..801a1c5ca8 --- /dev/null +++ b/src/world/area_kpa/kpa_03/kpa_03_3_npc.c @@ -0,0 +1,144 @@ +#include "kpa_03.h" + +#include "world/common/enemy/complete/Koopatrol_Wander.inc.c" +#include "world/common/enemy/complete/SpikeTop.inc.c" +#include "world/common/enemy/complete/Magikoopa.inc.c" + +s32 N(ExtraAnims_Koopatrol)[] = { + ANIM_WorldKoopatrol_Anim01, + ANIM_WorldKoopatrol_Anim04, + ANIM_WorldKoopatrol_Anim06, + ANIM_WorldKoopatrol_Anim10, + ANIM_WorldKoopatrol_Anim0B, + -1 +}; + +StaticNpc N(NpcData_Koopatrol_01) = { + .id = NPC_Koopatrol_01, + .settings = &N(NpcSettings_Koopatrol_Wander), + .pos = { 1045.0f, -255.0f, -194.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400, + .drops = KOOPATROL_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 1045, -255, -194 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 1045, -255, -194 }, + .detectSize = { 300 }, + } + }, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, +}; + +StaticNpc N(NpcData_Koopatrol_02) = { + .id = NPC_Koopatrol_02, + .settings = &N(NpcSettings_Koopatrol_Wander), + .pos = { 950.0f, -265.0f, 0.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400, + .drops = KOOPATROL_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 950, -265, 0 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 950, -265, 0 }, + .detectSize = { 300 }, + } + }, + .animations = KOOPATROL_ANIMS, + .extraAnimations = N(ExtraAnims_Koopatrol), + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, +}; + +StaticNpc N(NpcData_BonyBeetle_01) = { + .id = NPC_BonyBeetle_01, + .settings = &N(NpcSettings_BonyBeetle), + .pos = { -940.0f, 140.0f, -145.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .drops = BONY_BEETLE_DROPS_ALT, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -940, 140, -145 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -940, 140, -145 }, + .detectSize = { 300 }, + } + }, + .animations = BONY_BEETLE_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, +}; + +StaticNpc N(NpcData_BonyBeetle_02) = { + .id = NPC_BonyBeetle_02, + .settings = &N(NpcSettings_BonyBeetle), + .pos = { 175.0f, -130.0f, 0.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .drops = BONY_BEETLE_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 175, -130, 0 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 175, -130, 0 }, + .detectSize = { 300 }, + } + }, + .animations = BONY_BEETLE_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, +}; + +StaticNpc N(NpcData_Magikoopa_01)[] = { + { + .id = NPC_Magikoopa_01, + .settings = &N(NpcSettings_Magikoopa), + .pos = { -1000.0f, -160.0f, -150.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400, + .drops = MAGIKOOPA_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -1000, -160, -150 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -1000, -160, -150 }, + .detectSize = { 200 }, + } + }, + .animations = MAGIKOOPA_ANIMS, + .extraAnimations = N(ExtraAnims_Magikoopa), + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, + }, + MAGIKOOPA_SPELL_HITBOX(NPC_Magikoopa_01_Spell), +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Koopatrol_01), BTL_KPA_FORMATION_20, BTL_KPA_STAGE_03), + NPC_GROUP(N(NpcData_Koopatrol_02), BTL_KPA_FORMATION_1F, BTL_KPA_STAGE_03), + NPC_GROUP(N(NpcData_BonyBeetle_01), BTL_KPA_FORMATION_01, BTL_KPA_STAGE_03), + NPC_GROUP(N(NpcData_BonyBeetle_02), BTL_KPA_FORMATION_04, BTL_KPA_STAGE_03), + NPC_GROUP(N(NpcData_Magikoopa_01), BTL_KPA_FORMATION_2F, BTL_KPA_STAGE_03), + {} +}; diff --git a/src/world/area_kpa/kpa_03/kpa_03_4_entity.c b/src/world/area_kpa/kpa_03/kpa_03_4_entity.c new file mode 100644 index 0000000000..2f2c7e5fb3 --- /dev/null +++ b/src/world/area_kpa/kpa_03/kpa_03_4_entity.c @@ -0,0 +1,63 @@ +#include "kpa_03.h" +#include "entity.h" + +API_CALLABLE(N(MonitorPlayerAltitude)) { + PlayerStatus* playerStatus = &gPlayerStatus; + + if (playerStatus->lastGoodPosition.y >= 0) { + evt_set_variable(script, MV_PlayerHeightLevel, 0); + } + if (playerStatus->lastGoodPosition.y <= -280) { + evt_set_variable(script, MV_PlayerHeightLevel, 1); + } + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_TetherCamToPlayer) = { + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_GE(LVar1, LVar3) + EVT_SET(LVar1, LVar3) + EVT_END_IF + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseSpring) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAUNCH) + EVT_IF_EQ(MV_PlayerHeightLevel, 0) + EVT_SET(LVar3, -275) + EVT_EXEC_GET_TID(N(EVS_TetherCamToPlayer), LVarA) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.7)) + EVT_CALL(PlayerJump, -507, -288, -159, 20) + EVT_ELSE + EVT_SET(LVar3, 0) + EVT_EXEC_GET_TID(N(EVS_TetherCamToPlayer), LVarA) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.1)) + EVT_CALL(PlayerJump, -500, 0, -150, 40) + EVT_END_IF + EVT_KILL_THREAD(LVarA) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_WAIT(4) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_THREAD + EVT_CALL(N(MonitorPlayerAltitude)) + EVT_END_THREAD + EVT_CALL(MakeEntity, EVT_PTR(Entity_ScriptSpring), -400, -300, -150, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_UseSpring))) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 620, -65, -200, 0, ITEM_SHOOTING_STAR, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KPA03_ItemBlock_ShootingStar) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_04/A4BF60.c b/src/world/area_kpa/kpa_04/A4BF60.c deleted file mode 100644 index 4f44dc71c7..0000000000 --- a/src/world/area_kpa/kpa_04/A4BF60.c +++ /dev/null @@ -1,34 +0,0 @@ -#include "kpa_04.h" - -static char* N(exit_str_0) = "kpa_03"; -static char* N(exit_str_1) = "kpa_81"; - -#include "world/common/todo/UnkFunc11.inc.c" - -ApiStatus func_802400BC_A4C01C(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - f32 dist; - f32 x; - f32 y; - f32 z; - - if (script->varTable[5] == 0) { - playerStatus->position.x = script->varTable[0]; - } else { - playerStatus->position.z = script->varTable[0]; - } - - x = playerStatus->position.x; - y = playerStatus->position.y + 10.0f; - z = playerStatus->position.z; - - dist = 40.0f; - - npc_raycast_down_sides(0, &x, &y, &z, &dist); - - playerStatus->position.x = x; - playerStatus->position.y = y; - playerStatus->position.z = z; - - return ApiStatus_DONE2; -} diff --git a/src/world/area_kpa/kpa_04/kpa_04.h b/src/world/area_kpa/kpa_04/kpa_04.h index b2678198d3..32b5fa0a90 100644 --- a/src/world/area_kpa/kpa_04/kpa_04.h +++ b/src/world/area_kpa/kpa_04/kpa_04.h @@ -2,8 +2,15 @@ /// @brief Bowser's Castle - Cave Exit #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_04_shape.h" +#include "mapfs/kpa_04_hit.h" + #define NAMESPACE kpa_04 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupStatues); diff --git a/src/world/area_kpa/kpa_04/kpa_04_0_header.c b/src/world/area_kpa/kpa_04/kpa_04_0_header.c new file mode 100644 index 0000000000..0bbeffe549 --- /dev/null +++ b/src/world/area_kpa/kpa_04/kpa_04_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_04.h" + +EntryList N(Entrances) = { + [kpa_04_ENTRY_0] { 212.0, 0.0, 150.0, 270.0 }, + [kpa_04_ENTRY_1] { 0.0, 0.0, 287.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_04 }, +}; diff --git a/src/world/area_kpa/kpa_04/kpa_04_1_music.c b/src/world/area_kpa/kpa_04/kpa_04_1_music.c new file mode 100644 index 0000000000..e2c545e4dd --- /dev/null +++ b/src/world/area_kpa/kpa_04/kpa_04_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_04.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_04/kpa_04_2_main.c b/src/world/area_kpa/kpa_04/kpa_04_2_main.c new file mode 100644 index 0000000000..4383447a76 --- /dev/null +++ b/src/world/area_kpa/kpa_04/kpa_04_2_main.c @@ -0,0 +1,30 @@ +#include "kpa_04.h" + +EvtScript N(EVS_ExitWalk_kpa_03_1) = EVT_EXIT_WALK(60, kpa_04_ENTRY_0, "kpa_03", kpa_03_ENTRY_1); +EvtScript N(EVS_ExitWalk_kpa_81_3) = EVT_EXIT_WALK(60, kpa_04_ENTRY_1, "kpa_81", kpa_81_ENTRY_3); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_03_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_81_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_EXEC(N(EVS_SetupStatues)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_04/kpa_04_3_statues.c b/src/world/area_kpa/kpa_04/kpa_04_3_statues.c new file mode 100644 index 0000000000..7e15eb9233 --- /dev/null +++ b/src/world/area_kpa/kpa_04/kpa_04_3_statues.c @@ -0,0 +1,130 @@ +#include "kpa_04.h" + +#include "world/common/todo/UnkFunc11.inc.c" +#include "world/common/todo/UnkFunc12.inc.c" + +EvtScript N(EVS_PushStatue_Impl) = { + EVT_LOOP(20) + EVT_CALL(GetCurrentPartner, LVarA) + EVT_IF_NE(LVarA, 0) + EVT_SET(LVar9, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(UnkFunc11), 25) + EVT_IF_EQ(LVar0, 0) + EVT_SET(LVar9, 0) + EVT_RETURN + EVT_ELSE + EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(GetCurrentPartner, LVarA) + EVT_IF_NE(LVarA, 0) + EVT_SET(LVar9, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o160, SOUND_80000010, 0) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 100, EVT_FLOAT(0.6)) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(EnableGroup, MODEL_g22, TRUE) + EVT_CALL(MakeLerp, 6, 100, 100, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVarA, LVar0) + EVT_MULF(LVarA, EVT_FLOAT(0.01)) + EVT_CALL(ScaleGroup, MODEL_g22, LVarA, 1, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SET(LVar1, LVar0) + EVT_ADD(LVar1, LVarB) + EVT_CALL(MakeLerp, LVar0, LVar1, 100, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) + EVT_CALL(UpdateLerp) + EVT_CALL(N(UnkFunc12)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_THREAD + EVT_CALL(MakeLerp, 0, LVarB, 100, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g20, LVar0, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o160) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(StopSound, SOUND_80000010) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PushStatue_FromRight) = { + EVT_IF_NE(GB_KPA04_StatuePosition, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LE(LVar0, 30) + EVT_RETURN + EVT_END_IF + EVT_IF_LE(LVar2, 130) + EVT_RETURN + EVT_END_IF + EVT_IF_GE(LVar2, 170) + EVT_RETURN + EVT_END_IF + EVT_IF_GE(LVar0, 0) + EVT_SET(LVar9, 1) + EVT_SET(LVarB, -50) + EVT_EXEC_WAIT(N(EVS_PushStatue_Impl)) + EVT_ELSE + EVT_SET(LVar9, 2) + EVT_SET(LVarB, 50) + EVT_EXEC_WAIT(N(EVS_PushStatue_Impl)) + EVT_END_IF + EVT_SET(GB_KPA04_StatuePosition, LVar9) + EVT_IF_NE(GB_KPA04_StatuePosition, 0) + EVT_CALL(EnableModel, MODEL_o187, TRUE) + EVT_CALL(EnableModel, MODEL_o180, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitts, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupStatues) = { + EVT_CALL(ParentColliderToModel, COLLIDER_o160, MODEL_o103) + EVT_SWITCH(GB_KPA04_StatuePosition) + EVT_CASE_EQ(0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_PushStatue_FromRight)), TRIGGER_WALL_PUSH, COLLIDER_o160, 1, 0) + EVT_CALL(EnableGroup, MODEL_g22, FALSE) + EVT_CASE_EQ(1) + EVT_CALL(TranslateGroup, MODEL_g20, -50, 0, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitts, COLLIDER_FLAGS_UPPER_MASK) + EVT_CASE_EQ(2) + EVT_CALL(TranslateGroup, MODEL_g20, 50, 0, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitts, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_SWITCH + EVT_CALL(UpdateColliderTransform, COLLIDER_o160) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliwtt, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_08/A4CA20.c b/src/world/area_kpa/kpa_08/A4CA20.c deleted file mode 100644 index 45d94b49f2..0000000000 --- a/src/world/area_kpa/kpa_08/A4CA20.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "kpa_08.h" - -static char* N(exit_str_0) = "kpa_52"; -static char* N(exit_str_1) = "kpa_100"; - -#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" - -ApiStatus func_8024001C_A4CA3C(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 floor = evt_get_variable(script, *args++); - s32 yOffset = evt_get_variable(script, *args++); - PlayerStatus* playerStatus = &gPlayerStatus; - - if (floor == gCollisionStatus.currentFloor) { - playerStatus->position.y = script->varTable[0] + yOffset; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_kpa/kpa_08/A4CAC0.c b/src/world/area_kpa/kpa_08/A4CAC0.c deleted file mode 100644 index 0d59f4b100..0000000000 --- a/src/world/area_kpa/kpa_08/A4CAC0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "kpa_08.h" - -#include "world/common/enemy/ai/MagikoopaAI.inc.c" diff --git a/src/world/area_kpa/kpa_08/kpa_08.h b/src/world/area_kpa/kpa_08/kpa_08.h index 7fc9513642..f8326be7f6 100644 --- a/src/world/area_kpa/kpa_08/kpa_08.h +++ b/src/world/area_kpa/kpa_08/kpa_08.h @@ -2,8 +2,23 @@ /// @brief Bowser's Castle - Castle Key Timing Puzzle #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_08_shape.h" +#include "mapfs/kpa_08_hit.h" + +#include "sprite/npc/Magikoopa.h" + +enum { + NPC_Magikoopa = 0, + NPC_Magikoopa_Spell = 1, +}; + #define NAMESPACE kpa_08 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_08/kpa_08_0_header.c b/src/world/area_kpa/kpa_08/kpa_08_0_header.c new file mode 100644 index 0000000000..fd4654018f --- /dev/null +++ b/src/world/area_kpa/kpa_08/kpa_08_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_08.h" + +EntryList N(Entrances) = { + [kpa_08_ENTRY_0] { -483.0, 0.0, -19.0, 90.0 }, + [kpa_08_ENTRY_1] { 203.0, 100.0, -22.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = 11, //@bug -- should be 2 + .tattle = { MSG_MapTattle_kpa_08 }, +}; diff --git a/src/world/area_kpa/kpa_08/kpa_08_1_music.c b/src/world/area_kpa/kpa_08/kpa_08_1_music.c new file mode 100644 index 0000000000..4cdd066221 --- /dev/null +++ b/src/world/area_kpa/kpa_08/kpa_08_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_08.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_08/kpa_08_2_main.c b/src/world/area_kpa/kpa_08/kpa_08_2_main.c new file mode 100644 index 0000000000..ae2ad3ff30 --- /dev/null +++ b/src/world/area_kpa/kpa_08/kpa_08_2_main.c @@ -0,0 +1,41 @@ +#include "kpa_08.h" + +EvtScript N(EVS_ExitDoors_kpa_52_2) = EVT_EXIT_DOUBLE_DOOR(kpa_08_ENTRY_0, "kpa_52", kpa_52_ENTRY_2, COLLIDER_ttw, MODEL_o160, MODEL_o159); +EvtScript N(EVS_ExitWalk_kpa_100_0) = EVT_EXIT_WALK(40, kpa_08_ENTRY_1, "kpa_100", kpa_100_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_52_2)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_100_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_08_ENTRY_0) + EVT_SET(LVar0, kpa_08_ENTRY_0) + EVT_SET(LVar2, MODEL_o160) + EVT_SET(LVar3, MODEL_o159) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_08_ENTRY_1) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_08/kpa_08_3_entity.c b/src/world/area_kpa/kpa_08/kpa_08_3_entity.c new file mode 100644 index 0000000000..84181c42e6 --- /dev/null +++ b/src/world/area_kpa/kpa_08/kpa_08_3_entity.c @@ -0,0 +1,100 @@ +#include "kpa_08.h" +#include "entity.h" + +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" + +API_CALLABLE(N(ElevatePlayer)) { + Bytecode* args = script->ptrReadPos; + s32 floor = evt_get_variable(script, *args++); + s32 yOffset = evt_get_variable(script, *args++); + PlayerStatus* playerStatus = &gPlayerStatus; + + if (floor == gCollisionStatus.currentFloor) { + playerStatus->position.y = script->varTable[0] + yOffset; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ActivateSwitch) = { + EVT_IF_NE(AF_KPA_03, FALSE) + EVT_RETURN + EVT_END_IF + EVT_SET(AF_KPA_03, TRUE) + EVT_CALL(N(UnsetCamera0MoveFlag1)) + EVT_THREAD + EVT_SET_GROUP(EVT_GROUP_EF) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_227, 0) + EVT_CALL(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(ElevatePlayer), 15, 100) + EVT_CALL(TranslateGroup, MODEL_move, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o19) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(80) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_228, 0) + EVT_CALL(MakeLerp, 0, -50, 20, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(ElevatePlayer), 15, 100) + EVT_CALL(TranslateGroup, MODEL_move, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o19) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_SET_GROUP(EVT_GROUP_EF) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o90, SOUND_227, 0) + EVT_CALL(MakeLerp, -99, 0, 15, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(ElevatePlayer), 17, 100) + EVT_CALL(TranslateGroup, MODEL_move2, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o90) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, FALSE) + EVT_WAIT(80) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o90, SOUND_228, 0) + EVT_CALL(MakeLerp, 0, -99, 15, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(ElevatePlayer), 17, 100) + EVT_CALL(TranslateGroup, MODEL_move2, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o90) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(TranslateGroup, MODEL_move2, 0, -99, -1) + EVT_SET(AF_KPA_03, FALSE) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_SET(AF_KPA_03, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_RedSwitch), 10, 0, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_ActivateSwitch))) + EVT_CALL(ParentColliderToModel, COLLIDER_o19, MODEL_m_yuka) + EVT_CALL(TranslateGroup, MODEL_move, 0, -50, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o19) + EVT_CALL(ParentColliderToModel, COLLIDER_o90, MODEL_m2_yuka) + EVT_CALL(TranslateGroup, MODEL_move2, 0, -99, -1) + EVT_CALL(UpdateColliderTransform, COLLIDER_o90) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_08/kpa_08_4_npc.c b/src/world/area_kpa/kpa_08/kpa_08_4_npc.c new file mode 100644 index 0000000000..330adfa7d1 --- /dev/null +++ b/src/world/area_kpa/kpa_08/kpa_08_4_npc.c @@ -0,0 +1,35 @@ +#include "kpa_08.h" + +#include "world/common/enemy/complete/Magikoopa.inc.c" + +StaticNpc N(NpcData_Magikoopa)[] = { + { + .id = NPC_Magikoopa, + .settings = &N(NpcSettings_Magikoopa), + .pos = { -210.0f, 0.0f, 25.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = MAGIKOOPA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { -210, 0, 25 }, + .wanderSize = { 30, 10 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -210, 0, 25 }, + .detectSize = { 200 }, + } + }, + .animations = MAGIKOOPA_ANIMS, + .extraAnimations = N(ExtraAnims_Magikoopa), + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, + }, + MAGIKOOPA_SPELL_HITBOX(NPC_Magikoopa_Spell) +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Magikoopa), BTL_KPA_FORMATION_2B, BTL_KPA_STAGE_01), + {} +}; diff --git a/src/world/area_kpa/kpa_09/A4F000.c b/src/world/area_kpa/kpa_09/A4F000.c deleted file mode 100644 index f618d7e764..0000000000 --- a/src/world/area_kpa/kpa_09/A4F000.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "kpa_09.h" - -static char* N(exit_str_0) = "kpa_101"; -static char* N(exit_str_1) = "kpa_33"; - -#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" - -ApiStatus func_8024001C_A4F01C(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 floor = evt_get_variable(script, *args++); - s32 yOffset = evt_get_variable(script, *args++); - PlayerStatus* playerStatus = &gPlayerStatus; - - if (floor == gCollisionStatus.currentFloor) { - playerStatus->position.y = script->varTable[0] + yOffset; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_kpa/kpa_09/A4F0A0.c b/src/world/area_kpa/kpa_09/A4F0A0.c deleted file mode 100644 index b07d1b50ed..0000000000 --- a/src/world/area_kpa/kpa_09/A4F0A0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "kpa_09.h" - -#include "world/common/enemy/ai/RangedAttackAI.inc.c" - -#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_09/kpa_09.h b/src/world/area_kpa/kpa_09/kpa_09.h index 0924febb98..997b023903 100644 --- a/src/world/area_kpa/kpa_09/kpa_09.h +++ b/src/world/area_kpa/kpa_09/kpa_09.h @@ -2,8 +2,26 @@ /// @brief Bowser's Castle - Ultra Shroom Timing Puzzle #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_09_shape.h" +#include "mapfs/kpa_09_hit.h" + +#include "sprite/npc/DryBones.h" +#include "sprite/npc/ThrownBone.h" + +enum { + NPC_DryBones = 0, + NPC_DryBones_Bone1 = 1, + NPC_DryBones_Bone2 = 2, + NPC_DryBones_Bone3 = 3, +}; + #define NAMESPACE kpa_09 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_09/kpa_09_0_header.c b/src/world/area_kpa/kpa_09/kpa_09_0_header.c new file mode 100644 index 0000000000..d63b165e6f --- /dev/null +++ b/src/world/area_kpa/kpa_09/kpa_09_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_09.h" + +EntryList N(Entrances) = { + [kpa_09_ENTRY_0] { -483.0, 100.0, -17.0, 90.0 }, + [kpa_09_ENTRY_1] { 202.0, 0.0, -16.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = 11, //@bug -- should be 2 + .tattle = { MSG_MapTattle_kpa_09 }, +}; diff --git a/src/world/area_kpa/kpa_09/kpa_09_1_music.c b/src/world/area_kpa/kpa_09/kpa_09_1_music.c new file mode 100644 index 0000000000..e4dbe0291b --- /dev/null +++ b/src/world/area_kpa/kpa_09/kpa_09_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_09.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_09/kpa_09_2_main.c b/src/world/area_kpa/kpa_09/kpa_09_2_main.c new file mode 100644 index 0000000000..3b79f3bc9a --- /dev/null +++ b/src/world/area_kpa/kpa_09/kpa_09_2_main.c @@ -0,0 +1,45 @@ +#include "kpa_09.h" + +EvtScript N(EVS_ExitWalk_kpa_101_0) = EVT_EXIT_WALK(60, kpa_09_ENTRY_0, "kpa_101", kpa_101_ENTRY_0); +EvtScript N(EVS_ExitDoors_kpa_33_3) = EVT_EXIT_DOUBLE_DOOR(kpa_09_ENTRY_1, "kpa_33", kpa_33_ENTRY_3, COLLIDER_tte, MODEL_o159, MODEL_o160); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_101_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_33_3)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_09_ENTRY_0) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_CASE_EQ(kpa_09_ENTRY_1) + EVT_SET(LVar0, 1) + EVT_SET(LVar2, MODEL_o159) + EVT_SET(LVar3, MODEL_o160) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o180, FALSE) + EVT_CALL(EnableModel, MODEL_o181, FALSE) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_09/kpa_09_3_entity.c b/src/world/area_kpa/kpa_09/kpa_09_3_entity.c new file mode 100644 index 0000000000..c72dbb9086 --- /dev/null +++ b/src/world/area_kpa/kpa_09/kpa_09_3_entity.c @@ -0,0 +1,100 @@ +#include "kpa_09.h" +#include "entity.h" + +#include "world/common/todo/UnsetCamera0MoveFlag1.inc.c" + +API_CALLABLE(N(ElevatePlayer)) { + Bytecode* args = script->ptrReadPos; + s32 floor = evt_get_variable(script, *args++); + s32 yOffset = evt_get_variable(script, *args++); + PlayerStatus* playerStatus = &gPlayerStatus; + + if (floor == gCollisionStatus.currentFloor) { + playerStatus->position.y = script->varTable[0] + yOffset; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ActivateSwitch) = { + EVT_IF_NE(AF_KPA_04, FALSE) + EVT_RETURN + EVT_END_IF + EVT_SET(AF_KPA_04, TRUE) + EVT_CALL(N(UnsetCamera0MoveFlag1)) + EVT_THREAD + EVT_SET_GROUP(EVT_GROUP_EF) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_227, 0) + EVT_CALL(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(ElevatePlayer), 16, 100) + EVT_CALL(TranslateGroup, MODEL_move, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o19) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(80) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o19, SOUND_228, 0) + EVT_CALL(MakeLerp, 0, -50, 15, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(ElevatePlayer), 16, 100) + EVT_CALL(TranslateGroup, MODEL_move, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o19) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_SET_GROUP(EVT_GROUP_EF) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o106, SOUND_227, 0) + EVT_CALL(EnableGroup, MODEL_move2, TRUE) + EVT_CALL(MakeLerp, -50, 0, 15, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(ElevatePlayer), 18, 100) + EVT_CALL(TranslateGroup, MODEL_move2, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o106) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, FALSE) + EVT_WAIT(80) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o106, SOUND_228, 0) + EVT_CALL(MakeLerp, 0, -50, 15, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(ElevatePlayer), 18, 100) + EVT_CALL(TranslateGroup, MODEL_move2, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o106) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_SET(AF_KPA_04, FALSE) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_SET(AF_KPA_04, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_RedSwitch), -325, 0, -8, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_ActivateSwitch))) + EVT_CALL(ParentColliderToModel, COLLIDER_o19, MODEL_m_yuka) + EVT_CALL(TranslateGroup, MODEL_move, 0, -50, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o19) + EVT_CALL(ParentColliderToModel, COLLIDER_o106, MODEL_m_yuka2) + EVT_CALL(TranslateGroup, MODEL_move2, 0, -50, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o106) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_09/kpa_09_4_npc.c b/src/world/area_kpa/kpa_09/kpa_09_4_npc.c new file mode 100644 index 0000000000..21c6ed2a6c --- /dev/null +++ b/src/world/area_kpa/kpa_09/kpa_09_4_npc.c @@ -0,0 +1,36 @@ +#include "kpa_09.h" + +#include "world/common/enemy/complete/DryBones.inc.c" + +StaticNpc N(NpcData_DryBones)[] = { + { + .id = NPC_DryBones, + .settings = &N(NpcSettings_DryBones), + .pos = { -73.0f, 0.0f, 0.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_800, + .drops = DRY_BONES_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -73, 0, 0 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -73, 0, 0 }, + .detectSize = { 200 }, + } + }, + .animations = DRY_BONES_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, + }, + DRY_BONES_BONE_HITBOX(NPC_DryBones_Bone1), + DRY_BONES_BONE_HITBOX(NPC_DryBones_Bone2), + DRY_BONES_BONE_HITBOX(NPC_DryBones_Bone3), +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_DryBones), BTL_KPA_FORMATION_0B, BTL_KPA_STAGE_01), + {} +}; diff --git a/src/world/area_kpa/kpa_10/A51980.c b/src/world/area_kpa/kpa_10/A51980.c deleted file mode 100644 index 0b5c6aee65..0000000000 --- a/src/world/area_kpa/kpa_10/A51980.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "kpa_10.h" - -static char* N(exit_str_0) = "kpa_62"; -static char* N(exit_str_1) = "kpa_12"; -static char* N(exit_str_2) = "kpa_17"; -static char* N(exit_str_3) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kpa/kpa_10/kpa_10.h b/src/world/area_kpa/kpa_10/kpa_10.h index dc4e423faa..9a7d83a7fe 100644 --- a/src/world/area_kpa/kpa_10/kpa_10.h +++ b/src/world/area_kpa/kpa_10/kpa_10.h @@ -2,8 +2,25 @@ /// @brief Bowser's Castle - Outside Lower Jail (No Lava) #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_10_shape.h" +#include "mapfs/kpa_10_hit.h" + +#include "sprite/npc/Toad.h" +#include "sprite/npc/ToadGuard.h" + +enum { + NPC_Toad_01 = 0, + NPC_Toad_02 = 1, + NPC_ToadGuard = 2, +}; + #define NAMESPACE kpa_10 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern NpcGroupList N(DefaultNPCs); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_kpa/kpa_10/kpa_10_0_header.c b/src/world/area_kpa/kpa_10/kpa_10_0_header.c new file mode 100644 index 0000000000..ca33bd0d16 --- /dev/null +++ b/src/world/area_kpa/kpa_10/kpa_10_0_header.c @@ -0,0 +1,16 @@ +#include "kpa_10.h" + +EntryList N(Entrances) = { + [kpa_10_ENTRY_0] { 25.0, 100.0, -140.0, 90.0 }, + [kpa_10_ENTRY_1] { 1402.0, 30.0, -1082.0, 180.0 }, + [kpa_10_ENTRY_2] { 1378.0, 30.0, -724.0, 90.0 }, + [kpa_10_ENTRY_3] { 15.0, -20.0, -20.0, 90.0 }, + [kpa_10_ENTRY_4] { 1529.0, -20.0, -1082.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_10 }, +}; diff --git a/src/world/area_kpa/kpa_10/kpa_10_1_music.c b/src/world/area_kpa/kpa_10/kpa_10_1_music.c new file mode 100644 index 0000000000..20b1216453 --- /dev/null +++ b/src/world/area_kpa/kpa_10/kpa_10_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_10.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_10/kpa_10_2_main.c b/src/world/area_kpa/kpa_10/kpa_10_2_main.c new file mode 100644 index 0000000000..ebfa15d893 --- /dev/null +++ b/src/world/area_kpa/kpa_10/kpa_10_2_main.c @@ -0,0 +1,48 @@ +#include "kpa_10.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_kpa_62_1) = EVT_EXIT_WALK(60, kpa_10_ENTRY_0, "kpa_62", kpa_62_ENTRY_1); +EvtScript N(EVS_ExitWalk_kpa_12_0) = EVT_EXIT_WALK(60, kpa_10_ENTRY_1, "kpa_12", kpa_12_ENTRY_0); +EvtScript N(EVS_ExitWalk_kpa_17_1) = EVT_EXIT_WALK(60, kpa_10_ENTRY_2, "kpa_17", kpa_17_ENTRY_1); +EvtScript N(EVS_ExitWalk_kpa_62_2) = EVT_EXIT_WALK(60, kpa_10_ENTRY_3, "kpa_62", kpa_62_ENTRY_2); +EvtScript N(EVS_ExitWalk_kpa_12_2) = EVT_EXIT_WALK(60, kpa_10_ENTRY_4, "kpa_12", kpa_12_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_62_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_12_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_17_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiline, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_62_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilisw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_12_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilise, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetLoadType, LVar0) + EVT_IF_EQ(LVar0, 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_WAIT(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_10/kpa_10_3_npc.c b/src/world/area_kpa/kpa_10/kpa_10_3_npc.c new file mode 100644 index 0000000000..51b1d8904e --- /dev/null +++ b/src/world/area_kpa/kpa_10/kpa_10_3_npc.c @@ -0,0 +1,41 @@ +#include "kpa_10.h" + +#include "world/common/npc/Toad_Stationary.inc.c" + +StaticNpc N(NpcData_Prisoners)[] = { + { + .id = NPC_Toad_01, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 845.0f, 30.0f, -285.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .drops = TOAD_DROPS, + .animations = TOAD_RED_ANIMS, + .tattle = MSG_NpcTattle_KPA_CaptiveToadA, + }, + { + .id = NPC_Toad_02, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 872.0f, 30.0f, -315.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .drops = TOAD_DROPS, + .animations = TOAD_BLUE_ANIMS, + .tattle = MSG_NpcTattle_KPA_CaptiveToadB, + }, + { + .id = NPC_ToadGuard, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 900.0f, 30.0f, -285.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .drops = TOAD_DROPS, + .animations = TOAD_GUARD_YELLOW_ANIMS, + .tattle = MSG_NpcTattle_KPA_CaptiveSoldierA, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Prisoners), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_02), + {} +}; diff --git a/src/world/area_kpa/kpa_10/kpa_10_4_entity.c b/src/world/area_kpa/kpa_10/kpa_10_4_entity.c new file mode 100644 index 0000000000..75c014ed78 --- /dev/null +++ b/src/world/area_kpa/kpa_10/kpa_10_4_entity.c @@ -0,0 +1,10 @@ +#include "kpa_10.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 1400, 90, -875, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 1400, 90, -375, 0, ITEM_LIFE_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KPA10_ItemBlock_LifeShroom) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_100/A93160.c b/src/world/area_kpa/kpa_100/A93160.c deleted file mode 100644 index 7263ab199a..0000000000 --- a/src/world/area_kpa/kpa_100/A93160.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "kpa_100.h" - -ApiStatus func_80240000_A93160(Evt* script, s32 isInitialCall) { - sprintf(wMapShapeName, "kpa_117_shape"); - sprintf(wMapHitName, "kpa_117_hit"); - return ApiStatus_BLOCK; -} - -const char* N(exit_str_0) = "kpa_08"; diff --git a/src/world/area_kpa/kpa_100/kpa_100.h b/src/world/area_kpa/kpa_100/kpa_100.h index f63f68a4e5..57e19b23a8 100644 --- a/src/world/area_kpa/kpa_100/kpa_100.h +++ b/src/world/area_kpa/kpa_100/kpa_100.h @@ -2,8 +2,15 @@ /// @brief Bowser's Castle - Castle Key Room #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_117_shape.h" +#include "mapfs/kpa_117_hit.h" + #define NAMESPACE kpa_100 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_kpa/kpa_100/kpa_100_0_header.c b/src/world/area_kpa/kpa_100/kpa_100_0_header.c new file mode 100644 index 0000000000..c2398d65a9 --- /dev/null +++ b/src/world/area_kpa/kpa_100/kpa_100_0_header.c @@ -0,0 +1,12 @@ +#include "kpa_100.h" + +EntryList N(Entrances) = { + [kpa_100_ENTRY_0] { -208.0, 0.0, 100.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_100 }, +}; diff --git a/src/world/area_kpa/kpa_100/kpa_100_1_music.c b/src/world/area_kpa/kpa_100/kpa_100_1_music.c new file mode 100644 index 0000000000..dca60c59a2 --- /dev/null +++ b/src/world/area_kpa/kpa_100/kpa_100_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_100.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_100/kpa_100_2_main.c b/src/world/area_kpa/kpa_100/kpa_100_2_main.c new file mode 100644 index 0000000000..6f8a6fd173 --- /dev/null +++ b/src/world/area_kpa/kpa_100/kpa_100_2_main.c @@ -0,0 +1,29 @@ +#include "kpa_100.h" +#include "sprite.h" + +s32 N(map_init)(void) { + sprintf(wMapShapeName, "kpa_117_shape"); + sprintf(wMapHitName, "kpa_117_hit"); + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_ExitWalk_kpa_08_1) = EVT_EXIT_WALK(60, kpa_100_ENTRY_0, "kpa_08", kpa_08_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_08_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + 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_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_100/kpa_100_3_entity.c b/src/world/area_kpa/kpa_100/kpa_100_3_entity.c new file mode 100644 index 0000000000..87a5c13223 --- /dev/null +++ b/src/world/area_kpa/kpa_100/kpa_100_3_entity.c @@ -0,0 +1,7 @@ +#include "kpa_100.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_BOWSER_CASTLE_KEY, -100, 0, 100, ITEM_SPAWN_MODE_KEY, GF_KPA100_Item_CastleKey2) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_101/A93440.c b/src/world/area_kpa/kpa_101/A93440.c deleted file mode 100644 index 2f9552e0c6..0000000000 --- a/src/world/area_kpa/kpa_101/A93440.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "kpa_101.h" - -ApiStatus func_80240000_A93440(Evt* script, s32 isInitialCall) { - sprintf(wMapShapeName, "kpa_119_shape"); - sprintf(wMapHitName, "kpa_119_hit"); - return ApiStatus_BLOCK; -} - -const char* N(exit_str_0) = "kpa_09"; diff --git a/src/world/area_kpa/kpa_101/kpa_101.h b/src/world/area_kpa/kpa_101/kpa_101.h index 63a0fbce55..21031ef8cb 100644 --- a/src/world/area_kpa/kpa_101/kpa_101.h +++ b/src/world/area_kpa/kpa_101/kpa_101.h @@ -2,8 +2,15 @@ /// @brief Bowser's Castle - Ultra Shroom Room #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_119_shape.h" +#include "mapfs/kpa_119_hit.h" + #define NAMESPACE kpa_101 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_kpa/kpa_101/kpa_101_0_header.c b/src/world/area_kpa/kpa_101/kpa_101_0_header.c new file mode 100644 index 0000000000..146975fd7a --- /dev/null +++ b/src/world/area_kpa/kpa_101/kpa_101_0_header.c @@ -0,0 +1,12 @@ +#include "kpa_101.h" + +EntryList N(Entrances) = { + [kpa_101_ENTRY_0] { 6.0, 0.0, 100.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_101 }, +}; diff --git a/src/world/area_kpa/kpa_101/kpa_101_1_music.c b/src/world/area_kpa/kpa_101/kpa_101_1_music.c new file mode 100644 index 0000000000..5034733cf0 --- /dev/null +++ b/src/world/area_kpa/kpa_101/kpa_101_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_101.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_101/kpa_101_2_main.c b/src/world/area_kpa/kpa_101/kpa_101_2_main.c new file mode 100644 index 0000000000..651a040342 --- /dev/null +++ b/src/world/area_kpa/kpa_101/kpa_101_2_main.c @@ -0,0 +1,29 @@ +#include "kpa_101.h" + +s32 N(map_init)(void) { + sprintf(wMapShapeName, "kpa_119_shape"); + sprintf(wMapHitName, "kpa_119_hit"); + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_ExitWalk_kpa_09_0) = EVT_EXIT_WALK(60, kpa_101_ENTRY_0, "kpa_09", kpa_09_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_09_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliwtt, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_101/kpa_101_3_entity.c b/src/world/area_kpa/kpa_101/kpa_101_3_entity.c new file mode 100644 index 0000000000..b50266c761 --- /dev/null +++ b/src/world/area_kpa/kpa_101/kpa_101_3_entity.c @@ -0,0 +1,7 @@ +#include "kpa_101.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_ULTRA_SHROOM, -100, 20, 100, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KPA101_Item_UltraShroom) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_102/A93740.c b/src/world/area_kpa/kpa_102/A93740.c deleted file mode 100644 index 83d580fd33..0000000000 --- a/src/world/area_kpa/kpa_102/A93740.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "kpa_102.h" - -static char* N(exit_str_0) = "kpa_41"; -static char* N(exit_str_1) = "kpa_53"; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c deleted file mode 100644 index 2c85ea702c..0000000000 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "kpa_102.h" - -#include "world/common/enemy/ai/RangedAttackAI.inc.c" - -#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" - -#include "world/common/enemy/ai/TackleAI.inc.c" - -#include "world/common/enemy/ai/FlyingMagikoopaAI.inc.c" diff --git a/src/world/area_kpa/kpa_102/kpa_102.h b/src/world/area_kpa/kpa_102/kpa_102.h index 0685405ca2..fe0d8c9600 100644 --- a/src/world/area_kpa/kpa_102/kpa_102.h +++ b/src/world/area_kpa/kpa_102/kpa_102.h @@ -2,8 +2,25 @@ /// @brief Bowser's Castle - Blue Fire Bridge #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_102_shape.h" +#include "mapfs/kpa_102_hit.h" + +#include "sprite/npc/HammerBros.h" +#include "sprite/npc/FlyingMagikoopa.h" +#include "sprite/npc/WorldKoopatrol.h" + +enum { + NPC_Koopatrol = 0, + NPC_FlyingMagikoopa = 1, // spell uses ID 2 + NPC_HammerBros = 50, // hammers use IDs 51-56 +}; + #define NAMESPACE kpa_102 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_102/kpa_102_0_header.c b/src/world/area_kpa/kpa_102/kpa_102_0_header.c new file mode 100644 index 0000000000..4863675132 --- /dev/null +++ b/src/world/area_kpa/kpa_102/kpa_102_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_102.h" + +EntryList N(Entrances) = { + [kpa_102_ENTRY_0] { -480.0, 0.0, -215.0, 90.0 }, + [kpa_102_ENTRY_1] { 764.0, 0.0, -215.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_102 }, +}; diff --git a/src/world/area_kpa/kpa_102/kpa_102_1_music.c b/src/world/area_kpa/kpa_102/kpa_102_1_music.c new file mode 100644 index 0000000000..94360605a7 --- /dev/null +++ b/src/world/area_kpa/kpa_102/kpa_102_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_102.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_102/kpa_102_2_main.c b/src/world/area_kpa/kpa_102/kpa_102_2_main.c new file mode 100644 index 0000000000..954a779e42 --- /dev/null +++ b/src/world/area_kpa/kpa_102/kpa_102_2_main.c @@ -0,0 +1,94 @@ +#include "kpa_102.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_kpa_41_2) = EVT_EXIT_WALK(40, kpa_102_ENTRY_0, "kpa_41", kpa_41_ENTRY_2); +EvtScript N(EVS_ExitDoors_kpa_53_0) = EVT_EXIT_DOUBLE_DOOR(kpa_102_ENTRY_1, "kpa_53", kpa_53_ENTRY_0, COLLIDER_tte, MODEL_o631, MODEL_o632); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_41_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_53_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_102_ENTRY_0) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_CASE_EQ(kpa_102_ENTRY_1) + EVT_SET(LVar0, kpa_102_ENTRY_1) + EVT_SET(LVar2, MODEL_o631) + EVT_SET(LVar3, MODEL_o632) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC(N(EVS_EnterMap)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(EnableTexPanning, MODEL_o655, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o657, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o663, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o661, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 20, 20, -20, -20) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 20, 20, -20, -20) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_3) + TEX_PAN_PARAMS_STEP( 20, 20, -20, -20) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_4) + TEX_PAN_PARAMS_STEP( 20, 20, -20, -20) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(0) + EVT_CALL(ScaleModel, MODEL_o655, EVT_FLOAT(1.0), 1, EVT_FLOAT(1.0)) + EVT_CALL(ScaleModel, MODEL_o657, EVT_FLOAT(1.0), 1, EVT_FLOAT(1.0)) + EVT_CALL(ScaleModel, MODEL_o663, EVT_FLOAT(1.0), 1, EVT_FLOAT(1.0)) + EVT_CALL(ScaleModel, MODEL_o661, EVT_FLOAT(1.0), 1, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(ScaleModel, MODEL_o655, EVT_FLOAT(0.98), 1, EVT_FLOAT(0.98)) + EVT_CALL(ScaleModel, MODEL_o657, EVT_FLOAT(0.98), 1, EVT_FLOAT(0.98)) + EVT_CALL(ScaleModel, MODEL_o663, EVT_FLOAT(0.98), 1, EVT_FLOAT(0.98)) + EVT_CALL(ScaleModel, MODEL_o661, EVT_FLOAT(0.98), 1, EVT_FLOAT(0.98)) + EVT_WAIT(10) + EVT_CALL(ScaleModel, MODEL_o655, EVT_FLOAT(0.961), 1, EVT_FLOAT(0.961)) + EVT_CALL(ScaleModel, MODEL_o657, EVT_FLOAT(0.961), 1, EVT_FLOAT(0.961)) + EVT_CALL(ScaleModel, MODEL_o663, EVT_FLOAT(0.961), 1, EVT_FLOAT(0.961)) + EVT_CALL(ScaleModel, MODEL_o661, EVT_FLOAT(0.961), 1, EVT_FLOAT(0.961)) + EVT_WAIT(10) + EVT_END_LOOP + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_102/kpa_102_3_npc.c b/src/world/area_kpa/kpa_102/kpa_102_3_npc.c new file mode 100644 index 0000000000..72d2029fd3 --- /dev/null +++ b/src/world/area_kpa/kpa_102/kpa_102_3_npc.c @@ -0,0 +1,91 @@ +#include "kpa_102.h" + +#include "world/common/enemy/complete/HammerBros.inc.c" +#include "world/common/enemy/complete/Koopatrol_Wander.inc.c" +#include "world/common/enemy/complete/FlyingMagikoopa.inc.c" + +StaticNpc N(NpcData_Koopatrol) = { + .id = NPC_Koopatrol, + .settings = &N(NpcSettings_Koopatrol_Wander), + .pos = { -200.0f, 0.0f, -225.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = KOOPATROL_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -200, 0, -225 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -200, 0, -225 }, + .detectSize = { 200 }, + } + }, + .animations = KOOPATROL_ANIMS, +}; + +StaticNpc N(NpcData_FlyingMagikoopa)[] = { + { + .id = NPC_FlyingMagikoopa, + .settings = &N(NpcSettings_FlyingMagikoopa), + .pos = { 125.0f, 50.0f, -225.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_800, + .drops = FLYING_MAGIKOOPA_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_RECT, + .centerPos = { 125, 50, -225 }, + .wanderSize = { 120, 25 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 125, 50, -225 }, + .detectSize = { 200 }, + } + }, + .animations = FLYING_MAGIKOOPA_ANIMS, + .extraAnimations = N(ExtraAnims_FlyingMagikoopa), + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, + }, + FLYING_MAGIKOOPA_SPELL_HITBOX(NPC_FlyingMagikoopa + 1), +}; + +StaticNpc N(NpcData_HammerBros)[] = { + { + .id = NPC_HammerBros, + .settings = &N(NpcSettings_HammerBros), + .pos = { 450.0f, 0.0f, -225.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = HAMMER_BROS_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 450, 0, -225 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 450, 0, -225 }, + .detectSize = { 200 }, + } + }, + .animations = HAMMER_BROS_ANIMS, + }, + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 1), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 2), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 3), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 4), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 5), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 6), +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Koopatrol), BTL_KPA_FORMATION_24, BTL_KPA_STAGE_0A), + NPC_GROUP(N(NpcData_FlyingMagikoopa), BTL_KPA_FORMATION_32, BTL_KPA_STAGE_0A), + NPC_GROUP(N(NpcData_HammerBros), BTL_KPA_FORMATION_16, BTL_KPA_STAGE_0A), + {} +}; diff --git a/src/world/area_kpa/kpa_11/A528C0.c b/src/world/area_kpa/kpa_11/A528C0.c deleted file mode 100644 index d5a963367d..0000000000 --- a/src/world/area_kpa/kpa_11/A528C0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "kpa_11.h" - -static char* N(exit_str_0) = "kpa_62"; -static char* N(exit_str_1) = "kpa_12"; -static char* N(exit_str_2) = "kpa_17"; -static char* N(exit_str_3) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kpa/kpa_11/A52BD0.c b/src/world/area_kpa/kpa_11/A52BD0.c deleted file mode 100644 index d28a486805..0000000000 --- a/src/world/area_kpa/kpa_11/A52BD0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "kpa_11.h" - -#include "world/common/enemy/ai/TackleAI.inc.c" diff --git a/src/world/area_kpa/kpa_11/kpa_11.h b/src/world/area_kpa/kpa_11/kpa_11.h index 8303520b06..858c7f11ad 100644 --- a/src/world/area_kpa/kpa_11/kpa_11.h +++ b/src/world/area_kpa/kpa_11/kpa_11.h @@ -2,8 +2,27 @@ /// @brief Bowser's Castle - Outisde Lower Jail (Lava) #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_11_shape.h" +#include "mapfs/kpa_11_hit.h" + +#include "sprite/npc/WorldKoopatrol.h" +#include "sprite/npc/Toad.h" +#include "sprite/npc/ToadGuard.h" + +enum { + NPC_Koopatrol = 0, + NPC_Toad_01 = 1, + NPC_Toad_02 = 2, + NPC_ToadGuard = 3, +}; + #define NAMESPACE kpa_11 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_11/kpa_11_0_header.c b/src/world/area_kpa/kpa_11/kpa_11_0_header.c new file mode 100644 index 0000000000..d639e9df28 --- /dev/null +++ b/src/world/area_kpa/kpa_11/kpa_11_0_header.c @@ -0,0 +1,16 @@ +#include "kpa_11.h" + +EntryList N(Entrances) = { + [kpa_11_ENTRY_0] { 30.0, 100.0, -140.0, 90.0 }, + [kpa_11_ENTRY_1] { 1402.0, 30.0, -1070.0, 180.0 }, + [kpa_11_ENTRY_2] { 1378.0, 30.0, -724.0, 90.0 }, + [kpa_11_ENTRY_3] { 15.0, -20.0, -20.0, 90.0 }, + [kpa_11_ENTRY_4] { 1529.0, -20.0, -1082.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_10 }, +}; diff --git a/src/world/area_kpa/kpa_11/kpa_11_1_music.c b/src/world/area_kpa/kpa_11/kpa_11_1_music.c new file mode 100644 index 0000000000..da4f6604d7 --- /dev/null +++ b/src/world/area_kpa/kpa_11/kpa_11_1_music.c @@ -0,0 +1,13 @@ +#include "kpa_11.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_11/kpa_11_2_main.c b/src/world/area_kpa/kpa_11/kpa_11_2_main.c new file mode 100644 index 0000000000..4f8771ba56 --- /dev/null +++ b/src/world/area_kpa/kpa_11/kpa_11_2_main.c @@ -0,0 +1,110 @@ +#include "kpa_11.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_kpa_62_1) = EVT_EXIT_WALK(60, kpa_11_ENTRY_0, "kpa_62", kpa_62_ENTRY_1); +EvtScript N(EVS_ExitWalk_kpa_12_0) = EVT_EXIT_WALK(60, kpa_11_ENTRY_1, "kpa_12", kpa_12_ENTRY_0); +EvtScript N(EVS_ExitWalk_kpa_17_1) = EVT_EXIT_WALK(60, kpa_11_ENTRY_2, "kpa_17", kpa_17_ENTRY_1); +EvtScript N(EVS_ExitWalk_kpa_62_2) = EVT_EXIT_WALK(60, kpa_11_ENTRY_3, "kpa_62", kpa_62_ENTRY_2); +EvtScript N(EVS_ExitWalk_kpa_12_2) = EVT_EXIT_WALK(60, kpa_11_ENTRY_4, "kpa_12", kpa_12_ENTRY_2); + +MAP_RODATA_PAD(1, strings); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_62_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_12_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_17_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiline, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_62_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilisw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_12_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilise, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240F04_A537C4) = { + EVT_CALL(GetLoadType, LVar0) + EVT_IF_EQ(LVar0, 1) + 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_WAIT(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240F84_A53844) = { + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( -400, 0, -800, 0) + TEX_PAN_PARAMS_FREQ( 1, 0, 1, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_CALL(SetTexPanner, MODEL_o1871, 0) + EVT_CALL(SetTexPanner, MODEL_o1815, 0) + EVT_CALL(SetTexPanner, MODEL_o1816, 0) + EVT_CALL(SetTexPanner, MODEL_o1817, 0) + EVT_CALL(SetTexPanner, MODEL_o1818, 0) + EVT_CALL(SetTexPanner, MODEL_o1819, 0) + EVT_CALL(SetTexPanner, MODEL_o1820, 0) + EVT_CALL(SetTexPanner, MODEL_o1821, 0) + EVT_CALL(SetTexPanner, MODEL_o1822, 0) + EVT_CALL(SetTexPanner, MODEL_o1823, 0) + EVT_CALL(SetTexPanner, MODEL_o1824, 0) + EVT_CALL(SetTexPanner, MODEL_o1825, 0) + EVT_CALL(SetTexPanner, MODEL_o1826, 0) + EVT_CALL(SetTexPanner, MODEL_o1827, 0) + EVT_CALL(SetTexPanner, MODEL_o1828, 0) + EVT_CALL(SetTexPanner, MODEL_o1829, 0) + EVT_RETURN + EVT_END +}; + +LavaReset N(SafeFloorColliders)[] = { + { .colliderID = COLLIDER_o1234, .pos = { 1400.0, 30.0, -325.0 }}, + { .colliderID = -1 } +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(D_80240F84_A53844)) + EVT_IF_EQ(GF_KPA17_BombedWall, TRUE) + EVT_CALL(EnableGroup, MODEL_g301, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittne, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_EXEC(N(D_80240F04_A537C4)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_THREAD + EVT_WAIT(2) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1266, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1265, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1264, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1263, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1262, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1261, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1260, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1253, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1254, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1255, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1256, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1257, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1258, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1259, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deilise, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deilisw, SURFACE_TYPE_LAVA) + EVT_THREAD + EVT_CALL(ResetFromLava, EVT_PTR(N(SafeFloorColliders))) + EVT_END_THREAD + EVT_END_THREAD + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_11/kpa_11_3_entity.c b/src/world/area_kpa/kpa_11/kpa_11_3_entity.c new file mode 100644 index 0000000000..035464cab4 --- /dev/null +++ b/src/world/area_kpa/kpa_11/kpa_11_3_entity.c @@ -0,0 +1,13 @@ +#include "kpa_11.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 1400, 90, -875, 0, MAKE_ENTITY_END) + EVT_IF_EQ(GF_KPA11_Defeated_Guard, TRUE) + EVT_CALL(MakeItemEntity, ITEM_BOWSER_CASTLE_KEY, 550, 30, -145, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KPA11_Item_CastleKey2) + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 1400, 90, -375, 0, ITEM_LIFE_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KPA10_ItemBlock_LifeShroom) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_11/kpa_11_4_npc.c b/src/world/area_kpa/kpa_11/kpa_11_4_npc.c new file mode 100644 index 0000000000..4543a28e61 --- /dev/null +++ b/src/world/area_kpa/kpa_11/kpa_11_4_npc.c @@ -0,0 +1,104 @@ +#include "kpa_11.h" + +#include "world/common/enemy/complete/Koopatrol_Wander.inc.c" +#include "world/common/npc/Toad_Stationary.inc.c" + +EvtScript N(EVS_NpcDefeat_Koopatrol) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_SET(GF_KPA11_Defeated_Guard, TRUE) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(MakeItemEntity, ITEM_BOWSER_CASTLE_KEY, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, GF_KPA11_Item_CastleKey2) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_SET(GF_KPA11_Defeated_Guard, TRUE) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(MakeItemEntity, ITEM_BOWSER_CASTLE_KEY, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, GF_KPA11_Item_CastleKey2) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol) = { + EVT_IF_EQ(GF_KPA11_Defeated_Guard, FALSE) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Koopatrol))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Koopatrol) = { + .id = NPC_Koopatrol, + .settings = &N(NpcSettings_Koopatrol_Wander), + .pos = { 550.0f, 30.0f, -145.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .init = &N(EVS_NpcInit_Koopatrol), + .drops = NPC_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 550, 30, -145 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 550, 30, -145 }, + .detectSize = { 200 }, + } + }, + .animations = KOOPATROL_ANIMS, +}; + +EvtScript N(EVS_NpcInit_Prisoner) = { + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Prisoners)[] = { + { + .id = NPC_Toad_01, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 845.0f, 30.0f, -285.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Prisoner), + .drops = TOAD_DROPS, + .animations = TOAD_RED_ANIMS, + .tattle = MSG_NpcTattle_KPA_CaptiveToadA, + }, + { + .id = NPC_Toad_02, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 872.0f, 30.0f, -315.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Prisoner), + .drops = TOAD_DROPS, + .animations = TOAD_BLUE_ANIMS, + .tattle = MSG_NpcTattle_KPA_CaptiveToadB, + }, + { + .id = NPC_ToadGuard, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { 900.0f, 30.0f, -285.0f }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_Prisoner), + .drops = TOAD_DROPS, + .animations = TOAD_GUARD_YELLOW_ANIMS, + .tattle = MSG_NpcTattle_KPA_CaptiveSoldierA, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Koopatrol), BTL_KPA_FORMATION_18, BTL_KPA_STAGE_02), + NPC_GROUP(N(NpcData_Prisoners), BTL_KMR_PART_1_FORMATION_00, BTL_KMR_PART_1_STAGE_02), + {} +}; diff --git a/src/world/area_kpa/kpa_111/A99590.c b/src/world/area_kpa/kpa_111/A99590.c deleted file mode 100644 index d2ded0f06c..0000000000 --- a/src/world/area_kpa/kpa_111/A99590.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "kpa_111.h" - -static char* N(exit_str_0) = "kpa_130"; -static char* N(exit_str_1) = "kpa_112"; - -#include "world/common/todo/UnkFunc11.inc.c" - -#include "world/common/todo/UnkFunc12.inc.c" - -#include "world/common/enemy/ai/RangedAttackAI.inc.c" - -#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_111/kpa_111.h b/src/world/area_kpa/kpa_111/kpa_111.h index 4ba1fd7dd2..865b9c1d1f 100644 --- a/src/world/area_kpa/kpa_111/kpa_111.h +++ b/src/world/area_kpa/kpa_111/kpa_111.h @@ -2,8 +2,31 @@ /// @brief Bowser's Castle - Room with Hidden Door 1 #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_111_shape.h" +#include "mapfs/kpa_111_hit.h" + +#include "sprite/npc/DryBones.h" +#include "sprite/npc/ThrownBone.h" + +enum { + NPC_DryBones_01 = 0, + NPC_DryBones_01_Hitbox1 = 1, + NPC_DryBones_01_Hitbox2 = 2, + NPC_DryBones_01_Hitbox3 = 3, + NPC_DryBones_02 = 4, + NPC_DryBones_02_Hitbox1 = 5, + NPC_DryBones_02_Hitbox2 = 6, + NPC_DryBones_02_Hitbox3 = 7, +}; + #define NAMESPACE kpa_111 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupStatues); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_111/kpa_111_0_header.c b/src/world/area_kpa/kpa_111/kpa_111_0_header.c new file mode 100644 index 0000000000..38bc723177 --- /dev/null +++ b/src/world/area_kpa/kpa_111/kpa_111_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_111.h" + +EntryList N(Entrances) = { + [kpa_111_ENTRY_0] { -208.0, 0.0, 105.0, 90.0 }, + [kpa_111_ENTRY_1] { 300.0, 0.0, 25.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_111 }, +}; diff --git a/src/world/area_kpa/kpa_111/kpa_111_1_music.c b/src/world/area_kpa/kpa_111/kpa_111_1_music.c new file mode 100644 index 0000000000..0776a728f1 --- /dev/null +++ b/src/world/area_kpa/kpa_111/kpa_111_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_111.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_111/kpa_111_2_main.c b/src/world/area_kpa/kpa_111/kpa_111_2_main.c new file mode 100644 index 0000000000..d79158a253 --- /dev/null +++ b/src/world/area_kpa/kpa_111/kpa_111_2_main.c @@ -0,0 +1,42 @@ +#include "kpa_111.h" + +EvtScript N(EVS_ExitDoors_kpa_130_1) = EVT_EXIT_DOUBLE_DOOR(kpa_111_ENTRY_0, "kpa_130", kpa_130_ENTRY_1, COLLIDER_deiliwtt, MODEL_o119, MODEL_o118); +EvtScript N(EVS_ExitDoors_kpa_112_0) = EVT_EXIT_WALK(40, kpa_111_ENTRY_1, "kpa_112", kpa_112_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_130_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deiliwtt, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_112_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiline, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_111_ENTRY_0) + EVT_SET(LVar0, kpa_111_ENTRY_0) + EVT_SET(LVar2, MODEL_o119) + EVT_SET(LVar3, MODEL_o118) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_111_ENTRY_1) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupStatues)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_111/kpa_111_3_statues.c b/src/world/area_kpa/kpa_111/kpa_111_3_statues.c new file mode 100644 index 0000000000..490ef87a45 --- /dev/null +++ b/src/world/area_kpa/kpa_111/kpa_111_3_statues.c @@ -0,0 +1,133 @@ +#include "kpa_111.h" + +#include "world/common/todo/UnkFunc11.inc.c" +#include "world/common/todo/UnkFunc12.inc.c" + +EvtScript N(EVS_PushRightStatue_Impl) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_LOOP(20) + EVT_CALL(GetCurrentPartner, LVarA) + EVT_IF_NE(LVarA, 0) + EVT_SET(LVar8, -1) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(UnkFunc11), LVar9) + EVT_IF_EQ(LVar0, 0) + EVT_SET(LVar8, -1) + EVT_RETURN + EVT_ELSE + EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(GetCurrentPartner, LVarA) + EVT_IF_NE(LVarA, 0) + EVT_SET(LVar8, -1) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 100, EVT_FLOAT(0.6)) + EVT_END_THREAD + EVT_THREAD + EVT_IF_GE(LVar6, LVar7) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_ELSE + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_END_IF + EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SET(LVar1, LVar0) + EVT_SET(LVar2, LVar7) + EVT_SUB(LVar2, LVar6) + EVT_ADD(LVar1, LVar2) + EVT_CALL(MakeLerp, LVar0, LVar1, 100, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) + EVT_CALL(UpdateLerp) + EVT_CALL(N(UnkFunc12)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_THREAD + EVT_CALL(MakeLerp, LVar6, LVar7, 100, EASING_LINEAR) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_80000010, 0) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g21, LVar0, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_kpa_c) + EVT_CALL(UpdateColliderTransform, COLLIDER_kpa_l) + EVT_CALL(UpdateColliderTransform, COLLIDER_kpa_r) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(StopSound, SOUND_80000010) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PushRightStatue_FromLeft) = { + EVT_IF_EQ(GB_KPA111_StatuePosition, 2) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GB_KPA111_StatuePosition, 0) + EVT_SET(LVar6, 0) + EVT_SET(LVar7, 50) + EVT_SET(LVar8, 2) + EVT_ELSE + EVT_SET(LVar6, -50) + EVT_SET(LVar7, 0) + EVT_SET(LVar8, 0) + EVT_END_IF + EVT_SET(LVar9, COLLIDER_kpa_l) + EVT_EXEC_WAIT(N(EVS_PushRightStatue_Impl)) + EVT_IF_NE(LVar8, -1) + EVT_SET(GB_KPA111_StatuePosition, LVar8) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PushRightStatue_FromRight) = { + EVT_IF_EQ(GB_KPA111_StatuePosition, 1) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GB_KPA111_StatuePosition, 0) + EVT_SET(LVar6, 0) + EVT_SET(LVar7, -50) + EVT_SET(LVar8, 1) + EVT_ELSE + EVT_SET(LVar6, 50) + EVT_SET(LVar7, 0) + EVT_SET(LVar8, 0) + EVT_END_IF + EVT_SET(LVar9, COLLIDER_kpa_r) + EVT_EXEC_WAIT(N(EVS_PushRightStatue_Impl)) + EVT_IF_NE(LVar8, -1) + EVT_SET(GB_KPA111_StatuePosition, LVar8) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupStatues) = { + EVT_SWITCH(GB_KPA111_StatuePosition) + EVT_CASE_EQ(1) + EVT_CALL(TranslateGroup, MODEL_g21, -50, 0, 0) + EVT_CASE_EQ(2) + EVT_CALL(TranslateGroup, MODEL_g21, 50, 0, 0) + EVT_END_SWITCH + EVT_CALL(ParentColliderToModel, COLLIDER_kpa_c, MODEL_o105) + EVT_CALL(ParentColliderToModel, COLLIDER_kpa_l, MODEL_o105) + EVT_CALL(ParentColliderToModel, COLLIDER_kpa_r, MODEL_o105) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_PushRightStatue_FromLeft)), TRIGGER_WALL_PUSH, COLLIDER_kpa_l, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_PushRightStatue_FromRight)), TRIGGER_WALL_PUSH, COLLIDER_kpa_r, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_111/kpa_111_4_npc.c b/src/world/area_kpa/kpa_111/kpa_111_4_npc.c new file mode 100644 index 0000000000..ab34cf105d --- /dev/null +++ b/src/world/area_kpa/kpa_111/kpa_111_4_npc.c @@ -0,0 +1,63 @@ +#include "kpa_111.h" + +#include "world/common/enemy/complete/DryBones.inc.c" + +StaticNpc N(NpcData_DryBones)[] = { + { + .id = NPC_DryBones_01, + .settings = &N(NpcSettings_DryBones), + .pos = { -10.0f, 0.0f, 100.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_800, + .drops = DRY_BONES_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -10, 0, 100 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -10, 0, 100 }, + .detectSize = { 180 }, + } + }, + .animations = DRY_BONES_ANIMS, + }, + DRY_BONES_BONE_HITBOX(NPC_DryBones_01 + 1), + DRY_BONES_BONE_HITBOX(NPC_DryBones_01 + 2), + DRY_BONES_BONE_HITBOX(NPC_DryBones_01 + 3), +}; + +StaticNpc N(NpcData_DryBones_02)[] = { + { + .id = NPC_DryBones_02, + .settings = &N(NpcSettings_DryBones), + .pos = { 200.0f, 0.0f, 140.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_800, + .drops = DRY_BONES_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 200, 0, 140 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 200, 0, 140 }, + .detectSize = { 180 }, + } + }, + .animations = DRY_BONES_ANIMS, + }, + DRY_BONES_BONE_HITBOX(NPC_DryBones_02 + 1), + DRY_BONES_BONE_HITBOX(NPC_DryBones_02 + 2), + DRY_BONES_BONE_HITBOX(NPC_DryBones_02 + 3), +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_DryBones), BTL_KPA_FORMATION_07, BTL_KPA_STAGE_0C), + NPC_GROUP(N(NpcData_DryBones_02), BTL_KPA_FORMATION_0C, BTL_KPA_STAGE_0C), + {} +}; diff --git a/src/world/area_kpa/kpa_111/kpa_111_5_entity.c b/src/world/area_kpa/kpa_111/kpa_111_5_entity.c new file mode 100644 index 0000000000..91cf292b6e --- /dev/null +++ b/src/world/area_kpa/kpa_111/kpa_111_5_entity.c @@ -0,0 +1,11 @@ +#include "kpa_111.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 205, 60, 110, 0, ITEM_SUPER_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KPA111_ItemBlock_SuperShroom) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 5, 60, 110, 0, ITEM_MAPLE_SYRUP, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KPA111_HiddenItem_MapleSyrup) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_112/A9C990.c b/src/world/area_kpa/kpa_112/A9C990.c deleted file mode 100644 index 1850f7487a..0000000000 --- a/src/world/area_kpa/kpa_112/A9C990.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "kpa_112.h" - -static char* N(exit_str_0) = "kpa_111"; -static char* N(exit_str_1) = "kpa_113"; diff --git a/src/world/area_kpa/kpa_112/kpa_112.h b/src/world/area_kpa/kpa_112/kpa_112.h index 920c4ef272..a2fc69aa54 100644 --- a/src/world/area_kpa/kpa_112/kpa_112.h +++ b/src/world/area_kpa/kpa_112/kpa_112.h @@ -2,8 +2,14 @@ /// @brief Bowser's Castle - Hidden Passage 1 #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_112_shape.h" +#include "mapfs/kpa_112_hit.h" + #define NAMESPACE kpa_112 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); diff --git a/src/world/area_kpa/kpa_112/kpa_112_0_header.c b/src/world/area_kpa/kpa_112/kpa_112_0_header.c new file mode 100644 index 0000000000..85011add4a --- /dev/null +++ b/src/world/area_kpa/kpa_112/kpa_112_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_112.h" + +EntryList N(Entrances) = { + [kpa_112_ENTRY_0] { -150.0, 0.0, 110.0, 0.0 }, + [kpa_112_ENTRY_1] { 473.0, 0.0, 112.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_112 }, +}; diff --git a/src/world/area_kpa/kpa_112/kpa_112_1_music.c b/src/world/area_kpa/kpa_112/kpa_112_1_music.c new file mode 100644 index 0000000000..5621c8e03c --- /dev/null +++ b/src/world/area_kpa/kpa_112/kpa_112_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_112.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_112/kpa_112_2_main.c b/src/world/area_kpa/kpa_112/kpa_112_2_main.c new file mode 100644 index 0000000000..9ac7054e0d --- /dev/null +++ b/src/world/area_kpa/kpa_112/kpa_112_2_main.c @@ -0,0 +1,24 @@ +#include "kpa_112.h" +#include "sprite.h" + +EvtScript N(EVS_ExitWalk_kpa_111_1) = EVT_EXIT_WALK(40, kpa_112_ENTRY_0, "kpa_111", kpa_111_ENTRY_1); +EvtScript N(EVS_ExitWalk_kpa_113_0) = EVT_EXIT_WALK(40, kpa_112_ENTRY_1, "kpa_113", kpa_113_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_111_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_113_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC(N(EVS_SetupMusic)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_113/A9CC30.c b/src/world/area_kpa/kpa_113/A9CC30.c deleted file mode 100644 index 6c0d7211ff..0000000000 --- a/src/world/area_kpa/kpa_113/A9CC30.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "kpa_113.h" - -static char* N(exit_str_0) = "kpa_112"; -static char* N(exit_str_1) = "kpa_114"; -static char* N(exit_str_2) = "kpa_82"; -static char* N(exit_str_3) = ""; - -#include "world/common/todo/RemovePadlock.inc.c" diff --git a/src/world/area_kpa/kpa_113/A9CC70.c b/src/world/area_kpa/kpa_113/A9CC70.c deleted file mode 100644 index 0bdb1f9e0b..0000000000 --- a/src/world/area_kpa/kpa_113/A9CC70.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "kpa_113.h" - -#include "world/common/todo/UnkFunc11.inc.c" - -#include "world/common/todo/UnkFunc12.inc.c" - -#include "world/common/enemy/ai/TackleAI.inc.c" - -#include "world/common/todo/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_kpa/kpa_113/kpa_113.h b/src/world/area_kpa/kpa_113/kpa_113.h index 62b6394828..7b2719afba 100644 --- a/src/world/area_kpa/kpa_113/kpa_113.h +++ b/src/world/area_kpa/kpa_113/kpa_113.h @@ -2,8 +2,25 @@ /// @brief Bowser's Castle - Room with Hidden Door 2 #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_113_shape.h" +#include "mapfs/kpa_113_hit.h" + +enum { + NPC_BonyBeetle = 0, +}; + +enum { + MV_PadlockEntityID = MapVar(1), +}; + #define NAMESPACE kpa_113 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupStatues); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_113/kpa_113_0_header.c b/src/world/area_kpa/kpa_113/kpa_113_0_header.c new file mode 100644 index 0000000000..ab990da2f9 --- /dev/null +++ b/src/world/area_kpa/kpa_113/kpa_113_0_header.c @@ -0,0 +1,14 @@ +#include "kpa_113.h" + +EntryList N(Entrances) = { + [kpa_113_ENTRY_0] { -208.0, 0.0, 100.0, 90.0 }, + [kpa_113_ENTRY_1] { 408.0, 0.0, 100.0, 270.0 }, + [kpa_113_ENTRY_2] { -102.0, 0.0, 20.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_113 }, +}; diff --git a/src/world/area_kpa/kpa_113/kpa_113_1_music.c b/src/world/area_kpa/kpa_113/kpa_113_1_music.c new file mode 100644 index 0000000000..c1731943e4 --- /dev/null +++ b/src/world/area_kpa/kpa_113/kpa_113_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_113.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_113/kpa_113_2_main.c b/src/world/area_kpa/kpa_113/kpa_113_2_main.c new file mode 100644 index 0000000000..b5e76706f1 --- /dev/null +++ b/src/world/area_kpa/kpa_113/kpa_113_2_main.c @@ -0,0 +1,46 @@ +#include "kpa_113.h" + +EvtScript N(EVS_ExitWalk_kpa_112_1) = EVT_EXIT_WALK(40, kpa_113_ENTRY_0, "kpa_112", kpa_112_ENTRY_1); +EvtScript N(EVS_ExitWalk_kpa_114_0) = EVT_EXIT_WALK(40, kpa_113_ENTRY_2, "kpa_114", kpa_114_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_112_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_114_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilinw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetLoadType, LVar0) + EVT_IF_EQ(LVar0, LOAD_FROM_FILE_SELECT) + EVT_EXEC(EnterSavePoint) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, kpa_113_ENTRY_1) + EVT_SET(LVar2, MODEL_o136) + EVT_SET(LVar3, MODEL_o137) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_ELSE + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupStatues)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_113/kpa_113_3_entity.c b/src/world/area_kpa/kpa_113/kpa_113_3_entity.c new file mode 100644 index 0000000000..2edd775a33 --- /dev/null +++ b/src/world/area_kpa/kpa_113/kpa_113_3_entity.c @@ -0,0 +1,51 @@ +#include "kpa_113.h" +#include "entity.h" + +#include "world/common/todo/RemovePadlock.inc.c" + +s32 N(KeyList_BowsersCastle)[] = { + ITEM_BOWSER_CASTLE_KEY, + ITEM_NONE +}; + +EvtScript N(EVS_ExitDoors_kpa_82_0) = EVT_EXIT_DOUBLE_DOOR(kpa_113_ENTRY_1, "kpa_82", kpa_82_ENTRY_0, COLLIDER_deiliett, MODEL_o136, MODEL_o137); + +MAP_RODATA_PAD(1, exits); + +EvtScript N(EVS_UnlockPrompt_LockedDoor) = { + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_CALL(PlaySound, SOUND_269) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(GF_KPA113_UnlockedDoor, TRUE) + EVT_SET(LVar0, MV_PadlockEntityID) + EVT_CALL(N(RemovePadlock)) + EVT_SET(LVar1, 0) + EVT_WAIT(5) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_82_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deiliett, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_KPA113_UnlockedDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 418, 10, 100, 280, MAKE_ENTITY_END) + EVT_SET(MV_PadlockEntityID, LVar0) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockPrompt_LockedDoor)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(KeyList_BowsersCastle)), 0, 1) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_82_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deiliett, 1, 0) + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 375, 60, 50, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_113/kpa_113_4_statues.c b/src/world/area_kpa/kpa_113/kpa_113_4_statues.c new file mode 100644 index 0000000000..9b633f2578 --- /dev/null +++ b/src/world/area_kpa/kpa_113/kpa_113_4_statues.c @@ -0,0 +1,134 @@ +#include "kpa_113.h" + +#include "world/common/todo/UnkFunc11.inc.c" +#include "world/common/todo/UnkFunc12.inc.c" + +EvtScript N(EVS_PushLeftStatue_Impl) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_LOOP(20) + EVT_CALL(GetCurrentPartner, LVarA) + EVT_IF_NE(LVarA, 0) + EVT_SET(LVar8, -1) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(UnkFunc11), LVar9) + EVT_IF_EQ(LVar0, 0) + EVT_SET(LVar8, -1) + EVT_RETURN + EVT_ELSE + EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(GetCurrentPartner, LVarA) + EVT_IF_NE(LVarA, 0) + EVT_SET(LVar8, -1) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 100, EVT_FLOAT(0.6)) + EVT_END_THREAD + EVT_THREAD + EVT_IF_GE(LVar6, LVar7) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_ELSE + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_END_IF + EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SET(LVar1, LVar0) + EVT_SET(LVar2, LVar7) + EVT_SUB(LVar2, LVar6) + EVT_ADD(LVar1, LVar2) + EVT_CALL(MakeLerp, LVar0, LVar1, 100, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) + EVT_CALL(UpdateLerp) + EVT_CALL(N(UnkFunc12)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_THREAD + EVT_CALL(MakeLerp, LVar6, LVar7, 100, EASING_LINEAR) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_80000010, 0) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g19, LVar0, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_kpa_c) + EVT_CALL(UpdateColliderTransform, COLLIDER_kpa_l) + EVT_CALL(UpdateColliderTransform, COLLIDER_kpa_r) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(StopSound, SOUND_80000010) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PushLeftStatue_FromLeft) = { + EVT_IF_EQ(GB_KPA113_StatuePosition, 2) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GB_KPA113_StatuePosition, 0) + EVT_SET(LVar6, 0) + EVT_SET(LVar7, 50) + EVT_SET(LVar8, 2) + EVT_ELSE + EVT_SET(LVar6, -50) + EVT_SET(LVar7, 0) + EVT_SET(LVar8, 0) + EVT_END_IF + EVT_SET(LVar9, COLLIDER_kpa_l) + EVT_EXEC_WAIT(N(EVS_PushLeftStatue_Impl)) + EVT_IF_NE(LVar8, -1) + EVT_SET(GB_KPA113_StatuePosition, LVar8) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PushLeftStatue_FromRight) = { + EVT_IF_EQ(GB_KPA113_StatuePosition, 1) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GB_KPA113_StatuePosition, 0) + EVT_SET(LVar6, 0) + EVT_SET(LVar7, -50) + EVT_SET(LVar8, 1) + EVT_ELSE + EVT_SET(LVar6, 50) + EVT_SET(LVar7, 0) + EVT_SET(LVar8, 0) + EVT_END_IF + EVT_SET(LVar9, COLLIDER_kpa_r) + EVT_EXEC_WAIT(N(EVS_PushLeftStatue_Impl)) + EVT_IF_NE(LVar8, -1) + EVT_SET(GB_KPA113_StatuePosition, LVar8) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupStatues) = { + EVT_SWITCH(GB_KPA113_StatuePosition) + EVT_CASE_EQ(1) + EVT_CALL(TranslateGroup, MODEL_g19, -50, 0, 0) + EVT_CASE_EQ(2) + EVT_CALL(TranslateGroup, MODEL_g19, 50, 0, 0) + EVT_END_SWITCH + EVT_CALL(ParentColliderToModel, COLLIDER_kpa_c, MODEL_o101) + EVT_CALL(ParentColliderToModel, COLLIDER_kpa_l, MODEL_o101) + EVT_CALL(ParentColliderToModel, COLLIDER_kpa_r, MODEL_o101) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_PushLeftStatue_FromLeft)), TRIGGER_WALL_PUSH, COLLIDER_kpa_l, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_PushLeftStatue_FromRight)), TRIGGER_WALL_PUSH, COLLIDER_kpa_r, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_113/kpa_113_5_npc.c b/src/world/area_kpa/kpa_113/kpa_113_5_npc.c new file mode 100644 index 0000000000..4c76895d40 --- /dev/null +++ b/src/world/area_kpa/kpa_113/kpa_113_5_npc.c @@ -0,0 +1,30 @@ +#include "kpa_113.h" + +#include "world/common/enemy/complete/SpikeTop.inc.c" + +StaticNpc N(NpcData_BonyBeetle) = { + .id = NPC_BonyBeetle, + .settings = &N(NpcSettings_BonyBeetle), + .pos = { 100.0f, 0.0f, 83.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .drops = BONY_BEETLE_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 100, 0, 83 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_RECT, + .detectPos = { 65, 0, 100 }, + .detectSize = { 260, 100 }, + } + }, + .animations = BONY_BEETLE_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_BonyBeetle), BTL_KPA_FORMATION_06, BTL_KPA_STAGE_0C), + {} +}; diff --git a/src/world/area_kpa/kpa_114/A9E980.c b/src/world/area_kpa/kpa_114/A9E980.c deleted file mode 100644 index c267b5115b..0000000000 --- a/src/world/area_kpa/kpa_114/A9E980.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "kpa_114.h" - -ApiStatus func_80240000_A9E980(Evt* script, s32 isInitialCall) { - sprintf(wMapShapeName, "kpa_112_shape"); - sprintf(wMapHitName, "kpa_112_hit"); - return ApiStatus_BLOCK; -} - -const char* N(exit_str_0) = "kpa_113\0kpa_115"; diff --git a/src/world/area_kpa/kpa_114/kpa_114.h b/src/world/area_kpa/kpa_114/kpa_114.h index dd41e1febc..acd14b7550 100644 --- a/src/world/area_kpa/kpa_114/kpa_114.h +++ b/src/world/area_kpa/kpa_114/kpa_114.h @@ -2,8 +2,15 @@ /// @brief Bowser's Castle - Hidden Passage 2 #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_112_shape.h" +#include "mapfs/kpa_112_hit.h" + #define NAMESPACE kpa_114 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_kpa/kpa_114/kpa_114_0_header.c b/src/world/area_kpa/kpa_114/kpa_114_0_header.c new file mode 100644 index 0000000000..a978bf2220 --- /dev/null +++ b/src/world/area_kpa/kpa_114/kpa_114_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_114.h" + +EntryList N(Entrances) = { + [kpa_114_ENTRY_0] { -150.0, 0.0, 110.0, 0.0 }, + [kpa_114_ENTRY_1] { 473.0, 0.0, 112.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_114 }, +}; diff --git a/src/world/area_kpa/kpa_114/kpa_114_1_music.c b/src/world/area_kpa/kpa_114/kpa_114_1_music.c new file mode 100644 index 0000000000..951f835677 --- /dev/null +++ b/src/world/area_kpa/kpa_114/kpa_114_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_114.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_114/kpa_114_2_main.c b/src/world/area_kpa/kpa_114/kpa_114_2_main.c new file mode 100644 index 0000000000..aba6d7ed94 --- /dev/null +++ b/src/world/area_kpa/kpa_114/kpa_114_2_main.c @@ -0,0 +1,44 @@ +#include "kpa_114.h" +#include "sprite.h" + +s32 N(map_init)(void) { + sprintf(wMapShapeName, "kpa_112_shape"); + sprintf(wMapHitName, "kpa_112_hit"); + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_ExitWalk_kpa_113_2) = EVT_EXIT_WALK(60, kpa_114_ENTRY_0, "kpa_113", kpa_113_ENTRY_2); +EvtScript N(EVS_ExitWalk_kpa_115_0) = EVT_EXIT_WALK(40, kpa_114_ENTRY_1, "kpa_115", kpa_115_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_113_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_115_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetLoadType, LVar0) + EVT_IF_EQ(LVar0, 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(EnterWalkShort) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_114/kpa_114_3_entity.c b/src/world/area_kpa/kpa_114/kpa_114_3_entity.c new file mode 100644 index 0000000000..6c78ca89e6 --- /dev/null +++ b/src/world/area_kpa/kpa_114/kpa_114_3_entity.c @@ -0,0 +1,8 @@ +#include "kpa_114.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), -250, 60, 100, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_115/A9ED40.c b/src/world/area_kpa/kpa_115/A9ED40.c deleted file mode 100644 index 09a29d1ace..0000000000 --- a/src/world/area_kpa/kpa_115/A9ED40.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "kpa_115.h" - -static char* N(exit_str_0) = "kpa_114"; -static char* N(exit_str_1) = "kpa_116"; -static char* N(exit_str_2) = "kpa_118"; -static char* N(exit_str_3) = ""; - -#include "world/common/todo/UnkFunc11.inc.c" - -#include "world/common/todo/UnkFunc12.inc.c" - -#include "world/common/enemy/ai/RangedAttackAI.inc.c" - -#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_115/kpa_115.h b/src/world/area_kpa/kpa_115/kpa_115.h index 376f8bfcb7..f43cee527a 100644 --- a/src/world/area_kpa/kpa_115/kpa_115.h +++ b/src/world/area_kpa/kpa_115/kpa_115.h @@ -2,8 +2,20 @@ /// @brief Bowser's Castle - Room with Hidden Door 3 #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_115_shape.h" +#include "mapfs/kpa_115_hit.h" + +enum { + NPC_HammerBros = 20, // uses 21-26 for hammers +}; + #define NAMESPACE kpa_115 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupStatues); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_115/kpa_115_0_header.c b/src/world/area_kpa/kpa_115/kpa_115_0_header.c new file mode 100644 index 0000000000..d4f80bfb4e --- /dev/null +++ b/src/world/area_kpa/kpa_115/kpa_115_0_header.c @@ -0,0 +1,14 @@ +#include "kpa_115.h" + +EntryList N(Entrances) = { + [kpa_115_ENTRY_0] { -208.0, 0.0, 100.0, 90.0 }, + [kpa_115_ENTRY_1] { 100.0, 0.0, 20.0, 180.0 }, + [kpa_115_ENTRY_2] { 50.0, 0.0, 20.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_115 }, +}; diff --git a/src/world/area_kpa/kpa_115/kpa_115_1_music.c b/src/world/area_kpa/kpa_115/kpa_115_1_music.c new file mode 100644 index 0000000000..219244a608 --- /dev/null +++ b/src/world/area_kpa/kpa_115/kpa_115_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_115.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_115/kpa_115_2_main.c b/src/world/area_kpa/kpa_115/kpa_115_2_main.c new file mode 100644 index 0000000000..94b6cb972b --- /dev/null +++ b/src/world/area_kpa/kpa_115/kpa_115_2_main.c @@ -0,0 +1,29 @@ +#include "kpa_115.h" + +EvtScript N(EVS_ExitWalk_kpa_114_1) = EVT_EXIT_WALK(60, kpa_115_ENTRY_0, "kpa_114", kpa_114_ENTRY_1); +EvtScript N(EVS_ExitWalk_kpa_116_0) = EVT_EXIT_WALK(60, kpa_115_ENTRY_1, "kpa_116", kpa_116_ENTRY_0); +EvtScript N(EVS_ExitWalk_kpa_118_0) = EVT_EXIT_WALK(60, kpa_115_ENTRY_2, "kpa_118", kpa_118_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_114_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_118_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_116_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiline, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC(N(EVS_SetupStatues)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; + +MAP_RODATA_PAD(1, exits); diff --git a/src/world/area_kpa/kpa_115/kpa_115_3_statues.c b/src/world/area_kpa/kpa_115/kpa_115_3_statues.c new file mode 100644 index 0000000000..6b62700071 --- /dev/null +++ b/src/world/area_kpa/kpa_115/kpa_115_3_statues.c @@ -0,0 +1,141 @@ +#include "kpa_115.h" + +#include "world/common/todo/UnkFunc11.inc.c" +#include "world/common/todo/UnkFunc12.inc.c" + +EvtScript N(EVS_PushMiddleStatue_Impl) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_LOOP(20) + EVT_CALL(GetCurrentPartner, LVarA) + EVT_IF_NE(LVarA, 0) + EVT_SET(LVar8, -1) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(UnkFunc11), LVar9) + EVT_IF_EQ(LVar0, 0) + EVT_SET(LVar8, -1) + EVT_RETURN + EVT_ELSE + EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(GetCurrentPartner, LVarA) + EVT_IF_NE(LVarA, 0) + EVT_SET(LVar8, -1) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 100, EVT_FLOAT(0.6)) + EVT_END_THREAD + EVT_THREAD + EVT_IF_GE(LVar6, LVar7) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_ELSE + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_END_IF + EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SET(LVar1, LVar0) + EVT_SET(LVar2, LVar7) + EVT_SUB(LVar2, LVar6) + EVT_ADD(LVar1, LVar2) + EVT_CALL(MakeLerp, LVar0, LVar1, 100, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(SetPlayerActionState, ACTION_STATE_PUSHING_BLOCK) + EVT_CALL(UpdateLerp) + EVT_CALL(N(UnkFunc12)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_THREAD + EVT_CALL(MakeLerp, LVar6, LVar7, 100, EASING_LINEAR) + EVT_CALL(PlaySoundAtCollider, LVar9, SOUND_80000010, 0) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g20, LVar0, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o145) + EVT_CALL(UpdateColliderTransform, COLLIDER_o143) + EVT_CALL(UpdateColliderTransform, COLLIDER_o144) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(StopSound, SOUND_80000010) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PushMiddleStatue_Impl_FromLeft) = { + EVT_IF_EQ(GB_KPA115_StatuePosition, 1) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GB_KPA115_StatuePosition, 0) + EVT_SET(LVar6, 0) + EVT_SET(LVar7, 50) + EVT_SET(LVar8, 1) + EVT_ELSE + EVT_SET(LVar6, 50) + EVT_SET(LVar7, 100) + EVT_SET(LVar8, 1) + EVT_END_IF + EVT_SET(LVar9, COLLIDER_o143) + EVT_EXEC_WAIT(N(EVS_PushMiddleStatue_Impl)) + EVT_IF_NE(LVar8, -1) + EVT_SET(GB_KPA115_StatuePosition, LVar8) + EVT_END_IF + EVT_IF_EQ(GB_KPA115_StatuePosition, 1) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o157, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PushMiddleStatue_Impl_FromRight) = { + EVT_IF_EQ(GB_KPA115_StatuePosition, 0) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GB_KPA115_StatuePosition, 1) + EVT_SET(LVar6, 50) + EVT_SET(LVar7, 0) + EVT_SET(LVar8, 0) + EVT_ELSE + EVT_SET(LVar6, 100) + EVT_SET(LVar7, 50) + EVT_SET(LVar8, 0) + EVT_END_IF + EVT_SET(LVar9, COLLIDER_o144) + EVT_EXEC_WAIT(N(EVS_PushMiddleStatue_Impl)) + EVT_IF_NE(LVar8, -1) + EVT_SET(GB_KPA115_StatuePosition, LVar8) + EVT_END_IF + EVT_IF_EQ(GB_KPA115_StatuePosition, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o157, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupStatues) = { + EVT_SWITCH(GB_KPA115_StatuePosition) + EVT_CASE_EQ(0) + EVT_CASE_EQ(1) + EVT_CALL(TranslateGroup, MODEL_g20, 50, 0, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o157, COLLIDER_FLAGS_UPPER_MASK) + EVT_CASE_EQ(2) + EVT_CALL(TranslateGroup, MODEL_g20, 100, 0, 0) + EVT_END_SWITCH + EVT_CALL(ParentColliderToModel, COLLIDER_o145, MODEL_o103) + EVT_CALL(ParentColliderToModel, COLLIDER_o143, MODEL_o103) + EVT_CALL(ParentColliderToModel, COLLIDER_o144, MODEL_o103) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_PushMiddleStatue_Impl_FromLeft)), TRIGGER_WALL_PUSH, COLLIDER_o143, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_PushMiddleStatue_Impl_FromRight)), TRIGGER_WALL_PUSH, COLLIDER_o144, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_115/kpa_115_4_npc.c b/src/world/area_kpa/kpa_115/kpa_115_4_npc.c new file mode 100644 index 0000000000..30013595b1 --- /dev/null +++ b/src/world/area_kpa/kpa_115/kpa_115_4_npc.c @@ -0,0 +1,38 @@ +#include "kpa_115.h" + +#include "world/common/enemy/complete/HammerBros.inc.c" + +StaticNpc N(NpcData_HammerBros)[] = { + { + .id = NPC_HammerBros, + .settings = &N(NpcSettings_HammerBros), + .pos = { 100.0f, 0.0f, 120.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .drops = HAMMER_BROS_DROPS, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 100, 0, 120 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 100, 0, 120 }, + .detectSize = { 200 }, + } + }, + .animations = HAMMER_BROS_ANIMS, + }, + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 1), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 2), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 3), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 4), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 5), + HAMMER_BROS_HAMMER_HITBOX(NPC_HammerBros + 6), +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_HammerBros), BTL_KPA_FORMATION_14, BTL_KPA_STAGE_0C), + {} +}; diff --git a/src/world/area_kpa/kpa_116/AA1EE0.c b/src/world/area_kpa/kpa_116/AA1EE0.c deleted file mode 100644 index eb773bd270..0000000000 --- a/src/world/area_kpa/kpa_116/AA1EE0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "kpa_116.h" - -static char* N(exit_str_0) = "kpa_115"; -static char* N(exit_str_1) = "kpa_117"; diff --git a/src/world/area_kpa/kpa_116/kpa_116.h b/src/world/area_kpa/kpa_116/kpa_116.h index 79bbd977ad..74177aa187 100644 --- a/src/world/area_kpa/kpa_116/kpa_116.h +++ b/src/world/area_kpa/kpa_116/kpa_116.h @@ -2,8 +2,14 @@ /// @brief Bowser's Castle - Dead End Passage #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_116_shape.h" +#include "mapfs/kpa_116_hit.h" + #define NAMESPACE kpa_116 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); diff --git a/src/world/area_kpa/kpa_116/kpa_116_0_header.c b/src/world/area_kpa/kpa_116/kpa_116_0_header.c new file mode 100644 index 0000000000..ed0e19a485 --- /dev/null +++ b/src/world/area_kpa/kpa_116/kpa_116_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_116.h" + +EntryList N(Entrances) = { + [kpa_116_ENTRY_0] { -150.0, 0.0, 110.0, 0.0 }, + [kpa_116_ENTRY_1] { 473.0, 0.0, 112.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_116 }, +}; diff --git a/src/world/area_kpa/kpa_116/kpa_116_1_music.c b/src/world/area_kpa/kpa_116/kpa_116_1_music.c new file mode 100644 index 0000000000..6e49991e80 --- /dev/null +++ b/src/world/area_kpa/kpa_116/kpa_116_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_116.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_116/kpa_116_2_main.c b/src/world/area_kpa/kpa_116/kpa_116_2_main.c new file mode 100644 index 0000000000..f2139a684d --- /dev/null +++ b/src/world/area_kpa/kpa_116/kpa_116_2_main.c @@ -0,0 +1,23 @@ +#include "kpa_116.h" + +EvtScript N(EVS_ExitWalk_kpa_115_1) = EVT_EXIT_WALK(60, kpa_116_ENTRY_0, "kpa_115", kpa_115_ENTRY_1); +EvtScript N(EVS_ExitWalk_kpa_117_0) = EVT_EXIT_WALK(60, kpa_116_ENTRY_1, "kpa_117", kpa_117_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_115_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_117_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_117/kpa_117_0_header.c b/src/world/area_kpa/kpa_117/kpa_117_0_header.c index 397a941a7c..483e804639 100644 --- a/src/world/area_kpa/kpa_117/kpa_117_0_header.c +++ b/src/world/area_kpa/kpa_117/kpa_117_0_header.c @@ -10,14 +10,3 @@ MapSettings N(settings) = { .entryCount = ENTRY_COUNT(N(Entrances)), .tattle = { MSG_MapTattle_kpa_117 }, }; - -EvtScript N(EVS_SetupMusic) = { - EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) - EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) - EVT_THREAD - EVT_WAIT(30) - EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; diff --git a/src/world/area_kpa/kpa_117/kpa_117_1_music.c b/src/world/area_kpa/kpa_117/kpa_117_1_music.c new file mode 100644 index 0000000000..f295e87206 --- /dev/null +++ b/src/world/area_kpa/kpa_117/kpa_117_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_117.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_117/kpa_117_1_main.c b/src/world/area_kpa/kpa_117/kpa_117_2_main.c similarity index 100% rename from src/world/area_kpa/kpa_117/kpa_117_1_main.c rename to src/world/area_kpa/kpa_117/kpa_117_2_main.c diff --git a/src/world/area_kpa/kpa_118/AA23C0.c b/src/world/area_kpa/kpa_118/AA23C0.c deleted file mode 100644 index cbf34db6bd..0000000000 --- a/src/world/area_kpa/kpa_118/AA23C0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "kpa_118.h" - -static char* N(exit_str_0) = "kpa_115"; -static char* N(exit_str_1) = "kpa_119"; diff --git a/src/world/area_kpa/kpa_118/kpa_118.h b/src/world/area_kpa/kpa_118/kpa_118.h index 15a292d025..94f6e1654e 100644 --- a/src/world/area_kpa/kpa_118/kpa_118.h +++ b/src/world/area_kpa/kpa_118/kpa_118.h @@ -2,8 +2,14 @@ /// @brief Bowser's Castle - Hidden Passage 3 #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_118_shape.h" +#include "mapfs/kpa_118_hit.h" + #define NAMESPACE kpa_118 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); diff --git a/src/world/area_kpa/kpa_118/kpa_118_0_header.c b/src/world/area_kpa/kpa_118/kpa_118_0_header.c new file mode 100644 index 0000000000..870a8336a6 --- /dev/null +++ b/src/world/area_kpa/kpa_118/kpa_118_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_118.h" + +EntryList N(Entrances) = { + [kpa_118_ENTRY_0] { 144.0, 0.0, 100.0, 0.0 }, + [kpa_118_ENTRY_1] { -471.0, 0.0, 100.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_118 }, +}; diff --git a/src/world/area_kpa/kpa_118/kpa_118_1_music.c b/src/world/area_kpa/kpa_118/kpa_118_1_music.c new file mode 100644 index 0000000000..a04f5f32c2 --- /dev/null +++ b/src/world/area_kpa/kpa_118/kpa_118_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_118.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_118/kpa_118_2_main.c b/src/world/area_kpa/kpa_118/kpa_118_2_main.c new file mode 100644 index 0000000000..34435385ef --- /dev/null +++ b/src/world/area_kpa/kpa_118/kpa_118_2_main.c @@ -0,0 +1,23 @@ +#include "kpa_118.h" + +EvtScript N(EVS_ExitWalk_kpa_115_2) = EVT_EXIT_WALK(60, kpa_118_ENTRY_0, "kpa_115", kpa_115_ENTRY_2); +EvtScript N(EVS_ExitWalk_kpa_119_0) = EVT_EXIT_WALK(60, kpa_118_ENTRY_1, "kpa_119", kpa_119_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_115_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_119_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_119/AA2660.c b/src/world/area_kpa/kpa_119/AA2660.c deleted file mode 100644 index 6cb375a820..0000000000 --- a/src/world/area_kpa/kpa_119/AA2660.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "kpa_119.h" - -static char* N(exit_str_0) = "kpa_118"; diff --git a/src/world/area_kpa/kpa_119/kpa_119.h b/src/world/area_kpa/kpa_119/kpa_119.h index 23259786e9..c0bc6ecaa2 100644 --- a/src/world/area_kpa/kpa_119/kpa_119.h +++ b/src/world/area_kpa/kpa_119/kpa_119.h @@ -2,8 +2,15 @@ /// @brief Bowser's Castle - Hidden Key Room #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_119_shape.h" +#include "mapfs/kpa_119_hit.h" + #define NAMESPACE kpa_119 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_kpa/kpa_119/kpa_119_0_header.c b/src/world/area_kpa/kpa_119/kpa_119_0_header.c new file mode 100644 index 0000000000..0bdc7a0b78 --- /dev/null +++ b/src/world/area_kpa/kpa_119/kpa_119_0_header.c @@ -0,0 +1,12 @@ +#include "kpa_119.h" + +EntryList N(Entrances) = { + [kpa_119_ENTRY_0] { 6.0, 0.0, 100.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_119 }, +}; diff --git a/src/world/area_kpa/kpa_119/kpa_119_1_music.c b/src/world/area_kpa/kpa_119/kpa_119_1_music.c new file mode 100644 index 0000000000..f326a98373 --- /dev/null +++ b/src/world/area_kpa/kpa_119/kpa_119_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_119.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_119/kpa_119_2_entity.c b/src/world/area_kpa/kpa_119/kpa_119_2_entity.c new file mode 100644 index 0000000000..db93df9ade --- /dev/null +++ b/src/world/area_kpa/kpa_119/kpa_119_2_entity.c @@ -0,0 +1,7 @@ +#include "kpa_119.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_BOWSER_CASTLE_KEY, -100, 20, 100, ITEM_SPAWN_MODE_KEY, GF_KPA119_Item_CastleKey2) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_119/kpa_119_3_main.c b/src/world/area_kpa/kpa_119/kpa_119_3_main.c new file mode 100644 index 0000000000..25ef93023f --- /dev/null +++ b/src/world/area_kpa/kpa_119/kpa_119_3_main.c @@ -0,0 +1,24 @@ +#include "kpa_119.h" +#include "sprite.h" + +EvtScript N(EVS_ExitWalk_kpa_118_1) = EVT_EXIT_WALK(60, kpa_119_ENTRY_0, "kpa_118", kpa_118_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_118_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliwtt, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_12/A54950.c b/src/world/area_kpa/kpa_12/A54950.c deleted file mode 100644 index 656901338b..0000000000 --- a/src/world/area_kpa/kpa_12/A54950.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "kpa_12.h" - -static char* N(exit_str_0) = "kpa_10"; -static char* N(exit_str_1) = "kpa_11"; -static char* N(exit_str_2) = "kpa_13"; - -s32 N(get_tattle)(void) { - if (!evt_get_variable(NULL, GF_KPA16_ShutOffLava)) { - return MSG_MapTattle_kpa_12_before; - } else { - return MSG_MapTattle_kpa_12_after; - } -} diff --git a/src/world/area_kpa/kpa_12/A54990.c b/src/world/area_kpa/kpa_12/A54990.c deleted file mode 100644 index 6dc30fa78f..0000000000 --- a/src/world/area_kpa/kpa_12/A54990.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "kpa_12.h" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kpa/kpa_12/A54CA0.c b/src/world/area_kpa/kpa_12/A54CA0.c deleted file mode 100644 index 5ec7613284..0000000000 --- a/src/world/area_kpa/kpa_12/A54CA0.c +++ /dev/null @@ -1,37 +0,0 @@ -#include "kpa_12.h" - -ApiStatus N(func_80240350_A54CA0)(Evt* script, s32 isInitialCall) { - CollisionStatus* collisionStatus = &gCollisionStatus; - - evt_set_variable(script, *script->ptrReadPos, collisionStatus->floorBelow); - return ApiStatus_DONE2; -} - -ApiStatus func_8024037C_A54CCC(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 velocity = evt_get_variable(script, *args++); - s32 floor = evt_get_variable(script, *args++); - PlayerStatus* playerStatus = &gPlayerStatus; - - if (gCollisionStatus.currentFloor == floor || gCollisionStatus.lastTouchedFloor == floor) { - playerStatus->pushVelocity.x = velocity; - } - - if (gPlayerData.currentPartner != PARTNER_NONE) { - Npc* partner = get_npc_unsafe(NPC_PARTNER); - - if (partner->currentFloor == floor) { - partner->pos.x += velocity; - } - } - return ApiStatus_DONE2; -} - -ApiStatus N(IsPartnerLakilester)(Evt* script, s32 isInitialCall) { - if (gPartnerActionStatus.actingPartner == PARTNER_LAKILESTER) { - script->varTable[9] = TRUE; - } else { - script->varTable[9] = FALSE; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_kpa/kpa_12/kpa_12.h b/src/world/area_kpa/kpa_12/kpa_12.h index 4b2831385d..62a650bb21 100644 --- a/src/world/area_kpa/kpa_12/kpa_12.h +++ b/src/world/area_kpa/kpa_12/kpa_12.h @@ -2,8 +2,15 @@ /// @brief Bowser's Castle - Lava Channel 1 #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_12_shape.h" +#include "mapfs/kpa_12_hit.h" + #define NAMESPACE kpa_12 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupPlatforms); diff --git a/src/world/area_kpa/kpa_12/kpa_12_0_header.c b/src/world/area_kpa/kpa_12/kpa_12_0_header.c new file mode 100644 index 0000000000..1c7d947546 --- /dev/null +++ b/src/world/area_kpa/kpa_12/kpa_12_0_header.c @@ -0,0 +1,22 @@ +#include "kpa_12.h" + +s32 N(get_tattle)(void) { + if (!evt_get_variable(NULL, GF_KPA16_ShutOffLava)) { + return MSG_MapTattle_kpa_12_before; + } else { + return MSG_MapTattle_kpa_12_after; + } +} + +EntryList N(Entrances) = { + [kpa_12_ENTRY_0] { 30.0, 30.0, -150.0, 90.0 }, + [kpa_12_ENTRY_1] { 1470.0, 30.0, -150.0, 270.0 }, + [kpa_12_ENTRY_2] { 17.0, -20.0, -17.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { .get = &N(get_tattle) }, +}; diff --git a/src/world/area_kpa/kpa_12/kpa_12_1_music.c b/src/world/area_kpa/kpa_12/kpa_12_1_music.c new file mode 100644 index 0000000000..055d9c7882 --- /dev/null +++ b/src/world/area_kpa/kpa_12/kpa_12_1_music.c @@ -0,0 +1,15 @@ +#include "kpa_12.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_END_IF + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_12/kpa_12_2_main.c b/src/world/area_kpa/kpa_12/kpa_12_2_main.c new file mode 100644 index 0000000000..3484a22fc6 --- /dev/null +++ b/src/world/area_kpa/kpa_12/kpa_12_2_main.c @@ -0,0 +1,115 @@ +#include "kpa_12.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_kpa_1X_Upper) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, kpa_12_ENTRY_0) + EVT_EXEC(ExitWalk) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(GotoMap, EVT_PTR("kpa_11"), kpa_11_ENTRY_1) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("kpa_10"), kpa_10_ENTRY_1) + EVT_END_IF + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_kpa_1X_Lower) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, kpa_12_ENTRY_2) + EVT_EXEC(ExitWalk) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(GotoMap, EVT_PTR("kpa_11"), kpa_11_ENTRY_4) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("kpa_10"), kpa_10_ENTRY_4) + EVT_END_IF + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_kpa_13_0) = EVT_EXIT_WALK(60, kpa_12_ENTRY_1, "kpa_13", kpa_13_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_1X_Upper)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_1X_Lower)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilisw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_13_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Lava) = { + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( -400, 0, -800, 0) + TEX_PAN_PARAMS_FREQ( 1, 0, 1, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_CALL(SetTexPanner, MODEL_o319, 0) + EVT_CALL(SetTexPanner, MODEL_o555, 0) + EVT_CALL(SetTexPanner, MODEL_o516, 0) + EVT_CALL(SetTexPanner, MODEL_o526, 0) + EVT_CALL(SetTexPanner, MODEL_o557, 0) + EVT_CALL(SetTexPanner, MODEL_o558, 0) + EVT_CALL(SetTexPanner, MODEL_o513, 0) + EVT_CALL(SetTexPanner, MODEL_o561, 0) + EVT_RETURN + EVT_END +}; + +LavaReset N(SafeFloorColliders)[] = { + { .colliderID = COLLIDER_o179, .pos = { 100.0, 30.0, -150.0 }}, + { .colliderID = COLLIDER_o171, .pos = { 245.0, 30.0, -150.0 }}, + { .colliderID = COLLIDER_o174, .pos = { 400.0, 30.0, -150.0 }}, + { .colliderID = COLLIDER_o175, .pos = { 700.0, 30.0, -150.0 }}, + { .colliderID = COLLIDER_o144, .pos = { 855.0, 30.0, -100.0 }}, + { .colliderID = COLLIDER_o305, .pos = { 1445.0, 30.0, -135.0 }}, + { .colliderID = -1 } +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(EnableGroup, MODEL_after, FALSE) + EVT_EXEC(N(EVS_TexPan_Lava)) + EVT_ELSE + EVT_CALL(EnableGroup, MODEL_before, FALSE) + EVT_END_IF + EVT_EXEC(N(EVS_SetupMusic)) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_EXEC(N(EVS_SetupPlatforms)) + EVT_END_IF + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_THREAD + EVT_WAIT(2) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o356, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o358, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o359, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o360, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o361, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o362, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o363, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o364, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o365, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o370, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o371, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o419, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o420, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deilisw, SURFACE_TYPE_LAVA) + EVT_THREAD + EVT_CALL(ResetFromLava, EVT_PTR(N(SafeFloorColliders))) + EVT_END_THREAD + EVT_END_THREAD + EVT_END_IF + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_12/kpa_12_3_platforms.c b/src/world/area_kpa/kpa_12/kpa_12_3_platforms.c new file mode 100644 index 0000000000..0eca5e5175 --- /dev/null +++ b/src/world/area_kpa/kpa_12/kpa_12_3_platforms.c @@ -0,0 +1,229 @@ +#include "kpa_12.h" + +API_CALLABLE(N(GetFloorBelow)) { + Bytecode* args = script->ptrReadPos; + s32 outVar = *args++; + + evt_set_variable(script, outVar, gCollisionStatus.floorBelow); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(AddPlatformPushVelocity)) { + Bytecode* args = script->ptrReadPos; + s32 velocity = evt_get_variable(script, *args++); + s32 floor = evt_get_variable(script, *args++); + PlayerStatus* playerStatus = &gPlayerStatus; + + if (gCollisionStatus.currentFloor == floor || gCollisionStatus.lastTouchedFloor == floor) { + playerStatus->pushVelocity.x = velocity; + } + + if (gPlayerData.currentPartner != PARTNER_NONE) { + Npc* partner = get_npc_unsafe(NPC_PARTNER); + + if (partner->currentFloor == floor) { + partner->pos.x += velocity; + } + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(IsPartnerLakilester)) { + if (gPartnerActionStatus.actingPartner == PARTNER_LAKILESTER) { + script->varTable[9] = TRUE; + } else { + script->varTable[9] = FALSE; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SinkingPlatform_Update) = { + EVT_SET_GROUP(EVT_GROUP_0B) + EVT_SETF(LVar0, EVT_FLOAT(0.0)) + EVT_LABEL(0) + EVT_CALL(TranslateGroup, LVar1, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, LVar3) + EVT_SUBF(LVar0, EVT_FLOAT(0.5)) + EVT_IF_LT(LVar0, -40) + EVT_SET(LVar0, -40) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(N(GetFloorBelow), LVarB) + EVT_CALL(GetPlayerActionState, LVarC) + EVT_IF_EQ(LVar3, LVarB) + EVT_IF_NE(LVarC, ACTION_STATE_JUMP) + EVT_GOTO(0) + EVT_END_IF + EVT_END_IF + EVT_LABEL(1) + EVT_ADDF(LVar0, EVT_FLOAT(1.0)) + EVT_CALL(TranslateGroup, LVar1, 0, LVar0, 0) + EVT_CALL(UpdateColliderTransform, LVar3) + EVT_WAIT(1) + EVT_CALL(N(GetFloorBelow), LVarB) + EVT_CALL(GetPlayerActionState, LVarC) + EVT_IF_EQ(LVar3, LVarB) + EVT_IF_NE(LVarC, ACTION_STATE_JUMP) + EVT_GOTO(0) + EVT_END_IF + EVT_END_IF + EVT_IF_LT(LVar0, 0) + EVT_GOTO(1) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Touch_SinkingPlatform1) = { + EVT_SET(LVar1, MODEL_dai01) + EVT_SET(LVar3, COLLIDER_o405) + EVT_EXEC_WAIT(N(EVS_SinkingPlatform_Update)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Touch_SinkingPlatform2) = { + EVT_SET(LVar1, MODEL_dai02) + EVT_SET(LVar3, COLLIDER_o407) + EVT_EXEC_WAIT(N(EVS_SinkingPlatform_Update)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Touch_SinkingPlatform3) = { + EVT_SET(LVar1, MODEL_dai03) + EVT_SET(LVar3, COLLIDER_o409) + EVT_EXEC_WAIT(N(EVS_SinkingPlatform_Update)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Touch_SinkingPlatform4) = { + EVT_SET(LVar1, MODEL_dai04) + EVT_SET(LVar3, COLLIDER_o411) + EVT_EXEC_WAIT(N(EVS_SinkingPlatform_Update)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SinkingPlatform_Idle) = { + EVT_SET_GROUP(EVT_GROUP_0B) + EVT_LABEL(0) + EVT_CALL(MakeLerp, 0, -3, 20, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, LVar2, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_NE(LVar1, 0) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(MakeLerp, -3, 0, 20, EASING_LINEAR) + EVT_LABEL(2) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, LVar2, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_NE(LVar1, 0) + EVT_GOTO(2) + EVT_END_IF + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupSinkingPlatforms) = { + EVT_THREAD + EVT_SET(LVar2, MODEL_dai01) + EVT_EXEC_WAIT(N(EVS_SinkingPlatform_Idle)) + EVT_END_THREAD + EVT_WAIT(10) + EVT_THREAD + EVT_SET(LVar2, MODEL_dai02) + EVT_EXEC_WAIT(N(EVS_SinkingPlatform_Idle)) + EVT_END_THREAD + EVT_WAIT(10) + EVT_THREAD + EVT_SET(LVar2, MODEL_dai03) + EVT_EXEC_WAIT(N(EVS_SinkingPlatform_Idle)) + EVT_END_THREAD + EVT_WAIT(10) + EVT_SET(LVar2, MODEL_dai04) + EVT_EXEC_WAIT(N(EVS_SinkingPlatform_Idle)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupMovingPlatform) = { + EVT_SET_GROUP(EVT_GROUP_0B) + EVT_CALL(ParentColliderToModel, COLLIDER_o414, MODEL_o522) + EVT_SET(LVar0, 0) + EVT_SET(LVar3, 0) + EVT_LOOP(0) + EVT_SET(LVar1, 125) + EVT_SUB(LVar1, LVar0) + EVT_CALL(MakeLerp, LVar0, 125, LVar1, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_dai05, LVar0, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o414) + EVT_SET(LVar4, LVar0) + EVT_SUB(LVar4, LVar3) + EVT_SET(LVar3, LVar0) + EVT_CALL(N(AddPlatformPushVelocity), LVar4, COLLIDER_o414) + EVT_IF_GT(LVar0, 95) + EVT_CALL(N(IsPartnerLakilester)) + EVT_IF_EQ(LVar9, 1) + EVT_CALL(N(GetFloorBelow), LVar2) + EVT_IF_EQ(LVar2, 81) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(20) + EVT_CALL(MakeLerp, LVar0, 0, LVar0, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_dai05, LVar0, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o414) + EVT_SET(LVar4, LVar0) + EVT_SUB(LVar4, LVar3) + EVT_SET(LVar3, LVar0) + EVT_CALL(N(AddPlatformPushVelocity), LVar4, COLLIDER_o414) + EVT_IF_LT(LVar0, 30) + EVT_CALL(N(IsPartnerLakilester)) + EVT_IF_EQ(LVar9, 1) + EVT_CALL(N(GetFloorBelow), LVar2) + EVT_IF_EQ(LVar2, 80) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(20) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupPlatforms) = { + EVT_CALL(ParentColliderToModel, COLLIDER_o405, MODEL_o447) + EVT_CALL(ParentColliderToModel, COLLIDER_o407, MODEL_o449) + EVT_CALL(ParentColliderToModel, COLLIDER_o409, MODEL_o451) + EVT_CALL(ParentColliderToModel, COLLIDER_o411, MODEL_o453) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Touch_SinkingPlatform1)), TRIGGER_FLOOR_TOUCH, COLLIDER_o405, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Touch_SinkingPlatform2)), TRIGGER_FLOOR_TOUCH, COLLIDER_o407, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Touch_SinkingPlatform3)), TRIGGER_FLOOR_TOUCH, COLLIDER_o409, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Touch_SinkingPlatform4)), TRIGGER_FLOOR_TOUCH, COLLIDER_o411, 1, 0) + EVT_EXEC(N(EVS_SetupSinkingPlatforms)) + EVT_EXEC(N(EVS_SetupMovingPlatform)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_121/AA28F0.c b/src/world/area_kpa/kpa_121/AA28F0.c deleted file mode 100644 index 4f5a22b8dc..0000000000 --- a/src/world/area_kpa/kpa_121/AA28F0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "kpa_121.h" - -static char* N(exit_str_0) = "kpa_83"; -static char* N(exit_str_1) = "osr_02"; diff --git a/src/world/area_kpa/kpa_121/kpa_121.h b/src/world/area_kpa/kpa_121/kpa_121.h index 7d6cd4998f..9b557fa7b2 100644 --- a/src/world/area_kpa/kpa_121/kpa_121.h +++ b/src/world/area_kpa/kpa_121/kpa_121.h @@ -2,8 +2,14 @@ /// @brief Bowser's Castle - Exit to Peach's Castle #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_121_shape.h" +#include "mapfs/kpa_121_hit.h" + #define NAMESPACE kpa_121 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); diff --git a/src/world/area_kpa/kpa_121/kpa_121_0_header.c b/src/world/area_kpa/kpa_121/kpa_121_0_header.c new file mode 100644 index 0000000000..a4e1f9ced8 --- /dev/null +++ b/src/world/area_kpa/kpa_121/kpa_121_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_121.h" + +EntryList N(Entrances) = { + [kpa_121_ENTRY_0] { -373.0, -240.0, 100.0, 90.0 }, + [kpa_121_ENTRY_1] { 465.0, 0.0, 95.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_121 }, +}; diff --git a/src/world/area_kpa/kpa_121/kpa_121_1_music.c b/src/world/area_kpa/kpa_121/kpa_121_1_music.c new file mode 100644 index 0000000000..5a7ef7a3d6 --- /dev/null +++ b/src/world/area_kpa/kpa_121/kpa_121_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_121.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_121/kpa_121_2_main.c b/src/world/area_kpa/kpa_121/kpa_121_2_main.c new file mode 100644 index 0000000000..ef4e90d791 --- /dev/null +++ b/src/world/area_kpa/kpa_121/kpa_121_2_main.c @@ -0,0 +1,59 @@ +#include "kpa_121.h" + +EvtScript N(EVS_ExitDoors_kpa_83_1) = EVT_EXIT_DOUBLE_DOOR(kpa_121_ENTRY_0, "kpa_83", kpa_83_ENTRY_1, COLLIDER_deilitw, MODEL_o348, MODEL_o356); + +EvtScript N(EVS_ExitDoor_osr_02_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_IF_LT(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_SET(GB_StoryProgress, STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_END_IF + EVT_SET(LVar0, kpa_121_ENTRY_1) + EVT_SET(LVar1, COLLIDER_deilitte) + EVT_SET(LVar2, MODEL_o340) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC(ExitSingleDoor) + EVT_WAIT(17) + EVT_CALL(GotoMap, EVT_PTR("osr_02"), osr_02_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_83_1)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoor_osr_02_0)), TRIGGER_WALL_PRESS_A, COLLIDER_deilitte, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_121_ENTRY_0) + EVT_SET(LVar0, 0) + EVT_SET(LVar2, MODEL_o356) + EVT_SET(LVar3, MODEL_o348) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_121_ENTRY_1) + EVT_SET(LVar0, 1) + EVT_SET(LVar2, MODEL_o340) + EVT_SET(LVar3, DOOR_SWING_OUT) + EVT_EXEC_WAIT(EnterSingleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_13/A55F20.c b/src/world/area_kpa/kpa_13/A55F20.c deleted file mode 100644 index d24c01d098..0000000000 --- a/src/world/area_kpa/kpa_13/A55F20.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "kpa_13.h" - -static char* N(exit_str_0) = "kpa_12"; -static char* N(exit_str_1) = "kpa_15"; -static char* N(exit_str_2) = "kpa_14"; - -s32 N(get_tattle)(void) { - if (!evt_get_variable(NULL, GF_KPA16_ShutOffLava)) { - return MSG_MapTattle_kpa_13_before; - } else { - return MSG_MapTattle_kpa_13_after; - } -} diff --git a/src/world/area_kpa/kpa_13/A55F60.c b/src/world/area_kpa/kpa_13/A55F60.c deleted file mode 100644 index 50540ce904..0000000000 --- a/src/world/area_kpa/kpa_13/A55F60.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "kpa_13.h" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kpa/kpa_13/A56270.c b/src/world/area_kpa/kpa_13/A56270.c deleted file mode 100644 index 2bc3ec2ab6..0000000000 --- a/src/world/area_kpa/kpa_13/A56270.c +++ /dev/null @@ -1,38 +0,0 @@ -#include "kpa_13.h" - -ApiStatus N(func_80240350_A56270)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - CollisionStatus* collisionStatus = &gCollisionStatus; - - evt_set_variable(script, *args++, collisionStatus->floorBelow); - return ApiStatus_DONE2; -} - -ApiStatus func_8024037C_A5629C(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 velocity = evt_get_variable(script, *args++); - s32 floor = evt_get_variable(script, *args++); - PlayerStatus* playerStatus = &gPlayerStatus; - - if (gCollisionStatus.currentFloor == floor || gCollisionStatus.lastTouchedFloor == floor) { - playerStatus->pushVelocity.x = velocity; - } - - if (gPlayerData.currentPartner != PARTNER_NONE) { - Npc* partner = get_npc_unsafe(NPC_PARTNER); - - if (partner->currentFloor == floor) { - partner->pos.x += velocity; - } - } - return ApiStatus_DONE2; -} - -ApiStatus N(IsPartnerLakilester)(Evt* script, s32 isInitialCall) { - if (gPartnerActionStatus.actingPartner == PARTNER_LAKILESTER) { - script->varTable[9] = TRUE; - } else { - script->varTable[9] = FALSE; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_kpa/kpa_13/kpa_13.h b/src/world/area_kpa/kpa_13/kpa_13.h index e38bb79820..eb1baef823 100644 --- a/src/world/area_kpa/kpa_13/kpa_13.h +++ b/src/world/area_kpa/kpa_13/kpa_13.h @@ -2,8 +2,16 @@ /// @brief Bowser's Castle - Lava Channel 2 #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_13_shape.h" +#include "mapfs/kpa_13_hit.h" + #define NAMESPACE kpa_13 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupPlatforms); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_kpa/kpa_13/kpa_13_0_header.c b/src/world/area_kpa/kpa_13/kpa_13_0_header.c new file mode 100644 index 0000000000..28a1f52be0 --- /dev/null +++ b/src/world/area_kpa/kpa_13/kpa_13_0_header.c @@ -0,0 +1,22 @@ +#include "kpa_13.h" + +s32 N(get_tattle)(void) { + if (!evt_get_variable(NULL, GF_KPA16_ShutOffLava)) { + return MSG_MapTattle_kpa_13_before; + } else { + return MSG_MapTattle_kpa_13_after; + } +} + +EntryList N(Entrances) = { + [kpa_13_ENTRY_0] { 30.0, 30.0, -150.0, 90.0 }, + [kpa_13_ENTRY_1] { 1920.0, 30.0, -150.0, 270.0 }, + [kpa_13_ENTRY_2] { 647.0, 0.0, -173.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { .get = &N(get_tattle) }, +}; diff --git a/src/world/area_kpa/kpa_13/kpa_13_1_music.c b/src/world/area_kpa/kpa_13/kpa_13_1_music.c new file mode 100644 index 0000000000..2df827288f --- /dev/null +++ b/src/world/area_kpa/kpa_13/kpa_13_1_music.c @@ -0,0 +1,15 @@ +#include "kpa_13.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(PlayAmbientSounds, AMBIENT_UNDER_SEA1) + EVT_END_IF + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_13/kpa_13_2_main.c b/src/world/area_kpa/kpa_13/kpa_13_2_main.c new file mode 100644 index 0000000000..620392eb16 --- /dev/null +++ b/src/world/area_kpa/kpa_13/kpa_13_2_main.c @@ -0,0 +1,94 @@ +#include "kpa_13.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_kpa_12_1) = EVT_EXIT_WALK(60, kpa_13_ENTRY_0, "kpa_12", kpa_12_ENTRY_1); +EvtScript N(EVS_ExitWalk_kpa_15_0) = EVT_EXIT_WALK(60, kpa_13_ENTRY_2, "kpa_15", kpa_15_ENTRY_0); +EvtScript N(EVS_ExitWalk_kpa_14_0) = EVT_EXIT_WALK(60, kpa_13_ENTRY_1, "kpa_14", kpa_14_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_12_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_15_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_14_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Lava) = { + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_0) + TEX_PAN_PARAMS_STEP( -400, 0, -800, 0) + TEX_PAN_PARAMS_FREQ( 1, 0, 1, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_CALL(SetTexPanner, MODEL_o926, 0) + EVT_CALL(SetTexPanner, MODEL_o927, 0) + EVT_CALL(SetTexPanner, MODEL_o928, 0) + EVT_CALL(SetTexPanner, MODEL_o925, 0) + EVT_RETURN + EVT_END +}; + +LavaReset N(SafeFloorColliders)[] = { + { .colliderID = COLLIDER_o1043, .pos = { 110.0, 30.0, -150.0 }}, + { .colliderID = COLLIDER_o1047, .pos = { 285.0, 30.0, -20.0 }}, + { .colliderID = COLLIDER_o1048, .pos = { 500.0, 30.0, -90.0 }}, + { .colliderID = COLLIDER_o1041, .pos = { 800.0, 30.0, -150.0 }}, + { .colliderID = COLLIDER_o1051, .pos = { 935.0, 30.0, -20.0 }}, + { .colliderID = COLLIDER_o1040, .pos = { 1150.0, 30.0, -150.0 }}, + { .colliderID = COLLIDER_o1050, .pos = { 1285.0, 30.0, -175.0 }}, + { .colliderID = COLLIDER_o1062, .pos = { 1415.0, 30.0, -175.0 }}, + { .colliderID = COLLIDER_o1064, .pos = { 1515.0, 30.0, -175.0 }}, + { .colliderID = COLLIDER_o1066, .pos = { 1655.0, 30.0, -175.0 }}, + { .colliderID = COLLIDER_o1068, .pos = { 1755.0, 30.0, -175.0 }}, + { .colliderID = COLLIDER_o1042, .pos = { 1860.0, 30.0, -120.0 }}, + { .colliderID = -1 } +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_CALL(EnableGroup, MODEL_after, FALSE) + EVT_EXEC(N(EVS_TexPan_Lava)) + EVT_ELSE + EVT_CALL(EnableGroup, MODEL_before, FALSE) + EVT_END_IF + EVT_EXEC(N(EVS_SetupMusic)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_EXEC(N(EVS_SetupPlatforms)) + EVT_END_IF + EVT_IF_EQ(GF_KPA16_ShutOffLava, FALSE) + EVT_THREAD + EVT_WAIT(2) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1039, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o805, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1028, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1029, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1030, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1031, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1032, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1033, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1034, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1035, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1036, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1037, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1038, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1074, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1075, SURFACE_TYPE_LAVA) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deilin, SURFACE_TYPE_LAVA) + EVT_THREAD + EVT_CALL(ResetFromLava, EVT_PTR(N(SafeFloorColliders))) + EVT_END_THREAD + EVT_END_THREAD + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_13/kpa_13_3_entity.c b/src/world/area_kpa/kpa_13/kpa_13_3_entity.c new file mode 100644 index 0000000000..e9e0f4c0ad --- /dev/null +++ b/src/world/area_kpa/kpa_13/kpa_13_3_entity.c @@ -0,0 +1,17 @@ +#include "kpa_13.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_SET(AF_KPA_05, FALSE) + EVT_SET(AF_KPA_06, FALSE) + EVT_IF_EQ(GF_KPA13_BlueSwitchA, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), 285, 10, -55, 0, MAKE_ENTITY_END) + EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_KPA_05)) + EVT_END_IF + EVT_IF_EQ(GF_KPA13_BlueSwitchB, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), 935, 10, -55, 0, MAKE_ENTITY_END) + EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_KPA_06)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_13/kpa_13_4_platforms.c b/src/world/area_kpa/kpa_13/kpa_13_4_platforms.c new file mode 100644 index 0000000000..34f10710c0 --- /dev/null +++ b/src/world/area_kpa/kpa_13/kpa_13_4_platforms.c @@ -0,0 +1,184 @@ +#include "kpa_13.h" + +API_CALLABLE(N(GetFloorBelow)) { + Bytecode* args = script->ptrReadPos; + s32 outVar = *args++; + + evt_set_variable(script, outVar, gCollisionStatus.floorBelow); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(AddPlatformPushVelocity)) { + Bytecode* args = script->ptrReadPos; + s32 velocity = evt_get_variable(script, *args++); + s32 floor = evt_get_variable(script, *args++); + PlayerStatus* playerStatus = &gPlayerStatus; + + if (gCollisionStatus.currentFloor == floor || gCollisionStatus.lastTouchedFloor == floor) { + playerStatus->pushVelocity.x = velocity; + } + + if (gPlayerData.currentPartner != PARTNER_NONE) { + Npc* partner = get_npc_unsafe(NPC_PARTNER); + + if (partner->currentFloor == floor) { + partner->pos.x += velocity; + } + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(IsPartnerLakilester)) { + if (gPartnerActionStatus.actingPartner == PARTNER_LAKILESTER) { + script->varTable[9] = TRUE; + } else { + script->varTable[9] = FALSE; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SetupPlatforms) = { + EVT_SET_GROUP(EVT_GROUP_0B) + EVT_THREAD + EVT_CALL(ParentColliderToModel, COLLIDER_o1070, MODEL_o1083) + EVT_CALL(TranslateGroup, MODEL_dai05, 125, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o1070) + EVT_IF_EQ(GF_KPA13_BlueSwitchA, FALSE) + EVT_LABEL(11) + EVT_IF_EQ(AF_KPA_05, FALSE) + EVT_WAIT(1) + EVT_GOTO(11) + EVT_END_IF + EVT_WAIT(20) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(0.5)) + EVT_SET(GF_KPA13_BlueSwitchA, TRUE) + EVT_END_IF + EVT_SET(LVar0, 125) + EVT_SET(LVar3, -100) + EVT_LOOP(0) + EVT_SET(LVar1, LVar0) + EVT_SUB(LVar1, -100) + EVT_CALL(MakeLerp, LVar0, -100, LVar1, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_dai05, LVar0, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o1070) + EVT_SET(LVar4, LVar0) + EVT_SUB(LVar4, LVar3) + EVT_SET(LVar3, LVar0) + EVT_CALL(N(AddPlatformPushVelocity), LVar4, COLLIDER_o1070) + EVT_IF_LT(LVar0, -70) + EVT_CALL(N(IsPartnerLakilester)) + EVT_IF_EQ(LVar9, 1) + EVT_CALL(N(GetFloorBelow), LVar2) + EVT_IF_EQ(LVar2, 90) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(20) + EVT_SET(LVar1, 125) + EVT_SUB(LVar1, LVar0) + EVT_CALL(MakeLerp, LVar0, 125, LVar1, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_dai05, LVar0, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o1070) + EVT_SET(LVar4, LVar0) + EVT_SUB(LVar4, LVar3) + EVT_SET(LVar3, LVar0) + EVT_CALL(N(AddPlatformPushVelocity), LVar4, COLLIDER_o1070) + EVT_IF_GT(LVar0, 95) + EVT_CALL(N(IsPartnerLakilester)) + EVT_IF_EQ(LVar9, 1) + EVT_CALL(N(GetFloorBelow), LVar2) + EVT_IF_EQ(LVar2, 91) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(20) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(ParentColliderToModel, COLLIDER_o1072, MODEL_o1087) + EVT_CALL(TranslateGroup, MODEL_dai06, 75, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o1072) + EVT_IF_EQ(GF_KPA13_BlueSwitchB, FALSE) + EVT_LABEL(12) + EVT_IF_EQ(AF_KPA_06, FALSE) + EVT_WAIT(1) + EVT_GOTO(12) + EVT_END_IF + EVT_WAIT(20) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(0.5)) + EVT_SET(GF_KPA13_BlueSwitchB, TRUE) + EVT_END_IF + EVT_SET(LVar0, 75) + EVT_SET(LVar3, -100) + EVT_LOOP(0) + EVT_SET(LVar1, LVar0) + EVT_SUB(LVar1, -100) + EVT_CALL(MakeLerp, LVar0, -100, LVar1, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_dai06, LVar0, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o1072) + EVT_SET(LVar4, LVar0) + EVT_SUB(LVar4, LVar3) + EVT_SET(LVar3, LVar0) + EVT_CALL(N(AddPlatformPushVelocity), LVar4, COLLIDER_o1072) + EVT_IF_LT(LVar0, -70) + EVT_CALL(N(IsPartnerLakilester)) + EVT_IF_EQ(LVar9, 1) + EVT_CALL(N(GetFloorBelow), LVar2) + EVT_IF_EQ(LVar2, 90) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(20) + EVT_SET(LVar1, 75) + EVT_SUB(LVar1, LVar0) + EVT_CALL(MakeLerp, LVar0, 75, LVar1, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_dai06, LVar0, 0, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o1072) + EVT_SET(LVar4, LVar0) + EVT_SUB(LVar4, LVar3) + EVT_SET(LVar3, LVar0) + EVT_CALL(N(AddPlatformPushVelocity), LVar4, COLLIDER_o1072) + EVT_IF_GT(LVar0, 45) + EVT_CALL(N(IsPartnerLakilester)) + EVT_IF_EQ(LVar9, 1) + EVT_CALL(N(GetFloorBelow), LVar2) + EVT_IF_EQ(LVar2, 91) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(20) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_130/AA2D20.c b/src/world/area_kpa/kpa_130/AA2D20.c deleted file mode 100644 index 464ad73ae5..0000000000 --- a/src/world/area_kpa/kpa_130/AA2D20.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "kpa_130.h" - -static char* N(exit_str_0) = "kpa_134"; -static char* N(exit_str_1) = "kpa_111"; - -#include "world/common/enemy/ai/BulletBillAI.inc.c" diff --git a/src/world/area_kpa/kpa_130/kpa_130.h b/src/world/area_kpa/kpa_130/kpa_130.h index 719bb98a4c..7abd95d88d 100644 --- a/src/world/area_kpa/kpa_130/kpa_130.h +++ b/src/world/area_kpa/kpa_130/kpa_130.h @@ -2,8 +2,49 @@ /// @brief Bowser's Castle - Bill Blaster Hall #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_130_shape.h" +#include "mapfs/kpa_130_hit.h" + +#include "sprite/npc/BillBlaster.h" +#include "sprite/npc/BulletBill.h" + +enum { + NPC_BillBlaster_01 = 0, + NPC_BillBlaster_02 = 1, + NPC_BillBlaster_03 = 2, + NPC_BillBlaster_04 = 3, + NPC_BillBlaster_05 = 4, + NPC_BillBlaster_06 = 5, + NPC_BillBlaster_07 = 6, + NPC_BillBlaster_08 = 7, + NPC_BulletBill_01 = 50, + NPC_BulletBill_02 = 51, + NPC_BulletBill_03 = 52, + NPC_BulletBill_04 = 53, + NPC_BulletBill_05 = 54, + NPC_BulletBill_06 = 55, + NPC_BulletBill_07 = 56, + NPC_BulletBill_08 = 57, + NPC_BulletBill_09 = 58, + NPC_BulletBill_10 = 59, + NPC_BulletBill_11 = 60, + NPC_BulletBill_12 = 61, + NPC_BulletBill_13 = 62, + NPC_BulletBill_14 = 63, + NPC_BulletBill_15 = 64, + NPC_BulletBill_16 = 65, + NPC_BulletBill_17 = 66, + NPC_BulletBill_18 = 67, + NPC_BulletBill_19 = 68, + NPC_BulletBill_20 = 69, +}; + #define NAMESPACE kpa_130 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_130/kpa_130_0_header.c b/src/world/area_kpa/kpa_130/kpa_130_0_header.c new file mode 100644 index 0000000000..14e4dafa0e --- /dev/null +++ b/src/world/area_kpa/kpa_130/kpa_130_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_130.h" + +EntryList N(Entrances) = { + [kpa_130_ENTRY_0] { -975.0, 0.0, -5.0, 90.0 }, + [kpa_130_ENTRY_1] { 975.0, 720.0, -100.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_130 }, +}; diff --git a/src/world/area_kpa/kpa_130/kpa_130_1_music.c b/src/world/area_kpa/kpa_130/kpa_130_1_music.c new file mode 100644 index 0000000000..c1d6c52317 --- /dev/null +++ b/src/world/area_kpa/kpa_130/kpa_130_1_music.c @@ -0,0 +1,13 @@ + +#include "kpa_130.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_130/kpa_130_2_main.c b/src/world/area_kpa/kpa_130/kpa_130_2_main.c new file mode 100644 index 0000000000..1d18a32317 --- /dev/null +++ b/src/world/area_kpa/kpa_130/kpa_130_2_main.c @@ -0,0 +1,44 @@ +#include "kpa_130.h" + +EvtScript N(EVS_ExitDoors_kpa_134_1) = EVT_EXIT_DOUBLE_DOOR(kpa_130_ENTRY_0, "kpa_134", kpa_134_ENTRY_1, COLLIDER_ttw, MODEL_o11, MODEL_o9); +EvtScript N(EVS_ExitDoors_kpa_111_0) = EVT_EXIT_DOUBLE_DOOR(kpa_130_ENTRY_1, "kpa_111", kpa_111_ENTRY_0, COLLIDER_tte, MODEL_o455, MODEL_o454); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_134_1)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_111_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_130_ENTRY_0) + EVT_SET(LVar0, kpa_130_ENTRY_0) + EVT_SET(LVar2, MODEL_o11) + EVT_SET(LVar3, MODEL_o9) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_130_ENTRY_1) + EVT_SET(LVar0, 1) + EVT_SET(LVar2, MODEL_o455) + EVT_SET(LVar3, MODEL_o454) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_130/kpa_130_3_npc.c b/src/world/area_kpa/kpa_130/kpa_130_3_npc.c new file mode 100644 index 0000000000..9229104cb3 --- /dev/null +++ b/src/world/area_kpa/kpa_130/kpa_130_3_npc.c @@ -0,0 +1,381 @@ +#include "kpa_130.h" + +#include "world/common/enemy/complete/BombshellBill.h" + +#include "world/common/enemy/ai/BulletBillAI.inc.c" + +StationaryAISettings N(D_80240B50_AA3870) = { + .playerSearchInterval = 30, +}; + +EvtScript N(D_80240B74_AA3894) = { + EVT_CALL(N(BillBlasterAI_Main), EVT_PTR(N(D_80240B50_AA3870))) + EVT_RETURN + EVT_END +}; + +MobileAISettings N(D_80240B94_AA38B4) = { + .chaseSpeed = 3.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(D_80240BC4_AA38E4) = { + EVT_CALL(SelfEnemyOverrideSyncPos, 1) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(N(BulletBillAI_Main), EVT_PTR(N(D_80240B94_AA38B4))) + EVT_RETURN + EVT_END +}; + +StationaryAISettings N(AISettings_BillBlaster) = { + .playerSearchInterval = 10, +}; + +EvtScript N(EVS_NpcAI_BillBlaster) = { + EVT_CALL(N(BillBlasterAI_Main), EVT_PTR(N(AISettings_BillBlaster))) + EVT_RETURN + EVT_END +}; + +MobileAISettings N(AISettings_BulletBill) = { + .chaseSpeed = 7.3f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_BulletBill) = { + EVT_CALL(SelfEnemyOverrideSyncPos, 1) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(N(BulletBillAI_Main), EVT_PTR(N(AISettings_BulletBill))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_BillBlaster) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(OnPlayerFled, 0) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240D94_AA3AB4) = { + EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(DoNpcDefeat) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(D_80240BC4_AA38E4))) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(OnPlayerFled, 0) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_BulletBill) = { + EVT_CALL(SetNpcRotation, NPC_SELF, 0, 0, 0) + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(SetSelfVar, 0, 100) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(OnPlayerFled, 0) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +NpcSettings N(missing_80240F50) = { + .height = 26, + .radius = 32, + .level = 10, + .ai = &N(D_80240B74_AA3894), + .onHit = &EnemyNpcHit, + .onDefeat = &N(EVS_NpcDefeat_BillBlaster), +}; + +NpcSettings N(missing_80240F7C) = { + .height = 14, + .radius = 31, + .level = 5, + .ai = &N(D_80240BC4_AA38E4), + .onHit = &EnemyNpcHit, + .onDefeat = &N(D_80240D94_AA3AB4), +}; + + +NpcSettings N(NpcSettings_BillBlaster) = { + .height = 26, + .radius = 32, + .level = 27, + .ai = &N(EVS_NpcAI_BillBlaster), + .onHit = &EnemyNpcHit, + .onDefeat = &N(EVS_NpcDefeat_BillBlaster), +}; + +NpcSettings N(NpcSettings_BulletBill) = { + .height = 14, + .radius = 31, + .level = 24, + .ai = &N(EVS_NpcAI_BulletBill), + .onHit = &EnemyNpcHit, + .onDefeat = &N(EVS_NpcDefeat_BulletBill), +}; + +EvtScript N(EVS_NpcInit_BillBlaster) = { + EVT_CALL(SetSelfVar, 1, -995) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_BillBlaster_03) = { + EVT_CALL(SetSelfVar, 1, 30) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_BillBlaster_01)[] = { + { + .id = NPC_BillBlaster_01, + .settings = &N(NpcSettings_BillBlaster), + .pos = { -288.0f, 120.0f, 120.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_BillBlaster), + .drops = BOMBSHELL_BLASTER_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = BOMBSHELL_BLASTER_ANIMS, + }, + { + .id = NPC_BillBlaster_02, + .settings = &N(NpcSettings_BillBlaster), + .pos = { -288.0f, 120.0f, 78.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_BillBlaster), + .drops = BOMBSHELL_BLASTER_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = BOMBSHELL_BLASTER_ANIMS, + }, +}; + +StaticNpc N(NpcData_BillBlaster_03)[] = { + { + .id = NPC_BillBlaster_03, + .settings = &N(NpcSettings_BillBlaster), + .pos = { -748.0f, 300.0f, -22.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_BillBlaster_03), + .drops = BOMBSHELL_BLASTER_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = BOMBSHELL_BLASTER_ANIMS, + }, + { + .id = NPC_BillBlaster_04, + .settings = &N(NpcSettings_BillBlaster), + .pos = { -748.0f, 300.0f, 22.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_BillBlaster_03), + .drops = BOMBSHELL_BLASTER_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = BOMBSHELL_BLASTER_ANIMS, + }, +}; + +StaticNpc N(NpcData_BillBlaster_05)[] = { + { + .id = NPC_BillBlaster_05, + .settings = &N(NpcSettings_BillBlaster), + .pos = { 30.0f, 480.0f, -122.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_BillBlaster), + .drops = BOMBSHELL_BLASTER_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = BOMBSHELL_BLASTER_ANIMS, + }, + { + .id = NPC_BillBlaster_06, + .settings = &N(NpcSettings_BillBlaster), + .pos = { 30.0f, 480.0f, -78.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_BillBlaster), + .drops = BOMBSHELL_BLASTER_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = BOMBSHELL_BLASTER_ANIMS, + }, +}; + +StaticNpc N(NpcData_BillBlaster_07)[] = { + { + .id = NPC_BillBlaster_07, + .settings = &N(NpcSettings_BillBlaster), + .pos = { 820.0f, 600.0f, -122.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_BillBlaster), + .drops = BOMBSHELL_BLASTER_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = BOMBSHELL_BLASTER_ANIMS, + }, + { + .id = NPC_BillBlaster_08, + .settings = &N(NpcSettings_BillBlaster), + .pos = { 820.0f, 600.0f, -78.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000, + .init = &N(EVS_NpcInit_BillBlaster), + .drops = BOMBSHELL_BLASTER_NO_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 0 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 0 }, + } + }, + .animations = BOMBSHELL_BLASTER_ANIMS, + }, +}; + +StaticNpc N(NpcData_BulletBill_01) = BOMBSHELL_BILL_NPC(NPC_BulletBill_01); +StaticNpc N(NpcData_BulletBill_02) = BOMBSHELL_BILL_NPC(NPC_BulletBill_02); +StaticNpc N(NpcData_BulletBill_03) = BOMBSHELL_BILL_NPC(NPC_BulletBill_03); +StaticNpc N(NpcData_BulletBill_04) = BOMBSHELL_BILL_NPC(NPC_BulletBill_04); +StaticNpc N(NpcData_BulletBill_05) = BOMBSHELL_BILL_NPC(NPC_BulletBill_05); +StaticNpc N(NpcData_BulletBill_06) = BOMBSHELL_BILL_NPC(NPC_BulletBill_06); +StaticNpc N(NpcData_BulletBill_07) = BOMBSHELL_BILL_NPC(NPC_BulletBill_07); +StaticNpc N(NpcData_BulletBill_08) = BOMBSHELL_BILL_NPC(NPC_BulletBill_08); +StaticNpc N(NpcData_BulletBill_09) = BOMBSHELL_BILL_NPC(NPC_BulletBill_09); +StaticNpc N(NpcData_BulletBill_10) = BOMBSHELL_BILL_NPC(NPC_BulletBill_10); + +// the following NPCs are unused +StaticNpc N(NpcData_BulletBill_11) = BOMBSHELL_BILL_NPC(NPC_BulletBill_11); +StaticNpc N(NpcData_BulletBill_12) = BOMBSHELL_BILL_NPC(NPC_BulletBill_12); +StaticNpc N(NpcData_BulletBill_13) = BOMBSHELL_BILL_NPC(NPC_BulletBill_13); +StaticNpc N(NpcData_BulletBill_14) = BOMBSHELL_BILL_NPC(NPC_BulletBill_14); +StaticNpc N(NpcData_BulletBill_15) = BOMBSHELL_BILL_NPC(NPC_BulletBill_15); +StaticNpc N(NpcData_BulletBill_16) = BOMBSHELL_BILL_NPC(NPC_BulletBill_16); +StaticNpc N(NpcData_BulletBill_17) = BOMBSHELL_BILL_NPC(NPC_BulletBill_17); +StaticNpc N(NpcData_BulletBill_18) = BOMBSHELL_BILL_NPC(NPC_BulletBill_18); +StaticNpc N(NpcData_BulletBill_19) = BOMBSHELL_BILL_NPC(NPC_BulletBill_19); +StaticNpc N(NpcData_BulletBill_20) = BOMBSHELL_BILL_NPC(NPC_BulletBill_20); + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_BillBlaster_01), BTL_KPA4_FORMATION_02, BTL_KPA4_STAGE_04), + NPC_GROUP(N(NpcData_BillBlaster_03), BTL_KPA4_FORMATION_02, BTL_KPA4_STAGE_05), + NPC_GROUP(N(NpcData_BillBlaster_05), BTL_KPA4_FORMATION_03, BTL_KPA4_STAGE_05), + NPC_GROUP(N(NpcData_BillBlaster_07), BTL_KPA4_FORMATION_04, BTL_KPA4_STAGE_05), + NPC_GROUP(N(NpcData_BulletBill_01), BTL_KPA4_FORMATION_01, BTL_KPA4_STAGE_04), + NPC_GROUP(N(NpcData_BulletBill_02), BTL_KPA4_FORMATION_01, BTL_KPA4_STAGE_04), + NPC_GROUP(N(NpcData_BulletBill_03), BTL_KPA4_FORMATION_01, BTL_KPA4_STAGE_04), + NPC_GROUP(N(NpcData_BulletBill_04), BTL_KPA4_FORMATION_01, BTL_KPA4_STAGE_04), + NPC_GROUP(N(NpcData_BulletBill_05), BTL_KPA4_FORMATION_01, BTL_KPA4_STAGE_04), + NPC_GROUP(N(NpcData_BulletBill_06), BTL_KPA4_FORMATION_01, BTL_KPA4_STAGE_04), + NPC_GROUP(N(NpcData_BulletBill_07), BTL_KPA4_FORMATION_01, BTL_KPA4_STAGE_04), + NPC_GROUP(N(NpcData_BulletBill_08), BTL_KPA4_FORMATION_01, BTL_KPA4_STAGE_04), + NPC_GROUP(N(NpcData_BulletBill_09), BTL_KPA4_FORMATION_01, BTL_KPA4_STAGE_04), + NPC_GROUP(N(NpcData_BulletBill_10), BTL_KPA4_FORMATION_01, BTL_KPA4_STAGE_04), + {} +}; diff --git a/src/world/area_kpa/kpa_133/AA7480.c b/src/world/area_kpa/kpa_133/AA7480.c deleted file mode 100644 index b13826058f..0000000000 --- a/src/world/area_kpa/kpa_133/AA7480.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "kpa_133.h" - -static char* N(exit_str_0) = "kpa_51"; -static char* N(exit_str_1) = "kpa_134"; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kpa/kpa_133/AA7790.c b/src/world/area_kpa/kpa_133/AA7790.c deleted file mode 100644 index 8b3aab712b..0000000000 --- a/src/world/area_kpa/kpa_133/AA7790.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "kpa_133.h" - -ApiStatus func_80240310_AA7790(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Entity* entity = get_entity_by_index(evt_get_variable(NULL, -50000000)); - - entity->rotation.x = evt_get_variable(script, *args++); - entity->rotation.y = evt_get_variable(script, *args++); - entity->rotation.z = evt_get_variable(script, *args++); - return ApiStatus_DONE2; -} - -ApiStatus func_802403C0_AA7840(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - Entity* entity = get_entity_by_index(evt_get_variable(NULL, -50000000)); - - entity->position.x = evt_get_variable(script, *args++); - entity->position.y = evt_get_variable(script, *args++); - entity->position.z = evt_get_variable(script, *args++); - return ApiStatus_DONE2; -} diff --git a/src/world/area_kpa/kpa_133/kpa_133.h b/src/world/area_kpa/kpa_133/kpa_133.h index 387a5cf653..93381218f4 100644 --- a/src/world/area_kpa/kpa_133/kpa_133.h +++ b/src/world/area_kpa/kpa_133/kpa_133.h @@ -2,8 +2,27 @@ /// @brief Bowser's Castle - Left Water Puzzle #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_133_shape.h" +#include "mapfs/kpa_133_hit.h" + +enum { + NPC_Dummy = 0, +}; + +enum { + MV_SpringEntityID = MapVar(0), + MV_RevealHiddenSpring = MapVar(1), +}; + #define NAMESPACE kpa_133 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetWaterLevel); +extern EvtScript N(D_80241A90_AA8F10); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_133/kpa_133_0_header.c b/src/world/area_kpa/kpa_133/kpa_133_0_header.c new file mode 100644 index 0000000000..b34bd3c063 --- /dev/null +++ b/src/world/area_kpa/kpa_133/kpa_133_0_header.c @@ -0,0 +1,15 @@ +#include "kpa_133.h" + +EntryList N(Entrances) = { + [kpa_133_ENTRY_0] { -387.0, 0.0, 115.0, 90.0 }, + [kpa_133_ENTRY_1] { 370.0, 0.0, 120.0, 270.0 }, + [kpa_133_ENTRY_2] { 370.0, 100.0, 120.0, 270.0 }, + [kpa_133_ENTRY_3] { 365.0, 240.0, -20.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_133 }, +}; diff --git a/src/world/area_kpa/kpa_133/kpa_133_1_music.c b/src/world/area_kpa/kpa_133/kpa_133_1_music.c new file mode 100644 index 0000000000..7e1ca1d51f --- /dev/null +++ b/src/world/area_kpa/kpa_133/kpa_133_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_133.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_133/kpa_133_2_main.c b/src/world/area_kpa/kpa_133/kpa_133_2_main.c new file mode 100644 index 0000000000..201870018e --- /dev/null +++ b/src/world/area_kpa/kpa_133/kpa_133_2_main.c @@ -0,0 +1,108 @@ +#include "kpa_133.h" +#include "effects.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitDoors_kpa_51_1) = EVT_EXIT_DOUBLE_DOOR(kpa_133_ENTRY_0, "kpa_51", kpa_51_ENTRY_1, COLLIDER_ttw, MODEL_o486, MODEL_o485); +EvtScript N(EVS_ExitWalk_kpa_134_0) = EVT_EXIT_WALK(40, kpa_133_ENTRY_1, "kpa_134", kpa_134_ENTRY_0); +EvtScript N(EVS_ExitWalk_kpa_134_2) = EVT_EXIT_WALK(40, kpa_133_ENTRY_2, "kpa_134", kpa_134_ENTRY_2); +EvtScript N(EVS_ExitWalk_kpa_134_3) = EVT_EXIT_WALK(40, kpa_133_ENTRY_3, "kpa_134", kpa_134_ENTRY_3); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_51_1)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_134_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_134_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie2, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_134_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliae, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_133_ENTRY_0) + EVT_SET(LVar0, kpa_133_ENTRY_0) + EVT_SET(LVar2, MODEL_o486) + EVT_SET(LVar3, MODEL_o485) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_133_ENTRY_1) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(kpa_133_ENTRY_2) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(kpa_133_ENTRY_3) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +BombTrigger N(BombPos_Wall) = { + .pos = { 388.0f, 240.0f, -25.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_BlastWall) = { + EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 56, 56, 1, 10, 30) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(EVT_GROUP_01) + EVT_CALL(EnableModel, MODEL_o235, TRUE) + EVT_LOOP(10) + EVT_CALL(EnableModel, MODEL_o477, TRUE) + EVT_CALL(EnableModel, MODEL_o476, TRUE) + EVT_WAIT(1) + EVT_CALL(EnableModel, MODEL_o477, FALSE) + EVT_CALL(EnableModel, MODEL_o476, FALSE) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttae, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_KPA133_Item_BombedWall, TRUE) + EVT_RESUME_GROUP(EVT_GROUP_01) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_IF_EQ(GF_KPA133_Item_BombedWall, FALSE) + EVT_CALL(EnableModel, MODEL_o235, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_BlastWall)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Wall)), 1, 0) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_o477, FALSE) + EVT_CALL(EnableModel, MODEL_o476, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_ttae, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_EXEC(N(EVS_SetWaterLevel)) + EVT_BIND_TRIGGER(EVT_PTR(N(D_80241A90_AA8F10)), TRIGGER_AREA_FLAG_SET, AF_KPA133_HitWaterSwitch, 1, 0) + EVT_CALL(EnableTexPanning, MODEL_move, TRUE) + EVT_CALL(EnableTexPanning, MODEL_s_sui, TRUE) + EVT_CALL(EnableTexPanning, MODEL_sui, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( -100, 100, 70, -70) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_4) + TEX_PAN_PARAMS_STEP( 200, -100, 20, -20) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_133/kpa_133_3_entity.c b/src/world/area_kpa/kpa_133/kpa_133_3_entity.c new file mode 100644 index 0000000000..ecea0c2fd1 --- /dev/null +++ b/src/world/area_kpa/kpa_133/kpa_133_3_entity.c @@ -0,0 +1,137 @@ +#include "kpa_133.h" +#include "entity.h" +#include "effects.h" + +extern EvtScript N(EVS_TriggerSwitch); +extern EvtScript N(EVS_SetupHiddenSpring); + +API_CALLABLE(N(SetSpringRotation)) { + Bytecode* args = script->ptrReadPos; + Entity* entity = get_entity_by_index(evt_get_variable(NULL, MV_SpringEntityID)); + + entity->rotation.x = evt_get_variable(script, *args++); + entity->rotation.y = evt_get_variable(script, *args++); + entity->rotation.z = evt_get_variable(script, *args++); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(SetSpringPosition)) { + Bytecode* args = script->ptrReadPos; + Entity* entity = get_entity_by_index(evt_get_variable(NULL, MV_SpringEntityID)); + + entity->position.x = evt_get_variable(script, *args++); + entity->position.y = evt_get_variable(script, *args++); + entity->position.z = evt_get_variable(script, *args++); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_KPA133_BlueSwitch, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), 60, 115, 10, 0, MAKE_ENTITY_END) + EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_KPA133_HitWaterSwitch)) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_TriggerSwitch))) + EVT_END_IF + EVT_IF_EQ(GF_KPA133_BlueSwitch, TRUE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SimpleSpring), 150, 115, 0, 90, 60, MAKE_ENTITY_END) + EVT_ELSE + EVT_CALL(MakeEntity, EVT_PTR(Entity_SimpleSpring), 150, 150, -105, 90, 60, MAKE_ENTITY_END) + EVT_SET(MV_SpringEntityID, LVar0) + EVT_CALL(N(SetSpringRotation), -90, 0, 0) + EVT_EXEC(N(EVS_SetupHiddenSpring)) + EVT_END_IF + EVT_CALL(MakeItemEntity, ITEM_BOWSER_CASTLE_KEY, -350, 215, -50, ITEM_SPAWN_MODE_KEY, GF_KPA133_Item_CastleKey2) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupHiddenSpring) = { + EVT_LOOP(0) + EVT_WAIT(1) + EVT_IF_EQ(MV_RevealHiddenSpring, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(GF_KPA133_BlueSwitch, TRUE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_GE(LVar0, 115) + EVT_IF_LE(LVar0, 180) + EVT_SET(LVar3, LVar0) + EVT_IF_LT(LVar0, 150) + EVT_ADD(LVar3, -40) + EVT_SET(LVar4, 90) + EVT_ELSE + EVT_ADD(LVar3, 40) + EVT_SET(LVar4, 270) + EVT_END_IF + EVT_THREAD + EVT_WAIT(2) + EVT_CALL(InterpPlayerYaw, LVar4, 0) + EVT_WAIT(2) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(PlayerJump1, LVar3, LVar1, LVar2, 10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(5) + EVT_END_THREAD + EVT_END_IF + EVT_END_IF + EVT_THREAD + EVT_CALL(MakeLerp, 0, 80, 15, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_kakusitobira, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 135, 115, -70, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 180, 115, -70, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 135, 115, -55, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 180, 115, -55, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 135, 115, -40, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 180, 115, -40, 0) + EVT_WAIT(20) + EVT_CALL(EnableModel, MODEL_kakusitobira, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_123, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(18) + EVT_CALL(PlaySoundAtNpc, NPC_Dummy, SOUND_1EF, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(MakeLerp, -90, 0, 15, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetSpringRotation), LVar0, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(23) + EVT_CALL(GetNpcPos, NPC_Dummy, LVar0, LVar1, LVar2) + EVT_CALL(N(SetSpringPosition), LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcPos, NPC_Dummy, NPC_DISPOSE_LOCATION) + EVT_END_THREAD + EVT_WAIT(3) + EVT_CALL(SetNpcPos, NPC_Dummy, 150, 150, -105) + EVT_CALL(SetNpcJumpscale, NPC_Dummy, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_Dummy, 150, 115, 0, 17) + EVT_CALL(GetNpcPos, NPC_Dummy, LVar0, LVar1, LVar2) + EVT_WAIT(20) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TriggerSwitch) = { + EVT_SET(MV_RevealHiddenSpring, TRUE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_133/kpa_133_4_npc.c b/src/world/area_kpa/kpa_133/kpa_133_4_npc.c new file mode 100644 index 0000000000..e61a8c32f3 --- /dev/null +++ b/src/world/area_kpa/kpa_133/kpa_133_4_npc.c @@ -0,0 +1,25 @@ +#include "kpa_133.h" + +#include "world/common/npc/Toad_Stationary.inc.c" + +EvtScript N(EVS_NpcInit_Toad) = { + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_HAS_SHADOW, FALSE) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Dummy) = { + .id = NPC_Dummy, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_200000, + .init = &N(EVS_NpcInit_Toad), + .drops = TOAD_DROPS, + .animations = TOAD_RED_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Dummy)), + {} +}; diff --git a/src/world/area_kpa/kpa_133/kpa_133_5_water.c b/src/world/area_kpa/kpa_133/kpa_133_5_water.c new file mode 100644 index 0000000000..d9dba695f9 --- /dev/null +++ b/src/world/area_kpa/kpa_133/kpa_133_5_water.c @@ -0,0 +1,36 @@ +#include "kpa_133.h" + +EvtScript N(EVS_SetWaterLevel) = { + EVT_CALL(SetRenderMode, MODEL_s_sui, RENDER_MODE_SURFACE_XLU_LAYER2) + EVT_CALL(SetRenderMode, MODEL_sui, RENDER_MODE_SURFACE_XLU_LAYER2) + EVT_SWITCH(GB_KPA_WaterLevel) + EVT_CASE_EQ(0) + EVT_CALL(SetGroupEnabled, MODEL_suimen, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o358, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o405, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o414, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o418, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o451, COLLIDER_FLAGS_UPPER_MASK) + EVT_CASE_EQ(1) + EVT_CALL(TranslateGroup, MODEL_suimen, 0, 120, 0) + EVT_CALL(EnableModel, MODEL_s_sui, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o405, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o418, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o414, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o414, COLLIDER_FLAGS_80000) + EVT_CASE_EQ(2) + EVT_CALL(TranslateGroup, MODEL_suimen, 0, 220, 0) + EVT_CALL(EnableModel, MODEL_sui, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o358, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o414, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_kabe_2, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o418, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o440, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o418, COLLIDER_FLAGS_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o440, COLLIDER_FLAGS_80000) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_133/kpa_133_6.c b/src/world/area_kpa/kpa_133/kpa_133_6.c new file mode 100644 index 0000000000..f3a81a1fcf --- /dev/null +++ b/src/world/area_kpa/kpa_133/kpa_133_6.c @@ -0,0 +1,14 @@ +#include "kpa_133.h" + +EvtScript N(D_80241A90_AA8F10) = { + EVT_CALL(MakeLerp, 0, 90, 45, EASING_COS_FAST_OVERSHOOT) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_UNBIND + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_134/AA8FA0.c b/src/world/area_kpa/kpa_134/AA8FA0.c deleted file mode 100644 index 654333f69b..0000000000 --- a/src/world/area_kpa/kpa_134/AA8FA0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "kpa_134.h" - -static char* N(exit_str_0) = "kpa_133"; -static char* N(exit_str_1) = "kpa_130"; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_kpa/kpa_134/AA92B0.c b/src/world/area_kpa/kpa_134/AA92B0.c deleted file mode 100644 index 541d9ea017..0000000000 --- a/src/world/area_kpa/kpa_134/AA92B0.c +++ /dev/null @@ -1,63 +0,0 @@ -#include "kpa_134.h" - -ApiStatus func_80240310_AA92B0(Evt* script, s32 isInitialCall) { - create_shadow_type(0, 50.0f, 115.0f, -34.0f); - return ApiStatus_DONE2; -} - -ApiStatus func_8024033C_AA92DC(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - - if (playerStatus->actionState != ACTION_STATE_FALLING) { - return ApiStatus_BLOCK; - } - - if (fabs(playerStatus->position.x - 50.0f) > 14.0) { - return ApiStatus_BLOCK; - } - - if (fabs(playerStatus->position.y - 150.0f) > 14.0) { - return ApiStatus_BLOCK; - } - - if (fabs(playerStatus->position.z - -34.0f) > 14.0) { - return ApiStatus_BLOCK; - } - - playerStatus->position.x = 50.0f; - playerStatus->position.y = 150.0f; - playerStatus->position.z = -34.0f; - playerStatus->currentSpeed = 0.0f; - return ApiStatus_DONE2; -} - -ApiStatus func_80240408_AA93A8(Evt* script, s32 isInitialCall) { - create_shadow_type(0, 680.0f, 240.0f, -35.0f); - return ApiStatus_DONE2; -} - -ApiStatus func_80240434_AA93D4(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - - if (playerStatus->actionState != ACTION_STATE_FALLING) { - return ApiStatus_BLOCK; - } - - if (fabs(playerStatus->position.x - 680.0f) > 14.0) { - return ApiStatus_BLOCK; - } - - if (fabs(playerStatus->position.y - 275.0f) > 14.0) { - return ApiStatus_BLOCK; - } - - if (fabs(playerStatus->position.z - -35.0f) > 14.0) { - return ApiStatus_BLOCK; - } - - playerStatus->position.x = 680.0f; - playerStatus->position.y = 275.0f; - playerStatus->position.z = -35.0f; - playerStatus->currentSpeed = 0.0f; - return ApiStatus_DONE2; -} diff --git a/src/world/area_kpa/kpa_134/AA94B0.c b/src/world/area_kpa/kpa_134/AA94B0.c deleted file mode 100644 index c03fb2637f..0000000000 --- a/src/world/area_kpa/kpa_134/AA94B0.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "kpa_134.h" - -ApiStatus func_80240510_AA94B0(Evt* script, s32 isInitialCall) { - Entity* entity = get_entity_by_index(script->varTable[10]); - - entity->position.x = script->varTable[0]; - entity->position.y = script->varTable[1]; - entity->position.z = script->varTable[2]; - return ApiStatus_DONE2; -} - -#include "world/common/todo/SetEntityPosition.inc.c" - -#include "world/common/todo/RemovePadlock.inc.c" - -#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_134/kpa_134.h b/src/world/area_kpa/kpa_134/kpa_134.h index 4038985c95..5f68df6f77 100644 --- a/src/world/area_kpa/kpa_134/kpa_134.h +++ b/src/world/area_kpa/kpa_134/kpa_134.h @@ -2,8 +2,30 @@ /// @brief Bowser's Castle - Right Water Puzzle #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_134_shape.h" +#include "mapfs/kpa_134_hit.h" + +#include "sprite/npc/Toad.h" + +enum { + NPC_Dummy = 0, +}; + +enum { + MV_SwitchEntityID = MapVar(0), + MV_Unk_01 = MapVar(1), +}; + #define NAMESPACE kpa_134 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_ExitDoors_kpa_130_0); +extern EvtScript N(EVS_SetupChains); +extern EvtScript N(EVS_FlipWallPanels); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_134/kpa_134_0_header.c b/src/world/area_kpa/kpa_134/kpa_134_0_header.c new file mode 100644 index 0000000000..a2e2c4954a --- /dev/null +++ b/src/world/area_kpa/kpa_134/kpa_134_0_header.c @@ -0,0 +1,15 @@ +#include "kpa_134.h" + +EntryList N(Entrances) = { + [kpa_134_ENTRY_0] { -370.0, 0.0, 115.0, 90.0 }, + [kpa_134_ENTRY_1] { 730.0, 0.0, 115.0, 270.0 }, + [kpa_134_ENTRY_2] { -370.0, 100.0, 128.0, 90.0 }, + [kpa_134_ENTRY_3] { -365.0, 240.0, -22.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_134 }, +}; diff --git a/src/world/area_kpa/kpa_134/kpa_134_1_music.c b/src/world/area_kpa/kpa_134/kpa_134_1_music.c new file mode 100644 index 0000000000..a0e29d0743 --- /dev/null +++ b/src/world/area_kpa/kpa_134/kpa_134_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_134.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_134/kpa_134_2_main.c b/src/world/area_kpa/kpa_134/kpa_134_2_main.c new file mode 100644 index 0000000000..3b51c096b0 --- /dev/null +++ b/src/world/area_kpa/kpa_134/kpa_134_2_main.c @@ -0,0 +1,101 @@ +#include "kpa_134.h" +#include "effects.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_kpa_133_1) = EVT_EXIT_WALK(40, kpa_134_ENTRY_0, "kpa_133", kpa_133_ENTRY_1); +EvtScript N(EVS_ExitDoors_kpa_130_0) = EVT_EXIT_DOUBLE_DOOR(kpa_134_ENTRY_1, "kpa_130", kpa_130_ENTRY_0, COLLIDER_nno, MODEL_o408, MODEL_o409); +EvtScript N(EVS_ExitWalk_kpa_133_2) = EVT_EXIT_WALK(40, kpa_134_ENTRY_2, "kpa_133", kpa_133_ENTRY_2); +EvtScript N(EVS_ExitWalk_kpa_133_3) = EVT_EXIT_WALK(40, kpa_134_ENTRY_3, "kpa_133", kpa_133_ENTRY_3); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_133_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_exitw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_133_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilite, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_133_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_g98, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(kpa_134_ENTRY_0) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(kpa_134_ENTRY_1) + EVT_SET(LVar0, 1) + EVT_SET(LVar2, MODEL_o408) + EVT_SET(LVar3, MODEL_o409) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(kpa_134_ENTRY_2) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(kpa_134_ENTRY_3) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupChains)) + EVT_IF_EQ(GF_KPA134_BlueSwitch, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_FlipWallPanels)), TRIGGER_AREA_FLAG_SET, AF_KPA134_HitWaterSwitch, 1, 0) + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o383, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o384, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_sikake, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o384, FALSE) + EVT_CALL(EnableModel, MODEL_o383, FALSE) + EVT_CALL(EnableModel, MODEL_o378, FALSE) + EVT_CALL(EnableModel, MODEL_o379, FALSE) + EVT_CALL(EnableModel, MODEL_o380, FALSE) + EVT_CALL(EnableModel, MODEL_o381, FALSE) + EVT_CALL(EnableModel, MODEL_o382, FALSE) + EVT_CALL(EnableModel, MODEL_o377, FALSE) + EVT_CALL(EnableModel, MODEL_o376, FALSE) + EVT_CALL(EnableModel, MODEL_o375, FALSE) + EVT_CALL(EnableModel, MODEL_o374, FALSE) + EVT_CALL(EnableModel, MODEL_o373, FALSE) + EVT_CALL(EnableModel, MODEL_o372, FALSE) + EVT_CALL(EnableModel, MODEL_o371, FALSE) + EVT_END_IF + EVT_IF_EQ(GF_KPA133_Item_BombedWall, TRUE) + EVT_CALL(EnableModel, MODEL_o503, FALSE) + EVT_CALL(EnableModel, MODEL_o502, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o358, COLLIDER_FLAGS_UPPER_MASK) + EVT_ELSE + EVT_CALL(EnableModel, MODEL_o400, FALSE) + EVT_END_IF + EVT_CALL(EnableTexPanning, MODEL_move, TRUE) + EVT_CALL(EnableTexPanning, MODEL_s_sui, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o385, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( -100, 100, 70, -70) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_4) + TEX_PAN_PARAMS_STEP( 200, -100, 20, -20) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_134/kpa_134_3_chains.c b/src/world/area_kpa/kpa_134/kpa_134_3_chains.c new file mode 100644 index 0000000000..b25d92203c --- /dev/null +++ b/src/world/area_kpa/kpa_134/kpa_134_3_chains.c @@ -0,0 +1,532 @@ +#include "kpa_134.h" + +extern EvtScript N(EVS_LowerWaterLevel0); +extern EvtScript N(EVS_RaiseWaterLevel1); +extern EvtScript N(EVS_LowerWaterLevel1); +extern EvtScript N(EVS_RaiseWaterLevel2); +extern EvtScript N(EVS_SetupLowerChain); +extern EvtScript N(EVS_SetupUpperChain); + +EvtScript N(EVS_SetupChains) = { + EVT_CALL(SetRenderMode, MODEL_s_sui, RENDER_MODE_SURFACE_XLU_LAYER2) + EVT_CALL(SetRenderMode, MODEL_o385, RENDER_MODE_SURFACE_XLU_LAYER2) + EVT_CALL(EnableModel, MODEL_o388, FALSE) + EVT_CALL(EnableModel, MODEL_o389, FALSE) + EVT_CALL(TranslateModel, MODEL_o387, 0, 30, 0) + EVT_CALL(TranslateModel, MODEL_o505, 0, 0, 0) + EVT_SWITCH(GB_KPA_WaterLevel) + EVT_CASE_EQ(0) + EVT_CALL(SetGroupEnabled, MODEL_suimen, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_hidari, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_migi, COLLIDER_FLAGS_UPPER_MASK) + EVT_CASE_EQ(1) + EVT_CALL(EnableModel, MODEL_s_sui, FALSE) + EVT_CALL(TranslateGroup, MODEL_sui1, 0, 120, 0) + EVT_CALL(TranslateModel, MODEL_o385, 0, 120, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deiliaw, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAGS_80000) + EVT_CASE_EQ(2) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_hidari, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o385, FALSE) + EVT_CALL(TranslateGroup, MODEL_sui1, 0, 220, 0) + EVT_CALL(TranslateModel, MODEL_s_sui, 0, 220, 0) + EVT_END_SWITCH + EVT_EXEC(N(EVS_SetupLowerChain)) + EVT_EXEC(N(EVS_SetupUpperChain)) + EVT_RETURN + EVT_END +}; + +s32 N(ChainAnimOffsets)[] = { + -2, -3, -2, -1, 0, + 1, 1, 1, 1, 1, + 0, 0, 0, -1, -1, + -1, -2, -2, -2, -1, +}; + +API_CALLABLE(N(CreateLowerChainShadow)) { + create_shadow_type(0, 50.0f, 115.0f, -34.0f); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DetectLowerChainGrab)) { + PlayerStatus* playerStatus = &gPlayerStatus; + + if (playerStatus->actionState != ACTION_STATE_FALLING) { + return ApiStatus_BLOCK; + } + + if (fabs(playerStatus->position.x - 50.0f) > 14.0) { + return ApiStatus_BLOCK; + } + + if (fabs(playerStatus->position.y - 150.0f) > 14.0) { + return ApiStatus_BLOCK; + } + + if (fabs(playerStatus->position.z - -34.0f) > 14.0) { + return ApiStatus_BLOCK; + } + + playerStatus->position.x = 50.0f; + playerStatus->position.y = 150.0f; + playerStatus->position.z = -34.0f; + playerStatus->currentSpeed = 0.0f; + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SetupLowerChain) = { + EVT_CALL(N(CreateLowerChainShadow)) + EVT_LABEL(10) + EVT_CALL(N(DetectLowerChainGrab)) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtPlayer, SOUND_229, 0) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000D) + EVT_THREAD + EVT_SET(LVar0, 150) + EVT_SET(LVar1, 30) + EVT_USE_BUF(EVT_PTR(N(ChainAnimOffsets))) + EVT_LOOP(ARRAY_COUNT(N(ChainAnimOffsets))) + EVT_BUF_READ1(LVar2) + EVT_ADD(LVar0, LVar2) + EVT_ADD(LVar1, LVar2) + EVT_CALL(SetPlayerPos, 50, LVar0, -34) + EVT_CALL(TranslateModel, MODEL_o387, 0, LVar1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_IF_EQ(GB_KPA_WaterLevel, 0) + EVT_EXEC_WAIT(N(EVS_RaiseWaterLevel1)) + EVT_SET(GB_KPA_WaterLevel, 1) + EVT_ELSE + EVT_EXEC_WAIT(N(EVS_LowerWaterLevel0)) + EVT_SET(GB_KPA_WaterLevel, 0) + EVT_END_IF + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 115) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LowerWaterLevel0) = { + EVT_WAIT(20) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 120, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(func_802CA988, 0, LVar4, LVar5, LVar6, LVar7) + EVT_CALL(MakeLerp, LVar6, 600, 20, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(func_802CABE8, 0, LVar4, LVar5, LVar0, LVar7) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_SET(LVar2, LVar0) + EVT_WAIT(5) + EVT_CALL(MakeLerp, LVar7, -20, 20, EASING_LINEAR) + EVT_LABEL(15) + EVT_CALL(UpdateLerp) + EVT_CALL(func_802CABE8, 0, LVar4, LVar5, LVar2, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(15) + EVT_END_IF + EVT_END_THREAD + EVT_CALL(SetGroupEnabled, MODEL_sui1, 1) + EVT_CALL(EnableModel, MODEL_o385, TRUE) + EVT_CALL(PlaySound, SOUND_80000053) + EVT_CALL(MakeLerp, 120, 20, 120, EASING_LINEAR) + EVT_LABEL(30) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_sui1, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o385, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(30) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_62B) + EVT_CALL(func_802D62E4, 555) + EVT_CALL(SetGroupEnabled, MODEL_sui1, 0) + EVT_CALL(EnableModel, MODEL_s_sui, FALSE) + EVT_CALL(EnableModel, MODEL_o385, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_hidari, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_migi, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAGS_UPPER_MASK) + EVT_WAIT(10) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_THREAD + EVT_SET(LVar0, 17) + EVT_LOOP(13) + EVT_ADD(LVar0, 1) + EVT_CALL(TranslateModel, MODEL_o387, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RaiseWaterLevel1) = { + EVT_WAIT(20) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 220, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(60) + EVT_CALL(func_802CA988, 0, LVar4, LVar5, LVar6, LVar7) + EVT_CALL(MakeLerp, LVar6, 600, 20, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(func_802CABE8, 0, LVar4, LVar5, LVar0, LVar7) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_SET(LVar2, LVar0) + EVT_WAIT(5) + EVT_CALL(MakeLerp, LVar7, -20, 20, EASING_LINEAR) + EVT_LABEL(15) + EVT_CALL(UpdateLerp) + EVT_CALL(func_802CABE8, 0, LVar4, LVar5, LVar2, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(15) + EVT_END_IF + EVT_END_THREAD + EVT_CALL(PlaySoundAt, SOUND_80000052, 0, 118, 115, -11) + EVT_WAIT(20) + EVT_THREAD + EVT_CALL(SetTexPanner, MODEL_o388, 2) + EVT_CALL(SetTexPanner, MODEL_o389, 3) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 0) + EVT_LOOP(1000) + EVT_CALL(SetTexPanOffset, 2, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, 3, 0, 0, LVar2) + EVT_ADD(LVar0, 1000) + EVT_ADD(LVar1, 4000) + EVT_ADD(LVar2, -1500) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(EnableModel, MODEL_o388, TRUE) + EVT_CALL(MakeLerp, 400, 0, 20, EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o388, -100, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(SetGroupEnabled, MODEL_sui1, 1) + EVT_CALL(EnableModel, MODEL_o385, TRUE) + EVT_CALL(EnableModel, MODEL_o389, TRUE) + EVT_CALL(MakeLerp, 20, 120, 180, EASING_LINEAR) + EVT_LABEL(30) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_sui1, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o385, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o389, -100, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o388, -100, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(30) + EVT_END_IF + EVT_CALL(MakeLerp, 100, 1, 20, EASING_LINEAR) + EVT_LABEL(40) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar2, LVar0) + EVT_DIVF(LVar2, 100) + EVT_CALL(TranslateModel, MODEL_o389, -100, 120, 0) + EVT_CALL(TranslateModel, MODEL_o388, -100, 120, 0) + EVT_CALL(ScaleModel, MODEL_o389, LVar2, EVT_FLOAT(1.0), LVar2) + EVT_CALL(ScaleModel, MODEL_o388, LVar2, EVT_FLOAT(1.0), LVar2) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(40) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_62A) + EVT_CALL(func_802D62E4, 554) + EVT_CALL(EnableModel, MODEL_o389, FALSE) + EVT_CALL(EnableModel, MODEL_o388, FALSE) + EVT_END_THREAD + EVT_WAIT(230) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_hidari, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_migi, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_deiliaw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAGS_IGNORE_SHELL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deiliaw, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deiliaw, COLLIDER_FLAGS_80000) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_THREAD + EVT_SET(LVar0, 17) + EVT_LOOP(13) + EVT_ADD(LVar0, 1) + EVT_CALL(TranslateModel, MODEL_o387, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +API_CALLABLE(N(CreateUpperChainShadow)) { + create_shadow_type(0, 680.0f, 240.0f, -35.0f); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(DetectUpperChainGrab)) { + PlayerStatus* playerStatus = &gPlayerStatus; + + if (playerStatus->actionState != ACTION_STATE_FALLING) { + return ApiStatus_BLOCK; + } + + if (fabs(playerStatus->position.x - 680.0f) > 14.0) { + return ApiStatus_BLOCK; + } + + if (fabs(playerStatus->position.y - 275.0f) > 14.0) { + return ApiStatus_BLOCK; + } + + if (fabs(playerStatus->position.z - -35.0f) > 14.0) { + return ApiStatus_BLOCK; + } + + playerStatus->position.x = 680.0f; + playerStatus->position.y = 275.0f; + playerStatus->position.z = -35.0f; + playerStatus->currentSpeed = 0.0f; + return ApiStatus_DONE2; +} + +EvtScript N(EVS_SetupUpperChain) = { + EVT_CALL(N(CreateUpperChainShadow)) + EVT_LABEL(10) + EVT_CALL(N(DetectUpperChainGrab)) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtPlayer, SOUND_229, 0) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000D) + EVT_THREAD + EVT_SET(LVar0, 275) + EVT_SET(LVar1, 0) + EVT_USE_BUF(EVT_PTR(N(ChainAnimOffsets))) + EVT_LOOP(20) + EVT_BUF_READ1(LVar2) + EVT_ADD(LVar0, LVar2) + EVT_ADD(LVar1, LVar2) + EVT_CALL(SetPlayerPos, 680, LVar0, -35) + EVT_CALL(TranslateModel, MODEL_o505, 0, LVar1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_IF_EQ(GB_KPA_WaterLevel, 1) + EVT_EXEC_WAIT(N(EVS_RaiseWaterLevel2)) + EVT_SET(GB_KPA_WaterLevel, 2) + EVT_ELSE + EVT_EXEC_WAIT(N(EVS_LowerWaterLevel1)) + EVT_SET(GB_KPA_WaterLevel, 1) + EVT_END_IF + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 240) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LowerWaterLevel1) = { + EVT_WAIT(20) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 120, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_CALL(EnableModel, MODEL_s_sui, FALSE) + EVT_CALL(EnableModel, MODEL_o385, TRUE) + EVT_THREAD + EVT_CALL(func_802CA988, 0, LVar4, LVar5, LVar6, LVar7) + EVT_CALL(MakeLerp, LVar6, 600, 20, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(func_802CABE8, 0, LVar4, LVar5, LVar0, LVar7) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_SET(LVar2, LVar0) + EVT_WAIT(5) + EVT_CALL(MakeLerp, LVar7, -20, 20, EASING_LINEAR) + EVT_LABEL(15) + EVT_CALL(UpdateLerp) + EVT_CALL(func_802CABE8, 0, LVar4, LVar5, LVar2, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(15) + EVT_END_IF + EVT_END_THREAD + EVT_CALL(SetGroupEnabled, MODEL_sui1, 1) + EVT_CALL(PlaySound, SOUND_80000053) + EVT_CALL(MakeLerp, 220, 120, 120, EASING_LINEAR) + EVT_LABEL(30) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_sui1, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o385, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(30) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_62B) + EVT_CALL(func_802D62E4, 555) + EVT_WAIT(10) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_THREAD + EVT_SET(LVar0, -13) + EVT_LOOP(13) + EVT_ADD(LVar0, 1) + EVT_CALL(TranslateModel, MODEL_o505, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RaiseWaterLevel2) = { + EVT_WAIT(20) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 220, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_CALL(EnableModel, MODEL_s_sui, TRUE) + EVT_CALL(EnableModel, MODEL_o385, FALSE) + EVT_THREAD + EVT_WAIT(60) + EVT_CALL(func_802CA988, 0, LVar4, LVar5, LVar6, LVar7) + EVT_CALL(MakeLerp, LVar6, 600, 20, EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(func_802CABE8, 0, LVar4, LVar5, LVar0, LVar7) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_SET(LVar2, LVar0) + EVT_WAIT(5) + EVT_CALL(MakeLerp, LVar7, -20, 20, EASING_LINEAR) + EVT_LABEL(15) + EVT_CALL(UpdateLerp) + EVT_CALL(func_802CABE8, 0, LVar4, LVar5, LVar2, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(15) + EVT_END_IF + EVT_END_THREAD + EVT_CALL(PlaySoundAt, SOUND_80000052, 0, 500, 240, -25) + EVT_WAIT(20) + EVT_THREAD + EVT_CALL(SetTexPanner, MODEL_o388, 2) + EVT_CALL(SetTexPanner, MODEL_o389, 3) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 0) + EVT_LOOP(1000) + EVT_CALL(SetTexPanOffset, 2, 0, LVar0, LVar1) + EVT_CALL(SetTexPanOffset, 3, 0, 0, LVar2) + EVT_ADD(LVar0, 1000) + EVT_ADD(LVar1, 4000) + EVT_ADD(LVar2, -1500) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(EnableModel, MODEL_o388, TRUE) + EVT_CALL(MakeLerp, 400, 0, 20, EASING_LINEAR) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o388, 300, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_CALL(SetGroupEnabled, MODEL_sui1, 1) + EVT_CALL(EnableModel, MODEL_o389, TRUE) + EVT_CALL(MakeLerp, 120, 220, 180, EASING_LINEAR) + EVT_LABEL(30) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_sui1, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_s_sui, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o388, 300, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o389, 300, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(30) + EVT_END_IF + EVT_CALL(MakeLerp, 100, 1, 20, EASING_LINEAR) + EVT_LABEL(40) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar2, LVar0) + EVT_DIVF(LVar2, 100) + EVT_CALL(TranslateModel, MODEL_o389, 300, 220, 0) + EVT_CALL(TranslateModel, MODEL_o388, 300, 220, 0) + EVT_CALL(ScaleModel, MODEL_o389, LVar2, EVT_FLOAT(1.0), LVar2) + EVT_CALL(ScaleModel, MODEL_o388, LVar2, EVT_FLOAT(1.0), LVar2) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(40) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_62A) + EVT_CALL(func_802D62E4, 554) + EVT_CALL(EnableModel, MODEL_o389, FALSE) + EVT_CALL(EnableModel, MODEL_o388, FALSE) + EVT_END_THREAD + EVT_WAIT(230) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_THREAD + EVT_SET(LVar0, -13) + EVT_LOOP(13) + EVT_ADD(LVar0, 1) + EVT_CALL(TranslateModel, MODEL_o505, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_134/kpa_134_4_npc.c b/src/world/area_kpa/kpa_134/kpa_134_4_npc.c new file mode 100644 index 0000000000..314fd246b5 --- /dev/null +++ b/src/world/area_kpa/kpa_134/kpa_134_4_npc.c @@ -0,0 +1,25 @@ +#include "kpa_134.h" + +#include "world/common/npc/Toad_Stationary.inc.c" + +EvtScript N(EVS_NpcInit_Toad) = { + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_HAS_SHADOW, FALSE) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Dummy) = { + .id = NPC_Dummy, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000 | ENEMY_FLAGS_200000, + .init = &N(EVS_NpcInit_Toad), + .drops = TOAD_DROPS, + .animations = TOAD_RED_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Dummy)), + {} +}; diff --git a/src/world/area_kpa/kpa_134/kpa_134_5_panels.c b/src/world/area_kpa/kpa_134/kpa_134_5_panels.c new file mode 100644 index 0000000000..239496c7dc --- /dev/null +++ b/src/world/area_kpa/kpa_134/kpa_134_5_panels.c @@ -0,0 +1,87 @@ +#include "kpa_134.h" + +s32 N(WallPanels)[] = { + MODEL_o371, -230, 272, -100, + MODEL_o372, -160, 272, -100, + MODEL_o373, -103, 272, -100, + MODEL_o374, -46, 272, -100, + MODEL_o375, 10, 272, -100, + MODEL_o376, 67, 272, -100, + MODEL_o377, 135, 272, -100, + MODEL_o382, 245, 272, -100, + MODEL_o381, 318, 272, -100, + MODEL_o380, 375, 272, -100, + MODEL_o379, 432, 272, -100, + MODEL_o378, 490, 272, -100, + MODEL_o383, 547, 272, -100, + MODEL_o384, 615, 272, -100, + -1, +}; + +EvtScript N(EVS_FocusCam_Wall) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar6, LVar7, LVar8) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(450.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.5), EVT_FLOAT(-8.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar6, LVar7, LVar8) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlipWallPanel) = { + EVT_CALL(MakeLerp, 0, 450, 15, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, LVar5, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(EnableModel, LVar5, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_FlipWallPanels) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetPlayerActionState, LVar0) + EVT_IF_EQ(LVar0, ACTION_STATE_IDLE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(20) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o383, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o384, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_sikake, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitw, COLLIDER_FLAGS_UPPER_MASK) + EVT_USE_BUF(EVT_PTR(N(WallPanels))) + EVT_CALL(GetPlayerPos, LVar6, LVar7, LVar8) + EVT_SET(LVar6, 615) + EVT_EXEC(N(EVS_FocusCam_Wall)) + EVT_LOOP(0) + EVT_BUF_READ4(LVar5, LVar6, LVar7, LVar8) + EVT_IF_EQ(LVar5, -1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_CALL(PlaySoundAt, SOUND_2040, 0, LVar6, LVar7, LVar8) + EVT_EXEC(N(EVS_FlipWallPanel)) + EVT_WAIT(10) + EVT_END_LOOP + EVT_WAIT(50) + EVT_CALL(StopSound, SOUND_2040) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + 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_SET(GF_KPA134_BlueSwitch, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_134/kpa_134_6_entity.c b/src/world/area_kpa/kpa_134/kpa_134_6_entity.c new file mode 100644 index 0000000000..316a8a4488 --- /dev/null +++ b/src/world/area_kpa/kpa_134/kpa_134_6_entity.c @@ -0,0 +1,99 @@ +#include "kpa_134.h" +#include "entity.h" + +API_CALLABLE(N(UnusedSetEntityPosition)) { + Entity* entity = get_entity_by_index(script->varTable[10]); + + entity->position.x = script->varTable[0]; + entity->position.y = script->varTable[1]; + entity->position.z = script->varTable[2]; + return ApiStatus_DONE2; +} + +#include "world/common/todo/SetEntityPosition.inc.c" +#include "world/common/todo/RemovePadlock.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" + +EvtScript N(EVS_BreakBlock_Brick) = { + EVT_IF_EQ(GF_KPA134_BlueSwitch, TRUE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(LVar5, -224) + EVT_CALL(MakeLerp, 355, 370, 4, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetEntityPosition), MV_SwitchEntityID, LVar5, LVar0, 0) + EVT_WAIT(1) + EVT_SUB(LVar5, 2) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(MakeLerp, LVar0, 240, 16, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetEntityPosition), MV_SwitchEntityID, LVar5, LVar0, 0) + EVT_WAIT(1) + EVT_SUB(LVar5, 2) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +s32 N(KeyList_BowsersCastle)[] = { + ITEM_BOWSER_CASTLE_KEY, + ITEM_NONE, +}; + +EvtScript N(EVS_UnlockPrompt_Door) = { + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(GF_KPA134_UnlockedDoor, TRUE) + EVT_CALL(N(GetEntityPosition), MV_Unk_01, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) + EVT_SET(LVar0, MV_Unk_01) + EVT_CALL(N(RemovePadlock)) + EVT_SET(LVar1, 0) + EVT_WAIT(5) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_130_0)), TRIGGER_WALL_PRESS_A, COLLIDER_nno, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_KPA134_UnlockedDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 743, 10, 115, 270, MAKE_ENTITY_END) + EVT_SET(MV_Unk_01, LVar0) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockPrompt_Door)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(KeyList_BowsersCastle)), 0, 1) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_130_0)), TRIGGER_WALL_PRESS_A, COLLIDER_nno, 1, 0) + EVT_END_IF + EVT_IF_EQ(GF_KPA134_BlueSwitch, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), -224, 355, -25, 0, MAKE_ENTITY_END) + EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_KPA134_HitWaterSwitch)) + EVT_SET(MV_SwitchEntityID, LVar0) + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -224, 330, -25, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_BreakBlock_Brick))) + EVT_CALL(MakeEntity, EVT_PTR(Entity_SimpleSpring), 475, 0, -20, 90, 60, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 195, 300, -75, 0, ITEM_MAPLE_SYRUP, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_KPA134_HiddenItem_MapleSyrup) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_90/A867B0.c b/src/world/area_kpa/kpa_90/A867B0.c deleted file mode 100644 index 3e6883087c..0000000000 --- a/src/world/area_kpa/kpa_90/A867B0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "kpa_90.h" - -static char* N(exit_str_0) = "kpa_91"; -static char* N(exit_str_1) = "kpa_32"; diff --git a/src/world/area_kpa/kpa_90/kpa_90.h b/src/world/area_kpa/kpa_90/kpa_90.h index 569b10340b..743d61c377 100644 --- a/src/world/area_kpa/kpa_90/kpa_90.h +++ b/src/world/area_kpa/kpa_90/kpa_90.h @@ -2,8 +2,14 @@ /// @brief Bowser's Castle - Stairs to East Upper Jail #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_90_shape.h" +#include "mapfs/kpa_90_hit.h" + #define NAMESPACE kpa_90 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); diff --git a/src/world/area_kpa/kpa_90/kpa_90_0_header.c b/src/world/area_kpa/kpa_90/kpa_90_0_header.c new file mode 100644 index 0000000000..6183b176ec --- /dev/null +++ b/src/world/area_kpa/kpa_90/kpa_90_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_90.h" + +EntryList N(Entrances) = { + [kpa_90_ENTRY_0] { -470.0, 0.0, 100.0, 90.0 }, + [kpa_90_ENTRY_1] { 265.0, -240.0, 100.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_90 }, +}; diff --git a/src/world/area_kpa/kpa_90/kpa_90_1_music.c b/src/world/area_kpa/kpa_90/kpa_90_1_music.c new file mode 100644 index 0000000000..47f2d4ecd9 --- /dev/null +++ b/src/world/area_kpa/kpa_90/kpa_90_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_90.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_90/kpa_90_2_main.c b/src/world/area_kpa/kpa_90/kpa_90_2_main.c new file mode 100644 index 0000000000..5ae7767687 --- /dev/null +++ b/src/world/area_kpa/kpa_90/kpa_90_2_main.c @@ -0,0 +1,23 @@ +#include "kpa_90.h" + +EvtScript N(EVS_ExitWalk_kpa_91_0) = EVT_EXIT_WALK(60, kpa_90_ENTRY_1, "kpa_91", kpa_91_ENTRY_0); +EvtScript N(EVS_ExitWalk_kpa_32_1) = EVT_EXIT_WALK(60, kpa_90_ENTRY_0, "kpa_32", kpa_32_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_91_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_32_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c deleted file mode 100644 index 57ed38b7be..0000000000 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "kpa_91.h" - -static char* N(exit_str_0) = "kpa_90"; -static char* N(exit_str_1) = ""; - -#include "world/common/enemy/ai/KoopaPatrolAI.inc.c" - -#include "world/common/atomic/ToadHouse.inc.c" diff --git a/src/world/area_kpa/kpa_91/A88280.c b/src/world/area_kpa/kpa_91/A88280.c deleted file mode 100644 index a8422011e1..0000000000 --- a/src/world/area_kpa/kpa_91/A88280.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "kpa_91.h" - -#include "world/common/todo/RemovePadlock.inc.c" - -#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_91/kpa_91.h b/src/world/area_kpa/kpa_91/kpa_91.h index 905e9f0a97..306c39fa20 100644 --- a/src/world/area_kpa/kpa_91/kpa_91.h +++ b/src/world/area_kpa/kpa_91/kpa_91.h @@ -2,8 +2,34 @@ /// @brief Bowser's Castle - East Upper Jail #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_91_shape.h" +#include "mapfs/kpa_91_hit.h" + +#include "sprite/npc/ToadGuard.h" + +enum { + NPC_Toad_01 = 0, + NPC_Toad_02 = 1, + NPC_ToadGuard = 2, + NPC_Dryite = 3, + NPC_Koopatrol = 4, +}; + +enum { + MV_PadlockEntityID = MapVar(0), + MV_LastPlayerPosX = MapVar(1), + MV_LastPlayerPosY = MapVar(2), + MV_LastPlayerPosZ = MapVar(3), +}; + #define NAMESPACE kpa_91 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_OpenCellDoor); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_91/kpa_91_0_header.c b/src/world/area_kpa/kpa_91/kpa_91_0_header.c new file mode 100644 index 0000000000..b6d1033564 --- /dev/null +++ b/src/world/area_kpa/kpa_91/kpa_91_0_header.c @@ -0,0 +1,12 @@ +#include "kpa_91.h" + +EntryList N(Entrances) = { + [kpa_91_ENTRY_0] { -200.0, 0.0, 100.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_91 }, +}; diff --git a/src/world/area_kpa/kpa_91/kpa_91_1_music.c b/src/world/area_kpa/kpa_91/kpa_91_1_music.c new file mode 100644 index 0000000000..3bd786c9d0 --- /dev/null +++ b/src/world/area_kpa/kpa_91/kpa_91_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_91.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_91/kpa_91_2_main.c b/src/world/area_kpa/kpa_91/kpa_91_2_main.c new file mode 100644 index 0000000000..1f48eb9a2c --- /dev/null +++ b/src/world/area_kpa/kpa_91/kpa_91_2_main.c @@ -0,0 +1,51 @@ +#include "kpa_91.h" + +EvtScript N(EVS_ExitWalk_kpa_90_1) = EVT_EXIT_WALK(60, kpa_91_ENTRY_0, "kpa_90", kpa_90_ENTRY_1); + +MAP_RODATA_PAD(1, exits); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_90_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OpenCellDoor) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlayerMoveTo, -30, 15, 20) + EVT_CALL(InterpPlayerYaw, 90, 2) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_METAL_GATE_OPEN, 0) + EVT_CALL(MakeLerp, 0, 140, 60, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o199, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_g35, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittn, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o297, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_SET(AB_KPA_5, 0) + EVT_SET(AB_KPA_7, 0) + EVT_SET(AB_KPA_6, 0) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o297, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_91/kpa_91_3_npc.c b/src/world/area_kpa/kpa_91/kpa_91_3_npc.c new file mode 100644 index 0000000000..1491899f39 --- /dev/null +++ b/src/world/area_kpa/kpa_91/kpa_91_3_npc.c @@ -0,0 +1,286 @@ +#include "kpa_91.h" + +#include "world/common/npc/Toad_Stationary.inc.c" +#include "world/common/npc/Dryite_Stationary.inc.c" +#include "world/common/enemy/complete/Koopatrol_Patrol.inc.c" + +extern EvtScript N(EVS_ToadHouse_SetDialogue); +extern EvtScript N(EVS_ToadHouse_GetInBed); +extern EvtScript N(EVS_ToadHouse_ReturnFromRest); + +#include "world/common/complete/ToadHouseBlanketAnim.inc.c" +#include "world/common/atomic/ToadHouse.inc.c" +#include "world/common/atomic/ToadHouse.data.inc.c" + +EvtScript N(EVS_ToadHouse_SetDialogue) = { + EVT_SET(LVar0, MSG_CH8_0044) + EVT_SET(LVar8, MSG_CH8_0045) + EVT_SET(LVar1, MSG_CH8_0046) + EVT_SET(LVar2, MSG_CH8_0047) + EVT_SET(LVar3, MSG_CH8_0048) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadHouse_GetInBed) = { + EVT_CALL(SetMusicTrack, 0, SONG_TAKING_REST, 0, 8) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(N(ToadHouse_CamSetFOV), 0, 40) + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 34, -8) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 220) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-3.0), EVT_FLOAT(-240.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(-150.0), EVT_FLOAT(-56.0)) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 1, 10) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -180, -100, 0) + EVT_CALL(InterpPlayerYaw, 191, 1) + EVT_CALL(SetPlayerPos, -160, 22, -123) + EVT_WAIT(5) + EVT_CALL(InterpPlayerYaw, 114, 1) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(func_802D286C, 0x00002800) + EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 7, 1, 1, 0) + EVT_WAIT(61) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_THREAD + EVT_WAIT(63) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadHouse_ReturnFromRest) = { + EVT_CALL(N(ToadHouse_CamSetFOV), 0, 25) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ) + EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(HidePlayerShadow, FALSE) + EVT_CALL(SetPlayerPos, -139, 0, -90) + EVT_CALL(PlayerMoveTo, -102, -130, 20) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_01) = { + EVT_CALL(GetPlayerPos, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ) + EVT_EXEC_WAIT(N(EVS_NpcInteract_ToadHouseKeeper)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_02) = { + EVT_SWITCH(AB_KPA_5) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Yellow_Talk, ANIM_Toad_Yellow_Idle, 0, MSG_CH8_0049) + EVT_SET(AB_KPA_5, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Yellow_Talk, ANIM_Toad_Yellow_Idle, 0, MSG_CH8_004A) + EVT_SET(AB_KPA_5, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ToadGuard) = { + EVT_SWITCH(AB_KPA_6) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Blue_Talk, ANIM_ToadGuard_Blue_Idle, 0, MSG_CH8_004B) + EVT_SET(AB_KPA_6, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Blue_Talk, ANIM_ToadGuard_Blue_Idle, 0, MSG_CH8_004C) + EVT_SET(AB_KPA_6, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Dryite) = { + EVT_SWITCH(AB_KPA_7) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH8_004D) + EVT_SET(AB_KPA_7, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH8_004E) + EVT_SET(AB_KPA_7, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_01))) + EVT_CALL(SetNpcPos, NPC_SELF, -70, 0, -140) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_02))) + EVT_CALL(SetNpcPos, NPC_SELF, 110, 0, -130) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Toad_Yellow_Idle) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadGuard) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadGuard))) + EVT_CALL(SetNpcPos, NPC_SELF, 10, 0, -180) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ToadGuard_Blue_Idle) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Dryite) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Dryite))) + EVT_CALL(SetNpcPos, NPC_SELF, 175, 0, -65) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Prisoners)[] = { + { + .id = NPC_Toad_01, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Toad_01), + .drops = TOAD_DROPS, + .animations = TOAD_RED_ANIMS, + .tattle = MSG_NpcTattle_KPA_ToadHouseToadA, + }, + { + .id = NPC_Toad_02, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Toad_02), + .drops = TOAD_DROPS, + .animations = TOAD_RED_ANIMS, + .tattle = MSG_NpcTattle_KPA_CaptiveToadC, + }, + { + .id = NPC_ToadGuard, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_ToadGuard), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ToadGuard_Red_Idle, + .walk = ANIM_ToadGuard_Red_Idle, + .run = ANIM_ToadGuard_Red_Idle, + .chase = ANIM_ToadGuard_Red_Idle, + .anim_4 = ANIM_ToadGuard_Red_Idle, + .anim_5 = ANIM_ToadGuard_Red_Idle, + .death = ANIM_ToadGuard_Red_Idle, + .hit = ANIM_ToadGuard_Red_Idle, + .anim_8 = ANIM_ToadGuard_Red_Idle, + .anim_9 = ANIM_ToadGuard_Red_Idle, + .anim_A = ANIM_ToadGuard_Red_Idle, + .anim_B = ANIM_ToadGuard_Red_Idle, + .anim_C = ANIM_ToadGuard_Red_Idle, + .anim_D = ANIM_ToadGuard_Red_Idle, + .anim_E = ANIM_ToadGuard_Red_Idle, + .anim_F = ANIM_ToadGuard_Red_Idle, + }, + .tattle = MSG_NpcTattle_KPA_CaptiveSoldierB, + }, + { + .id = NPC_Dryite, + .settings = &N(NpcSettings_Dryite), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Dryite), + .drops = DRYITE_DROPS, + .animations = DRYITE_GREEN_ANIMS, + .tattle = MSG_NpcTattle_KPA_CaptiveDryite, + }, +}; + +EvtScript N(EVS_NpcDefeat_Koopatrol) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_SET(GF_KPA91_Defeated_Guard, TRUE) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(MakeItemEntity, ITEM_PRISON_KEY1, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, GF_KPA91_Item_PrisonKey1) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_SET(GF_KPA91_Defeated_Guard, TRUE) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(MakeItemEntity, ITEM_PRISON_KEY1, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, GF_KPA91_Item_PrisonKey1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol) = { + EVT_IF_EQ(GF_KPA91_Defeated_Guard, FALSE) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Koopatrol))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Koopatrol) = { + .id = NPC_Koopatrol, + .settings = &N(NpcSettings_Koopatrol_Patrol), + .pos = { 60.0f, 0.0f, 55.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .init = &N(EVS_NpcInit_Koopatrol), + .drops = KOOPATROL_NO_DROPS, + .territory = { + .patrol = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .numPoints = 2, + .points = { + { 60, 0, 55 }, + { 140, 0, 55 }, + }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 60, 0, 55 }, + .detectSize = { 200 }, + } + }, + .animations = KOOPATROL_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Prisoners)), + NPC_GROUP(N(NpcData_Koopatrol), BTL_KPA_FORMATION_17, BTL_KPA_STAGE_0D), + {} +}; diff --git a/src/world/area_kpa/kpa_91/kpa_91_4_entity.c b/src/world/area_kpa/kpa_91/kpa_91_4_entity.c new file mode 100644 index 0000000000..7ae2c01ee5 --- /dev/null +++ b/src/world/area_kpa/kpa_91/kpa_91_4_entity.c @@ -0,0 +1,51 @@ +#include "kpa_91.h" +#include "entity.h" + +#include "world/common/todo/RemovePadlock.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" + +s32 N(KeyList_PrisonCell)[] = { + ITEM_PRISON_KEY1, + ITEM_NONE +}; + +EvtScript N(EVS_UnlockPrompt_PrisonCell) = { + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(GF_KPA91_UnlockedDoor, TRUE) + EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) + EVT_SET(LVar0, MV_PadlockEntityID) + EVT_CALL(N(RemovePadlock)) + EVT_SET(LVar1, 0) + EVT_WAIT(5) + EVT_CALL(CloseChoicePopup) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OpenCellDoor)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittn, 1, 0) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_KPA91_UnlockedDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), -5, 10, 13, 0, MAKE_ENTITY_END) + EVT_SET(MV_PadlockEntityID, LVar0) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockPrompt_PrisonCell)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(KeyList_PrisonCell)), 0, 1) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OpenCellDoor)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittn, 1, 0) + EVT_END_IF + EVT_IF_EQ(GF_KPA91_Defeated_Guard, TRUE) + EVT_CALL(MakeItemEntity, ITEM_PRISON_KEY1, 60, 0, 55, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KPA91_Item_PrisonKey1) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_94/A8C7C0.c b/src/world/area_kpa/kpa_94/A8C7C0.c deleted file mode 100644 index b1411dadf5..0000000000 --- a/src/world/area_kpa/kpa_94/A8C7C0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "kpa_94.h" - -static char* N(exit_str_0) = "kpa_95"; -static char* N(exit_str_1) = "kpa_33"; diff --git a/src/world/area_kpa/kpa_94/kpa_94.h b/src/world/area_kpa/kpa_94/kpa_94.h index 549bdf7dbd..27fca706bd 100644 --- a/src/world/area_kpa/kpa_94/kpa_94.h +++ b/src/world/area_kpa/kpa_94/kpa_94.h @@ -2,8 +2,14 @@ /// @brief Bowser's Castle - Stairs to West Upper Jail #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_94_shape.h" +#include "mapfs/kpa_94_hit.h" + #define NAMESPACE kpa_94 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); diff --git a/src/world/area_kpa/kpa_94/kpa_94_0_header.c b/src/world/area_kpa/kpa_94/kpa_94_0_header.c new file mode 100644 index 0000000000..78b80622a1 --- /dev/null +++ b/src/world/area_kpa/kpa_94/kpa_94_0_header.c @@ -0,0 +1,13 @@ +#include "kpa_94.h" + +EntryList N(Entrances) = { + [kpa_94_ENTRY_0] { -270.0, -240.0, 100.0, 90.0 }, + [kpa_94_ENTRY_1] { 470.0, 0.0, 100.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_94 }, +}; diff --git a/src/world/area_kpa/kpa_94/kpa_94_1_music.c b/src/world/area_kpa/kpa_94/kpa_94_1_music.c new file mode 100644 index 0000000000..372bab68e9 --- /dev/null +++ b/src/world/area_kpa/kpa_94/kpa_94_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_94.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_94/kpa_94_2_main.c b/src/world/area_kpa/kpa_94/kpa_94_2_main.c new file mode 100644 index 0000000000..195c7074b4 --- /dev/null +++ b/src/world/area_kpa/kpa_94/kpa_94_2_main.c @@ -0,0 +1,25 @@ +#include "kpa_94.h" + +EvtScript N(EVS_ExitWalk_kpa_95_0) = EVT_EXIT_WALK(60, kpa_94_ENTRY_0, "kpa_95", kpa_95_ENTRY_0); +EvtScript N(EVS_ExitWalk_kpa_33_0) = EVT_EXIT_WALK(60, kpa_94_ENTRY_1, "kpa_33", kpa_33_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_95_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_33_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitte, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o340, FALSE) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_95/A8CA80.c b/src/world/area_kpa/kpa_95/A8CA80.c deleted file mode 100644 index 5453362a57..0000000000 --- a/src/world/area_kpa/kpa_95/A8CA80.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "kpa_95.h" - -static char* N(exit_str_0) = "kpa_94"; -static char* N(exit_str_1) = ""; - -#include "world/common/todo/RemovePadlock.inc.c" - -#include "world/common/todo/GetEntityPosition.inc.c" diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c deleted file mode 100644 index ff0d6e7c03..0000000000 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "kpa_95.h" - -#include "world/common/enemy/ai/KoopaPatrolAI.inc.c" - -#include "world/common/atomic/ToadHouse.inc.c" diff --git a/src/world/area_kpa/kpa_95/kpa_95.h b/src/world/area_kpa/kpa_95/kpa_95.h index 36898fee51..29db7d1d71 100644 --- a/src/world/area_kpa/kpa_95/kpa_95.h +++ b/src/world/area_kpa/kpa_95/kpa_95.h @@ -2,8 +2,37 @@ /// @brief Bowser's Castle - West Upper Jail #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_95_shape.h" +#include "mapfs/kpa_95_hit.h" + +#include "sprite/npc/Toad.h" +#include "sprite/npc/ToadGuard.h" +#include "sprite/npc/Penguin.h" +#include "sprite/npc/WorldKoopatrol.h" + +enum { + NPC_Toad_01 = 0, + NPC_Toad_02 = 1, + NPC_ToadGuard = 2, + NPC_Penguin = 3, + NPC_Koopatrol = 4, +}; + +enum { + MV_PadlockEntityID = MapVar(0), + MV_LastPlayerPosX = MapVar(1), + MV_LastPlayerPosY = MapVar(2), + MV_LastPlayerPosZ = MapVar(3), +}; + #define NAMESPACE kpa_95 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_OpenCellDoor); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_95/kpa_95_0_header.c b/src/world/area_kpa/kpa_95/kpa_95_0_header.c new file mode 100644 index 0000000000..663ad55193 --- /dev/null +++ b/src/world/area_kpa/kpa_95/kpa_95_0_header.c @@ -0,0 +1,12 @@ +#include "kpa_95.h" + +EntryList N(Entrances) = { + [kpa_95_ENTRY_0] { 205.0, 0.0, 100.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_95 }, +}; diff --git a/src/world/area_kpa/kpa_95/kpa_95_1_music.c b/src/world/area_kpa/kpa_95/kpa_95_1_music.c new file mode 100644 index 0000000000..54a6ccf39b --- /dev/null +++ b/src/world/area_kpa/kpa_95/kpa_95_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_95.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_3) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_95/kpa_95_2_entity.c b/src/world/area_kpa/kpa_95/kpa_95_2_entity.c new file mode 100644 index 0000000000..b618a5c8ab --- /dev/null +++ b/src/world/area_kpa/kpa_95/kpa_95_2_entity.c @@ -0,0 +1,51 @@ +#include "kpa_95.h" +#include "entity.h" + +#include "world/common/todo/RemovePadlock.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" + +s32 N(KeyList_PrisonCell)[] = { + ITEM_PRISON_KEY1, + ITEM_NONE +}; + +EvtScript N(EVS_UnlockPrompt_PrisonCell) = { + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RETURN + EVT_END_IF + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_SET(GF_KPA95_UnlockedDoor, TRUE) + EVT_CALL(N(GetEntityPosition), MV_PadlockEntityID, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) + EVT_SET(LVar0, MV_PadlockEntityID) + EVT_CALL(N(RemovePadlock)) + EVT_SET(LVar1, 0) + EVT_WAIT(5) + EVT_CALL(CloseChoicePopup) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OpenCellDoor)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittn, 1, 0) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_KPA95_UnlockedDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), -5, 10, 13, 0, MAKE_ENTITY_END) + EVT_SET(MV_PadlockEntityID, LVar0) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockPrompt_PrisonCell)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(KeyList_PrisonCell)), 0, 1) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OpenCellDoor)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittn, 1, 0) + EVT_END_IF + EVT_IF_EQ(GF_KPA95_Defeated_Guard, TRUE) + EVT_CALL(MakeItemEntity, ITEM_PRISON_KEY1, -70, 0, 55, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_KPA95_Item_PrisonKey1) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_95/kpa_95_3_main.c b/src/world/area_kpa/kpa_95/kpa_95_3_main.c new file mode 100644 index 0000000000..42ff81d61a --- /dev/null +++ b/src/world/area_kpa/kpa_95/kpa_95_3_main.c @@ -0,0 +1,48 @@ +#include "kpa_95.h" + +EvtScript N(EVS_OpenCellDoor) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlayerMoveTo, -30, 15, 20) + EVT_CALL(InterpPlayerYaw, 90, 2) + EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittn, SOUND_METAL_GATE_OPEN, 0) + EVT_CALL(MakeLerp, 0, 140, 60, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o199, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_g35, LVar0, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilittn, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o297, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_kpa_94_0) = EVT_EXIT_WALK(60, kpa_95_ENTRY_0, "kpa_94", kpa_94_ENTRY_0); + +MAP_RODATA_PAD(1, exits); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kpa_94_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o297, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_95/kpa_95_4_npc.c b/src/world/area_kpa/kpa_95/kpa_95_4_npc.c new file mode 100644 index 0000000000..6b27f88621 --- /dev/null +++ b/src/world/area_kpa/kpa_95/kpa_95_4_npc.c @@ -0,0 +1,334 @@ +#include "kpa_95.h" + +#include "world/common/npc/Toad_Stationary.inc.c" + +NpcSettings N(NpcSettings_Penguin) = { + .height = 24, + .radius = 24, + .level = 99, +}; + +#include "world/common/enemy/complete/Koopatrol_Patrol.inc.c" + +extern EvtScript N(EVS_ToadHouse_SetDialogue); +extern EvtScript N(EVS_ToadHouse_GetInBed); +extern EvtScript N(EVS_ToadHouse_ReturnFromRest); + +#include "world/common/complete/ToadHouseBlanketAnim.inc.c" +#include "world/common/atomic/ToadHouse.inc.c" +#include "world/common/atomic/ToadHouse.data.inc.c" + +EvtScript N(EVS_ToadHouse_SetDialogue) = { + EVT_SET(LVar0, MSG_CH8_0064) + EVT_SET(LVar8, MSG_CH8_0065) + EVT_SET(LVar1, MSG_CH8_0066) + EVT_SET(LVar2, MSG_CH8_0067) + EVT_SET(LVar3, MSG_CH8_0068) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadHouse_GetInBed) = { + EVT_CALL(SetMusicTrack, 0, SONG_TAKING_REST, 0, 8) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(N(ToadHouse_CamSetFOV), 0, 40) + EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 34, -8) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 220) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(-3.0), EVT_FLOAT(-240.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(-150.0), EVT_FLOAT(-56.0)) + EVT_CALL(SetCamPosC, CAM_DEFAULT, 1, 10) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, -180, -100, 0) + EVT_CALL(InterpPlayerYaw, 191, 1) + EVT_CALL(SetPlayerPos, -160, 22, -123) + EVT_WAIT(5) + EVT_CALL(InterpPlayerYaw, 114, 1) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(func_802D286C, 0x00002800) + EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 7, 1, 1, 0) + EVT_WAIT(61) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_THREAD + EVT_WAIT(63) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ToadHouse_ReturnFromRest) = { + EVT_CALL(N(ToadHouse_CamSetFOV), 0, 25) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ) + EVT_CALL(func_802D2520, 0x00010002, 0, 0, 0, 0, 0) + EVT_CALL(HidePlayerShadow, FALSE) + EVT_CALL(SetPlayerPos, -139, 0, -90) + EVT_CALL(PlayerMoveTo, -102, -130, 20) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_01) = { + EVT_CALL(GetPlayerPos, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ) + EVT_EXEC_WAIT(N(EVS_NpcInteract_ToadHouseKeeper)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad_02) = { + EVT_SWITCH(AB_KPA_8) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, MSG_CH8_0069) + EVT_SET(AB_KPA_8, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Blue_Talk, ANIM_Toad_Blue_Idle, 0, MSG_CH8_006A) + EVT_SET(AB_KPA_8, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_ToadGuard) = { + EVT_SWITCH(AB_KPA_9) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Green_Talk, ANIM_ToadGuard_Green_Idle, 0, MSG_CH8_006B) + EVT_SET(AB_KPA_9, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ToadGuard_Green_Talk, ANIM_ToadGuard_Green_Idle, 0, MSG_CH8_006C) + EVT_SET(AB_KPA_9, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Penguin) = { + EVT_SWITCH(AB_KPA_A) + EVT_CASE_EQ(0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Penguin_Talk, ANIM_Penguin_Idle, 0, MSG_CH8_006D) + EVT_SET(AB_KPA_A, 1) + EVT_CASE_EQ(1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Penguin_Talk, ANIM_Penguin_Idle, 0, MSG_CH8_006E) + EVT_SET(AB_KPA_A, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_01))) + EVT_CALL(SetNpcPos, NPC_SELF, -70, 0, -140) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad_02))) + EVT_CALL(SetNpcPos, NPC_SELF, 100, 0, -90) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Toad_Blue_Idle) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ToadGuard) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_ToadGuard))) + EVT_CALL(SetNpcPos, NPC_SELF, 30, 0, -170) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_ToadGuard_Green_Idle) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Penguin) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Penguin))) + EVT_CALL(SetNpcPos, NPC_SELF, 170, 0, -180) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Prisoners)[] = { + { + .id = NPC_Toad_01, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Toad_01), + .drops = TOAD_DROPS, + .animations = TOAD_RED_ANIMS, + .tattle = MSG_NpcTattle_KPA_ToadHouseToadB, + }, + { + .id = NPC_Toad_02, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Toad_02), + .drops = TOAD_DROPS, + .animations = TOAD_RED_ANIMS, + .tattle = MSG_NpcTattle_KPA_CaptiveToadD, + }, + { + .id = NPC_ToadGuard, + .settings = &N(NpcSettings_Toad_Stationary), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_ToadGuard), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_ToadGuard_Red_Idle, + .walk = ANIM_ToadGuard_Red_Idle, + .run = ANIM_ToadGuard_Red_Idle, + .chase = ANIM_ToadGuard_Red_Idle, + .anim_4 = ANIM_ToadGuard_Red_Idle, + .anim_5 = ANIM_ToadGuard_Red_Idle, + .death = ANIM_ToadGuard_Red_Idle, + .hit = ANIM_ToadGuard_Red_Idle, + .anim_8 = ANIM_ToadGuard_Red_Idle, + .anim_9 = ANIM_ToadGuard_Red_Idle, + .anim_A = ANIM_ToadGuard_Red_Idle, + .anim_B = ANIM_ToadGuard_Red_Idle, + .anim_C = ANIM_ToadGuard_Red_Idle, + .anim_D = ANIM_ToadGuard_Red_Idle, + .anim_E = ANIM_ToadGuard_Red_Idle, + .anim_F = ANIM_ToadGuard_Red_Idle, + }, + .tattle = MSG_NpcTattle_KPA_CaptiveSoldierC, + }, + { + .id = NPC_Penguin, + .settings = &N(NpcSettings_Penguin), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, + .init = &N(EVS_NpcInit_Penguin), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Penguin_Idle, + .walk = ANIM_Penguin_Walk, + .run = ANIM_Penguin_Run, + .chase = ANIM_Penguin_Run, + .anim_4 = ANIM_Penguin_Idle, + .anim_5 = ANIM_Penguin_Idle, + .death = ANIM_Penguin_Idle, + .hit = ANIM_Penguin_Idle, + .anim_8 = ANIM_Penguin_Idle, + .anim_9 = ANIM_Penguin_Idle, + .anim_A = ANIM_Penguin_Idle, + .anim_B = ANIM_Penguin_Idle, + .anim_C = ANIM_Penguin_Idle, + .anim_D = ANIM_Penguin_Idle, + .anim_E = ANIM_Penguin_Idle, + .anim_F = ANIM_Penguin_Idle, + }, + .tattle = MSG_NpcTattle_KPA_CaptivePenguin, + }, +}; + +EvtScript N(EVS_NpcDefeat_Koopatrol) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_SET(GF_KPA95_Defeated_Guard, TRUE) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(MakeItemEntity, ITEM_PRISON_KEY1, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, GF_KPA95_Item_PrisonKey1) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_SET(GF_KPA95_Defeated_Guard, TRUE) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(MakeItemEntity, ITEM_PRISON_KEY1, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_NEVER_VANISH, GF_KPA95_Item_PrisonKey1) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Koopatrol) = { + EVT_IF_EQ(GF_KPA95_Defeated_Guard, FALSE) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_Koopatrol))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Koopatrol) = { + .id = NPC_Koopatrol, + .settings = &N(NpcSettings_Koopatrol_Patrol), + .pos = { -70.0f, 0.0f, 55.0f }, + .yaw = 270, + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_800000, + .init = &N(EVS_NpcInit_Koopatrol), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .patrol = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .numPoints = 2, + .points = { + { -70, 0, 55 }, + { -140, 0, 55 }, + }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -70, 0, 55 }, + .detectSize = { 200 }, + } + }, + .animations = { + .idle = ANIM_WorldKoopatrol_Anim01, + .walk = ANIM_WorldKoopatrol_Anim04, + .run = ANIM_WorldKoopatrol_Anim06, + .chase = ANIM_WorldKoopatrol_Anim06, + .anim_4 = ANIM_WorldKoopatrol_Anim01, + .anim_5 = ANIM_WorldKoopatrol_Anim01, + .death = ANIM_WorldKoopatrol_Anim10, + .hit = ANIM_WorldKoopatrol_Anim10, + .anim_8 = ANIM_WorldKoopatrol_Anim0C, + .anim_9 = ANIM_WorldKoopatrol_Anim0B, + .anim_A = ANIM_WorldKoopatrol_Anim0D, + .anim_B = ANIM_WorldKoopatrol_Anim01, + .anim_C = ANIM_WorldKoopatrol_Anim01, + .anim_D = ANIM_WorldKoopatrol_Anim01, + .anim_E = ANIM_WorldKoopatrol_Anim01, + .anim_F = ANIM_WorldKoopatrol_Anim01, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Prisoners)), + NPC_GROUP(N(NpcData_Koopatrol), BTL_KPA_FORMATION_17, BTL_KPA_STAGE_0D), + {} +}; diff --git a/src/world/area_kpa/kpa_96/A927C0.c b/src/world/area_kpa/kpa_96/A927C0.c deleted file mode 100644 index 7820445479..0000000000 --- a/src/world/area_kpa/kpa_96/A927C0.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "kpa_96.h" - -static char* N(exit_str_0) = "kpa_32"; -static char* N(exit_str_1) = ""; - -ApiStatus func_80240000_A927C0(Evt* script, s32 isInitialCall) { - if (gPlayerData.coins > 0) { - script->varTable[0] = FALSE; - } else { - script->varTable[0] = TRUE; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_kpa/kpa_96/kpa_96.h b/src/world/area_kpa/kpa_96/kpa_96.h index f23c50a9e6..b1ef0d85e3 100644 --- a/src/world/area_kpa/kpa_96/kpa_96.h +++ b/src/world/area_kpa/kpa_96/kpa_96.h @@ -2,8 +2,26 @@ /// @brief Bowser's Castle - Item Shop #include "common.h" -#include "../kpa.h" #include "message_ids.h" #include "map.h" +#include "../kpa.h" +#include "mapfs/kpa_96_shape.h" +#include "mapfs/kpa_96_hit.h" + +#include "sprite/npc/SpikedGoomba.h" + +enum { + NPC_SpikedGoomba = 0, +}; + +enum { + MV_MetShopkeeper = MapVar(0), +}; + #define NAMESPACE kpa_96 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupShop); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_kpa/kpa_96/kpa_96_0_header.c b/src/world/area_kpa/kpa_96/kpa_96_0_header.c new file mode 100644 index 0000000000..c75ae498e9 --- /dev/null +++ b/src/world/area_kpa/kpa_96/kpa_96_0_header.c @@ -0,0 +1,12 @@ +#include "kpa_96.h" + +EntryList N(Entrances) = { + [kpa_96_ENTRY_0] { 210.0, 0.0, 100.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_kpa_96 }, +}; diff --git a/src/world/area_kpa/kpa_96/kpa_96_1_music.c b/src/world/area_kpa/kpa_96/kpa_96_1_music.c new file mode 100644 index 0000000000..17606cdb1e --- /dev/null +++ b/src/world/area_kpa/kpa_96/kpa_96_1_music.c @@ -0,0 +1,12 @@ +#include "kpa_96.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_BOWSERS_CASTLE, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetMusicTrackVolumes, TRACK_VOLS_KPA_2) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_96/kpa_96_2_main.c b/src/world/area_kpa/kpa_96/kpa_96_2_main.c new file mode 100644 index 0000000000..fdb9f8d3dd --- /dev/null +++ b/src/world/area_kpa/kpa_96/kpa_96_2_main.c @@ -0,0 +1,32 @@ +#include "kpa_96.h" + +EvtScript N(EVS_ExitDoors_kpa_32_3) = EVT_EXIT_DOUBLE_DOOR(kpa_96_ENTRY_0, "kpa_32", kpa_32_ENTRY_3, COLLIDER_deilittw, MODEL_o881, MODEL_o882); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_kpa_32_3)), TRIGGER_WALL_PRESS_A, COLLIDER_deilittw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_SET(LVar0, kpa_96_ENTRY_0) + EVT_SET(LVar2, MODEL_o881) + EVT_SET(LVar3, MODEL_o882) + EVT_EXEC(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC(N(EVS_SetupShop)) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_kpa/kpa_96/kpa_96_3_npc.c b/src/world/area_kpa/kpa_96/kpa_96_3_npc.c new file mode 100644 index 0000000000..a6f7a01851 --- /dev/null +++ b/src/world/area_kpa/kpa_96/kpa_96_3_npc.c @@ -0,0 +1,179 @@ +#include "kpa_96.h" + +s32 N(ShopMessages)[] = { + MSG_Shop_00BC, + MSG_Shop_00BD, + MSG_Shop_00BE, + MSG_Shop_00BF, + MSG_Shop_00C0, + MSG_Shop_00C1, + MSG_Shop_00C2, + MSG_Shop_00C3, + MSG_Shop_00C4, + MSG_Shop_00C5, + MSG_Shop_00C6, + MSG_Shop_00C7, + MSG_Shop_00C8, + MSG_Shop_00C9, + MSG_Shop_00CA, + MSG_Shop_00CB, + MSG_Shop_00CC, + MSG_Shop_00CD, + MSG_Shop_00CE, + MSG_Shop_00CF, + MSG_Shop_00D0, + MSG_Shop_00D1, + MSG_Shop_00D2, +}; + +ShopItemData N(Inventory)[] = { + { .itemID = ITEM_MYSTERY, .price = 5, .descMsg = 0x0024002B }, + { .itemID = ITEM_DIZZY_DIAL, .price = 25, .descMsg = 0x00240029 }, + { .itemID = ITEM_POW_BLOCK, .price = 15, .descMsg = 0x00240027 }, + { .itemID = ITEM_THUNDER_RAGE, .price = 30, .descMsg = 0x00240002 }, + { .itemID = ITEM_MAPLE_SYRUP, .price = 30, .descMsg = 0x00240017 }, + { .itemID = ITEM_SUPER_SHROOM, .price = 30, .descMsg = 0x0024000A }, + {} +}; + +ShopSellPriceData N(PriceList)[] = { + { .itemID = ITEM_FRIGHT_JAR, .sellPrice = 15 }, + { .itemID = ITEM_EGG_MISSILE, .sellPrice = 30 }, + { .itemID = ITEM_PEBBLE, .sellPrice = 20 }, + { .itemID = ITEM_MISTAKE, .sellPrice = 20 }, + { .itemID = ITEM_LIFE_SHROOM, .sellPrice = 25 }, + { .itemID = ITEM_SHOOTING_STAR, .sellPrice = 20 }, + { .itemID = ITEM_SUPER_SODA, .sellPrice = 10 }, + { .itemID = ITEM_STOP_WATCH, .sellPrice = 20 }, + {} +}; + +EvtScript N(EVS_OnBuy) = { + EVT_SWITCH(LVar0) + EVT_CASE_EQ(3) + EVT_CASE_EQ(4) + EVT_CASE_EQ(1) + EVT_CASE_EQ(1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +ShopItemLocation N(ItemPositions)[] = { + { .posModelID = MODEL_o831, .triggerColliderID = COLLIDER_o865 }, + { .posModelID = MODEL_o832, .triggerColliderID = COLLIDER_o864 }, + { .posModelID = MODEL_o833, .triggerColliderID = COLLIDER_o863 }, + { .posModelID = MODEL_o834, .triggerColliderID = COLLIDER_o862 }, + { .posModelID = MODEL_o835, .triggerColliderID = COLLIDER_o861 }, + { .posModelID = MODEL_o836, .triggerColliderID = COLLIDER_o860 }, +}; + +ShopOwner N(Owner) = { + .npcID = NPC_SpikedGoomba, + .idleAnim = ANIM_SpikedGoomba_Idle, + .talkAnim = ANIM_SpikedGoomba_Walk, + .onBuyEvt = &N(EVS_OnBuy), + .shopMsgIDs = N(ShopMessages), +}; + +EvtScript N(EVS_SetupShop) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o860, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o861, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o862, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o863, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o864, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o865, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(MakeShop, EVT_PTR(N(ItemPositions)), EVT_PTR(N(Inventory)), EVT_PTR(N(PriceList)), 0) + EVT_CALL(MakeShopOwner, EVT_PTR(N(Owner))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_SpikedGoomba) = { + .height = 22, + .radius = 24, + .level = 99, + .actionFlags = AI_ACTION_LOOK_AROUND_DURING_LOITER, +}; + +API_CALLABLE(N(CheckPlayerHasCoins)) { + if (gPlayerData.coins > 0) { + script->varTable[0] = FALSE; + } else { + script->varTable[0] = TRUE; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcInteract_SpikedGoomba) = { + EVT_IF_EQ(MV_MetShopkeeper, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_SpikedGoomba_Walk, ANIM_SpikedGoomba_Idle, 0, MSG_CH8_004F) + EVT_CALL(ShowChoice, MSG_Choice_0013) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(N(CheckPlayerHasCoins)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_SpikedGoomba_Walk, ANIM_SpikedGoomba_Idle, 0, MSG_CH8_0051) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o860, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o861, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o862, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o863, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o864, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o865, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o964, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(MV_MetShopkeeper, 1) + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_SpikedGoomba_Walk, ANIM_SpikedGoomba_Idle, 0, MSG_CH8_0052) + EVT_END_IF + EVT_ELSE + EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_SpikedGoomba_Walk, ANIM_SpikedGoomba_Idle, 0, MSG_CH8_0050) + EVT_END_IF + EVT_ELSE + EVT_EXEC_WAIT(ItemShopInteract) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_SpikedGoomba) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_SpikedGoomba))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_SpikedGoomba) = { + .id = NPC_SpikedGoomba, + .settings = &N(NpcSettings_SpikedGoomba), + .pos = { -122.0f, 0.0f, 163.0f }, + .yaw = 90, + .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_10000 | ENEMY_FLAGS_100000 | ENEMY_FLAGS_400000, + .init = &N(EVS_NpcInit_SpikedGoomba), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_SpikedGoomba_Idle, + .walk = ANIM_SpikedGoomba_Walk, + .run = ANIM_SpikedGoomba_Run, + .chase = ANIM_SpikedGoomba_Run, + .anim_4 = ANIM_SpikedGoomba_Idle, + .anim_5 = ANIM_SpikedGoomba_Idle, + .death = ANIM_SpikedGoomba_HurtStill, + .hit = ANIM_SpikedGoomba_HurtStill, + .anim_8 = ANIM_SpikedGoomba_Run, + .anim_9 = ANIM_SpikedGoomba_Run, + .anim_A = ANIM_SpikedGoomba_Run, + .anim_B = ANIM_SpikedGoomba_Run, + .anim_C = ANIM_SpikedGoomba_Run, + .anim_D = ANIM_SpikedGoomba_Run, + .anim_E = ANIM_SpikedGoomba_Run, + .anim_F = ANIM_SpikedGoomba_Run, + }, + .tattle = MSG_NpcTattle_KPA_ShopOwner, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_SpikedGoomba)), + {} +}; diff --git a/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c b/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c index b98ddcbce5..c481f9a10e 100644 --- a/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c +++ b/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c @@ -178,7 +178,7 @@ s32 N(ExtraAnims_Gooma_Epilogue)[] = { -1 }; -StaticNpc N(NpcData_Goompapa_Epilogue)[] = { +StaticNpc N(NpcData_GoombaFamilypa_Epilogue)[] = { { .id = NPC_Goompapa_Epilogue, .settings = &N(NpcSettings_GoombaFamily_Epilogue), @@ -453,7 +453,7 @@ extern StaticNpc N(NpcData_Waterfront_Family)[4]; NpcGroupList N(EpilogueNPCs) = { NPC_GROUP(N(NpcData_Luigi_Epilogue)), NPC_GROUP(N(NpcData_DojoMembers_Epilogue)), - NPC_GROUP(N(NpcData_Goompapa_Epilogue)), + NPC_GROUP(N(NpcData_GoombaFamilypa_Epilogue)), NPC_GROUP(N(NpcData_ChuckQuizmo_Epilogue)), NPC_GROUP(N(NpcData_Toad_01_Epilogue)), NPC_GROUP(N(NpcData_SharedTownsfolk)), diff --git a/src/world/area_mac/mac_00/mac_00_5_npc.c b/src/world/area_mac/mac_00/mac_00_5_npc.c index 7c1ffe858d..b96b6c5a25 100644 --- a/src/world/area_mac/mac_00/mac_00_5_npc.c +++ b/src/world/area_mac/mac_00/mac_00_5_npc.c @@ -395,7 +395,7 @@ StaticNpc N(NpcData_Toad_03)[] = { StaticNpc N(NpcData_Quizmo_Unused) = { .id = NPC_ChuckQuizmo, - .settings = &N(Quizmo_NpcSettings), + .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 545.0f, 20.0f, 150.0f }, .yaw = 30, .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000, diff --git a/src/world/area_mac/mac_01/mac_01_13_foliage.c b/src/world/area_mac/mac_01/mac_01_13_foliage.c index ca9f5e1186..457a9d52d2 100644 --- a/src/world/area_mac/mac_01/mac_01_13_foliage.c +++ b/src/world/area_mac/mac_01/mac_01_13_foliage.c @@ -62,11 +62,11 @@ BombTrigger N(BombPos_Tree2) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o393, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o393, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o237, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o237, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_mac/mac_01/mac_01_9_npc.c b/src/world/area_mac/mac_01/mac_01_9_npc.c index 060a7431e3..d0e0f82149 100644 --- a/src/world/area_mac/mac_01/mac_01_9_npc.c +++ b/src/world/area_mac/mac_01/mac_01_9_npc.c @@ -2423,7 +2423,7 @@ StaticNpc N(NpcData_Kolorado) = { StaticNpc N(NpcData_ChuckQuizmo) = { .id = NPC_ChuckQuizmo, - .settings = &N(Quizmo_NpcSettings), + .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -440.0f, 20.0f, -140.0f }, .yaw = 30, .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000, diff --git a/src/world/area_mac/mac_02/mac_02_4_foliage.c b/src/world/area_mac/mac_02/mac_02_4_foliage.c index d66f344e36..96c7fc68ac 100644 --- a/src/world/area_mac/mac_02/mac_02_4_foliage.c +++ b/src/world/area_mac/mac_02/mac_02_4_foliage.c @@ -114,17 +114,17 @@ BombTrigger N(BombPos_Tree4) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o409, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o409, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o361, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o361, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o370, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o370, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree4))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o378, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree4)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o378, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree4)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_mac/mac_03/mac_03_6_foliage.c b/src/world/area_mac/mac_03/mac_03_6_foliage.c index f8ef964f34..f3598c55fe 100644 --- a/src/world/area_mac/mac_03/mac_03_6_foliage.c +++ b/src/world/area_mac/mac_03/mac_03_6_foliage.c @@ -111,14 +111,14 @@ BombTrigger N(BombPos_Tree3) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o212, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o212, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o211, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o211, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_mgm_tree, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_mgm_tree, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_mac/mac_04/mac_04_4_foliage.c b/src/world/area_mac/mac_04/mac_04_4_foliage.c index 722c8abcdb..c586c70f53 100644 --- a/src/world/area_mac/mac_04/mac_04_4_foliage.c +++ b/src/world/area_mac/mac_04/mac_04_4_foliage.c @@ -70,14 +70,14 @@ BombTrigger N(BombPos_Tree3) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o452, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o452, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o446, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o446, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o435, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o435, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_mac/mac_04/mac_04_6_npc.c b/src/world/area_mac/mac_04/mac_04_6_npc.c index b32c84f89e..8e8b024969 100644 --- a/src/world/area_mac/mac_04/mac_04_6_npc.c +++ b/src/world/area_mac/mac_04/mac_04_6_npc.c @@ -490,7 +490,7 @@ StaticNpc N(NpcData_GoombaFamily)[] = { StaticNpc N(NpcData_ChuckQuizmo) = { .id = NPC_ChuckQuizmo, - .settings = &N(Quizmo_NpcSettings), + .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 57.0f, 20.0f, -114.0f }, .yaw = 270, .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000, diff --git a/src/world/area_mac/mac_05/mac_05_4_npc.c b/src/world/area_mac/mac_05/mac_05_4_npc.c index 48ac95eaee..9184112e33 100644 --- a/src/world/area_mac/mac_05/mac_05_4_npc.c +++ b/src/world/area_mac/mac_05/mac_05_4_npc.c @@ -2523,7 +2523,7 @@ StaticNpc N(NpcData_Bartender)[] = { StaticNpc N(NpcData_ChuckQuizmo) = { .id = NPC_ChuckQuizmo, - .settings = &N(Quizmo_NpcSettings), + .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 472.0f, 0.0f, -230.0f }, .yaw = 90, .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_8 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_4000, diff --git a/src/world/area_mac/machi/machi_1_tables.c b/src/world/area_mac/machi/machi_1_tables.c index ba89a24a1e..8ee725a9b5 100644 --- a/src/world/area_mac/machi/machi_1_tables.c +++ b/src/world/area_mac/machi/machi_1_tables.c @@ -9,8 +9,8 @@ } GameVarRange N(GameByteTable)[] = { - VAR_RANGE_BYTE("GSW EVT", GB_StoryProgress, GB_Unused_KMR_00, GB_Unused_EVT_02), - VAR_RANGE_BYTE("GSW KMR", GB_Unused_KMR_00, GB_MAC01_Merlon_SpinJumpCount, GB_Unused_KMR_05), + VAR_RANGE_BYTE("GSW EVT", GB_StoryProgress, GB_KMR20_MarioReadDiaryFlags_00, GB_Unused_EVT_02), + VAR_RANGE_BYTE("GSW KMR", GB_KMR20_MarioReadDiaryFlags_00, GB_MAC01_Merlon_SpinJumpCount, GB_Unused_KMR_05), VAR_RANGE_BYTE("GSW MAC", GB_MAC01_Merlon_SpinJumpCount, GB_TIK15_RipCheato_PurchaseCount, GB_Unused_MAC_13), VAR_RANGE_BYTE("GSW TIK", GB_TIK15_RipCheato_PurchaseCount, GB_Unused_KGR_00, GB_Unused_TIK_01), VAR_RANGE_BYTE("GSW KGR", GB_Unused_KGR_00, GB_Unused_KKJ_00, GB_Unused_KGR_00), diff --git a/src/world/area_mac/machi/machi_5_npc.c b/src/world/area_mac/machi/machi_5_npc.c index cbca151ba3..c2c54a8338 100644 --- a/src/world/area_mac/machi/machi_5_npc.c +++ b/src/world/area_mac/machi/machi_5_npc.c @@ -278,7 +278,7 @@ StaticNpc N(NpcData_05)[] = { }, }; -StaticNpc N(NpcData_Goompa) = { +StaticNpc N(NpcData_GoombaFamily) = { .id = NPC_Goompa, .settings = &N(NpcSettings_Goompa), .pos = { 0.0f, 0.0f, 0.0f }, @@ -385,7 +385,7 @@ StaticNpc N(NpcData_GoombaKing) = { NpcGroupList N(DefaultNPCs) = { NPC_GROUP(N(NpcData_05), BTL_KMR_PART_1_FORMATION_08), - NPC_GROUP(N(NpcData_Goompa), BTL_KMR_PART_1_FORMATION_08), + NPC_GROUP(N(NpcData_GoombaFamily), BTL_KMR_PART_1_FORMATION_08), NPC_GROUP(N(NpcData_Misstar)), {} }; 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 index 752d79fe66..e4411871f5 100644 --- a/src/world/area_mim/mim_11/mim_11_6_foliage.c +++ b/src/world/area_mim/mim_11/mim_11_6_foliage.c @@ -61,13 +61,13 @@ SearchBushConfig N(SearchBush_Bush4) = { 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_BIND_TRIGGER(EVT_PTR(N(EVS_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_BIND_TRIGGER(EVT_PTR(N(EVS_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_BIND_TRIGGER(EVT_PTR(N(EVS_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_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o210, 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_sbk/sbk_06/sbk_06_3_foliage.c b/src/world/area_sbk/sbk_06/sbk_06_3_foliage.c index d519f069c1..c5c4f95b77 100644 --- a/src/world/area_sbk/sbk_06/sbk_06_3_foliage.c +++ b/src/world/area_sbk/sbk_06/sbk_06_3_foliage.c @@ -41,8 +41,8 @@ BombTrigger N(BombPos_Tree1) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_sbk/sbk_16/sbk_16_2_foliage.c b/src/world/area_sbk/sbk_16/sbk_16_2_foliage.c index bd6415ffd8..b6969c4d12 100644 --- a/src/world/area_sbk/sbk_16/sbk_16_2_foliage.c +++ b/src/world/area_sbk/sbk_16/sbk_16_2_foliage.c @@ -52,11 +52,11 @@ BombTrigger N(BombPos_Tree2) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o193, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o193, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_sbk/sbk_24/sbk_24_4_foliage.c b/src/world/area_sbk/sbk_24/sbk_24_4_foliage.c index d5b22a4e93..676fae0efd 100644 --- a/src/world/area_sbk/sbk_24/sbk_24_4_foliage.c +++ b/src/world/area_sbk/sbk_24/sbk_24_4_foliage.c @@ -76,14 +76,14 @@ BombTrigger N(BombPos_Tree3) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o49, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o49, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o81, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o81, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o82, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o82, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_sbk/sbk_25/sbk_25_3_foliage.c b/src/world/area_sbk/sbk_25/sbk_25_3_foliage.c index 88ba05c6fb..c08b7a7a98 100644 --- a/src/world/area_sbk/sbk_25/sbk_25_3_foliage.c +++ b/src/world/area_sbk/sbk_25/sbk_25_3_foliage.c @@ -52,11 +52,11 @@ BombTrigger N(BombPos_Tree2) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o197, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o197, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o199, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o199, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_sbk/sbk_26/sbk_26_3_foliage.c b/src/world/area_sbk/sbk_26/sbk_26_3_foliage.c index 4cb8c255f2..422b04e565 100644 --- a/src/world/area_sbk/sbk_26/sbk_26_3_foliage.c +++ b/src/world/area_sbk/sbk_26/sbk_26_3_foliage.c @@ -41,8 +41,8 @@ BombTrigger N(BombPos_Tree1) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_sbk/sbk_30/sbk_30_4_foliage.c b/src/world/area_sbk/sbk_30/sbk_30_4_foliage.c index 22b47ecd21..45528e271b 100644 --- a/src/world/area_sbk/sbk_30/sbk_30_4_foliage.c +++ b/src/world/area_sbk/sbk_30/sbk_30_4_foliage.c @@ -51,8 +51,8 @@ EvtScript N(EVS_SetupFoliage) = { EVT_ELSE EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) EVT_END_IF - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o84, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o84, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_sbk/sbk_34/sbk_34_3_foliage.c b/src/world/area_sbk/sbk_34/sbk_34_3_foliage.c index ff062d4783..db26e41097 100644 --- a/src/world/area_sbk/sbk_34/sbk_34_3_foliage.c +++ b/src/world/area_sbk/sbk_34/sbk_34_3_foliage.c @@ -41,8 +41,8 @@ BombTrigger N(BombPos_Tree1) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o201, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o201, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_sbk/sbk_35/sbk_35_3_foliage.c b/src/world/area_sbk/sbk_35/sbk_35_3_foliage.c index 6c46f63832..48068a37ec 100644 --- a/src/world/area_sbk/sbk_35/sbk_35_3_foliage.c +++ b/src/world/area_sbk/sbk_35/sbk_35_3_foliage.c @@ -89,14 +89,14 @@ BombTrigger N(BombPos_Tree3) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o193, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o193, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o195, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o195, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_sbk/sbk_36/sbk_36_2_foliage.c b/src/world/area_sbk/sbk_36/sbk_36_2_foliage.c index f4df2b546b..7e6e03de36 100644 --- a/src/world/area_sbk/sbk_36/sbk_36_2_foliage.c +++ b/src/world/area_sbk/sbk_36/sbk_36_2_foliage.c @@ -273,32 +273,32 @@ BombTrigger N(BombPos_Tree9) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o205, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o205, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o203, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o203, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o207, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o207, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree4))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o201, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree4)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o201, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree4)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree5))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o199, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree5)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o199, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree5)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree6))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o197, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree6)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o197, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree6)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree7))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree7)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree7)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree8))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o195, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree8)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o195, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree8)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree9))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o193, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree9)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o193, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree9)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_sbk/sbk_46/sbk_46_3_foliage.c b/src/world/area_sbk/sbk_46/sbk_46_3_foliage.c index 288b8dd3fe..d359f58020 100644 --- a/src/world/area_sbk/sbk_46/sbk_46_3_foliage.c +++ b/src/world/area_sbk/sbk_46/sbk_46_3_foliage.c @@ -89,14 +89,14 @@ BombTrigger N(BombPos_Tree3) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o193, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o193, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o195, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o195, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_sbk/sbk_55/sbk_55_3_foliage.c b/src/world/area_sbk/sbk_55/sbk_55_3_foliage.c index ce27ec9efc..958b939b27 100644 --- a/src/world/area_sbk/sbk_55/sbk_55_3_foliage.c +++ b/src/world/area_sbk/sbk_55/sbk_55_3_foliage.c @@ -41,8 +41,8 @@ BombTrigger N(BombPos_Tree1) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_sbk/sbk_56/sbk_56_3_foliage.c b/src/world/area_sbk/sbk_56/sbk_56_3_foliage.c index 2b4b564ef0..30212c453a 100644 --- a/src/world/area_sbk/sbk_56/sbk_56_3_foliage.c +++ b/src/world/area_sbk/sbk_56/sbk_56_3_foliage.c @@ -302,35 +302,35 @@ EvtScript N(EVS_SetupFoliage) = { EVT_SET(GF_SBK56_Tree2_Lime, FALSE) EVT_SET(GF_SBK56_UnusedB, FALSE) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_remon, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_remon, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_rim, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_rim, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_y_miki, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_y_miki, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree4))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o67, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree4)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o67, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree4)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree5))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o68, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree5)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o68, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree5)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree6))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o69, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree6)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o69, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree6)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree7))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o70, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree7)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o70, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree7)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree8))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o71, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree8)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o71, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree8)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree9))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o72, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree9)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o72, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree9)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree10))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o73, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree10)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o73, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree10)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_sbk/sbk_66/sbk_66_3_foliage.c b/src/world/area_sbk/sbk_66/sbk_66_3_foliage.c index e99a12c70f..d1b353b227 100644 --- a/src/world/area_sbk/sbk_66/sbk_66_3_foliage.c +++ b/src/world/area_sbk/sbk_66/sbk_66_3_foliage.c @@ -89,14 +89,14 @@ BombTrigger N(BombTrigger_Tree3) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o180, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombTrigger_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o180, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombTrigger_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o182, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombTrigger_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o182, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombTrigger_Tree2)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o184, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombTrigger_Tree3)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o184, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombTrigger_Tree3)), 1, 0) 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 c93b1bd616..9e9457617b 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,6 +1,8 @@ #include "trd_09.h" #include "effects.h" +#include "world/common/enemy/complete/BulletBill.h" + API_CALLABLE(N(func_80240000_9BD660)) { Bytecode* args = script->ptrReadPos; Enemy* npc = script->owner1.enemy; @@ -130,10 +132,26 @@ EvtScript N(D_80240C2C_9BE28C) = { EVT_END }; -s32 N(missing_80240CE4_CE4)[] = { - 0x002E0001, 0x001A0020, (s32) trd_09_EVS_NpcAuxAI_BillBlaster, 0x00000000, (s32) trd_09_D_80240844_9BDEA4, (s32) trd_09_EVS_NpcHit_BillBlaster, 0x00000000, (s32) trd_09_D_80240B80_9BE1E0, - 0x00000000, 0x00000000, 0x000A0000, 0x002D0001, 0x000E001F, (s32) trd_09_EVS_NpcAuxAI_BulletBill, 0x00000000, (s32) trd_09_D_80240C1C_9BE27C, - (s32) EnemyNpcHit, 0x00000000, (s32) trd_09_D_80240C2C_9BE28C, 0x00000000, 0x00000000, 0x00050000, +NpcSettings N(missing_80240CE4) = { + .defaultAnim = ANIM_BillBlaster_Anim01, + .height = 26, + .radius = 32, + .level = 10, + .otherAI = &N(EVS_NpcAuxAI_BillBlaster), + .ai = &N(D_80240844_9BDEA4), + .onHit = &N(EVS_NpcHit_BillBlaster), + .onDefeat = &N(D_80240B80_9BE1E0), +}; + +NpcSettings N(missing_80240D10) = { + .defaultAnim = ANIM_BulletBill_Anim01, + .height = 14, + .radius = 31, + .level = 5, + .otherAI = &N(EVS_NpcAuxAI_BulletBill), + .ai = &N(D_80240C1C_9BE27C), + .onHit = &EnemyNpcHit, + .onDefeat = &N(D_80240C2C_9BE28C), }; EvtScript N(EVS_NpcAuxAI_KoopaBros_Red) = { @@ -532,11 +550,7 @@ StaticNpc N(NpcData_BillBlasters)[] = { .yaw = 270, .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000, .init = &N(EVS_NpcInit_BillBlaster), - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = BILL_BLASTER_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -549,24 +563,7 @@ StaticNpc N(NpcData_BillBlasters)[] = { .detectSize = { 0 }, } }, - .animations = { - .idle = ANIM_BillBlaster_Anim01, - .walk = ANIM_BillBlaster_Anim01, - .run = ANIM_BillBlaster_Anim01, - .chase = ANIM_BillBlaster_Anim01, - .anim_4 = ANIM_BillBlaster_Anim01, - .anim_5 = ANIM_BillBlaster_Anim01, - .death = ANIM_BillBlaster_Anim03, - .hit = ANIM_BillBlaster_Anim03, - .anim_8 = ANIM_BillBlaster_Anim01, - .anim_9 = ANIM_BillBlaster_Anim01, - .anim_A = ANIM_BillBlaster_Anim01, - .anim_B = ANIM_BillBlaster_Anim01, - .anim_C = ANIM_BillBlaster_Anim01, - .anim_D = ANIM_BillBlaster_Anim01, - .anim_E = ANIM_BillBlaster_Anim01, - .anim_F = ANIM_BillBlaster_Anim01, - }, + .animations = BILL_BLASTER_ANIMS, }, { .id = NPC_BillBlaster_03, @@ -574,13 +571,7 @@ StaticNpc N(NpcData_BillBlasters)[] = { .pos = { 1275.0f, 0.0f, 5.0f }, .yaw = 270, .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - .minCoinBonus = 1, - .maxCoinBonus = 1, - }, + .drops = BILL_BLASTER_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -593,24 +584,7 @@ StaticNpc N(NpcData_BillBlasters)[] = { .detectSize = { 0 }, } }, - .animations = { - .idle = ANIM_BillBlaster_Anim01, - .walk = ANIM_BillBlaster_Anim01, - .run = ANIM_BillBlaster_Anim01, - .chase = ANIM_BillBlaster_Anim01, - .anim_4 = ANIM_BillBlaster_Anim01, - .anim_5 = ANIM_BillBlaster_Anim01, - .death = ANIM_BillBlaster_Anim03, - .hit = ANIM_BillBlaster_Anim03, - .anim_8 = ANIM_BillBlaster_Anim01, - .anim_9 = ANIM_BillBlaster_Anim01, - .anim_A = ANIM_BillBlaster_Anim01, - .anim_B = ANIM_BillBlaster_Anim01, - .anim_C = ANIM_BillBlaster_Anim01, - .anim_D = ANIM_BillBlaster_Anim01, - .anim_E = ANIM_BillBlaster_Anim01, - .anim_F = ANIM_BillBlaster_Anim01, - }, + .animations = BILL_BLASTER_ANIMS, }, { .id = NPC_BillBlaster_02, @@ -618,11 +592,7 @@ StaticNpc N(NpcData_BillBlasters)[] = { .pos = { 1290.0f, 0.0f, 50.0f }, .yaw = 270, .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_2000 | ENEMY_FLAGS_40000 | ENEMY_FLAGS_200000, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .heartDrops = NO_DROPS, - .flowerDrops = NO_DROPS, - }, + .drops = BILL_BLASTER_NO_DROPS, .territory = { .wander = { .isFlying = TRUE, @@ -635,516 +605,20 @@ StaticNpc N(NpcData_BillBlasters)[] = { .detectSize = { 0 }, } }, - .animations = { - .idle = ANIM_BillBlaster_Anim01, - .walk = ANIM_BillBlaster_Anim01, - .run = ANIM_BillBlaster_Anim01, - .chase = ANIM_BillBlaster_Anim01, - .anim_4 = ANIM_BillBlaster_Anim01, - .anim_5 = ANIM_BillBlaster_Anim01, - .death = ANIM_BillBlaster_Anim03, - .hit = ANIM_BillBlaster_Anim03, - .anim_8 = ANIM_BillBlaster_Anim01, - .anim_9 = ANIM_BillBlaster_Anim01, - .anim_A = ANIM_BillBlaster_Anim01, - .anim_B = ANIM_BillBlaster_Anim01, - .anim_C = ANIM_BillBlaster_Anim01, - .anim_D = ANIM_BillBlaster_Anim01, - .anim_E = ANIM_BillBlaster_Anim01, - .anim_F = ANIM_BillBlaster_Anim01, - }, + .animations = BILL_BLASTER_ANIMS, }, }; -StaticNpc N(NpcData_BulletBill_01) = { - .id = NPC_BulletBill_01, - .settings = &N(NpcSettings_BulletBill), - .pos = { NPC_DISPOSE_LOCATION }, - .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .itemDropChance = 3, - .itemDrops = { - { ITEM_MUSHROOM, 10, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_CYLINDER, - .centerPos = { 0, 0, 0 }, - .wanderSize = { 0 }, - .detectShape = SHAPE_CYLINDER, - .detectPos = { 0, 0, 0 }, - .detectSize = { 0 }, - } - }, - .animations = { - .idle = ANIM_BulletBill_Anim01, - .walk = ANIM_BulletBill_Anim02, - .run = ANIM_BulletBill_Anim03, - .chase = ANIM_BulletBill_Anim03, - .anim_4 = ANIM_BulletBill_Anim01, - .anim_5 = ANIM_BulletBill_Anim04, - .death = ANIM_BulletBill_Anim05, - .hit = ANIM_BulletBill_Anim05, - .anim_8 = ANIM_BulletBill_Anim01, - .anim_9 = ANIM_BulletBill_Anim01, - .anim_A = ANIM_BulletBill_Anim01, - .anim_B = ANIM_BulletBill_Anim01, - .anim_C = ANIM_BulletBill_Anim01, - .anim_D = ANIM_BulletBill_Anim01, - .anim_E = ANIM_BulletBill_Anim01, - .anim_F = ANIM_BulletBill_Anim01, - }, -}; - -StaticNpc N(NpcData_BulletBill_02) = { - .id = NPC_BulletBill_02, - .settings = &N(NpcSettings_BulletBill), - .pos = { NPC_DISPOSE_LOCATION }, - .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .itemDropChance = 3, - .itemDrops = { - { ITEM_MUSHROOM, 10, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_CYLINDER, - .centerPos = { 0, 0, 0 }, - .wanderSize = { 0 }, - .detectShape = SHAPE_CYLINDER, - .detectPos = { 0, 0, 0 }, - .detectSize = { 0 }, - } - }, - .animations = { - .idle = ANIM_BulletBill_Anim01, - .walk = ANIM_BulletBill_Anim02, - .run = ANIM_BulletBill_Anim03, - .chase = ANIM_BulletBill_Anim03, - .anim_4 = ANIM_BulletBill_Anim01, - .anim_5 = ANIM_BulletBill_Anim04, - .death = ANIM_BulletBill_Anim05, - .hit = ANIM_BulletBill_Anim05, - .anim_8 = ANIM_BulletBill_Anim01, - .anim_9 = ANIM_BulletBill_Anim01, - .anim_A = ANIM_BulletBill_Anim01, - .anim_B = ANIM_BulletBill_Anim01, - .anim_C = ANIM_BulletBill_Anim01, - .anim_D = ANIM_BulletBill_Anim01, - .anim_E = ANIM_BulletBill_Anim01, - .anim_F = ANIM_BulletBill_Anim01, - }, -}; - -StaticNpc N(NpcData_BulletBill_03) = { - .id = NPC_BulletBill_03, - .settings = &N(NpcSettings_BulletBill), - .pos = { NPC_DISPOSE_LOCATION }, - .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .itemDropChance = 3, - .itemDrops = { - { ITEM_MUSHROOM, 10, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_CYLINDER, - .centerPos = { 0, 0, 0 }, - .wanderSize = { 0 }, - .detectShape = SHAPE_CYLINDER, - .detectPos = { 0, 0, 0 }, - .detectSize = { 0 }, - } - }, - .animations = { - .idle = ANIM_BulletBill_Anim01, - .walk = ANIM_BulletBill_Anim02, - .run = ANIM_BulletBill_Anim03, - .chase = ANIM_BulletBill_Anim03, - .anim_4 = ANIM_BulletBill_Anim01, - .anim_5 = ANIM_BulletBill_Anim04, - .death = ANIM_BulletBill_Anim05, - .hit = ANIM_BulletBill_Anim05, - .anim_8 = ANIM_BulletBill_Anim01, - .anim_9 = ANIM_BulletBill_Anim01, - .anim_A = ANIM_BulletBill_Anim01, - .anim_B = ANIM_BulletBill_Anim01, - .anim_C = ANIM_BulletBill_Anim01, - .anim_D = ANIM_BulletBill_Anim01, - .anim_E = ANIM_BulletBill_Anim01, - .anim_F = ANIM_BulletBill_Anim01, - }, -}; - -StaticNpc N(NpcData_BulletBill_04) = { - .id = NPC_BulletBill_04, - .settings = &N(NpcSettings_BulletBill), - .pos = { NPC_DISPOSE_LOCATION }, - .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .itemDropChance = 3, - .itemDrops = { - { ITEM_MUSHROOM, 10, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_CYLINDER, - .centerPos = { 0, 0, 0 }, - .wanderSize = { 0 }, - .detectShape = SHAPE_CYLINDER, - .detectPos = { 0, 0, 0 }, - .detectSize = { 0 }, - } - }, - .animations = { - .idle = ANIM_BulletBill_Anim01, - .walk = ANIM_BulletBill_Anim02, - .run = ANIM_BulletBill_Anim03, - .chase = ANIM_BulletBill_Anim03, - .anim_4 = ANIM_BulletBill_Anim01, - .anim_5 = ANIM_BulletBill_Anim04, - .death = ANIM_BulletBill_Anim05, - .hit = ANIM_BulletBill_Anim05, - .anim_8 = ANIM_BulletBill_Anim01, - .anim_9 = ANIM_BulletBill_Anim01, - .anim_A = ANIM_BulletBill_Anim01, - .anim_B = ANIM_BulletBill_Anim01, - .anim_C = ANIM_BulletBill_Anim01, - .anim_D = ANIM_BulletBill_Anim01, - .anim_E = ANIM_BulletBill_Anim01, - .anim_F = ANIM_BulletBill_Anim01, - }, -}; - -StaticNpc N(NpcData_BulletBill_05) = { - .id = NPC_BulletBill_05, - .settings = &N(NpcSettings_BulletBill), - .pos = { NPC_DISPOSE_LOCATION }, - .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .itemDropChance = 3, - .itemDrops = { - { ITEM_MUSHROOM, 10, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_CYLINDER, - .centerPos = { 0, 0, 0 }, - .wanderSize = { 0 }, - .detectShape = SHAPE_CYLINDER, - .detectPos = { 0, 0, 0 }, - .detectSize = { 0 }, - } - }, - .animations = { - .idle = ANIM_BulletBill_Anim01, - .walk = ANIM_BulletBill_Anim02, - .run = ANIM_BulletBill_Anim03, - .chase = ANIM_BulletBill_Anim03, - .anim_4 = ANIM_BulletBill_Anim01, - .anim_5 = ANIM_BulletBill_Anim04, - .death = ANIM_BulletBill_Anim05, - .hit = ANIM_BulletBill_Anim05, - .anim_8 = ANIM_BulletBill_Anim01, - .anim_9 = ANIM_BulletBill_Anim01, - .anim_A = ANIM_BulletBill_Anim01, - .anim_B = ANIM_BulletBill_Anim01, - .anim_C = ANIM_BulletBill_Anim01, - .anim_D = ANIM_BulletBill_Anim01, - .anim_E = ANIM_BulletBill_Anim01, - .anim_F = ANIM_BulletBill_Anim01, - }, -}; - -StaticNpc N(NpcData_BulletBill_06) = { - .id = NPC_BulletBill_06, - .settings = &N(NpcSettings_BulletBill), - .pos = { NPC_DISPOSE_LOCATION }, - .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .itemDropChance = 3, - .itemDrops = { - { ITEM_MUSHROOM, 10, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_CYLINDER, - .centerPos = { 0, 0, 0 }, - .wanderSize = { 0 }, - .detectShape = SHAPE_CYLINDER, - .detectPos = { 0, 0, 0 }, - .detectSize = { 0 }, - } - }, - .animations = { - .idle = ANIM_BulletBill_Anim01, - .walk = ANIM_BulletBill_Anim02, - .run = ANIM_BulletBill_Anim03, - .chase = ANIM_BulletBill_Anim03, - .anim_4 = ANIM_BulletBill_Anim01, - .anim_5 = ANIM_BulletBill_Anim04, - .death = ANIM_BulletBill_Anim05, - .hit = ANIM_BulletBill_Anim05, - .anim_8 = ANIM_BulletBill_Anim01, - .anim_9 = ANIM_BulletBill_Anim01, - .anim_A = ANIM_BulletBill_Anim01, - .anim_B = ANIM_BulletBill_Anim01, - .anim_C = ANIM_BulletBill_Anim01, - .anim_D = ANIM_BulletBill_Anim01, - .anim_E = ANIM_BulletBill_Anim01, - .anim_F = ANIM_BulletBill_Anim01, - }, -}; - -StaticNpc N(NpcData_BulletBill_07) = { - .id = NPC_BulletBill_07, - .settings = &N(NpcSettings_BulletBill), - .pos = { NPC_DISPOSE_LOCATION }, - .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .itemDropChance = 3, - .itemDrops = { - { ITEM_MUSHROOM, 10, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_CYLINDER, - .centerPos = { 0, 0, 0 }, - .wanderSize = { 0 }, - .detectShape = SHAPE_CYLINDER, - .detectPos = { 0, 0, 0 }, - .detectSize = { 0 }, - } - }, - .animations = { - .idle = ANIM_BulletBill_Anim01, - .walk = ANIM_BulletBill_Anim02, - .run = ANIM_BulletBill_Anim03, - .chase = ANIM_BulletBill_Anim03, - .anim_4 = ANIM_BulletBill_Anim01, - .anim_5 = ANIM_BulletBill_Anim04, - .death = ANIM_BulletBill_Anim05, - .hit = ANIM_BulletBill_Anim05, - .anim_8 = ANIM_BulletBill_Anim01, - .anim_9 = ANIM_BulletBill_Anim01, - .anim_A = ANIM_BulletBill_Anim01, - .anim_B = ANIM_BulletBill_Anim01, - .anim_C = ANIM_BulletBill_Anim01, - .anim_D = ANIM_BulletBill_Anim01, - .anim_E = ANIM_BulletBill_Anim01, - .anim_F = ANIM_BulletBill_Anim01, - }, -}; - -StaticNpc N(NpcData_BulletBill_08) = { - .id = NPC_BulletBill_08, - .settings = &N(NpcSettings_BulletBill), - .pos = { NPC_DISPOSE_LOCATION }, - .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .itemDropChance = 3, - .itemDrops = { - { ITEM_MUSHROOM, 10, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_CYLINDER, - .centerPos = { 0, 0, 0 }, - .wanderSize = { 0 }, - .detectShape = SHAPE_CYLINDER, - .detectPos = { 0, 0, 0 }, - .detectSize = { 0 }, - } - }, - .animations = { - .idle = ANIM_BulletBill_Anim01, - .walk = ANIM_BulletBill_Anim02, - .run = ANIM_BulletBill_Anim03, - .chase = ANIM_BulletBill_Anim03, - .anim_4 = ANIM_BulletBill_Anim01, - .anim_5 = ANIM_BulletBill_Anim04, - .death = ANIM_BulletBill_Anim05, - .hit = ANIM_BulletBill_Anim05, - .anim_8 = ANIM_BulletBill_Anim01, - .anim_9 = ANIM_BulletBill_Anim01, - .anim_A = ANIM_BulletBill_Anim01, - .anim_B = ANIM_BulletBill_Anim01, - .anim_C = ANIM_BulletBill_Anim01, - .anim_D = ANIM_BulletBill_Anim01, - .anim_E = ANIM_BulletBill_Anim01, - .anim_F = ANIM_BulletBill_Anim01, - }, -}; - -StaticNpc N(NpcData_BulletBill_09) = { - .id = NPC_BulletBill_09, - .settings = &N(NpcSettings_BulletBill), - .pos = { NPC_DISPOSE_LOCATION }, - .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .itemDropChance = 3, - .itemDrops = { - { ITEM_MUSHROOM, 10, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_CYLINDER, - .centerPos = { 0, 0, 0 }, - .wanderSize = { 0 }, - .detectShape = SHAPE_CYLINDER, - .detectPos = { 0, 0, 0 }, - .detectSize = { 0 }, - } - }, - .animations = { - .idle = ANIM_BulletBill_Anim01, - .walk = ANIM_BulletBill_Anim02, - .run = ANIM_BulletBill_Anim03, - .chase = ANIM_BulletBill_Anim03, - .anim_4 = ANIM_BulletBill_Anim01, - .anim_5 = ANIM_BulletBill_Anim04, - .death = ANIM_BulletBill_Anim05, - .hit = ANIM_BulletBill_Anim05, - .anim_8 = ANIM_BulletBill_Anim01, - .anim_9 = ANIM_BulletBill_Anim01, - .anim_A = ANIM_BulletBill_Anim01, - .anim_B = ANIM_BulletBill_Anim01, - .anim_C = ANIM_BulletBill_Anim01, - .anim_D = ANIM_BulletBill_Anim01, - .anim_E = ANIM_BulletBill_Anim01, - .anim_F = ANIM_BulletBill_Anim01, - }, -}; - -StaticNpc N(NpcData_BulletBill_10) = { - .id = NPC_BulletBill_10, - .settings = &N(NpcSettings_BulletBill), - .pos = { NPC_DISPOSE_LOCATION }, - .yaw = 270, - .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, - .initVarCount = 1, - .initVar = { .value = 0 }, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .itemDropChance = 3, - .itemDrops = { - { ITEM_MUSHROOM, 10, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - }, - .territory = { - .wander = { - .isFlying = TRUE, - .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, - .wanderShape = SHAPE_CYLINDER, - .centerPos = { 0, 0, 0 }, - .wanderSize = { 0 }, - .detectShape = SHAPE_CYLINDER, - .detectPos = { 0, 0, 0 }, - .detectSize = { 0 }, - } - }, - .animations = { - .idle = ANIM_BulletBill_Anim01, - .walk = ANIM_BulletBill_Anim02, - .run = ANIM_BulletBill_Anim03, - .chase = ANIM_BulletBill_Anim03, - .anim_4 = ANIM_BulletBill_Anim01, - .anim_5 = ANIM_BulletBill_Anim04, - .death = ANIM_BulletBill_Anim05, - .hit = ANIM_BulletBill_Anim05, - .anim_8 = ANIM_BulletBill_Anim01, - .anim_9 = ANIM_BulletBill_Anim01, - .anim_A = ANIM_BulletBill_Anim01, - .anim_B = ANIM_BulletBill_Anim01, - .anim_C = ANIM_BulletBill_Anim01, - .anim_D = ANIM_BulletBill_Anim01, - .anim_E = ANIM_BulletBill_Anim01, - .anim_F = ANIM_BulletBill_Anim01, - }, -}; +StaticNpc N(NpcData_BulletBill_01) = BULLET_BILL_NPC(NPC_BulletBill_01); +StaticNpc N(NpcData_BulletBill_02) = BULLET_BILL_NPC(NPC_BulletBill_02); +StaticNpc N(NpcData_BulletBill_03) = BULLET_BILL_NPC(NPC_BulletBill_03); +StaticNpc N(NpcData_BulletBill_04) = BULLET_BILL_NPC(NPC_BulletBill_04); +StaticNpc N(NpcData_BulletBill_05) = BULLET_BILL_NPC(NPC_BulletBill_05); +StaticNpc N(NpcData_BulletBill_06) = BULLET_BILL_NPC(NPC_BulletBill_06); +StaticNpc N(NpcData_BulletBill_07) = BULLET_BILL_NPC(NPC_BulletBill_07); +StaticNpc N(NpcData_BulletBill_08) = BULLET_BILL_NPC(NPC_BulletBill_08); +StaticNpc N(NpcData_BulletBill_09) = BULLET_BILL_NPC(NPC_BulletBill_09); +StaticNpc N(NpcData_BulletBill_10) = BULLET_BILL_NPC(NPC_BulletBill_10); StaticNpc N(NpcData_KoopaBros)[] = { { diff --git a/src/world/area_tst/tst_04/tst_04_4_npc.c b/src/world/area_tst/tst_04/tst_04_4_npc.c index cb90c69c63..f10660fa6d 100644 --- a/src/world/area_tst/tst_04/tst_04_4_npc.c +++ b/src/world/area_tst/tst_04/tst_04_4_npc.c @@ -51,7 +51,7 @@ NpcSettings N(NpcSettings_Goompa) = { .flags = ENEMY_FLAGS_1 | ENEMY_FLAGS_4, }; -StaticNpc N(NpcData_Goompa) = { +StaticNpc N(NpcData_GoombaFamily) = { .id = NPC_Goompa, .settings = &N(NpcSettings_Goompa), .pos = { 80.0f, 40.0f, -84.0f }, @@ -60,6 +60,6 @@ StaticNpc N(NpcData_Goompa) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(NpcData_Goompa)), + NPC_GROUP(N(NpcData_GoombaFamily)), {} }; diff --git a/src/world/common/atomic/QuizmoData.inc.c b/src/world/common/atomic/QuizmoData.inc.c index 9162345dea..c2f0f1a935 100644 --- a/src/world/common/atomic/QuizmoData.inc.c +++ b/src/world/common/atomic/QuizmoData.inc.c @@ -690,7 +690,7 @@ EvtScript N(EVS_Quizmo_Npc_AI) = { }; // primary quizmo NpcSettings -NpcSettings N(Quizmo_NpcSettings) = { +NpcSettings N(NpcSettings_ChuckQuizmo) = { .defaultAnim = ANIM_ChuckQuizmo_Idle, .height = 35, .radius = 28, diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index 3e25dfeb30..d328b7333d 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -39,14 +39,32 @@ extern s16 MessagePlural; extern s16 MessageSingular; BSS s32 N(Quizmo_Worker); -BSS s32 N(pad_D_8024EFA4); -BSS s32 N(Quizmo_ScriptArray)[4]; -BSS s32 N(Quizmo_AnswerResult); -MAP_STATIC_PAD(1,quizmo_unk) +// needed for kmr_02 +#ifndef QUIZMO_PRE_STATIC_PAD +MAP_STATIC_PAD(1,quizmo_pre_array) +#endif +BSS s32 N(Quizmo_ScriptArray)[5]; +MAP_STATIC_PAD(1,quizmo_post_array) BSS EffectInstance* N(Quizmo_StageEffect); BSS EffectInstance* N(Quizmo_AudienceEffect); BSS EffectInstance* N(Quizmo_VannaTEffect); +enum { + QUIZ_ARRAY_SAVED_FOV = ArrayVar(0), + QUIZ_ARRAY_ORIGIN_X = ArrayVar(1), + QUIZ_ARRAY_ORIGIN_Y = ArrayVar(2), + QUIZ_ARRAY_ORIGIN_Z = ArrayVar(3), + QUIZ_ARRAY_ANSWER_RESULT = ArrayVar(4), +}; + +enum { + QUIZ_ARRAY_INDEX_SAVED_FOV = 0, + QUIZ_ARRAY_INDEX_ORIGIN_X = 1, + QUIZ_ARRAY_INDEX_ORIGIN_Y = 2, + QUIZ_ARRAY_INDEX_ORIGIN_Z = 3, + QUIZ_ARRAY_INDEX_ANSWER_RESULT = 4, +}; + #include "world/common/complete/GiveReward.inc.c" // values for Quizmo npc init vars @@ -61,6 +79,8 @@ enum { }; enum { + QUIZ_MAP_KMR_02 = 0, + QUIZ_COUNT_KMR = 1, // area_mac QUIZ_MAP_MAC_00 = 0, QUIZ_MAP_MAC_01 = 1, @@ -298,17 +318,17 @@ API_CALLABLE(N(Quizmo_CreateStage)) { if (isInitialCall) { N(Quizmo_StageEffect) = fx_quizmo_stage(0, - evt_get_variable(script, ArrayVar(1)), - evt_get_variable(script, ArrayVar(2)), - evt_get_variable(script, ArrayVar(3))); + evt_get_variable(script, QUIZ_ARRAY_ORIGIN_X), + evt_get_variable(script, QUIZ_ARRAY_ORIGIN_Y), + evt_get_variable(script, QUIZ_ARRAY_ORIGIN_Z)); N(Quizmo_AudienceEffect) = fx_quizmo_audience(0, - evt_get_variable(script, ArrayVar(1)), - evt_get_variable(script, ArrayVar(2)), - evt_get_variable(script, ArrayVar(3))); + evt_get_variable(script, QUIZ_ARRAY_ORIGIN_X), + evt_get_variable(script, QUIZ_ARRAY_ORIGIN_Y), + evt_get_variable(script, QUIZ_ARRAY_ORIGIN_Z)); N(Quizmo_VannaTEffect) = fx_quizmo_assistant(0, - evt_get_variable(script, ArrayVar(1)), - evt_get_variable(script, ArrayVar(2)), - evt_get_variable(script, ArrayVar(3)), + evt_get_variable(script, QUIZ_ARRAY_ORIGIN_X), + evt_get_variable(script, QUIZ_ARRAY_ORIGIN_Y), + evt_get_variable(script, QUIZ_ARRAY_ORIGIN_Z), 1.0f, 0); stageData = N(Quizmo_StageEffect)->data.quizmoStage; @@ -431,8 +451,8 @@ API_CALLABLE(N(Quizmo_AddViewRelativeOffset)) { Bytecode outVarZ = *args++; s32 cameraYaw = gCameras[gCurrentCameraID].currentYaw; - s32 outX = evt_get_variable(script, ArrayVar(1)) - (z * cos_deg(cameraYaw)); - s32 outZ = evt_get_variable(script, ArrayVar(3)) - (z * sin_deg(cameraYaw)); + s32 outX = evt_get_variable(script, QUIZ_ARRAY_ORIGIN_X) - (z * cos_deg(cameraYaw)); + s32 outZ = evt_get_variable(script, QUIZ_ARRAY_ORIGIN_Z) - (z * sin_deg(cameraYaw)); outX -= x; outZ -= y; @@ -511,7 +531,7 @@ API_CALLABLE(N(Quizmo_UpdatePartnerPosition)) { } void N(Quizmo_CreateReactionEffect)(void) { - s32 result = evt_get_variable(NULL, N(Quizmo_AnswerResult)); + s32 result = evt_get_variable(NULL, N(Quizmo_ScriptArray[QUIZ_ARRAY_INDEX_ANSWER_RESULT])); if (result == 1) { fx_quizmo_answer(0, 0, 0, 0); @@ -540,7 +560,7 @@ EvtScript N(EVS_Quizmo_Exit) = { }; EvtScript N(EVS_Quizmo_SetQuizCamera) = { - EVT_CALL(N(Quizmo_GetCamVfov), 0, ArrayVar(0)) + EVT_CALL(N(Quizmo_GetCamVfov), 0, QUIZ_ARRAY_SAVED_FOV) EVT_CALL(N(Quizmo_SetCamVfov), 0, 25) //TODO EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, 0, LVar0, LVar1, LVar2) @@ -583,7 +603,7 @@ EvtScript N(EVS_Quizmo_OtherCamScript) = { }; EvtScript N(EVS_Quizmo_ResetCamera) = { - EVT_CALL(N(Quizmo_SetCamVfov), 0, ArrayVar(0)) + EVT_CALL(N(Quizmo_SetCamVfov), 0, QUIZ_ARRAY_SAVED_FOV) EVT_CALL(PanToTarget, 0, 0, 0) EVT_RETURN EVT_END @@ -591,7 +611,7 @@ EvtScript N(EVS_Quizmo_ResetCamera) = { EvtScript N(EVS_Quizmo_MovePlayerToPodium) = { EVT_WAIT(20) - EVT_CALL(N(Quizmo_AddViewRelativeOffset), ArrayVar(1), ArrayVar(3), 83, LVar0, LVar1) + EVT_CALL(N(Quizmo_AddViewRelativeOffset), QUIZ_ARRAY_ORIGIN_X, QUIZ_ARRAY_ORIGIN_Z, 83, LVar0, LVar1) EVT_THREAD EVT_SETF(LVar2, 0) EVT_LOOP(60) @@ -601,20 +621,20 @@ EvtScript N(EVS_Quizmo_MovePlayerToPodium) = { EVT_MULF(LVar4, LVar2) EVT_DIVF(LVar3, 60) EVT_DIVF(LVar4, 60) - EVT_ADDF(LVar3, ArrayVar(1)) - EVT_ADDF(LVar4, ArrayVar(3)) - EVT_CALL(SetPlayerPos, LVar3, ArrayVar(2), LVar4) + EVT_ADDF(LVar3, QUIZ_ARRAY_ORIGIN_X) + EVT_ADDF(LVar4, QUIZ_ARRAY_ORIGIN_Z) + EVT_CALL(SetPlayerPos, LVar3, QUIZ_ARRAY_ORIGIN_Y, LVar4) EVT_ADDF(LVar2, 1) EVT_WAIT(1) EVT_END_LOOP EVT_SETF(LVar3, LVar0) EVT_SETF(LVar4, LVar1) - EVT_ADDF(LVar3, ArrayVar(1)) - EVT_ADDF(LVar4, ArrayVar(3)) - EVT_CALL(SetPlayerPos, LVar3, ArrayVar(2), LVar4) + EVT_ADDF(LVar3, QUIZ_ARRAY_ORIGIN_X) + EVT_ADDF(LVar4, QUIZ_ARRAY_ORIGIN_Z) + EVT_CALL(SetPlayerPos, LVar3, QUIZ_ARRAY_ORIGIN_Y, LVar4) EVT_END_THREAD EVT_CALL(N(Quizmo_SpinPlayer)) - EVT_CALL(func_802D2884, ArrayVar(1), ArrayVar(3), 0) + EVT_CALL(func_802D2884, QUIZ_ARRAY_ORIGIN_X, QUIZ_ARRAY_ORIGIN_Z, 0) EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_RETURN EVT_END @@ -623,7 +643,7 @@ EvtScript N(EVS_Quizmo_MovePlayerToPodium) = { EvtScript N(EVS_Quizmo_MovePartnerToPodium) = { EVT_CALL(GetNpcPos, NPC_PARTNER, LVarA, LVarB, LVarC) EVT_CALL(N(Quizmo_AddViewRelativeOffset), LVarA, LVarC, 108, LVar0, LVar1) - EVT_SETF(LVar5, ArrayVar(2)) + EVT_SETF(LVar5, QUIZ_ARRAY_ORIGIN_Y) EVT_SUBF(LVar5, LVarB) EVT_THREAD EVT_CALL(N(Quizmo_UpdatePartnerPosition)) @@ -656,7 +676,7 @@ EvtScript N(EVS_Quizmo_MoveQuizmoToMicrophone) = { EVT_DIVF(LVar4, 60) EVT_ADDF(LVar3, LVarA) EVT_ADDF(LVar4, LVarC) - EVT_CALL(SetNpcPos, CHUCK_QUIZMO_NPC_ID, LVar3, ArrayVar(2), LVar4) + EVT_CALL(SetNpcPos, CHUCK_QUIZMO_NPC_ID, LVar3, QUIZ_ARRAY_ORIGIN_Y, LVar4) EVT_ADDF(LVar2, 1) EVT_WAIT(1) EVT_END_LOOP @@ -860,7 +880,7 @@ EvtScript N(EVS_Quizmo_PlayerReaction_RightAnswer) = { EVT_WAIT(2) EVT_END_LOOP EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_CALL(SetPlayerPos, LVar0, ArrayVar(2), LVar2) + EVT_CALL(SetPlayerPos, LVar0, QUIZ_ARRAY_ORIGIN_Y, LVar2) EVT_WAIT(1) EVT_RETURN EVT_END @@ -877,16 +897,16 @@ EvtScript N(EVS_Quizmo_PlayerReaction_WrongAnswer) = { EvtScript N(EVS_Quizmo_ReturnPlayerToOriginalPos) = { EVT_THREAD - EVT_CALL(N(Quizmo_AddViewRelativeOffset), ArrayVar(1), ArrayVar(3), 25, LVar0, LVar1) - EVT_SETF(LVar2, ArrayVar(1)) + EVT_CALL(N(Quizmo_AddViewRelativeOffset), QUIZ_ARRAY_ORIGIN_X, QUIZ_ARRAY_ORIGIN_Z, 25, LVar0, LVar1) + EVT_SETF(LVar2, QUIZ_ARRAY_ORIGIN_X) EVT_ADDF(LVar2, LVar0) - EVT_SETF(LVar3, ArrayVar(3)) + EVT_SETF(LVar3, QUIZ_ARRAY_ORIGIN_Z) EVT_ADDF(LVar3, LVar1) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_JUMP) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar2, LVar3, 40) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) EVT_END_THREAD - EVT_CALL(PlayerMoveTo, ArrayVar(1), ArrayVar(3), 40) + EVT_CALL(PlayerMoveTo, QUIZ_ARRAY_ORIGIN_X, QUIZ_ARRAY_ORIGIN_Z, 40) EVT_RETURN EVT_END }; @@ -928,7 +948,7 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_SET(LVar0, 0) EVT_RETURN EVT_END_IF - EVT_CALL(GetPlayerPos, ArrayVar(1), ArrayVar(2), ArrayVar(3)) + EVT_CALL(GetPlayerPos, QUIZ_ARRAY_ORIGIN_X, QUIZ_ARRAY_ORIGIN_Y, QUIZ_ARRAY_ORIGIN_Z) EVT_CALL(NpcFacePlayer, NPC_SELF, 16) EVT_IF_EQ(GB_CompletedQuizzes, 63) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ChuckQuizmo_Talk, ANIM_ChuckQuizmo_Idle, 0, MSG_MGM_000A) @@ -988,18 +1008,18 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_WAIT(15) EVT_CALL(PlaySound, 141) EVT_CALL(N(Quizmo_UnkStageEffectMode), LVar0) - EVT_SET(ArrayVar(4), 0) + EVT_SET(QUIZ_ARRAY_ANSWER_RESULT, 0) EVT_CALL(N(Quizmo_CreateWorker)) EVT_WAIT(40) EVT_CALL(N(Quizmo_UpdateRecords)) EVT_THREAD EVT_WAIT(110) EVT_CALL(CloseChoice) - EVT_SET(ArrayVar(4), 0) + EVT_SET(QUIZ_ARRAY_ANSWER_RESULT, 0) EVT_END_THREAD EVT_IF_EQ(LVar0, 1) EVT_CALL(SetNpcAnimation, CHUCK_QUIZMO_NPC_ID, ANIM_ChuckQuizmo_OpenCorrect) - EVT_SET(ArrayVar(4), 1) + EVT_SET(QUIZ_ARRAY_ANSWER_RESULT, 1) EVT_THREAD EVT_CALL(N(Quizmo_SetStageLightsDelay), 1) EVT_WAIT(6) @@ -1087,7 +1107,7 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_SET(LVar0, 1) EVT_ELSE EVT_CALL(SetNpcAnimation, CHUCK_QUIZMO_NPC_ID, ANIM_ChuckQuizmo_OpenWrong) - EVT_SET(ArrayVar(4), 2) + EVT_SET(QUIZ_ARRAY_ANSWER_RESULT, 2) EVT_CALL(PlaySound, SOUND_MENU_ERROR) EVT_CALL(PlaySound, SOUND_8B) EVT_EXEC_GET_TID(N(EVS_Quizmo_WrongAnswer), LVar1) @@ -1170,7 +1190,7 @@ EvtScript N(EVS_Quizmo_Npc_AI) = { }; // primary quizmo NpcSettings -NpcSettings N(Quizmo_NpcSettings) = { +NpcSettings N(NpcSettings_ChuckQuizmo) = { .defaultAnim = ANIM_ChuckQuizmo_Idle, .height = 35, .radius = 28, diff --git a/src/world/common/complete/ToadHouseBlanketAnim.inc.c b/src/world/common/complete/ToadHouseBlanketAnim.inc.c index 6bcf179fb7..29348894c2 100644 --- a/src/world/common/complete/ToadHouseBlanketAnim.inc.c +++ b/src/world/common/complete/ToadHouseBlanketAnim.inc.c @@ -125,7 +125,7 @@ StaticAnimatorNode* N(D_80248D8C_971F4C)[] = { &N(D_80248CB0_971E70), &N(D_80248C84_971E44), &N(D_80248C58_971E18), &N(D_80248C2C_971DEC), &N(D_80248C00_971DC0), &N(D_80248BD4_971D94), &N(D_80248BA8_971D68), &N(D_80248B7C_971D3C), &N(D_80248B50_971D10), &N(D_80248B24_971CE4), &N(D_80248AF8_971CB8), &N(D_80248ACC_971C8C), - &N(D_80248AA0_971C60), 0x00000000, 0x00000000, + &N(D_80248AA0_971C60), NULL }; #include "world/toad_house/blanket.vtx.inc.c" diff --git a/src/world/common/enemy/ai/TackleAI.inc.c b/src/world/common/enemy/ai/TackleAI.inc.c index 5c9d223bae..c0931430ae 100644 --- a/src/world/common/enemy/ai/TackleAI.inc.c +++ b/src/world/common/enemy/ai/TackleAI.inc.c @@ -1,3 +1,5 @@ +#ifndef _TACKLE_AI_H +#define _TACKLE_AI_H // TackleAI // used by Koopas, Koopatrols, Spinys, Buzzy Beetles @@ -155,3 +157,4 @@ ApiStatus N(TackleAI_Main)(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } +#endif diff --git a/src/world/common/enemy/complete/BombshellBill.h b/src/world/common/enemy/complete/BombshellBill.h new file mode 100644 index 0000000000..17b140b823 --- /dev/null +++ b/src/world/common/enemy/complete/BombshellBill.h @@ -0,0 +1,94 @@ +#include "common.h" +#include "sprite/npc/BulletBill.h" + +#define BOMBSHELL_BLASTER_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = STANDARD_HEART_DROPS(4), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 1, \ + .maxCoinBonus = 3, \ +} + +#define BOMBSHELL_BLASTER_NO_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define BOMBSHELL_BLASTER_ANIMS \ +{ \ + .idle = ANIM_BillBlaster_Gold_Anim01, \ + .walk = ANIM_BillBlaster_Gold_Anim01, \ + .run = ANIM_BillBlaster_Gold_Anim01, \ + .chase = ANIM_BillBlaster_Gold_Anim01, \ + .anim_4 = ANIM_BillBlaster_Gold_Anim01, \ + .anim_5 = ANIM_BillBlaster_Gold_Anim01, \ + .death = ANIM_BillBlaster_Gold_Anim03, \ + .hit = ANIM_BillBlaster_Gold_Anim03, \ + .anim_8 = ANIM_BillBlaster_Gold_Anim02, \ + .anim_9 = ANIM_BillBlaster_Gold_Anim01, \ + .anim_A = ANIM_BillBlaster_Gold_Anim01, \ + .anim_B = ANIM_BillBlaster_Gold_Anim01, \ + .anim_C = ANIM_BillBlaster_Gold_Anim01, \ + .anim_D = ANIM_BillBlaster_Gold_Anim01, \ + .anim_E = ANIM_BillBlaster_Gold_Anim01, \ + .anim_F = ANIM_BillBlaster_Gold_Anim01, \ +} + +#define BOMBSHELL_BILL_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 3, \ + .itemDrops = { \ + { ITEM_SUPER_SHROOM, 10, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(3), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 1, \ + .maxCoinBonus = 3, \ +} + +#define BOMBSHELL_BILL_ANIMS \ +{ \ + .idle = ANIM_BulletBill_Gold_Anim00, \ + .walk = ANIM_BulletBill_Gold_Anim02, \ + .run = ANIM_BulletBill_Gold_Anim03, \ + .chase = ANIM_BulletBill_Gold_Anim03, \ + .anim_4 = ANIM_BulletBill_Gold_Anim00, \ + .anim_5 = ANIM_BulletBill_Gold_Anim04, \ + .death = ANIM_BulletBill_Gold_Anim05, \ + .hit = ANIM_BulletBill_Gold_Anim05, \ + .anim_8 = ANIM_BulletBill_Gold_Anim00, \ + .anim_9 = ANIM_BulletBill_Gold_Anim00, \ + .anim_A = ANIM_BulletBill_Gold_Anim00, \ + .anim_B = ANIM_BulletBill_Gold_Anim00, \ + .anim_C = ANIM_BulletBill_Gold_Anim00, \ + .anim_D = ANIM_BulletBill_Gold_Anim00, \ + .anim_E = ANIM_BulletBill_Gold_Anim00, \ + .anim_F = ANIM_BulletBill_Gold_Anim00, \ +} + +#define BOMBSHELL_BILL_NPC(npcID) \ +{ \ + .id = npcID, \ + .settings = &N(NpcSettings_BulletBill), \ + .pos = { NPC_DISPOSE_LOCATION }, \ + .yaw = 0, \ + .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000 | ENEMY_FLAGS_200000, \ + .drops = BOMBSHELL_BILL_DROPS, \ + .territory = { \ + .wander = { \ + .isFlying = TRUE, \ + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, \ + .wanderShape = SHAPE_CYLINDER, \ + .centerPos = { 0, 0, 0 }, \ + .wanderSize = { 0 }, \ + .detectShape = SHAPE_CYLINDER, \ + .detectPos = { 0, 0, 0 }, \ + .detectSize = { 0 }, \ + } \ + }, \ + .animations = BOMBSHELL_BILL_ANIMS, \ +} diff --git a/src/world/common/enemy/complete/BulletBill.h b/src/world/common/enemy/complete/BulletBill.h new file mode 100644 index 0000000000..b5a2b808bf --- /dev/null +++ b/src/world/common/enemy/complete/BulletBill.h @@ -0,0 +1,94 @@ +#include "common.h" +#include "sprite/npc/BulletBill.h" + +#define BILL_BLASTER_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = STANDARD_HEART_DROPS(2), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 1, \ + .maxCoinBonus = 1, \ +} + +#define BILL_BLASTER_NO_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define BILL_BLASTER_ANIMS \ +{ \ + .idle = ANIM_BillBlaster_Anim01, \ + .walk = ANIM_BillBlaster_Anim01, \ + .run = ANIM_BillBlaster_Anim01, \ + .chase = ANIM_BillBlaster_Anim01, \ + .anim_4 = ANIM_BillBlaster_Anim01, \ + .anim_5 = ANIM_BillBlaster_Anim01, \ + .death = ANIM_BillBlaster_Anim03, \ + .hit = ANIM_BillBlaster_Anim03, \ + .anim_8 = ANIM_BillBlaster_Anim01, \ + .anim_9 = ANIM_BillBlaster_Anim01, \ + .anim_A = ANIM_BillBlaster_Anim01, \ + .anim_B = ANIM_BillBlaster_Anim01, \ + .anim_C = ANIM_BillBlaster_Anim01, \ + .anim_D = ANIM_BillBlaster_Anim01, \ + .anim_E = ANIM_BillBlaster_Anim01, \ + .anim_F = ANIM_BillBlaster_Anim01, \ +} + +#define BULLET_BILL_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 3, \ + .itemDrops = { \ + { ITEM_MUSHROOM, 10, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(2), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ +} + +#define BULLET_BILL_ANIMS \ +{ \ + .idle = ANIM_BulletBill_Anim01, \ + .walk = ANIM_BulletBill_Anim02, \ + .run = ANIM_BulletBill_Anim03, \ + .chase = ANIM_BulletBill_Anim03, \ + .anim_4 = ANIM_BulletBill_Anim01, \ + .anim_5 = ANIM_BulletBill_Anim04, \ + .death = ANIM_BulletBill_Anim05, \ + .hit = ANIM_BulletBill_Anim05, \ + .anim_8 = ANIM_BulletBill_Anim01, \ + .anim_9 = ANIM_BulletBill_Anim01, \ + .anim_A = ANIM_BulletBill_Anim01, \ + .anim_B = ANIM_BulletBill_Anim01, \ + .anim_C = ANIM_BulletBill_Anim01, \ + .anim_D = ANIM_BulletBill_Anim01, \ + .anim_E = ANIM_BulletBill_Anim01, \ + .anim_F = ANIM_BulletBill_Anim01, \ +} + +#define BULLET_BILL_NPC(npcID) \ +{ \ + .id = npcID, \ + .settings = &N(NpcSettings_BulletBill), \ + .pos = { NPC_DISPOSE_LOCATION }, \ + .yaw = 270, \ + .flags = ENEMY_FLAGS_4 | ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_80000, \ + .initVarCount = 1, \ + .initVar = { .value = 0 }, \ + .drops = BULLET_BILL_DROPS, \ + .territory = { \ + .wander = { \ + .isFlying = TRUE, \ + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, \ + .wanderShape = SHAPE_CYLINDER, \ + .centerPos = { 0, 0, 0 }, \ + .wanderSize = { 0 }, \ + .detectShape = SHAPE_CYLINDER, \ + .detectPos = { 0, 0, 0 }, \ + .detectSize = { 0 }, \ + } \ + }, \ + .animations = BULLET_BILL_ANIMS, \ +} diff --git a/src/world/common/enemy/complete/DryBones.h b/src/world/common/enemy/complete/DryBones.h new file mode 100644 index 0000000000..eaa33f07c2 --- /dev/null +++ b/src/world/common/enemy/complete/DryBones.h @@ -0,0 +1,79 @@ +#include "common.h" +#include "sprite/npc/DryBones.h" + +#define DRY_BONES_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 5, \ + .itemDrops = { \ + { ITEM_SUPER_SHROOM, 10, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(2), \ + .flowerDrops = STANDARD_FLOWER_DROPS(4), \ + .minCoinBonus = 0, \ + .maxCoinBonus = 4, \ +} + +#define DRY_BONES_ANIMS \ +{ \ + .idle = ANIM_DryBones_Anim02, \ + .walk = ANIM_DryBones_Anim03, \ + .run = ANIM_DryBones_Anim04, \ + .chase = ANIM_DryBones_Anim04, \ + .anim_4 = ANIM_DryBones_Anim02, \ + .anim_5 = ANIM_DryBones_Anim02, \ + .death = ANIM_DryBones_Anim07, \ + .hit = ANIM_DryBones_Anim07, \ + .anim_8 = ANIM_DryBones_Anim05, \ + .anim_9 = ANIM_DryBones_Anim06, \ + .anim_A = ANIM_DryBones_Anim02, \ + .anim_B = ANIM_DryBones_Anim02, \ + .anim_C = ANIM_DryBones_Anim02, \ + .anim_D = ANIM_DryBones_Anim02, \ + .anim_E = ANIM_DryBones_Anim02, \ + .anim_F = ANIM_DryBones_Anim02, \ +} + +#define DRY_BONES_BONE_HITBOX(npcID) \ +{ \ + .id = npcID, \ + .settings = &N(NpcSettings_ThrownBone), \ + .pos = { NPC_DISPOSE_LOCATION }, \ + .yaw = 90, \ + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, \ + .drops = { \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ + }, \ + .territory = { \ + .wander = { \ + .isFlying = TRUE, \ + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, \ + .wanderShape = SHAPE_CYLINDER, \ + .centerPos = { NPC_DISPOSE_LOCATION }, \ + .wanderSize = { 0 }, \ + .detectShape = SHAPE_CYLINDER, \ + .detectPos = { NPC_DISPOSE_LOCATION }, \ + .detectSize = { 0 }, \ + } \ + }, \ + .animations = { \ + .idle = ANIM_ThrownBone_Still, \ + .walk = ANIM_ThrownBone_Still, \ + .run = ANIM_ThrownBone_Still, \ + .chase = ANIM_ThrownBone_Still, \ + .anim_4 = ANIM_ThrownBone_Still, \ + .anim_5 = ANIM_ThrownBone_Still, \ + .death = ANIM_ThrownBone_Still, \ + .hit = ANIM_ThrownBone_Still, \ + .anim_8 = ANIM_ThrownBone_Still, \ + .anim_9 = ANIM_ThrownBone_Still, \ + .anim_A = ANIM_ThrownBone_Still, \ + .anim_B = ANIM_ThrownBone_Still, \ + .anim_C = ANIM_ThrownBone_Still, \ + .anim_D = ANIM_ThrownBone_Still, \ + .anim_E = ANIM_ThrownBone_Still, \ + .anim_F = ANIM_ThrownBone_Still, \ + }, \ +} diff --git a/src/world/common/enemy/complete/DryBones.inc.c b/src/world/common/enemy/complete/DryBones.inc.c new file mode 100644 index 0000000000..90ecb40648 --- /dev/null +++ b/src/world/common/enemy/complete/DryBones.inc.c @@ -0,0 +1,117 @@ +#include "DryBones.h" + +#include "world/common/enemy/ai/RangedAttackAI.inc.c" +#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" + +EvtScript N(EVS_NpcDefeat_ThrownBone) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(SetSelfVar, 0, 5) + 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_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +MobileAISettings N(AISettings_DryBones) = { + .moveSpeed = 2.0f, + .moveTime = 20, + .waitTime = 3, + .alertRadius = 120.0f, + .alertOffsetDist = 120.0f, + .playerSearchInterval = 2, + .chaseSpeed = 1.0f, + .chaseRadius = 150.0f, + .chaseOffsetDist = 150.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_DryBones) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetSelfVar, 1, 15) + EVT_CALL(SetSelfVar, 2, 10) + EVT_CALL(SetSelfVar, 3, 2) + EVT_CALL(N(RangedAttackAI_Main), EVT_PTR(N(AISettings_DryBones))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_DryBones) = { + .height = 32, + .radius = 24, + .level = 30, + .ai = &N(EVS_NpcAI_DryBones), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +MobileAISettings N(AISettings_ThrownBone) = { + .moveSpeed = 7.5f, + .alertRadius = 1.1f, + .alertOffsetDist = 0.18f, + .playerSearchInterval = -1, +}; + +EvtScript N(EVS_NpcAI_ThrownBone) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetSelfVar, 1, 3) + EVT_CALL(SetSelfVar, 2, 15) + EVT_CALL(SetSelfVar, 3, 15) + EVT_CALL(N(ProjectileAI_Main), EVT_PTR(N(AISettings_ThrownBone))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NoAI_ThrownBone) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_ThrownBone) = { + EVT_CALL(N(GetEncounterEnemyIsOwner)) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NoAI_ThrownBone))) + EVT_CALL(GetOwnerEncounterTrigger, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_HAMMER) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_SPIN) + EVT_CALL(SetSelfVar, 0, 3) + EVT_CALL(N(ProjectileAI_Reflect)) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_JUMP) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_PARTNER) + EVT_CALL(SetSelfVar, 0, 4) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2, 0, 0) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_CALL(func_800457F8) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_ThrownBone))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_ThrownBone) = { + .height = 12, + .radius = 12, + .ai = &N(EVS_NpcAI_ThrownBone), + .onHit = &N(EVS_NpcHit_ThrownBone), + .onDefeat = &N(EVS_NpcDefeat_ThrownBone), + .actionFlags = AI_ACTION_08, +}; diff --git a/src/world/common/enemy/complete/FlyingMagikoopa.h b/src/world/common/enemy/complete/FlyingMagikoopa.h new file mode 100644 index 0000000000..9a10f026d2 --- /dev/null +++ b/src/world/common/enemy/complete/FlyingMagikoopa.h @@ -0,0 +1,71 @@ +#include "common.h" +#include "sprite/npc/Magikoopa.h" +#include "sprite/npc/FlyingMagikoopa.h" + +#define FLYING_MAGIKOOPA_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 5, \ + .itemDrops = { \ + { ITEM_SUPER_SHROOM, 5, 0 }, \ + { ITEM_MAPLE_SYRUP, 5, 0 }, \ + { ITEM_THUNDER_RAGE, 5, 0 }, \ + { ITEM_STOP_WATCH, 5, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(2), \ + .flowerDrops = STANDARD_FLOWER_DROPS(5), \ + .minCoinBonus = 1, \ + .maxCoinBonus = 3, \ +} + +#define FLYING_MAGIKOOPA_ANIMS \ +{ \ + .idle = ANIM_FlyingMagikoopa_Anim00, \ + .walk = ANIM_FlyingMagikoopa_Anim01, \ + .run = ANIM_FlyingMagikoopa_Anim01, \ + .chase = ANIM_FlyingMagikoopa_Anim01, \ + .anim_4 = ANIM_FlyingMagikoopa_Anim01, \ + .anim_5 = ANIM_FlyingMagikoopa_Anim01, \ + .death = ANIM_FlyingMagikoopa_Anim04, \ + .hit = ANIM_FlyingMagikoopa_Anim04, \ + .anim_8 = ANIM_FlyingMagikoopa_Anim02, \ + .anim_9 = ANIM_FlyingMagikoopa_Anim03, \ + .anim_A = ANIM_FlyingMagikoopa_Anim01, \ + .anim_B = ANIM_FlyingMagikoopa_Anim01, \ + .anim_C = ANIM_FlyingMagikoopa_Anim01, \ + .anim_D = ANIM_FlyingMagikoopa_Anim01, \ + .anim_E = ANIM_FlyingMagikoopa_Anim01, \ + .anim_F = ANIM_FlyingMagikoopa_Anim01, \ +} + +#define FLYING_MAGIKOOPA_SPELL_HITBOX(npcID) \ +{ \ + .id = npcID, \ + .settings = &N(NpcSettings_FlyingMagikoopa_Hitbox), \ + .pos = { NPC_DISPOSE_LOCATION }, \ + .yaw = 90, \ + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, \ + .drops = { \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ + }, \ + .animations = { \ + .idle = ANIM_FlyingMagikoopa_Anim00, \ + .walk = ANIM_FlyingMagikoopa_Anim00, \ + .run = ANIM_FlyingMagikoopa_Anim00, \ + .chase = ANIM_FlyingMagikoopa_Anim00, \ + .anim_4 = ANIM_FlyingMagikoopa_Anim00, \ + .anim_5 = ANIM_FlyingMagikoopa_Anim00, \ + .death = ANIM_FlyingMagikoopa_Anim00, \ + .hit = ANIM_FlyingMagikoopa_Anim00, \ + .anim_8 = ANIM_FlyingMagikoopa_Anim00, \ + .anim_9 = ANIM_FlyingMagikoopa_Anim00, \ + .anim_A = ANIM_FlyingMagikoopa_Anim00, \ + .anim_B = ANIM_FlyingMagikoopa_Anim00, \ + .anim_C = ANIM_FlyingMagikoopa_Anim00, \ + .anim_D = ANIM_FlyingMagikoopa_Anim00, \ + .anim_E = ANIM_FlyingMagikoopa_Anim00, \ + .anim_F = ANIM_FlyingMagikoopa_Anim00, \ + }, \ +} diff --git a/src/world/common/enemy/complete/FlyingMagikoopa.inc.c b/src/world/common/enemy/complete/FlyingMagikoopa.inc.c new file mode 100644 index 0000000000..1a0b9247ca --- /dev/null +++ b/src/world/common/enemy/complete/FlyingMagikoopa.inc.c @@ -0,0 +1,122 @@ +#include "FlyingMagikoopa.h" + +#include "world/common/enemy/ai/FlyingMagikoopaAI.inc.c" + +MobileAISettings N(AISettings_FlyingMagikoopa) = { + .moveSpeed = 1.5f, + .moveTime = 60, + .waitTime = 30, + .alertRadius = 100.0f, + .alertOffsetDist = 20.0f, + .playerSearchInterval = 3, + .chaseSpeed = 5.0f, + .chaseTurnRate = 60, + .chaseUpdateInterval = 10, + .chaseRadius = 150.0f, + .chaseOffsetDist = 20.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_FlyingMagikoopa) = { + EVT_CALL(N(FlyingMagikoopaAI_Main), EVT_PTR(N(AISettings_FlyingMagikoopa))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_FlyingMagikoopa) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(OnPlayerFled, 0) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_FlyingMagikoopa) = { + .height = 33, + .radius = 32, + .level = 26, + .ai = &N(EVS_NpcAI_FlyingMagikoopa), + .onHit = &EnemyNpcHit, + .onDefeat = &N(EVS_NpcDefeat_FlyingMagikoopa), +}; + +s32 N(ExtraAnims_FlyingMagikoopa)[] = { + ANIM_FlyingMagikoopa_Anim00, + ANIM_FlyingMagikoopa_Anim01, + ANIM_FlyingMagikoopa_Anim01, + ANIM_FlyingMagikoopa_Anim01, + ANIM_FlyingMagikoopa_Anim02, + ANIM_FlyingMagikoopa_Anim03, + ANIM_FlyingMagikoopa_Anim04, + -1 +}; + +EvtScript N(EVS_NpcAuxAI_FlyingMagikoopa_AltHitbox) = { + EVT_CALL(SetSelfVar, 1, 10) + EVT_CALL(SetSelfVar, 2, 40) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAuxAI_FlyingMagikoopa_Hitbox) = { + EVT_CALL(SetSelfVar, 1, 0) + EVT_CALL(SetSelfVar, 2, 55) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_FlyingMagikoopa_Hitbox) = { + EVT_CALL(N(MagikoopaAI_SpellMain)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_FlyingMagikoopa_Hitbox) = { + EVT_CALL(N(FlyingMagikoopaAI_OnHitInit)) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(FlyingMagikoopaAI_OnHit)) + EVT_EXEC(EnemyNpcHit) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_FlyingMagikoopa_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_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_FlyingMagikoopa_AltHitbox) = { + .defaultAnim = ANIM_Magikoopa_Anim00, + .otherAI = &N(EVS_NpcAuxAI_FlyingMagikoopa_AltHitbox), + .ai = &N(EVS_NpcAI_FlyingMagikoopa_Hitbox), + .onHit = &N(EVS_NpcHit_FlyingMagikoopa_Hitbox), + .onDefeat = &N(EVS_NpcDefeat_FlyingMagikoopa_Hitbox), +}; + +NpcSettings N(NpcSettings_FlyingMagikoopa_Hitbox) = { + .defaultAnim = ANIM_FlyingMagikoopa_Anim00, + .otherAI = &N(EVS_NpcAuxAI_FlyingMagikoopa_Hitbox), + .ai = &N(EVS_NpcAI_FlyingMagikoopa_Hitbox), + .onHit = &N(EVS_NpcHit_FlyingMagikoopa_Hitbox), + .onDefeat = &N(EVS_NpcDefeat_FlyingMagikoopa_Hitbox), +}; diff --git a/src/world/common/enemy/complete/HammerBros.h b/src/world/common/enemy/complete/HammerBros.h new file mode 100644 index 0000000000..b4558daa30 --- /dev/null +++ b/src/world/common/enemy/complete/HammerBros.h @@ -0,0 +1,81 @@ +#include "common.h" +#include "sprite/npc/HammerBros.h" + +#define HAMMER_BROS_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 5, \ + .itemDrops = { \ + { ITEM_SUPER_SHROOM, 5, 0 }, \ + { ITEM_MAPLE_SYRUP, 5, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(4), \ + .flowerDrops = STANDARD_FLOWER_DROPS(3), \ + .minCoinBonus = 0, \ + .maxCoinBonus = 3, \ +} + +#define HAMMER_BROS_ANIMS \ +{ \ + .idle = ANIM_HammerBros_Anim02, \ + .walk = ANIM_HammerBros_Anim04, \ + .run = ANIM_HammerBros_Anim07, \ + .chase = ANIM_HammerBros_Anim07, \ + .anim_4 = ANIM_HammerBros_Anim02, \ + .anim_5 = ANIM_HammerBros_Anim02, \ + .death = ANIM_HammerBros_Anim0E, \ + .hit = ANIM_HammerBros_Anim0E, \ + .anim_8 = ANIM_HammerBros_Anim18, \ + .anim_9 = ANIM_HammerBros_Anim19, \ + .anim_A = ANIM_HammerBros_Anim02, \ + .anim_B = ANIM_HammerBros_Anim02, \ + .anim_C = ANIM_HammerBros_Anim02, \ + .anim_D = ANIM_HammerBros_Anim02, \ + .anim_E = ANIM_HammerBros_Anim02, \ + .anim_F = ANIM_HammerBros_Anim02, \ +} + +#define HAMMER_BROS_HAMMER_HITBOX(npcID) \ +{ \ + .id = npcID, \ + .settings = &N(NpcSettings_HammerBros_Hammer), \ + .pos = { NPC_DISPOSE_LOCATION }, \ + .yaw = 90, \ + .flags = ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, \ + .drops = { \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ + }, \ + .territory = { \ + .wander = { \ + .isFlying = TRUE, \ + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, \ + .wanderShape = SHAPE_CYLINDER, \ + .centerPos = { NPC_DISPOSE_LOCATION }, \ + .wanderSize = { 0 }, \ + .detectShape = SHAPE_CYLINDER, \ + .detectPos = { NPC_DISPOSE_LOCATION }, \ + .detectSize = { 0 }, \ + } \ + }, \ + .animations = { \ + .idle = ANIM_HammerBros_Anim0D, \ + .walk = ANIM_HammerBros_Anim0D, \ + .run = ANIM_HammerBros_Anim0D, \ + .chase = ANIM_HammerBros_Anim0D, \ + .anim_4 = ANIM_HammerBros_Anim0D, \ + .anim_5 = ANIM_HammerBros_Anim0D, \ + .death = ANIM_HammerBros_Anim0D, \ + .hit = ANIM_HammerBros_Anim0D, \ + .anim_8 = ANIM_HammerBros_Anim0D, \ + .anim_9 = ANIM_HammerBros_Anim0D, \ + .anim_A = ANIM_HammerBros_Anim0D, \ + .anim_B = ANIM_HammerBros_Anim0D, \ + .anim_C = ANIM_HammerBros_Anim0D, \ + .anim_D = ANIM_HammerBros_Anim0D, \ + .anim_E = ANIM_HammerBros_Anim0D, \ + .anim_F = ANIM_HammerBros_Anim0D, \ + }, \ + .extraAnimations = N(ExtraAnims_HammerBros_Hammer), \ +} diff --git a/src/world/common/enemy/complete/HammerBros.inc.c b/src/world/common/enemy/complete/HammerBros.inc.c new file mode 100644 index 0000000000..180f39c5e3 --- /dev/null +++ b/src/world/common/enemy/complete/HammerBros.inc.c @@ -0,0 +1,123 @@ +#include "HammerBros.h" + +#include "world/common/enemy/ai/RangedAttackAI.inc.c" + +#include "world/common/todo/GetEncounterEnemyIsOwner.inc.c" + +EvtScript N(EVS_NpcDefeat_HammerBros_Hammer) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(SetSelfVar, 0, 5) + 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_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +MobileAISettings N(AISettings_HammerBros) = { + .moveSpeed = 1.5f, + .moveTime = 30, + .waitTime = 30, + .alertRadius = 120.0f, + .alertOffsetDist = 20.0f, + .playerSearchInterval = 5, + .chaseSpeed = 3.0f, + .chaseTurnRate = 90, + .chaseUpdateInterval = 3, + .chaseRadius = 140.0f, + .chaseOffsetDist = 20.0f, +}; + +EvtScript N(EVS_NpcAI_HammerBros) = { + EVT_CALL(SetSelfVar, 0, 70) + EVT_CALL(SetSelfVar, 1, 3) + EVT_CALL(SetSelfVar, 2, 3) + EVT_CALL(SetSelfVar, 3, 6) + EVT_CALL(N(RangedAttackAI_Main), EVT_PTR(N(AISettings_HammerBros))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_HammerBros) = { + .height = 36, + .radius = 24, + .level = 27, + .ai = &N(EVS_NpcAI_HammerBros), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +MobileAISettings N(AISettings_HammerBros_Hammer) = { + .moveSpeed = 5.4f, + .alertRadius = 13.0f, + .alertOffsetDist = 1.4f, + .playerSearchInterval = -1, +}; + +EvtScript N(EVS_NpcAI_HammerBros_Hammer) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetSelfVar, 1, 3) + EVT_CALL(SetSelfVar, 2, 20) + EVT_CALL(N(ProjectileAI_Main), EVT_PTR(N(AISettings_HammerBros_Hammer))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NoAI_HammerBros_Hammer) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_HammerBros_Hammer) = { + EVT_CALL(N(GetEncounterEnemyIsOwner)) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NoAI_HammerBros_Hammer))) + EVT_CALL(GetOwnerEncounterTrigger, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_HAMMER) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_SPIN) + EVT_CALL(SetSelfVar, 0, 3) + EVT_CALL(N(ProjectileAI_Reflect)) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_END_CASE_GROUP + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_JUMP) + EVT_CASE_OR_EQ(ENCOUNTER_TRIGGER_PARTNER) + EVT_CALL(SetSelfVar, 0, 4) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, LVar0, LVar1, LVar2, 0, 0) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_CALL(func_800457F8) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_HammerBros_Hammer))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_HammerBros_Hammer) = { + .height = 12, + .radius = 12, + .ai = &N(EVS_NpcAI_HammerBros_Hammer), + .onHit = &N(EVS_NpcHit_HammerBros_Hammer), + .onDefeat = &N(EVS_NpcDefeat_HammerBros_Hammer), + .actionFlags = AI_ACTION_08, +}; + +s32 N(ExtraAnims_HammerBros_Hammer)[] = { + ANIM_HammerBros_Anim0D, + -1 +}; diff --git a/src/world/common/enemy/complete/Koopatrol.h b/src/world/common/enemy/complete/Koopatrol.h new file mode 100644 index 0000000000..d31cea0ed6 --- /dev/null +++ b/src/world/common/enemy/complete/Koopatrol.h @@ -0,0 +1,42 @@ +#include "common.h" +#include "sprite/npc/WorldKoopatrol.h" + +#define KOOPATROL_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 5, \ + .itemDrops = { \ + { ITEM_SUPER_SHROOM, 10, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(5), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 0, \ + .maxCoinBonus = 3, \ +} + +#define KOOPATROL_NO_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define KOOPATROL_ANIMS \ +{ \ + .idle = ANIM_WorldKoopatrol_Anim01, \ + .walk = ANIM_WorldKoopatrol_Anim04, \ + .run = ANIM_WorldKoopatrol_Anim06, \ + .chase = ANIM_WorldKoopatrol_Anim06, \ + .anim_4 = ANIM_WorldKoopatrol_Anim01, \ + .anim_5 = ANIM_WorldKoopatrol_Anim01, \ + .death = ANIM_WorldKoopatrol_Anim10, \ + .hit = ANIM_WorldKoopatrol_Anim10, \ + .anim_8 = ANIM_WorldKoopatrol_Anim0C, \ + .anim_9 = ANIM_WorldKoopatrol_Anim0B, \ + .anim_A = ANIM_WorldKoopatrol_Anim0D, \ + .anim_B = ANIM_WorldKoopatrol_Anim01, \ + .anim_C = ANIM_WorldKoopatrol_Anim01, \ + .anim_D = ANIM_WorldKoopatrol_Anim01, \ + .anim_E = ANIM_WorldKoopatrol_Anim01, \ + .anim_F = ANIM_WorldKoopatrol_Anim01, \ +} diff --git a/src/world/common/enemy/complete/Koopatrol_Patrol.inc.c b/src/world/common/enemy/complete/Koopatrol_Patrol.inc.c new file mode 100644 index 0000000000..be015427c7 --- /dev/null +++ b/src/world/common/enemy/complete/Koopatrol_Patrol.inc.c @@ -0,0 +1,34 @@ +#include "Koopatrol.h" + +#include "world/common/enemy/ai/KoopaPatrolAI.inc.c" + +MobileAISettings N(AISettings_Koopatrol_Patrol) = { + .moveSpeed = 1.0f, + .moveTime = 34, + .waitTime = 50, + .alertRadius = 90.0f, + .alertOffsetDist = 50.0f, + .playerSearchInterval = 2, + .chaseSpeed = 11.0f, + .chaseRadius = 100.0f, + .chaseOffsetDist = 60.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Koopatrol_Patrol) = { + EVT_CALL(SetSelfVar, 2, 8) + EVT_CALL(SetSelfVar, 3, 15) + EVT_CALL(SetSelfVar, 5, 10) + EVT_CALL(N(KoopaPatrolAI_Main), EVT_PTR(N(AISettings_Koopatrol_Patrol))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Koopatrol_Patrol) = { + .height = 40, + .radius = 24, + .level = 25, + .ai = &N(EVS_NpcAI_Koopatrol_Patrol), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/Koopatrol_Wander.inc.c b/src/world/common/enemy/complete/Koopatrol_Wander.inc.c new file mode 100644 index 0000000000..f0d5c65432 --- /dev/null +++ b/src/world/common/enemy/complete/Koopatrol_Wander.inc.c @@ -0,0 +1,35 @@ +#include "Koopatrol.h" + +#include "world/common/enemy/ai/TackleAI.inc.c" + +MobileAISettings N(AISettings_Koopatrol_Wander) = { + .moveSpeed = 1.0f, + .moveTime = 30, + .waitTime = 50, + .alertRadius = 90.0f, + .alertOffsetDist = 40.0f, + .playerSearchInterval = 2, + .chaseSpeed = 11.0f, + .chaseRadius = 100.0f, + .chaseOffsetDist = 40.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Koopatrol_Wander) = { + EVT_CALL(SetSelfVar, 2, 5) + EVT_CALL(SetSelfVar, 3, 4) + EVT_CALL(SetSelfVar, 5, 10) + EVT_CALL(SetSelfVar, 7, 5) + EVT_CALL(N(TackleAI_Main), EVT_PTR(N(AISettings_Koopatrol_Wander))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Koopatrol_Wander) = { + .height = 40, + .radius = 24, + .level = 25, + .ai = &N(EVS_NpcAI_Koopatrol_Wander), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/Magikoopa.h b/src/world/common/enemy/complete/Magikoopa.h index 0b455480fa..c8bc7c21ca 100644 --- a/src/world/common/enemy/complete/Magikoopa.h +++ b/src/world/common/enemy/complete/Magikoopa.h @@ -5,55 +5,67 @@ #define MAGIKOOPA_DROPS \ { \ .dropFlags = NPC_DROP_FLAGS_80, \ - .itemDropChance = 25, \ + .itemDropChance = 5, \ .itemDrops = { \ - { ITEM_SUPER_SHROOM, 2, 0 }, \ - { ITEM_MAPLE_SYRUP, 2, 0 }, \ - { ITEM_THUNDER_RAGE, 2, 0 }, \ - { ITEM_STOP_WATCH, 2, 0 }, \ + { ITEM_SUPER_SHROOM, 5, 0 }, \ + { ITEM_MAPLE_SYRUP, 5, 0 }, \ + { ITEM_THUNDER_RAGE, 5, 0 }, \ + { ITEM_STOP_WATCH, 5, 0 }, \ }, \ .heartDrops = STANDARD_HEART_DROPS(2), \ - .flowerDrops = STANDARD_FLOWER_DROPS(3), \ - .minCoinBonus = 0, \ - .maxCoinBonus = 2, \ + .flowerDrops = STANDARD_FLOWER_DROPS(5), \ + .minCoinBonus = 1, \ + .maxCoinBonus = 3, \ } -#define MAGIKOOPA_YELLOW_ANIMS \ +#define MAGIKOOPA_ANIMS \ { \ - .idle = ANIM_Magikoopa_Yellow_Anim01, \ - .walk = ANIM_Magikoopa_Yellow_Anim01, \ - .run = ANIM_Magikoopa_Yellow_Anim01, \ - .chase = ANIM_Magikoopa_Yellow_Anim01, \ - .anim_4 = ANIM_Magikoopa_Yellow_Anim01, \ - .anim_5 = ANIM_Magikoopa_Yellow_Anim01, \ - .death = ANIM_Magikoopa_Yellow_Anim04, \ - .hit = ANIM_Magikoopa_Yellow_Anim04, \ - .anim_8 = ANIM_Magikoopa_Yellow_Anim01, \ - .anim_9 = ANIM_Magikoopa_Yellow_Anim01, \ - .anim_A = ANIM_Magikoopa_Yellow_Anim01, \ - .anim_B = ANIM_Magikoopa_Yellow_Anim01, \ - .anim_C = ANIM_Magikoopa_Yellow_Anim01, \ - .anim_D = ANIM_Magikoopa_Yellow_Anim01, \ - .anim_E = ANIM_Magikoopa_Yellow_Anim01, \ - .anim_F = ANIM_Magikoopa_Yellow_Anim01, \ + .idle = ANIM_Magikoopa_Anim01, \ + .walk = ANIM_Magikoopa_Anim01, \ + .run = ANIM_Magikoopa_Anim01, \ + .chase = ANIM_Magikoopa_Anim01, \ + .anim_4 = ANIM_Magikoopa_Anim01, \ + .anim_5 = ANIM_Magikoopa_Anim01, \ + .death = ANIM_Magikoopa_Anim04, \ + .hit = ANIM_Magikoopa_Anim04, \ + .anim_8 = ANIM_Magikoopa_Anim02, \ + .anim_9 = ANIM_Magikoopa_Anim03, \ + .anim_A = ANIM_Magikoopa_Anim01, \ + .anim_B = ANIM_Magikoopa_Anim01, \ + .anim_C = ANIM_Magikoopa_Anim01, \ + .anim_D = ANIM_Magikoopa_Anim01, \ + .anim_E = ANIM_Magikoopa_Anim01, \ + .anim_F = ANIM_Magikoopa_Anim01, \ } -#define FLYING_MAGIKOOPA_YELLOW_ANIMS \ +#define MAGIKOOPA_SPELL_HITBOX(npcID) \ { \ - .idle = ANIM_FlyingMagikoopa_Yellow_Anim01, \ - .walk = ANIM_FlyingMagikoopa_Yellow_Anim01, \ - .run = ANIM_FlyingMagikoopa_Yellow_Anim01, \ - .chase = ANIM_FlyingMagikoopa_Yellow_Anim01, \ - .anim_4 = ANIM_FlyingMagikoopa_Yellow_Anim01, \ - .anim_5 = ANIM_FlyingMagikoopa_Yellow_Anim01, \ - .death = ANIM_FlyingMagikoopa_Yellow_Anim04, \ - .hit = ANIM_FlyingMagikoopa_Yellow_Anim04, \ - .anim_8 = ANIM_FlyingMagikoopa_Yellow_Anim01, \ - .anim_9 = ANIM_FlyingMagikoopa_Yellow_Anim01, \ - .anim_A = ANIM_FlyingMagikoopa_Yellow_Anim01, \ - .anim_B = ANIM_FlyingMagikoopa_Yellow_Anim01, \ - .anim_C = ANIM_FlyingMagikoopa_Yellow_Anim01, \ - .anim_D = ANIM_FlyingMagikoopa_Yellow_Anim01, \ - .anim_E = ANIM_FlyingMagikoopa_Yellow_Anim01, \ - .anim_F = ANIM_FlyingMagikoopa_Yellow_Anim01, \ + .id = npcID, \ + .settings = &N(NpcSettings_Magikoopa_GroundHitbox), \ + .pos = { NPC_DISPOSE_LOCATION }, \ + .yaw = 90, \ + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800 | ENEMY_FLAGS_800000, \ + .drops = { \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ + }, \ + .animations = { \ + .idle = ANIM_Magikoopa_Anim00, \ + .walk = ANIM_Magikoopa_Anim00, \ + .run = ANIM_Magikoopa_Anim00, \ + .chase = ANIM_Magikoopa_Anim00, \ + .anim_4 = ANIM_Magikoopa_Anim00, \ + .anim_5 = ANIM_Magikoopa_Anim00, \ + .death = ANIM_Magikoopa_Anim00, \ + .hit = ANIM_Magikoopa_Anim00, \ + .anim_8 = ANIM_Magikoopa_Anim00, \ + .anim_9 = ANIM_Magikoopa_Anim00, \ + .anim_A = ANIM_Magikoopa_Anim00, \ + .anim_B = ANIM_Magikoopa_Anim00, \ + .anim_C = ANIM_Magikoopa_Anim00, \ + .anim_D = ANIM_Magikoopa_Anim00, \ + .anim_E = ANIM_Magikoopa_Anim00, \ + .anim_F = ANIM_Magikoopa_Anim00, \ + }, \ } diff --git a/src/world/common/enemy/complete/Magikoopa.inc.c b/src/world/common/enemy/complete/Magikoopa.inc.c new file mode 100644 index 0000000000..d7aa1752a5 --- /dev/null +++ b/src/world/common/enemy/complete/Magikoopa.inc.c @@ -0,0 +1,148 @@ +#include "Magikoopa.h" + +#include "world/common/enemy/ai/MagikoopaAI.inc.c" + +MagikoopaTeleportAnim N(MagikoopaAI_TeleportAnim)[] = { + { 0.80f, 1.0f, 200 }, + { 0.60f, 1.0f, 180 }, + { 0.50f, 1.0f, 160 }, + { 0.40f, 1.0f, 140 }, + { 0.30f, 1.1f, 120 }, + { 0.20f, 1.3f, 110 }, + { 0.15f, 1.6f, 100 }, + { 0.12f, 2.0f, 90 }, + { 0.11f, 3.0f, 80 }, + { 0.10f, 4.0f, 70 }, + {} +}; + +MobileAISettings N(AISettings_Magikoopa) = { + .moveSpeed = 1.0f, + .moveTime = 120, + .waitTime = 30, + .alertRadius = 100.0f, + .playerSearchInterval = 10, + .chaseSpeed = 3.0f, + .chaseTurnRate = 90, + .chaseUpdateInterval = 15, + .chaseRadius = 200.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Magikoopa) = { + EVT_CALL(N(MagikoopaAI_Main), EVT_PTR(N(AISettings_Magikoopa))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_Magikoopa) = { + 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(0x800936DC) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Magikoopa) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(N(MagikoopaAI_OnPlayerWon)) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(N(MagikoopaAI_OnPlayerFled)) + EVT_CALL(OnPlayerFled, 0) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Magikoopa) = { + .height = 32, + .radius = 28, + .level = 26, + .ai = &N(EVS_NpcAI_Magikoopa), + .onHit = &N(EVS_NpcHit_Magikoopa), + .onDefeat = &N(EVS_NpcDefeat_Magikoopa), +}; + +s32 N(ExtraAnims_Magikoopa)[] = { + ANIM_Magikoopa_Anim00, + ANIM_Magikoopa_Anim01, + ANIM_Magikoopa_Anim01, + ANIM_Magikoopa_Anim01, + ANIM_Magikoopa_Anim02, + ANIM_Magikoopa_Anim03, + ANIM_Magikoopa_Anim04, + -1 +}; + +EvtScript N(EVS_NpcAuxAI_Magikoopa_GroundHitbox) = { + EVT_CALL(SetSelfVar, 1, 10) + EVT_CALL(SetSelfVar, 2, 40) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAuxAI_Magikoopa_FlyingHitbox) = { + EVT_CALL(SetSelfVar, 1, 0) + EVT_CALL(SetSelfVar, 2, 55) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_Magikoopa_Hitbox) = { + EVT_CALL(N(MagikoopaAI_SpellMain)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_Magikoopa_Hitbox) = { + EVT_CALL(N(MagikoopaAI_OnHitInit)) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(MagikoopaAI_OnHit)) + EVT_EXEC(EnemyNpcHit) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Magikoopa_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_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Magikoopa_GroundHitbox) = { + .defaultAnim = ANIM_Magikoopa_Anim00, + .otherAI = &N(EVS_NpcAuxAI_Magikoopa_GroundHitbox), + .ai = &N(EVS_NpcAI_Magikoopa_Hitbox), + .onHit = &N(EVS_NpcHit_Magikoopa_Hitbox), + .onDefeat = &N(EVS_NpcDefeat_Magikoopa_Hitbox), +}; + +NpcSettings N(NpcSettings_Magikoopa_FlyingHitbox) = { + .defaultAnim = ANIM_FlyingMagikoopa_Anim00, + .otherAI = &N(EVS_NpcAuxAI_Magikoopa_FlyingHitbox), + .ai = &N(EVS_NpcAI_Magikoopa_Hitbox), + .onHit = &N(EVS_NpcHit_Magikoopa_Hitbox), + .onDefeat = &N(EVS_NpcDefeat_Magikoopa_Hitbox), +}; diff --git a/src/world/common/enemy/complete/SpikeTop.h b/src/world/common/enemy/complete/SpikeTop.h index 66bb6eee3e..95306c1d5d 100644 --- a/src/world/common/enemy/complete/SpikeTop.h +++ b/src/world/common/enemy/complete/SpikeTop.h @@ -1,6 +1,7 @@ #include "common.h" #include "sprite/npc/BuzzyBeetle.h" #include "sprite/npc/SpikeTop.h" +#include "sprite/npc/BonyBeetle.h" #define TIK_BUZZY_BEETLE_DROPS \ { \ @@ -77,3 +78,49 @@ .anim_E = ANIM_SpikeTop_Anim03, \ .anim_F = ANIM_SpikeTop_Anim03, \ } + +#define BONY_BEETLE_DROPS_ALT \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 5, \ + .itemDrops = { \ + { ITEM_SUPER_SHROOM, 10, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(5), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 0, \ + .maxCoinBonus = 3, \ +} + +#define BONY_BEETLE_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 5, \ + .itemDrops = { \ + { ITEM_SUPER_SHROOM, 10, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(4), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 0, \ + .maxCoinBonus = 4, \ +} + +#define BONY_BEETLE_ANIMS \ +{ \ + .idle = ANIM_BonyBeetle_Anim04, \ + .walk = ANIM_BonyBeetle_Anim0C, \ + .run = ANIM_BonyBeetle_Anim0E, \ + .chase = ANIM_BonyBeetle_Anim0E, \ + .anim_4 = ANIM_BonyBeetle_Anim04, \ + .anim_5 = ANIM_BonyBeetle_Anim04, \ + .death = ANIM_BonyBeetle_Anim18, \ + .hit = ANIM_BonyBeetle_Anim18, \ + .anim_8 = ANIM_BonyBeetle_Anim10, \ + .anim_9 = ANIM_BonyBeetle_Anim16, \ + .anim_A = ANIM_BonyBeetle_Anim12, \ + .anim_B = ANIM_BonyBeetle_Anim04, \ + .anim_C = ANIM_BonyBeetle_Anim04, \ + .anim_D = ANIM_BonyBeetle_Anim04, \ + .anim_E = ANIM_BonyBeetle_Anim04, \ + .anim_F = ANIM_BonyBeetle_Anim04, \ +} diff --git a/src/world/common/enemy/complete/SpikeTop.inc.c b/src/world/common/enemy/complete/SpikeTop.inc.c index 9701979fbf..a94dafae73 100644 --- a/src/world/common/enemy/complete/SpikeTop.inc.c +++ b/src/world/common/enemy/complete/SpikeTop.inc.c @@ -48,7 +48,7 @@ EvtScript N(EVS_NpcAI_SpikeTop) = { EVT_END }; -MobileAISettings N(D_80243BE0_C648F0) = { +MobileAISettings N(AISettings_BonyBeetle) = { .moveSpeed = 1.0f, .moveTime = 20, .waitTime = 5, @@ -59,12 +59,12 @@ MobileAISettings N(D_80243BE0_C648F0) = { .unk_AI_2C = 1, }; -EvtScript N(D_80243C10_C64920) = { +EvtScript N(EVS_NpcAI_BonyBeetle) = { EVT_CALL(SetSelfVar, 2, 3) EVT_CALL(SetSelfVar, 3, 8) EVT_CALL(SetSelfVar, 5, 6) EVT_CALL(SetSelfVar, 7, 6) - EVT_CALL(N(TackleAI_Main), EVT_PTR(N(D_80243BE0_C648F0))) + EVT_CALL(N(TackleAI_Main), EVT_PTR(N(AISettings_BonyBeetle))) EVT_RETURN EVT_END }; @@ -89,8 +89,6 @@ EvtScript N(EVS_NpcAI_BuzzyBeetle_Ceiling) = { EVT_END }; -// different buzzy beetle / spike top varieties - NpcSettings N(NpcSettings_BuzzyBeetle) = { .height = 20, .radius = 22, @@ -118,11 +116,11 @@ NpcSettings N(NpcSettings_SpikeTop) = { .onDefeat = &EnemyNpcDefeat, }; -NpcSettings N(NpcSettings_Unused3) = { +NpcSettings N(NpcSettings_BonyBeetle) = { .height = 24, .radius = 24, .level = 25, - .ai = &N(D_80243C10_C64920), + .ai = &N(EVS_NpcAI_BonyBeetle), .onHit = &EnemyNpcHit, .onDefeat = &EnemyNpcDefeat, }; diff --git a/src/world/common/enemy/complete/YMagikoopa.h b/src/world/common/enemy/complete/YMagikoopa.h new file mode 100644 index 0000000000..0b455480fa --- /dev/null +++ b/src/world/common/enemy/complete/YMagikoopa.h @@ -0,0 +1,59 @@ +#include "common.h" +#include "sprite/npc/Magikoopa.h" +#include "sprite/npc/FlyingMagikoopa.h" + +#define MAGIKOOPA_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .itemDropChance = 25, \ + .itemDrops = { \ + { ITEM_SUPER_SHROOM, 2, 0 }, \ + { ITEM_MAPLE_SYRUP, 2, 0 }, \ + { ITEM_THUNDER_RAGE, 2, 0 }, \ + { ITEM_STOP_WATCH, 2, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(2), \ + .flowerDrops = STANDARD_FLOWER_DROPS(3), \ + .minCoinBonus = 0, \ + .maxCoinBonus = 2, \ +} + +#define MAGIKOOPA_YELLOW_ANIMS \ +{ \ + .idle = ANIM_Magikoopa_Yellow_Anim01, \ + .walk = ANIM_Magikoopa_Yellow_Anim01, \ + .run = ANIM_Magikoopa_Yellow_Anim01, \ + .chase = ANIM_Magikoopa_Yellow_Anim01, \ + .anim_4 = ANIM_Magikoopa_Yellow_Anim01, \ + .anim_5 = ANIM_Magikoopa_Yellow_Anim01, \ + .death = ANIM_Magikoopa_Yellow_Anim04, \ + .hit = ANIM_Magikoopa_Yellow_Anim04, \ + .anim_8 = ANIM_Magikoopa_Yellow_Anim01, \ + .anim_9 = ANIM_Magikoopa_Yellow_Anim01, \ + .anim_A = ANIM_Magikoopa_Yellow_Anim01, \ + .anim_B = ANIM_Magikoopa_Yellow_Anim01, \ + .anim_C = ANIM_Magikoopa_Yellow_Anim01, \ + .anim_D = ANIM_Magikoopa_Yellow_Anim01, \ + .anim_E = ANIM_Magikoopa_Yellow_Anim01, \ + .anim_F = ANIM_Magikoopa_Yellow_Anim01, \ +} + +#define FLYING_MAGIKOOPA_YELLOW_ANIMS \ +{ \ + .idle = ANIM_FlyingMagikoopa_Yellow_Anim01, \ + .walk = ANIM_FlyingMagikoopa_Yellow_Anim01, \ + .run = ANIM_FlyingMagikoopa_Yellow_Anim01, \ + .chase = ANIM_FlyingMagikoopa_Yellow_Anim01, \ + .anim_4 = ANIM_FlyingMagikoopa_Yellow_Anim01, \ + .anim_5 = ANIM_FlyingMagikoopa_Yellow_Anim01, \ + .death = ANIM_FlyingMagikoopa_Yellow_Anim04, \ + .hit = ANIM_FlyingMagikoopa_Yellow_Anim04, \ + .anim_8 = ANIM_FlyingMagikoopa_Yellow_Anim01, \ + .anim_9 = ANIM_FlyingMagikoopa_Yellow_Anim01, \ + .anim_A = ANIM_FlyingMagikoopa_Yellow_Anim01, \ + .anim_B = ANIM_FlyingMagikoopa_Yellow_Anim01, \ + .anim_C = ANIM_FlyingMagikoopa_Yellow_Anim01, \ + .anim_D = ANIM_FlyingMagikoopa_Yellow_Anim01, \ + .anim_E = ANIM_FlyingMagikoopa_Yellow_Anim01, \ + .anim_F = ANIM_FlyingMagikoopa_Yellow_Anim01, \ +} diff --git a/src/world/common/npc/GoombaFamily.h b/src/world/common/npc/GoombaFamily.h index 1a3c236b99..6632e3c6c7 100644 --- a/src/world/common/npc/GoombaFamily.h +++ b/src/world/common/npc/GoombaFamily.h @@ -14,22 +14,22 @@ #define GOOMPA_ANIMS \ { \ - ANIM_Dryite_Green_Idle, \ - ANIM_Dryite_Green_Walk, \ - ANIM_Dryite_Green_Run, \ - ANIM_Dryite_Green_Run, \ - ANIM_Dryite_Green_Idle, \ - ANIM_Dryite_Green_Idle, \ - ANIM_Dryite_Green_Still, \ - ANIM_Dryite_Green_Still, \ - ANIM_Dryite_Green_Idle, \ - ANIM_Dryite_Green_Idle, \ - ANIM_Dryite_Green_Idle, \ - ANIM_Dryite_Green_Idle, \ - ANIM_Dryite_Green_Idle, \ - ANIM_Dryite_Green_Idle, \ - ANIM_Dryite_Green_Idle, \ - ANIM_Dryite_Green_Idle, \ + .idle = ANIM_Goompa_Idle, \ + .walk = ANIM_Goompa_Walk, \ + .run = ANIM_Goompa_Run, \ + .chase = ANIM_Goompa_Run, \ + .anim_4 = ANIM_Goompa_Idle, \ + .anim_5 = ANIM_Goompa_Idle, \ + .death = ANIM_Goompa_Still, \ + .hit = ANIM_Goompa_Still, \ + .anim_8 = ANIM_Goompa_Run, \ + .anim_9 = ANIM_Goompa_Run, \ + .anim_A = ANIM_Goompa_Run, \ + .anim_B = ANIM_Goompa_Run, \ + .anim_C = ANIM_Goompa_Run, \ + .anim_D = ANIM_Goompa_Run, \ + .anim_E = ANIM_Goompa_Run, \ + .anim_F = ANIM_Goompa_Run, \ } #define GOOMA_DROPS \ @@ -113,6 +113,33 @@ .anim_F = ANIM_Goomama_Run, \ } +#define GOOMBARIO_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAGS_80, \ + .heartDrops = NO_DROPS, \ + .flowerDrops = NO_DROPS, \ +} + +#define GOOMBARIO_ANIMS \ +{ \ + .idle = ANIM_WorldGoombario_Idle, \ + .walk = ANIM_WorldGoombario_Walk, \ + .run = ANIM_WorldGoombario_Run, \ + .chase = ANIM_WorldGoombario_Run, \ + .anim_4 = ANIM_WorldGoombario_Idle, \ + .anim_5 = ANIM_WorldGoombario_Idle, \ + .death = ANIM_WorldGoombario_Still, \ + .hit = ANIM_WorldGoombario_Still, \ + .anim_8 = ANIM_WorldGoombario_Run, \ + .anim_9 = ANIM_WorldGoombario_Run, \ + .anim_A = ANIM_WorldGoombario_Run, \ + .anim_B = ANIM_WorldGoombario_Run, \ + .anim_C = ANIM_WorldGoombario_Run, \ + .anim_D = ANIM_WorldGoombario_Run, \ + .anim_E = ANIM_WorldGoombario_Run, \ + .anim_F = ANIM_WorldGoombario_Run, \ +} + #define GOOMBARIA_DROPS \ { \ .dropFlags = NPC_DROP_FLAGS_80, \ diff --git a/src/world/common/npc/GoombaFamily_Wander.inc.c b/src/world/common/npc/GoombaFamily_Wander.inc.c new file mode 100644 index 0000000000..c92b6e7fd2 --- /dev/null +++ b/src/world/common/npc/GoombaFamily_Wander.inc.c @@ -0,0 +1,23 @@ +#include "GoombaFamily.h" + +MobileAISettings N(AISettings_GoombaFamily_Wander) = { + .moveSpeed = 1.5f, + .moveTime = 60, + .waitTime = 30, + .playerSearchInterval = -1, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_GoombaFamily_Wander) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_GoombaFamily_Wander))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_GoombaFamily_Wander) = { + .height = 22, + .radius = 24, + .level = 99, + .ai = &N(EVS_NpcAI_GoombaFamily_Wander), + .actionFlags = AI_ACTION_LOOK_AROUND_DURING_LOITER, +}; diff --git a/src/world/common/npc/Toad.h b/src/world/common/npc/Toad.h index dcb983de98..8177a39918 100644 --- a/src/world/common/npc/Toad.h +++ b/src/world/common/npc/Toad.h @@ -2,13 +2,9 @@ #include "sprite/npc/Toad.h" #include "sprite/npc/ToadKid.h" #include "sprite/npc/Toadette.h" +#include "sprite/npc/ToadGuard.h" -#define TOAD_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAGS_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} +#define TOAD_DROPS NPC_NO_DROPS #define TOAD_RED_ANIMS \ { \ @@ -283,3 +279,83 @@ .anim_E = ANIM_Toadette_Purple_Run, \ .anim_F = ANIM_Toadette_Purple_Run, \ } + +#define TOAD_GUARD_RED_ANIMS \ +{ \ + .idle = ANIM_ToadGuard_Red_Idle, \ + .walk = ANIM_ToadGuard_Red_Idle, \ + .run = ANIM_ToadGuard_Red_Idle, \ + .chase = ANIM_ToadGuard_Red_Idle, \ + .anim_4 = ANIM_ToadGuard_Red_Idle, \ + .anim_5 = ANIM_ToadGuard_Red_Idle, \ + .death = ANIM_ToadGuard_Red_Idle, \ + .hit = ANIM_ToadGuard_Red_Idle, \ + .anim_8 = ANIM_ToadGuard_Red_Idle, \ + .anim_9 = ANIM_ToadGuard_Red_Idle, \ + .anim_A = ANIM_ToadGuard_Red_Idle, \ + .anim_B = ANIM_ToadGuard_Red_Idle, \ + .anim_C = ANIM_ToadGuard_Red_Idle, \ + .anim_D = ANIM_ToadGuard_Red_Idle, \ + .anim_E = ANIM_ToadGuard_Red_Idle, \ + .anim_F = ANIM_ToadGuard_Red_Idle, \ +} + +#define TOAD_GUARD_GREEN_ANIMS \ +{ \ + .idle = ANIM_ToadGuard_Green_Idle, \ + .walk = ANIM_ToadGuard_Green_Idle, \ + .run = ANIM_ToadGuard_Green_Idle, \ + .chase = ANIM_ToadGuard_Green_Idle, \ + .anim_4 = ANIM_ToadGuard_Green_Idle, \ + .anim_5 = ANIM_ToadGuard_Green_Idle, \ + .death = ANIM_ToadGuard_Green_Idle, \ + .hit = ANIM_ToadGuard_Green_Idle, \ + .anim_8 = ANIM_ToadGuard_Green_Idle, \ + .anim_9 = ANIM_ToadGuard_Green_Idle, \ + .anim_A = ANIM_ToadGuard_Green_Idle, \ + .anim_B = ANIM_ToadGuard_Green_Idle, \ + .anim_C = ANIM_ToadGuard_Green_Idle, \ + .anim_D = ANIM_ToadGuard_Green_Idle, \ + .anim_E = ANIM_ToadGuard_Green_Idle, \ + .anim_F = ANIM_ToadGuard_Green_Idle, \ +} + +#define TOAD_GUARD_BLUE_ANIMS \ +{ \ + .idle = ANIM_ToadGuard_Blue_Idle, \ + .walk = ANIM_ToadGuard_Blue_Idle, \ + .run = ANIM_ToadGuard_Blue_Idle, \ + .chase = ANIM_ToadGuard_Blue_Idle, \ + .anim_4 = ANIM_ToadGuard_Blue_Idle, \ + .anim_5 = ANIM_ToadGuard_Blue_Idle, \ + .death = ANIM_ToadGuard_Blue_Idle, \ + .hit = ANIM_ToadGuard_Blue_Idle, \ + .anim_8 = ANIM_ToadGuard_Blue_Idle, \ + .anim_9 = ANIM_ToadGuard_Blue_Idle, \ + .anim_A = ANIM_ToadGuard_Blue_Idle, \ + .anim_B = ANIM_ToadGuard_Blue_Idle, \ + .anim_C = ANIM_ToadGuard_Blue_Idle, \ + .anim_D = ANIM_ToadGuard_Blue_Idle, \ + .anim_E = ANIM_ToadGuard_Blue_Idle, \ + .anim_F = ANIM_ToadGuard_Blue_Idle, \ +} + +#define TOAD_GUARD_YELLOW_ANIMS \ +{ \ + .idle = ANIM_ToadGuard_Yellow_Idle, \ + .walk = ANIM_ToadGuard_Yellow_Idle, \ + .run = ANIM_ToadGuard_Yellow_Idle, \ + .chase = ANIM_ToadGuard_Yellow_Idle, \ + .anim_4 = ANIM_ToadGuard_Yellow_Idle, \ + .anim_5 = ANIM_ToadGuard_Yellow_Idle, \ + .death = ANIM_ToadGuard_Yellow_Idle, \ + .hit = ANIM_ToadGuard_Yellow_Idle, \ + .anim_8 = ANIM_ToadGuard_Yellow_Idle, \ + .anim_9 = ANIM_ToadGuard_Yellow_Idle, \ + .anim_A = ANIM_ToadGuard_Yellow_Idle, \ + .anim_B = ANIM_ToadGuard_Yellow_Idle, \ + .anim_C = ANIM_ToadGuard_Yellow_Idle, \ + .anim_D = ANIM_ToadGuard_Yellow_Idle, \ + .anim_E = ANIM_ToadGuard_Yellow_Idle, \ + .anim_F = ANIM_ToadGuard_Yellow_Idle, \ +} diff --git a/src/world/common/npc/Toad_Guard.inc.c b/src/world/common/npc/Toad_Guard.inc.c new file mode 100644 index 0000000000..23d682b37f --- /dev/null +++ b/src/world/common/npc/Toad_Guard.inc.c @@ -0,0 +1,29 @@ +#include "Toad.h" + +#include "world/common/enemy/ai/StationaryAI.inc.c" + +StationaryAISettings N(AISettings_Toad_Guard) = { + .playerSearchInterval = -1, + .chaseRadius = 300.0f, + .unk_20 = 30, +}; + +EvtScript N(EVS_NpcAI_Toad_Guard) = { + EVT_CALL(N(StationaryAI_Main), EVT_PTR(N(AISettings_Toad_Guard))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Toad_Guard) = { + .height = 30, + .radius = 24, + .level = 99, + .ai = &N(EVS_NpcAI_Toad_Guard), +}; + +NpcSettings N(NpcSettings_ToadKid_Guard) = { + .height = 23, + .radius = 19, + .level = 99, + .ai = &N(EVS_NpcAI_Toad_Guard), +}; diff --git a/src/world/common/todo/UnkFunc12.inc.c b/src/world/common/todo/UnkFunc12.inc.c index e81dcb1fac..cf2e01990f 100644 --- a/src/world/common/todo/UnkFunc12.inc.c +++ b/src/world/common/todo/UnkFunc12.inc.c @@ -15,7 +15,9 @@ ApiStatus N(UnkFunc12)(Evt* script, s32 isInitialCall) { posY = playerStatus->position.y + 10.0f; posZ = playerStatus->position.z; hitDepth = 40.0f; + npc_raycast_down_sides(0, &posX, &posY, &posZ, &hitDepth); + playerStatus->position.x = posX; playerStatus->position.y = posY; playerStatus->position.z = posZ; diff --git a/src/world/dead/area_flo/flo_03/flo_03_4_foliage.c b/src/world/dead/area_flo/flo_03/flo_03_4_foliage.c index 6d7a967c87..daee487952 100644 --- a/src/world/dead/area_flo/flo_03/flo_03_4_foliage.c +++ b/src/world/dead/area_flo/flo_03/flo_03_4_foliage.c @@ -49,8 +49,8 @@ EvtScript N(EVS_SetupFoliage) = { EVT_SET(AF_FLO_TreeDrop_RedBerry1, FALSE) EVT_SET(AF_FLO_TreeDrop_RedBerry2, FALSE) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o242, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o242, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/dead/area_flo/flo_07/flo_07_3_npc.c b/src/world/dead/area_flo/flo_07/flo_07_3_npc.c index 06d25659d5..3f22057d2f 100644 --- a/src/world/dead/area_flo/flo_07/flo_07_3_npc.c +++ b/src/world/dead/area_flo/flo_07/flo_07_3_npc.c @@ -238,8 +238,8 @@ BombTrigger N(BombPos_CrystalTree) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_CrystalTree))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o5, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_CrystalTree)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o5, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_CrystalTree)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/dead/area_flo/flo_08/flo_08_5_foliage.c b/src/world/dead/area_flo/flo_08/flo_08_5_foliage.c index 7d83331add..e82938ec33 100644 --- a/src/world/dead/area_flo/flo_08/flo_08_5_foliage.c +++ b/src/world/dead/area_flo/flo_08/flo_08_5_foliage.c @@ -49,8 +49,8 @@ EvtScript N(EVS_SetupFoliage) = { EVT_SET(AF_FLO_TreeDrop_BlueBerry1, FALSE) EVT_SET(AF_FLO_TreeDrop_BlueBerry2, FALSE) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o172, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o172, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/dead/area_flo/flo_09/flo_09_4_foliage.c b/src/world/dead/area_flo/flo_09/flo_09_4_foliage.c index bff932467f..3d97c45632 100644 --- a/src/world/dead/area_flo/flo_09/flo_09_4_foliage.c +++ b/src/world/dead/area_flo/flo_09/flo_09_4_foliage.c @@ -136,14 +136,14 @@ EvtScript N(EVS_SetupFoliage) = { EVT_SET(AB_FLO_TreePuzzle_FirstCorrect, 0) EVT_SET(AB_FLO_TreePuzzle_SecondCorrect, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o10, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o10, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o3, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o3, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o13, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o13, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/dead/area_flo/flo_10/flo_10_7_foliage.c b/src/world/dead/area_flo/flo_10/flo_10_7_foliage.c index 0e86487b5b..2c3a427d3a 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_7_foliage.c +++ b/src/world/dead/area_flo/flo_10/flo_10_7_foliage.c @@ -43,8 +43,8 @@ BombTrigger N(BombPos_Tree1) = { EvtScript N(EVS_SetupFoliage) = { EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o85, 1, 0) - EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o85, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) EVT_RETURN EVT_END }; diff --git a/src/world/dead/area_flo/flo_18/flo_18_4_npc.c b/src/world/dead/area_flo/flo_18/flo_18_4_npc.c index 8fa2d4a367..baa8269f88 100644 --- a/src/world/dead/area_flo/flo_18/flo_18_4_npc.c +++ b/src/world/dead/area_flo/flo_18/flo_18_4_npc.c @@ -3,7 +3,7 @@ #include "world/common/todo/UnkFunc42.inc.c" #include "world/common/enemy/complete/Lakitu.h" -#include "world/common/enemy/complete/Magikoopa.h" +#include "world/common/enemy/complete/YMagikoopa.h" NpcSettings N(NpcSettings_Lakitu) = { .height = 32, diff --git a/src/world/dead/area_kzn/kzn_18/kzn_18_0_header.c b/src/world/dead/area_kzn/kzn_18/kzn_18_0_header.c index 804eda8826..e4451178a5 100644 --- a/src/world/dead/area_kzn/kzn_18/kzn_18_0_header.c +++ b/src/world/dead/area_kzn/kzn_18/kzn_18_0_header.c @@ -20,5 +20,5 @@ MapSettings N(settings) = { .main = &N(EVS_Main), .entryList = &N(Entrances), .entryCount = ENTRY_COUNT(N(Entrances)), - .tattle = { .get = N(get_tattle) }, + .tattle = { .get = &N(get_tattle) }, }; diff --git a/src/world/partners.c b/src/world/partners.c index 2ab2de045b..2cd45bd5d1 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -42,7 +42,7 @@ extern s32 D_8010CD20; // BSS -BSS s32 D_8010CD34; +BSS s32 PartnerCommandState; BSS PlayerPathElement gPlayerMoveHistory[40]; BSS s32 gPlayerMoveHistoryIndex; BSS s32 D_8010CFBC; @@ -57,8 +57,8 @@ extern Evt* wPartnerCurrentScript; extern s32 wCurrentPartnerId; extern s32 wPartnerCurrentScriptID; extern s32 D_8010CFE0; -extern s32 D_8010CFE4; -extern s32 D_8010CFE8; +extern s32 NextPartnerID; +extern s32 NextPartnerCommand; extern WorldPartner* wPartner; extern HudScript HES_Partner0; @@ -623,7 +623,7 @@ void partner_free_npc(void) { } void _use_partner_ability(void) { - static u32 D_8010CD30; // goes into BSS, needs to be static for the function to match + static u32 PartnerCommand; // goes into BSS, needs to be static for the function to match PlayerData* playerData = &gPlayerData; PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; @@ -649,25 +649,25 @@ void _use_partner_ability(void) { playerStatus->animFlags |= PA_FLAGS_PARTNER_USAGE_STOPPED; } - if (D_8010CFE8 != 0) { - D_8010CD30 = D_8010CFE8; - D_8010CD34 = 0; - D_8010CFE8 = 0; + if (NextPartnerCommand != PARTNER_CMD_NONE) { + PartnerCommand = NextPartnerCommand; + PartnerCommandState = 0; + NextPartnerCommand = PARTNER_CMD_NONE; } - if (D_8010CD30 >= 2) { - if (D_8010CD30 != 8) { + if (PartnerCommand >= PARTNER_CMD_INSTA_SWITCH) { + if (PartnerCommand != PARTNER_CMD_USE_ABILITY) { D_8010CFC4 = 0; } } - switch (D_8010CD30) { - case 0: + switch (PartnerCommand) { + case PARTNER_CMD_NONE: break; - case 3: + case PARTNER_CMD_SWITCH: D_8010CFC4 = 3; - switch (D_8010CD34) { - case 0: + switch (PartnerCommandState) { + case 0: // put away current partner disable_player_input(); sfx_play_sound(SOUND_D); kill_script_by_ID(wPartnerCurrentScriptID); @@ -675,29 +675,30 @@ void _use_partner_ability(void) { wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; - D_8010CD34 += 1; + PartnerCommandState += 1; set_time_freeze_mode(TIME_FREEZE_PARTIAL); break; - case 1: + case 1: // free old partner and create new one if (does_script_exist(wPartnerCurrentScriptID)) { break; } set_time_freeze_mode(TIME_FREEZE_NORMAL); partner_free_npc(); - playerData->currentPartner = wCurrentPartnerId = D_8010CFE4; + playerData->currentPartner = wCurrentPartnerId = NextPartnerID; partner_create_npc(); sfx_play_sound(SOUND_E); wPartner->init(wPartnerNpc); - D_8010CD34 += 1; - case 2: + PartnerCommandState += 1; + // fall through + case 2: // take out new partner wPartnerCurrentScript = start_script(wPartner->takeOut, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; - D_8010CD34 += 1; + PartnerCommandState += 1; set_time_freeze_mode(TIME_FREEZE_PARTIAL); break; - case 3: + case 3: // resume normal partner behaviour if (does_script_exist(wPartnerCurrentScriptID)) { break; } @@ -705,21 +706,21 @@ void _use_partner_ability(void) { wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; - D_8010CD30 = 1; + PartnerCommand = PARTNER_CMD_INIT; enable_player_input(); set_time_freeze_mode(TIME_FREEZE_NORMAL); break; } break; - case 2: + case PARTNER_CMD_INSTA_SWITCH: D_8010CFC4 = 3; - switch (D_8010CD34) { + switch (PartnerCommandState) { case 0: kill_script_by_ID(wPartnerCurrentScriptID); - D_8010CD34 += 1; + PartnerCommandState += 1; case 1: partner_free_npc(); - playerData->currentPartner = wCurrentPartnerId = D_8010CFE4; + playerData->currentPartner = wCurrentPartnerId = NextPartnerID; partner_create_npc(); wPartnerNpc->pos.x = wSavedPartnerPosX; wPartnerNpc->pos.y = wSavedPartnerPosY; @@ -729,22 +730,23 @@ void _use_partner_ability(void) { wPartnerNpc->scale.y = 1.0f; wPartnerNpc->scale.z = 1.0f; wPartner->init(wPartnerNpc); - D_8010CD34 += 1; + PartnerCommandState += 1; + // fall through case 2: - D_8010CD34 += 1; + PartnerCommandState += 1; break; case 3: wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; - D_8010CD30 = 1; + PartnerCommand = PARTNER_CMD_INIT; break; } break; - case 4: - switch (D_8010CD34) { - case 0: + case PARTNER_CMD_PUT_AWAY: + switch (PartnerCommandState) { + case 0: // put away current partner disable_player_input(); sfx_play_sound(SOUND_D); kill_script_by_ID(wPartnerCurrentScriptID); @@ -752,44 +754,45 @@ void _use_partner_ability(void) { wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; - D_8010CD34 += 1; + PartnerCommandState += 1; break; - case 1: + case 1: // free old partner and resume game if (does_script_exist(wPartnerCurrentScriptID)) { break; } partner_free_npc(); - D_8010CD30 = 1; - playerData->currentPartner = wCurrentPartnerId = D_8010CFE4; + PartnerCommand = PARTNER_CMD_INIT; + playerData->currentPartner = wCurrentPartnerId = NextPartnerID; enable_player_input(); break; } break; - case 5: - if (D_8010CD34 == 0) { + case PARTNER_CMD_INSTA_PUT_AWAY: + if (PartnerCommandState == 0) { kill_script_by_ID(wPartnerCurrentScriptID); partner_free_npc(); - D_8010CD30 = 1; - playerData->currentPartner = wCurrentPartnerId = D_8010CFE4; + PartnerCommand = PARTNER_CMD_INIT; + playerData->currentPartner = wCurrentPartnerId = NextPartnerID; break; } break; - case 6: - switch (D_8010CD34) { - case 0: + case PARTNER_CMD_TAKE_OUT: + switch (PartnerCommandState) { + case 0: // create the new partner disable_player_input(); - playerData->currentPartner = wCurrentPartnerId = D_8010CFE4; + playerData->currentPartner = wCurrentPartnerId = NextPartnerID; partner_create_npc(); wPartner->init(wPartnerNpc); - D_8010CD34 += 1; - case 1: + PartnerCommandState += 1; + // fall through + case 1: // take out new partner wPartnerCurrentScript = start_script(wPartner->takeOut, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; - D_8010CD34 += 1; + PartnerCommandState += 1; break; - case 2: + case 2: // resume standard partner behaviour if (does_script_exist(wPartnerCurrentScriptID)) { break; } @@ -797,17 +800,17 @@ void _use_partner_ability(void) { wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; - D_8010CD30 = 1; + PartnerCommand = PARTNER_CMD_INIT; enable_player_input(); break; } break; - case 7: + case PARTNER_CMD_INSTA_TAKE_OUT: D_8010CFC4 = 2; - switch (D_8010CD34) { + switch (PartnerCommandState) { case 0: disable_player_input(); - playerData->currentPartner = wCurrentPartnerId = D_8010CFE4; + playerData->currentPartner = wCurrentPartnerId = NextPartnerID; partner_create_npc(); wPartnerNpc->pos.x = wSavedPartnerPosX; wPartnerNpc->pos.y = wSavedPartnerPosY; @@ -817,28 +820,28 @@ void _use_partner_ability(void) { wPartnerNpc->scale.y = 1.0f; wPartnerNpc->scale.z = 1.0f; wPartner->init(wPartnerNpc); - D_8010CD34 += 1; + PartnerCommandState += 1; break; case 1: wPartnerCurrentScript = start_script(wPartner->update, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; - D_8010CD30 = 1; + PartnerCommand = PARTNER_CMD_INIT; wPartnerNpc->currentAnim = gPartnerAnimations[wCurrentPartnerId].fly; enable_player_input(); break; } break; - case 8: - switch (D_8010CD34) { + case PARTNER_CMD_USE_ABILITY: + switch (PartnerCommandState) { case 0: kill_script_by_ID(wPartnerCurrentScriptID); wPartnerCurrentScript = start_script(wPartner->useAbility, EVT_PRIORITY_14, EVT_FLAG_RUN_IMMEDIATELY); wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; - D_8010CD34 += 1; + PartnerCommandState += 1; break; case 1: if (does_script_exist(wPartnerCurrentScriptID)) { @@ -848,19 +851,20 @@ void _use_partner_ability(void) { wPartnerCurrentScript->owner2.npc = wPartnerNpc; wPartnerCurrentScriptID = wPartnerCurrentScript->id; wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; - D_8010CD30 = 1; + PartnerCommand = PARTNER_CMD_INIT; break; } break; - case 9: + case PARTNER_CMD_RESET: D_8010CFC4 = 1; - switch (D_8010CD34) { + switch (PartnerCommandState) { case 0: disable_player_input(); wPartner->init(wPartnerNpc); - D_8010CD34 += 1; + PartnerCommandState += 1; + // fall through case 1: - D_8010CD34 += 1; + PartnerCommandState += 1; break; case 2: if (partnerActionStatus->partnerActionState != 1) { @@ -873,20 +877,20 @@ void _use_partner_ability(void) { wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; } enable_player_input(); - D_8010CD30 = 1; + PartnerCommand = PARTNER_CMD_INIT; break; } break; - case 10: - if (D_8010CD34 == 0) { + case PARTNER_CMD_ABORT: + if (PartnerCommandState == 0) { if (does_script_exist(wPartnerCurrentScriptID)) { kill_script_by_ID(wPartnerCurrentScriptID); } - D_8010CD34 += 1; + PartnerCommandState += 1; } break; - case 1: - D_8010CD30 = 0; + case PARTNER_CMD_INIT: + PartnerCommand = PARTNER_CMD_NONE; D_8010CFE0 = 0; if (D_8010CFC4 != 3) { D_8010CFC4 = 0; @@ -895,19 +899,19 @@ void _use_partner_ability(void) { } } -void switch_to_partner(s32 arg0) { +void switch_to_partner(s32 partnerID) { PlayerStatus* playerStatus = &gPlayerStatus; - if (wCurrentPartnerId != arg0) { + if (wCurrentPartnerId != partnerID) { D_8010CFE0 = 1; - D_8010CFE4 = arg0; + NextPartnerID = partnerID; - if (wCurrentPartnerId != 0 && arg0 != 0) { - D_8010CFE8 = 3; - } else if (arg0 == 0) { - D_8010CFE8 = 4; + if (wCurrentPartnerId != PARTNER_NONE && partnerID != PARTNER_NONE) { + NextPartnerCommand = PARTNER_CMD_SWITCH; + } else if (partnerID == PARTNER_NONE) { + NextPartnerCommand = PARTNER_CMD_PUT_AWAY; } else { - D_8010CFE8 = 6; + NextPartnerCommand = PARTNER_CMD_TAKE_OUT; wSavedPartnerPosX = playerStatus->position.x; wSavedPartnerPosY = playerStatus->position.y; wSavedPartnerPosZ = playerStatus->position.z; @@ -915,22 +919,22 @@ void switch_to_partner(s32 arg0) { } } -void partner_init_after_battle(s32 arg0) { +void partner_init_after_battle(s32 partnerID) { PlayerStatus* playerStatus = &gPlayerStatus; PartnerActionStatus* actionStatus = &gPartnerActionStatus; - if (wCurrentPartnerId != arg0) { + if (wCurrentPartnerId != partnerID) { D_8010CFE0 = 1; - D_8010CFE4 = arg0; + NextPartnerID = partnerID; actionStatus->partnerActionState = 0; actionStatus->partnerAction_unk_1 = 0; - if (wCurrentPartnerId != 0 && arg0 != 0) { - D_8010CFE8 = 2; - } else if (arg0 == 0) { - D_8010CFE8 = 4; + if (wCurrentPartnerId != PARTNER_NONE && partnerID != PARTNER_NONE) { + NextPartnerCommand = PARTNER_CMD_INSTA_SWITCH; + } else if (partnerID == PARTNER_NONE) { + NextPartnerCommand = PARTNER_CMD_PUT_AWAY; } else { - D_8010CFE8 = 6; + NextPartnerCommand = PARTNER_CMD_TAKE_OUT; wSavedPartnerPosX = playerStatus->position.x; wSavedPartnerPosY = playerStatus->position.y; wSavedPartnerPosZ = playerStatus->position.z; @@ -938,17 +942,17 @@ void partner_init_after_battle(s32 arg0) { } } -void func_800EB2A4(s32 arg0) { - if (wCurrentPartnerId != arg0) { +void func_800EB2A4(s32 partnerID) { + if (wCurrentPartnerId != partnerID) { D_8010CFE0 = 1; - D_8010CFE4 = arg0; + NextPartnerID = partnerID; - if (wCurrentPartnerId != 0 && arg0 != 0) { - D_8010CFE8 = 3; - } else if (arg0 == 0) { - D_8010CFE8 = 5; + if (wCurrentPartnerId != PARTNER_NONE && partnerID != PARTNER_NONE) { + NextPartnerCommand = PARTNER_CMD_SWITCH; + } else if (partnerID == PARTNER_NONE) { + NextPartnerCommand = PARTNER_CMD_INSTA_PUT_AWAY; } else { - D_8010CFE8 = 7; + NextPartnerCommand = PARTNER_CMD_INSTA_TAKE_OUT; } } } @@ -960,11 +964,11 @@ s32 partner_use_ability(void) { wPartner != NULL && (wPartner->canUseAbility == NULL || wPartner->canUseAbility(wPartnerNpc))) { - if ((gGameStatusPtr->multiplayerEnabled != 0) && (actionStatus->currentButtons & BUTTON_B)) { + if (gGameStatusPtr->multiplayerEnabled && (actionStatus->currentButtons & BUTTON_B)) { sfx_play_sound(SOUND_MENU_ERROR); - } else if (wCurrentPartnerId != 0) { + } else if (wCurrentPartnerId != PARTNER_NONE) { D_8010CFE0 = 1; - D_8010CFE8 = 8; + NextPartnerCommand = PARTNER_CMD_USE_ABILITY; _use_partner_ability(); return TRUE; } @@ -994,7 +998,7 @@ void partner_reset_data(void) { get_worker(create_worker_frontUI(_use_partner_ability, NULL)); D_8010CFE0 = 1; - D_8010CFE8 = 9; + NextPartnerCommand = PARTNER_CMD_RESET; wCurrentPartnerId = currentPartner; if (gGameStatusPtr->keepUsingPartnerOnMapChange != 0) { @@ -1007,8 +1011,8 @@ void partner_reset_data(void) { wSavedPartnerPosY = playerStatus->position.y; wSavedPartnerPosZ = playerStatus->position.z; - if (wCurrentPartnerId == 0) { - D_8010CFE8 = 1; + if (wCurrentPartnerId == PARTNER_NONE) { + NextPartnerCommand = PARTNER_CMD_INIT; } else { partner_create_npc(); wPartnerNpc->scale.x = 1.0f; @@ -1023,7 +1027,7 @@ void partner_initialize_data(void) { wCurrentPartnerId = 0; D_8010CFE0 = 0; - D_8010CFE8 = 0; + NextPartnerCommand = PARTNER_CMD_NONE; D_8010CFC4 = 0; actionStatus->actingPartner = 0; actionStatus->inputDisabled = 0; @@ -1038,7 +1042,7 @@ void partner_initialize_data(void) { } s32 partner_test_enemy_collision(Npc* enemy) { - if (wCurrentPartnerId != 0 && wPartner->testFirstStrike != NULL) { + if (wCurrentPartnerId != PARTNER_NONE && wPartner->testFirstStrike != NULL) { return wPartner->testFirstStrike(wPartnerNpc, enemy); } return FALSE; @@ -1054,7 +1058,7 @@ EvtScript* partner_get_ride_script(void) { } void partner_handle_before_battle(void) { - if (wCurrentPartnerId != 0) { + if (wCurrentPartnerId != PARTNER_NONE) { s32* scriptID = &wPartnerCurrentScriptID; if (does_script_exist(*scriptID)) { @@ -1071,7 +1075,7 @@ void partner_handle_after_battle(void) { PartnerActionStatus* actionStatus = &gPartnerActionStatus; PlayerData* playerData = &gPlayerData; - if (wCurrentPartnerId != 0) { + if (wCurrentPartnerId != PARTNER_NONE) { if (does_script_exist(wPartnerCurrentScriptID) != 0) { kill_script_by_ID(wPartnerCurrentScriptID); } @@ -1081,7 +1085,7 @@ void partner_handle_after_battle(void) { wPartnerCurrentScriptID = wPartnerCurrentScript->id; wPartnerCurrentScript->groupFlags = EVT_GROUP_08 | EVT_GROUP_02; - D_8010CFE8 = 1; + NextPartnerCommand = PARTNER_CMD_INIT; if (playerData->currentPartner != PARTNER_WATT && actionStatus->actingPartner == PARTNER_WATT) { gPlayerStatusPtr->animFlags &= ~PA_FLAGS_USING_WATT; @@ -1096,30 +1100,25 @@ void partner_handle_after_battle(void) { } void partner_kill_ability_script(void) { - s32* scriptID = &wPartnerCurrentScriptID; - D_8010CFE8 = 10; + NextPartnerCommand = PARTNER_CMD_ABORT; - if (does_script_exist(*scriptID)) { - kill_script_by_ID(*scriptID); + if (does_script_exist(wPartnerCurrentScriptID)) { + kill_script_by_ID(wPartnerCurrentScriptID); } } void partner_suspend_ability_script(void) { if (wCurrentPartnerId != NULL) { - s32* scriptID = &wPartnerCurrentScriptID; - - if (does_script_exist(*scriptID)) { - suspend_all_script(*scriptID); + if (does_script_exist(wPartnerCurrentScriptID)) { + suspend_all_script(wPartnerCurrentScriptID); } } } void partner_resume_ability_script(void) { if (wCurrentPartnerId != NULL) { - s32* scriptID = &wPartnerCurrentScriptID; - - if (does_script_exist(*scriptID)) { - resume_all_script(*scriptID); + if (does_script_exist(wPartnerCurrentScriptID)) { + resume_all_script(wPartnerCurrentScriptID); } } } diff --git a/src/world/world.c b/src/world/world.c index d7e06ff8b1..71ee3ec692 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -330,7 +330,7 @@ MapConfig kgr_maps[] = { #include "area_kmr/kmr.h" MapConfig kmr_maps[] = { { MAP(kmr_00), .bgName = "kmr_bg", .sfxReverb = 1 }, - { MAP_UNSPLIT(kmr_02, 0x80243AF0), .bgName = "kmr_bg" }, + { MAP(kmr_02), .bgName = "kmr_bg" }, { MAP(kmr_03), .bgName = "kmr_bg" }, { MAP(kmr_04), .bgName = "kmr_bg" }, { MAP(kmr_05), .bgName = "kmr_bg" }, @@ -340,7 +340,7 @@ MapConfig kmr_maps[] = { { MAP(kmr_10), .bgName = "kmr_bg" }, { MAP(kmr_11), .bgName = "kmr_bg" }, { MAP(kmr_12), .bgName = "kmr_bg" }, - { MAP_UNSPLIT(kmr_20, 0x80242C00), .bgName = "kmr_bg" }, // Mario's House + { MAP(kmr_20), .bgName = "kmr_bg" }, // Mario's House { MAP_WITH_INIT(kmr_21) }, { MAP_WITH_INIT(kmr_22) }, { MAP_WITH_INIT(kmr_23) }, @@ -487,16 +487,17 @@ MapConfig hos_maps[] = { }; /// Bowser's Castle +#include "area_kpa/kpa.h" MapConfig kpa_maps[] = { - { MAP_UNSPLIT(kpa_01, 0x80240A70), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_03, 0x80241EE0), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_04, 0x80240190), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_08, 0x802414C0), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_09, 0x80241310), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_10, 0x80240360), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_11, 0x80240B40), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_12, 0x802404A0), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_13, 0x802404A0), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_01), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_03), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_04), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_08), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_09), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_10), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_11), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_12), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_13), .songVariation = 1, .sfxReverb = 3 }, { MAP_UNSPLIT(kpa_14, 0x802408A0), .songVariation = 1, .sfxReverb = 3 }, { MAP_UNSPLIT(kpa_15, 0x802405E0), .songVariation = 1, .sfxReverb = 3 }, { MAP_UNSPLIT(kpa_16, 0x802403B0), .songVariation = 1, .sfxReverb = 3 }, @@ -517,27 +518,27 @@ MapConfig kpa_maps[] = { { MAP_UNSPLIT(kpa_81, 0x80240480), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, { MAP_UNSPLIT(kpa_82, 0x80240460), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, { MAP_UNSPLIT(kpa_83, 0x80240090), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kpa_90, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_91, 0x80241920), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_94, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_95, 0x80241920), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_96, 0x80240040), .songVariation = 1, .sfxReverb = 1 }, - { MAP_UNSPLIT(kpa_100, 0x80240060), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kpa_101, 0x80240060), .songVariation = 1, .sfxReverb = 1, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kpa_102, 0x802435B0), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_111, 0x802413E0), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_112, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_113, 0x80240AD0), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_114, 0x80240070), .songVariation = 1, .sfxReverb = 2, .init = (MapInit)0x80240000 }, - { MAP_UNSPLIT(kpa_115, 0x802413F0), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_116, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_117, 0x80240010), .songVariation = 1, .sfxReverb = 1 }, - { MAP_UNSPLIT(kpa_118, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_119, 0x80240010), .songVariation = 1, .sfxReverb = 1 }, - { MAP_UNSPLIT(kpa_121, 0x80240020), .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(kpa_130, 0x80240760), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_133, 0x802404B0), .songVariation = 1, .sfxReverb = 3 }, - { MAP_UNSPLIT(kpa_134, 0x80240740), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_90), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_91), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_94), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_95), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_96), .songVariation = 1, .sfxReverb = 1 }, + { MAP_WITH_INIT(kpa_100), .songVariation = 1, .sfxReverb = 1 }, + { MAP_WITH_INIT(kpa_101), .songVariation = 1, .sfxReverb = 1 }, + { MAP(kpa_102), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_111), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_112), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_113), .songVariation = 1, .sfxReverb = 3 }, + { MAP_WITH_INIT(kpa_114), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_115), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_116), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_117), .songVariation = 1, .sfxReverb = 1 }, + { MAP(kpa_118), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_119), .songVariation = 1, .sfxReverb = 1 }, + { MAP(kpa_121), .songVariation = 1, .sfxReverb = 2 }, + { MAP(kpa_130), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_133), .songVariation = 1, .sfxReverb = 3 }, + { MAP(kpa_134), .songVariation = 1, .sfxReverb = 3 }, }; /// Peach's Castle Grounds diff --git a/tools/saved_byte_renames.txt b/tools/saved_byte_renames.txt index b96490cdcf..4b17f54285 100644 --- a/tools/saved_byte_renames.txt +++ b/tools/saved_byte_renames.txt @@ -10,8 +10,8 @@ GameByte(8) GB_Unused_EVT_08 GameByte(9) GB_Unused_EVT_09 GameByte(10) GB_Unused_EVT_0A GameByte(11) GB_Unused_EVT_0B -GameByte(12) GB_Unused_KMR_00 -GameByte(13) GB_Unused_KMR_01 +GameByte(12) GB_KMR20_MarioReadDiaryFlags_00 +GameByte(13) GB_KMR20_MarioReadDiaryFlags_01 GameByte(14) GB_KMR20_MarioReadLetterFlags_00 GameByte(15) GB_KMR20_MarioReadLetterFlags_01 GameByte(16) GB_Unused_KMR_04 diff --git a/tools/star_rod_idx_to_c.py b/tools/star_rod_idx_to_c.py index b5f60ba3bb..dbcd9886f9 100755 --- a/tools/star_rod_idx_to_c.py +++ b/tools/star_rod_idx_to_c.py @@ -175,7 +175,7 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0, namespace use_script_lib=False, ).disassemble() - if "shakeTree" in name or "searchBush" in name: + if "EVS_ShakeTree" in name or "EVS_SearchBush" in name: symbol_map[struct["vaddr"]][0][1] = name.split("_",1)[0] + ")" if not treePrint: out += f"=======================================\n" diff --git a/ver/us/asm/bss2.s b/ver/us/asm/bss2.s index bee4d87178..950c240c77 100644 --- a/ver/us/asm/bss2.s +++ b/ver/us/asm/bss2.s @@ -7,7 +7,7 @@ .section .bss -dlabel D_8010C920 +dlabel PulseStoneNotificationCallback .space 4 dlabel D_8010C924 @@ -28,10 +28,10 @@ dlabel TweesterTouchingPlayer dlabel D_8010C938 .space 4 -dlabel D_8010C93C +dlabel ISpyNotificationCallback .space 4 -dlabel D_8010C940 +dlabel TalkNotificationCallback .space 4 dlabel gSpinHistoryBufferPos @@ -49,7 +49,7 @@ dlabel D_8010C950 dlabel TweesterTouchingPartner .space 4 -dlabel D_8010C958 +dlabel InteractNotificationCallback .space 4 dlabel PrevPlayerDirection diff --git a/ver/us/asm/bss2_2.s b/ver/us/asm/bss2_2.s index 71988a293e..dd524eba3f 100644 --- a/ver/us/asm/bss2_2.s +++ b/ver/us/asm/bss2_2.s @@ -40,10 +40,10 @@ dlabel wPartnerCurrentScriptID dlabel D_8010CFE0 .space 4 -dlabel D_8010CFE4 +dlabel NextPartnerID .space 4 -dlabel D_8010CFE8 +dlabel NextPartnerCommand .space 4 dlabel wPartner diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B3AB0.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B3AB0.data.s deleted file mode 100644 index b34b50b47c..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8B3AB0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243A40_8B3AB0 -.word 0x43C38000, 0x00000000, 0x438F0000, 0x439D8000, 0xC3B98000, 0x00000000, 0x43980000, 0x42340000, 0xC3EC8000, 0x00000000, 0x40800000, 0x42B40000, 0x00000000, 0x420C0000, 0x43B18000, 0x43340000, 0x42700000, 0x00000000, 0x41200000, 0x00000000, 0xC3660000, 0x42100000, 0xC3A60000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x43480000, 0x42480000, 0x428C0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80245218, D_80243A40_8B3AB0, 0x0000000B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019003A, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000010, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF82, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000010, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000005, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000082, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B3D10.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B3D10.data.s deleted file mode 100644 index 5c28ef8207..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8B3D10.data.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243CA0_8B3D10 -.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, kmr_02_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, kmr_02_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, kmr_02_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, kmr_02_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, kmr_02_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_802444C0_8B4530, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802444C0_8B4530 -.word 0x00000043, 0x00000001, kmr_02_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_02_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_02_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, kmr_02_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, kmr_02_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_02_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, kmr_02_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802449D0_8B4A40 -.word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80244A00_8B4A70 -.word 0x00000043, 0x00000002, BasicAI_Main, D_802449D0_8B4A40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_80244A00_8B4A70, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_80244A4C_8B4ABC -.word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80244A84_8B4AF4 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80244ABC_8B4B2C -.word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80244AF4_8B4B64 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80244B2C_8B4B9C -.word D_80244A4C_8B4ABC, D_80244A84_8B4AF4, D_80244ABC_8B4B2C, D_80244AF4_8B4B64 - -dlabel D_80244B3C_8B4BAC -.word 0x40000000, 0x0000000F, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, BasicAI_Main, D_80244B3C_8B4BAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244B8C_8B4BFC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80257D20, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244BE8_8B4C58 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80257D28, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244C44_8B4CB4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80257D30, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244CA0_8B4D10 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF98, 0x00000043, 0x00000006, RotateGroup, 0x000000BD, 0x00000078, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x000000BF, 0x00000078, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000068, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244D38_8B4DA8 -.word 0x00000047, 0x00000005, D_80244B8C_8B4BFC, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244BE8_8B4C58, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244C44_8B4CB4, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244D9C_8B4E0C -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80244D38_8B4DA8, 0x00000044, 0x00000001, D_80244CA0_8B4D10, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000044, 0x00000001, D_80244CA0_8B4D10, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_80244D38_8B4DA8, 0x00000044, 0x00000001, EnterWalk, 0x0000000A, 0x00000002, 0xF8405BAB, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000004, 0x000B001C, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xF8405BAB, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xF8406311, 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, 0xF8406311, 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_80244D38_8B4DA8, 0x00000046, 0x00000001, D_80243CA0_8B3D10, 0x00000016, 0x00000001, 0x00000005, 0x00000044, 0x00000001, 0x80255380, 0x00000044, 0x00000001, D_80244D38_8B4DA8, 0x00000016, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, 0x80285C50, 0x00000044, 0x00000001, D_80244D38_8B4DA8, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244D38_8B4DA8, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802450B4_8B5124 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802450FC_8B516C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000014, 0x000001D2, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x00000014, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x000000BD, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x000000BF, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000068, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000001E, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetLoadType, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000004, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802513D8, 0x00000044, 0x00000001, 0x80243B30, 0x00000002, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF8C, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8025136C, 0x00000018, 0x00000001, 0xFFFFFF8C, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80251324, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8025139C, 0x00000023, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, ClearDefeatedEnemies, 0x00000046, 0x00000001, 0x80251E84, 0x00000046, 0x00000001, 0x80255588, 0x00000046, 0x00000001, 0x80254FD0, 0x00000044, 0x00000001, 0x80243B74, 0x00000046, 0x00000001, 0x80257A0C, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF86, 0x00000047, 0x00000005, D_802450B4_8B5124, 0x00000100, 0x00000015, 0x00000001, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFF98, 0x0000001C, 0x00000000, 0x00000047, 0x00000005, D_802450FC_8B516C, 0x00000100, 0x00000014, 0x00000001, 0x00000000, 0x00000023, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF85, 0x00000043, 0x00000003, EnableGroup, 0x000000B8, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000C1, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFF98, 0x00000043, 0x00000003, EnableGroup, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000C1, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B4, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B8, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000068, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000044, 0x00000001, D_80244D9C_8B4E0C, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFF81, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_80240370_8B03E0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s deleted file mode 100644 index b658078196..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8B5640.data.s +++ /dev/null @@ -1,471 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel kmr_02_varStash -.word 0x00000000 - -dlabel D_802455D4_8B5644 -.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 kmr_02_Quizmo_Answers -.byte 0x02, 0x01, 0x01, 0x02, 0x02, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x02, 0x02, 0x02, 0x02, 0x00, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x02, 0x01, 0x00, 0x02, 0x02, 0x01, 0x02, 0x00, 0x02, 0x02, 0x01, 0x01, 0x01 - -dlabel kmr_02_Quizmo_Requirements -.word 0xFFFFFF94, 0x00000000, 0xFFFFFFB4, 0x0000000A, 0xFFFFFFCA, 0x00000014, 0xFFFFFFF2, 0x0000001E, 0x00000006, 0x00000025, 0x00000027, 0x0000002C, 0x0000003A, 0x00000034, 0x00000058, 0x0000003C, 0x00000060, 0x00000040, 0x00000000, 0x00000040 - -dlabel D_802456C4_8B5734 -.word 0x00000043, 0x00000001, kmr_02_Quizmo_ShouldQuizmoLeave, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000012C, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00AF000C, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245774_8B57E4 -.word 0x00000043, 0x00000003, kmr_02_Quizmo_GetCamVfov, 0x00000000, 0xF4ACD480, 0x00000043, 0x00000003, kmr_02_Quizmo_SetCamVfov, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetCamType, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000172, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFFFFFE8E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C80, 0x00000043, 0x00000004, GetCamPitch, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xF24AAE80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A5280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000008, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetCamDistance, 0x00000000, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000011, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFFFFFFEF, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFE363C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245A0C_8B5A7C -.word 0x00000043, 0x00000003, kmr_02_Quizmo_SetCamVfov, 0x00000000, 0xF4ACD480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245A48_8B5AB8 -.word 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, kmr_02_Quizmo_AddViewRelativeOffset, 0xF4ACD481, 0xF4ACD483, 0x00000053, 0xFE363C80, 0xFE363C81, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x0000003C, 0x0000002F, 0x00000002, 0xFE363C84, 0x0000003C, 0x0000002C, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C84, 0xF4ACD483, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C83, 0xF4ACD482, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002C, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C84, 0xF4ACD483, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C83, 0xF4ACD482, 0xFE363C84, 0x00000057, 0x00000000, 0x00000043, 0x00000001, kmr_02_Quizmo_SpinPlayer, 0x00000043, 0x00000004, func_802D2884, 0xF4ACD481, 0xF4ACD483, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245BF8_8B5C68 -.word 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000006, kmr_02_Quizmo_AddViewRelativeOffset, 0xFE363C8A, 0xFE363C8C, 0x0000006C, 0xFE363C80, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C85, 0xF4ACD482, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x00000056, 0x00000000, 0x00000043, 0x00000001, kmr_02_Quizmo_UpdatePartnerPosition, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C8B, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C86, 0xFE363C84, 0x00000057, 0x00000000, 0x00000043, 0x00000001, kmr_02_Quizmo_SpinPartner, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245D30_8B5DA0 -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000008, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000006, kmr_02_Quizmo_AddViewRelativeOffset, 0xFE363C8A, 0xFE363C8C, 0xFFFFFFBA, 0xFE363C80, 0xFE363C81, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C84, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x0000003C, 0x0000002F, 0x00000002, 0xFE363C84, 0x0000003C, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C8A, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C8C, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0xFE363C83, 0xF4ACD482, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000008, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245E9C_8B5F0C -.word 0x00000044, 0x00000001, D_80245A48_8B5AB8, 0x00000044, 0x00000001, D_80245BF8_8B5C68, 0x00000046, 0x00000001, D_80245D30_8B5DA0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245F10_8B5F80 -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010016, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245F4C_8B5FBC -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFE, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFE, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010008, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFE, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010009, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xF4ACD482, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246A94_8B6B04 -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010023, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246AD4_8B6B44 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000006, kmr_02_Quizmo_AddViewRelativeOffset, 0xF4ACD481, 0xF4ACD483, 0x00000019, 0xFE363C80, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C82, 0xF4ACD481, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C83, 0xF4ACD483, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xF4ACD481, 0xF4ACD483, 0x00000028, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246BB0_8B6C20 -.word 0x00000045, 0x00000002, D_80245F4C_8B5FBC, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000049, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80246AD4_8B6B44, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246C60_8B6CD0 -.word 0x00000045, 0x00000002, D_80246A94_8B6B04, 0xFE363C81, 0x00000008, 0x00000001, 0x0000003C, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000049, 0x00000001, 0xFE363C81, 0x00000046, 0x00000001, D_80246AD4_8B6B44, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246D10_8B6D80 -.word 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xF4ACD481, 0xF4ACD482, 0xF4ACD483, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000010, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000A, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406267, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080009, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080008, 0x00000024, 0x00000002, 0xF8406267, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000C, 0x00000046, 0x00000001, D_802456C4_8B5734, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8406281, 0x00000001, 0x00000043, 0x00000001, kmr_02_Quizmo_HideEntities, 0x00000043, 0x00000001, kmr_02_Quizmo_HideWorld, 0x00000044, 0x00000001, D_80245774_8B57E4, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000148, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000045, 0x00000002, D_80245E9C_8B5F0C, 0xFE363C81, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000B, 0x00000043, 0x00000002, PlaySound, 0x00000089, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000001, kmr_02_Quizmo_CreateStage, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x002C0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0005, 0x00AF0006, 0x00000000, 0xFE363C80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000024, 0x00000002, 0xFE363C80, 0x002D0000, 0x00000027, 0x00000002, 0xFE363C80, 0xF5DE02E0, 0x00000043, 0x00000002, PlaySound, 0x0000008E, 0x00000043, 0x00000002, ShowChoice, 0xFE363C80, 0x00000049, 0x00000001, 0xFE363C81, 0x00000043, 0x00000002, StopSound, 0x0000008E, 0x00000044, 0x00000001, D_80245F10_8B5F80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, PlaySound, 0x0000008D, 0x00000043, 0x00000002, kmr_02_Quizmo_UnkStageEffectMode, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000043, 0x00000001, kmr_02_Quizmo_CreateWorker, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000001, kmr_02_Quizmo_UpdateRecords, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000001, CloseChoice, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0007, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, kmr_02_Quizmo_SetStageLightsDelay, 0x00000001, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, kmr_02_Quizmo_SetStageLightsDelay, 0x00000002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000002, PlaySound, 0x0000021C, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000008A, 0x00000043, 0x00000001, kmr_02_Quizmo_SetVannaAnim_Clap, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000043, 0x00000006, kmr_02_Quizmo_AddViewRelativeOffset, 0x00000000, 0x00000000, 0x00000053, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFD, 0x00000043, 0x00000006, kmr_02_Quizmo_AddViewRelativeOffset, 0x00000000, 0x00000000, 0x0000003A, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000043, 0x00000006, kmr_02_Quizmo_AddViewRelativeOffset, 0x00000000, 0x00000000, 0x0000005D, 0xFE363C80, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000044, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80246BB0_8B6C20, 0xFE363C81, 0x00000027, 0x00000002, 0xF5DE02E0, 0x00000001, 0x0000000D, 0x00000002, 0xF5DE02E0, 0x0000003F, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00080010, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, kmr_02_Quizmo_SetStageLightsDelay, 0x0000000F, 0x00000043, 0x00000001, kmr_02_Quizmo_SetVannaAnim_Idle, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x00080011, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0006, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0005, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000002, kmr_02_Quizmo_SetStageLightsDelay, 0x0000000F, 0x00000043, 0x00000001, kmr_02_Quizmo_SetVannaAnim_Idle, 0x00000043, 0x00000003, SetMessageValue, 0xF5DE02E0, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02E0, 0x00000001, 0x00000043, 0x00000003, SetMessageMsg, MessageSingular, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetMessageMsg, MessagePlural, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00AF0004, 0x00AF0001, 0x00000000, 0x0008000F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF0009, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000002, 0x00000043, 0x00000002, PlaySound, 0x0000021D, 0x00000043, 0x00000002, PlaySound, 0x0000008B, 0x00000045, 0x00000002, D_80246C60_8B6CD0, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x0000000F, PlayEffect, 0x0000002B, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x0008000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00AF000A, 0x00000005, 0x00000001, 0x00000000, 0x00000055, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_02_Quizmo_UnkStageEffectMode, 0xFFFFFFFF, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, PlaySound, 0x0000008F, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, StopSound, 0x00000089, 0x00000057, 0x00000000, 0x00000043, 0x00000001, kmr_02_Quizmo_SetVannaAnim_Wave, 0x00000043, 0x00000001, kmr_02_Quizmo_DestroyEffects, 0x00000046, 0x00000001, D_802456C4_8B5734, 0x00000044, 0x00000001, D_80245A0C_8B5A7C, 0x00000043, 0x00000001, kmr_02_Quizmo_FadeInWorld, 0x00000043, 0x00000001, kmr_02_Quizmo_ShowEntities, 0x00000024, 0x00000002, 0xF8406281, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247A40_8B7AB0 -.word 0x00000043, 0x00000001, kmr_02_Quizmo_ShouldAppear, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetNpcSprite, 0xFFFFFFFF, 0x00AF0001, 0x00000043, 0x00000001, kmr_02_Quizmo_RenderInit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247AB4_8B7B24 -.word 0x0000003C, 0x00000001, 0x80257F30, 0x00000024, 0x00000002, 0xF8406269, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000001, 0x00000046, 0x00000001, D_80246D10_8B6D80, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00400000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247B34_8B7BA4 -.word 0x00000043, 0x00000001, kmr_02_Quizmo_NPC_Aux_Impl, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247B50_8B7BC0 -.word 0x3F333333, 0x0000001E, 0x00000014, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80247B80_8B7BF0 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80247B50_8B7BC0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247BA0_8B7C10 -.word 0x00AF0001, 0x0023001C, D_80247A40_8B7AB0, D_80247AB4_8B7B24, 0x00000000, 0x00000000, D_80247B34_8B7BA4, 0x00000000, 0x00000D01, 0x00000000, 0x00630000, 0x00AF0001, 0x0023001C, D_80247A40_8B7AB0, D_80247AB4_8B7B24, D_80247B80_8B7BF0, 0x00000000, D_80247B34_8B7BA4, 0x00000000, 0x00000C01, 0x00000000, 0x00630010 - -dlabel D_80247BF8_8B7C68 -.word 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x43960000, 0x00000000, 0x0000001E - -dlabel D_80247C1C_8B7C8C -.word 0x00000043, 0x00000002, kmr_02_StationaryAI_Main, D_80247BF8_8B7C68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247C3C_8B7CAC -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, D_80247C1C_8B7C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, D_80247C1C_8B7C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80247C94_8B7D04 -.word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80247CC4_8B7D34 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80247C94_8B7D04, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247CE4_8B7D54 -.word 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_80247CC4_8B7D34, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_80247D10_8B7D80 -.word 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_80247D3C_8B7DAC -.word 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x43960000, 0x00000000, 0x0000001E - -dlabel D_80247D60_8B7DD0 -.word 0x00000043, 0x00000002, kmr_02_StationaryAI_Main, D_80247D3C_8B7DAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247D80_8B7DF0 -.word 0x00000000, 0x0028001E, 0x00000000, 0x00000000, D_80247D60_8B7DD0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_80247DAC_8B7E1C -.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 kmr_02_ItemChoice_HasSelectedItem -.word 0x00000000 - -dlabel kmr_02_ItemChoice_SelectedItemID -.word 0x00000000 - -dlabel D_80247E38_8B7EA8 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kmr_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_80247E38_8B7EA8, 0x00000010, 0x00000000, kmr_02_D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247FCC_8B803C -.word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80248004_8B8074 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_8024803C_8B80AC -.word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80248074_8B80E4 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_802480AC_8B811C -.word D_80247FCC_8B803C, D_80248004_8B8074, D_8024803C_8B80AC, D_80248074_8B80E4 - -dlabel D_802480BC_8B812C -.word 0x40000000, 0x0000000F, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_802480EC_8B815C -.word 0x00000043, 0x00000002, BasicAI_Main, D_802480BC_8B812C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024810C_8B817C -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248154_8B81C4 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802481D4_8B8244 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80248154_8B81C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, kmr_02_ItemChoice_SaveSelected, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802484F8_8B8568 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802422F8_8B2368, 0xFE363C80, 0x0000004E, 0x00000006, D_802481D4_8B8244, 0x00000010, 0x00000000, kmr_02_D_80257F58, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_8024226C_8B22DC, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248568_8B85D8 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kmr_02_LetterDelivery_SaveNpcAnim, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000043, 0x00000003, FindKeyItem, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000046, 0x00000001, D_802484F8_8B8568, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kmr_02_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248860_8B88D0 -.word 0x00000040, 0x00000000 - -dlabel D_80248868_8B88D8 -.word 0x00000043, 0x0000000B, kmr_02_LetterDelivery_Init, 0x00000003, 0x00A00004, 0x00A00001, 0x00000040, 0x00000046, 0x000B006F, 0x000B0070, 0x000B0071, 0x000B0072, D_80248860_8B88D0, 0x00000046, 0x00000001, D_80248568_8B85D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802488B8_8B8928 -.word 0x00000052, 0x00000000 - -dlabel D_802488C0_8B8930 -.word 0x00000043, 0x0000000B, kmr_02_LetterDelivery_Init, 0x00000003, 0x00A00004, 0x00A00001, 0x00000052, 0x00000000, 0x000B0073, 0x000B0074, 0x000B0075, 0x000B0076, D_802488B8_8B8928, 0x00000046, 0x00000001, D_80248568_8B85D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248910_8B8980 -.word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000114, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000003, AddBadge, 0x00000114, 0xFE363C80, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248978_8B89E8 -.word 0x00000037, 0x00000000 - -dlabel D_80248980_8B89F0 -.word 0x00000043, 0x0000000B, kmr_02_LetterDelivery_Init, 0x00000000, 0x009D0008, 0x009D0001, 0x00000037, 0x00000000, 0x000B0045, 0x000B0046, 0x000B0047, 0x000B0048, D_80248978_8B89E8, 0x00000046, 0x00000001, D_80248568_8B85D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802489D0_8B8A40 -.word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248A34_8B8AA4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248A44_8B8AB4 -.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000064, 0x00000046, 0x00000001, D_80247CC4_8B7D34, 0x0000001D, 0x00000001, 0x00000065, 0x0000001D, 0x00000001, 0x00000066, 0x0000001D, 0x00000001, 0x00000003, 0x0000001D, 0x00000001, 0x00000067, 0x00000046, 0x00000001, D_80247CC4_8B7D34, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248AD4_8B8B44 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF85, 0x0000000A, 0x00000002, 0xF8405BA4, 0x00000000, 0x00000024, 0x00000002, 0xF8405BA4, 0x00000001, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8E80, 0x00000000, 0xF2462E80, 0xF24AB74D, 0xF24A5C80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000005, 0x000B004D, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405BA5, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000005, 0x000B004E, 0x00000024, 0x00000002, 0xF8405BA5, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000005, 0x000B004F, 0x00000024, 0x00000002, 0xF8405BA5, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFF85, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0051, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248C48_8B8CB8 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80248A44_8B8AB4, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80248AD4_8B8B44, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF85, 0x00000018, 0x00000001, 0xFFFFFF86, 0x00000043, 0x00000003, func_80242394_8B2404, 0x00000002, 0x00000002, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802480EC_8B815C, 0x00000018, 0x00000001, 0xFFFFFF8D, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000042, 0x00000000, 0xFFFFFF82, 0x0000001B, 0x00000001, 0xFFFFFF8D, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248D18_8B8D88 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248D28_8B8D98 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, kmr_02_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000007, MakeItemEntity, 0x00000056, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248DC8_8B8E38 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E000F, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000003, GetAngleToNPC, 0x00000001, 0xFE363C8A, 0x0000000F, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000040, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000214, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80248EBC_8B8F2C -.word 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0096, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8405B9F, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0097, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0098, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, ShowChoice, 0x001E0011, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, FindKeyItem, 0x00000056, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000046, 0x00000001, D_80248D28_8B8D98, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B009A, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B009B, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80248DC8_8B8E38, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0099, 0x00000024, 0x00000002, 0xF8405B9F, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024919C_8B920C -.word 0x00000043, 0x00000003, HasKeyItem, 0x00000056, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80248EBC_8B8F2C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF84, 0x00000014, 0x00000001, 0xF70F2E82, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0088, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0089, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000002, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B008A, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000001, 0x00000023, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFF85, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B008B, 0x00000018, 0x00000001, 0xFFFFFF86, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B008C, 0x00000018, 0x00000001, 0xFFFFFF90, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B008D, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B008E, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B008F, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B008F, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000001, 0x000B0090, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0xFFFFFFFC, 0x000B0091, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0x00000027, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0092, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0093, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000001, 0x000B0094, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0xFFFFFFFC, 0x000B0095, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249544_8B95B4 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024919C_8B920C, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF84, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80248D18_8B8D88, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000005, 0x00000000, 0xFFFFFF66, 0x00000018, 0x00000001, 0xFFFFFF85, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80248D18_8B8D88, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000D7, 0x00000000, 0x000000D7, 0x00000018, 0x00000001, 0xFFFFFF86, 0x00000043, 0x00000003, func_80242394_8B2404, 0x00000001, 0x00000003, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802480EC_8B815C, 0x00000018, 0x00000001, 0xFFFFFF8D, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000005E, 0x00000000, 0xFFFFFF93, 0x00000018, 0x00000001, 0x00000027, 0x00000018, 0x00000001, 0x00000059, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x0000001B, 0x00000001, 0x00000059, 0x0000001C, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249694_8B9704 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002D, 0x00000043, 0x00000002, ShowChoice, 0x001E0013, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002E, 0x00000043, 0x00000002, ShowChoice, 0x001E0013, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002F, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0030, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_802427B0_8B2820, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF8405BDE, 0x00000001, 0x00000043, 0x00000001, func_802427CC_8B283C, 0x00000043, 0x00000001, func_802427EC_8B285C, 0x00000024, 0x00000002, 0xF8405BDE, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802497F4_8B9864 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80242014_8B2084, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B001D, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFED9, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000269, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000015, 0x000001D2, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x00000014, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x000000A7, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x000000A9, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000016, 0x7FFFFE00, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0002, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFFA1, 0x00000000, 0xFFFFFFAA, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFFA4, 0x00000000, 0xFFFFFFD2, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF43, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF43, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFF93, 0xFFFFFFC3, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFF72, 0xFFFFFFA1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0002, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF12, 0xFFFFFFDF, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_80242014_8B2084, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFF58, 0xFFFFFFF1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000A, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0xFFFFFFFC, 0x000B001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x009E000C, 0x009E0002, 0x00000000, 0xFFFFFFFC, 0x000B001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x009D000B, 0x009D000A, 0x00000000, 0x00000002, 0x000B0020, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFB1, 0x00000000, 0xFFFFFFF6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFEA, 0x00000000, 0x0000000C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xFFFFFEA2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C1A, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFB1, 0xFFFFFFF6, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFFD3, 0x00000028, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0008, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFFE9, 0xFFFFFFEB, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000001E, 0x00000023, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000A, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D000B, 0x009D000A, 0x00000000, 0x000B0021, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8A80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000029, 0xFFFFFF6D, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D000C, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000007F, 0xFFFFFF63, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000003, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000003, 0x0000000A, 0x00000002, 0xF8405B9E, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2450280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0022, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, ShowChoice, 0x001E0011, 0x00000008, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000003, FindKeyItem, 0x00000056, 0xFE363C80, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C80, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFCE, 0xFFFFFFE8, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80248D28_8B8D98, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000C, 0x009E0002, 0x00000000, 0x000B0024, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0010, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0025, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0026, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80248DC8_8B8E38, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFFFFFFE2, 0x00000000, 0xFFFFFFED, 0x0000000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFFE9, 0xFFFFFFEB, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFAB, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0023, 0x00000024, 0x00000002, 0xF8405B9F, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0xF2462E80, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0xF2462E80, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0027, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000056, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8280, 0x00000028, 0xF2450280, 0xF24AB680, 0xF24A5E80, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x0000007F, 0x00000000, 0xFFFFFF63, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000020, 0xFFFFFF69, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C2, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0xFFFFFFFC, 0x000B002B, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000003, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B002C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFFC4, 0xFFFFFFF2, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000121, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000003, AddBadge, 0x00000121, 0xFE363C80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0002, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000003, 0x00000009, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80249694_8B9704, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000000, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000000, 0x00000043, 0x00000001, func_80242734_8B27A4, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0031, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8680, 0x0000001E, 0xF2462E80, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0032, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000057, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000003, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0033, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000003, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0034, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000002, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0035, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0036, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0xFFFFFFFC, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x00000002, 0x000B0037, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A7F4D, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000007, 0x00000043, 0x00000007, SpeakToNpc, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0xFFFFFFFC, 0x000B0038, 0x00000043, 0x00000001, kmr_02_LoadPartyImage, 0x00000044, 0x00000001, 0x80243C0C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0189, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80243C30, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, SpeakToNpc, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x00000002, 0x000B0039, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x009D0008, 0x009D0001, 0x00000000, 0x000B003A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000029, 0xFFFFFF71, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x009F0003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000007F, 0xFFFFFF63, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x009F0001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x00000050, 0xFFFFFF66, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000006F, 0xFFFFFF38, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFD, 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x000001C2, 0x00000000, 0x00000043, 0x00000001, func_80242788_8B27F8, 0x00000043, 0x00000001, func_80242710_8B2780, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B003B, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B003C, 0x00000013, 0x00000000, 0x00000043, 0x00000003, kmr_02_ChangeNpcToPartner, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000073, 0x00000000, 0xFFFFFECB, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000040, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000008, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000B8, 0x00000000, 0xFFFFFF6B, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000C8, 0x00000000, 0x00000064, 0x00000043, 0x00000002, RestartNpcAI, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000005, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF8D, 0x00000048, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000004, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B388_8BB3F8 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B398_8BB408 -.word 0x0000000A, 0x00000002, 0xF5DE02DC, 0x00000003, 0x0000000A, 0x00000002, 0xF8405BE4, 0x00000000, 0x00000024, 0x00000002, 0xF8405BE4, 0x00000001, 0x00000046, 0x00000001, D_8024810C_8B817C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0049, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009D0008, 0x009D0001, 0x00000000, 0x000B004A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7B4D, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000129, 0xFE363C81, 0xFFFFFFAC, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x009D0002, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000104, 0xFFFFFFA2, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000158, 0xFFFFFF8F, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x0000017D, 0xFFFFFFA3, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x009D0001, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 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, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x009D0002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000158, 0xFFFFFF8F, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000104, 0xFFFFFFA2, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C80, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009D0008, 0x009D0001, 0x00000000, 0x000B004B, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802455D4_8B5644, 0x00000043, 0x00000002, AddKeyItem, 0x0000005C, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009D0008, 0x009D0001, 0x00000000, 0x000B004C, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B73C_8BB7AC -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00040000, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000002, func_8024280C_8B287C, 0xF24A3280, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x009D0001, 0x00000043, 0x00000002, func_8024280C_8B287C, 0xF247AA80, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000002, func_8024280C_8B287C, 0xF24A3280, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B7E8_8BB858 -.word 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000002, func_8024280C_8B287C, 0xF24AC280, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x009D000D, 0x00000043, 0x00000002, func_8024280C_8B287C, 0xF24D4A80, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000002, func_8024280C_8B287C, 0xF24AC280, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00040000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B894_8BB904 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF85, 0x0000000A, 0x00000002, 0xF8405BA8, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8E80, 0x00000000, 0xF2462E80, 0xF24ACA80, 0xF24A5880, 0x00000046, 0x00000001, D_8024B73C_8BB7AC, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0019, 0x00000046, 0x00000001, D_8024B7E8_8BB858, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000001F3, 0x00000000, 0xFFFFFE86, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001F3, 0x00000046, 0xFFFFFE86, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000172, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8405BA8, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF84, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000D7, 0x00000000, 0x000000D7, 0x00000043, 0x00000003, BindNpcAI, 0x00000001, D_80248A34_8B8AA4, 0x0000000A, 0x00000002, 0xF8405BA0, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000109, 0x00000000, 0x000000F5, 0x00000043, 0x00000003, BindNpcAI, 0x00000003, D_80248A34_8B8AA4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_8024B73C_8BB7AC, 0x0000000A, 0x00000002, 0xF8405BA9, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009D0008, 0x009D0001, 0x00000000, 0x000B001A, 0x00000024, 0x00000002, 0xF8405BA9, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009D0008, 0x009D0001, 0x00000000, 0x000B001B, 0x00000024, 0x00000002, 0xF8405BA9, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024B7E8_8BB858, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFF90, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009D0008, 0x009D0001, 0x00000000, 0x000B003D, 0x00000018, 0x00000001, 0xFFFFFF96, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009D0008, 0x009D0001, 0x00000000, 0x000B003E, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009D0008, 0x009D0001, 0x00000000, 0x000B003F, 0x00000018, 0x00000001, 0x00000059, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0040, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0041, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0x00000059, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0042, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x009D0008, 0x009D0001, 0x00000000, 0x000B0043, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000000, 0x000B0044, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_80248980_8B89F0, 0x00000046, 0x00000001, D_802489D0_8B8A40, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024B398_8BB408, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024BCFC_8BBD6C -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024B388_8BB3F8, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024B894_8BB904, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF85, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000217, 0x00000019, 0xFFFFFE8F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x009D000D, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x000000C8, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFF86, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFF8D, 0x00000047, 0x00000005, D_802497F4_8B9864, 0x00000100, 0x00000015, 0x00000001, 0x00000000, 0x0000001B, 0x00000001, 0xFFFFFF8D, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000000AC, 0x00000000, 0xFFFFFF49, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000040, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x000000A7, 0x00000078, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x000000A9, 0x00000078, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000016, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024BEF8_8BBF68 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x00000110, 0x00000119, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0x00000003, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C84, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C84, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C83, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x0000010A, 0x000000E4, 0x00000014, 0x00000043, 0x00000003, GetNpcYaw, 0x00000003, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C84, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C84, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C83, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C04C_8BC0BC -.word 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF84, 0x00000046, 0x00000001, D_8024BEF8_8BBF68, 0x00000018, 0x00000001, 0xFFFFFF85, 0x0000000A, 0x00000002, 0xF8405BA0, 0x00000000, 0x00000046, 0x00000001, D_8024BEF8_8BBF68, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFF8E, 0x0000001C, 0x00000000, 0x00000046, 0x00000001, D_80247CC4_8B7D34, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C0FC_8BC16C -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF84, 0x0000000A, 0x00000002, 0xF8405BA0, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0052, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0053, 0x00000024, 0x00000002, 0xF8405BA0, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0054, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFF84, 0x0000000A, 0x00000002, 0xF8405BA0, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0056, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0057, 0x00000043, 0x00000003, BindNpcAI, 0x00000003, D_80248A34_8B8AA4, 0x00000024, 0x00000002, 0xF8405BA0, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0055, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0058, 0x00000056, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000046, 0x00000000, 0x000001F4, 0x00000000, 0x0000007F, 0x00000057, 0x00000000, 0x00000046, 0x00000001, 0x80255AA0, 0x00000018, 0x00000001, 0xFFFFFF86, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0063, 0x00000018, 0x00000001, 0xFFFFFF90, 0x0000000A, 0x00000002, 0xF8405BA1, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000003, 0x000B0064, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00010001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000007, SpeakToNpc, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0xFFFFFFFC, 0x000B0065, 0x00000024, 0x00000002, 0xF8405BA1, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0068, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00010001, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFA4, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0069, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B006A, 0x00000018, 0x00000001, 0x00000059, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B006B, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B006C, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0x00000059, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B006D, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B006E, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_80248868_8B88D8, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802488C0_8B8930, 0x00000046, 0x00000001, D_80248910_8B8980, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C644_8BC6B4 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024C04C_8BC0BC, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C0FC_8BC16C, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF84, 0x00000016, 0x00000001, 0xFFFFFF84, 0x0000000A, 0x00000002, 0xF8405BA0, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000109, 0x00000000, 0x000000F5, 0x00000043, 0x00000003, BindNpcAI, 0x00000003, D_80248A34_8B8AA4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00001, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFF86, 0x00000043, 0x00000003, func_80242394_8B2404, 0x00000003, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802480EC_8B815C, 0x00000018, 0x00000001, 0xFFFFFF8E, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000102, 0x00000000, 0x00000102, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000006A, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C778_8BC7E8 -.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000064, 0x00000046, 0x00000001, D_80247CC4_8B7D34, 0x0000001D, 0x00000001, 0x00000065, 0x0000001D, 0x00000001, 0x00000066, 0x0000001D, 0x00000001, 0x00000003, 0x0000001D, 0x00000001, 0x00000067, 0x00000046, 0x00000001, D_80247CC4_8B7D34, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C808_8BC878 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF85, 0x0000000A, 0x00000002, 0xF8405BA2, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00A10004, 0x00A10001, 0x00000000, 0x000B0077, 0x00000024, 0x00000002, 0xF8405BA2, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00A10004, 0x00A10001, 0x00000000, 0x000B0078, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFF8B, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00A10004, 0x00A10001, 0x00000000, 0x000B0079, 0x00000018, 0x00000001, 0xFFFFFF90, 0x0000000A, 0x00000002, 0xF8405BA3, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000005, 0x000B007A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x009D0001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00A10004, 0x00A10001, 0x00000000, 0x000B007B, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000005, 0x000B007C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00A10004, 0x00A10001, 0x00000000, 0x000B007D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000005, 0x000B007E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00A10004, 0x00A10001, 0x00000000, 0x000B007F, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF8405BA3, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00A10004, 0x00A10001, 0x00000000, 0x000B0080, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00A10004, 0x00A10001, 0x00000000, 0x000B0081, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000004, 0x000B0082, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000059, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00A10004, 0x00A10001, 0x00000000, 0x000B0083, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00A10004, 0x00A10001, 0x00000000, 0x000B0084, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000007, SpeakToNpc, 0xFFFFFFFC, 0x00010008, 0x00010001, 0x00000000, 0x00000004, 0x000B0085, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0x00000059, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00A10004, 0x00A10001, 0x00000000, 0x000B0086, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000004, 0x00A10004, 0x00A10001, 0x00000000, 0x000B0087, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024CC34_8BCCA4 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF82, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024C778_8BC7E8, 0x00000018, 0x00000001, 0xFFFFFF85, 0x00000018, 0x00000001, 0xFFFFFF86, 0x00000043, 0x00000003, func_80242394_8B2404, 0x00000004, 0x00000001, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802480EC_8B815C, 0x00000018, 0x00000001, 0xFFFFFF8B, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024C778_8BC7E8, 0x00000018, 0x00000001, 0xFFFFFF8D, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000C8, 0x00000000, 0x00000064, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024C778_8BC7E8, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024C778_8BC7E8, 0x00000018, 0x00000001, 0x00000059, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024C778_8BC7E8, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C808_8BC878, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024CDAC_8BCE1C -.word 0x00000043, 0x00000002, func_800445D4, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000064, 0x00000003, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF8D, 0x00000046, 0x00000001, D_80247CC4_8B7D34, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x0000001D, 0x00000001, 0x00000065, 0x0000001D, 0x00000001, 0x00000066, 0x0000001D, 0x00000001, 0x00000003, 0x0000001D, 0x00000001, 0x00000067, 0x00000046, 0x00000001, D_80247CC4_8B7D34, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024CE80_8BCEF0 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF85, 0x0000000A, 0x00000002, 0xF8405BA6, 0x00000000, 0x00000024, 0x00000002, 0xF8405BA6, 0x00000001, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8E80, 0x00000000, 0xF2462C80, 0xF24AB880, 0xF24A5280, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x009F0004, 0x009F0001, 0x00000005, 0x000B009C, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x009F0004, 0x009F0001, 0x00000005, 0x000B009D, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFF86, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x009F0004, 0x009F0001, 0x00000000, 0x000B009E, 0x00000018, 0x00000001, 0xFFFFFF90, 0x0000000A, 0x00000002, 0xF8405BA7, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x009F0004, 0x009F0001, 0x00000000, 0x000B009F, 0x00000024, 0x00000002, 0xF8405BA7, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x009F0004, 0x009F0001, 0x00000000, 0x000B00A0, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x009F0004, 0x009F0001, 0x00000000, 0x000B00A1, 0x00000018, 0x00000001, 0x00000059, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x009F0004, 0x009F0001, 0x00000000, 0x000B00A2, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x009F0004, 0x009F0001, 0x00000000, 0x000B00A3, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0x00000059, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x009F0004, 0x009F0001, 0x00000000, 0x000B00A4, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x009F0004, 0x009F0001, 0x00000000, 0x000B00A5, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D134_8BD1A4 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024CDAC_8BCE1C, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024CE80_8BCEF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D16C_8BD1DC -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kmr_02_GetKammyBroomEmitterPos, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C89, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C8B, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C86, 0x0000002D, 0x00000002, 0xFE363C84, 0xFE363C87, 0x0000002D, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000026, 0x00000002, 0xFE363C86, 0xFE363C89, 0x00000026, 0x00000002, 0xFE363C87, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x0000001F, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0xF24A7E80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D2E8_8BD358 -.word 0x00000001, 0x00000002, 0x00000003, 0x00000002, 0x00000001, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFF - -dlabel D_8024D310_8BD380 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000030, 0x00000001, D_8024D2E8_8BD358, 0x00000005, 0x00000001, 0x0000000A, 0x00000031, 0x00000001, 0xFE363C81, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D3B8_8BD428 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024D310_8BD380, 0x00000043, 0x00000003, BindNpcAux, 0xFFFFFFFF, D_8024D16C_8BD1DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D3F0_8BD460 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B0012, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D420_8BD490 -.word 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00800000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00800000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00800000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00800000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00800000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00800000, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2449E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_80242BA8_8B2C18, 0x00000043, 0x00000006, func_8024295C_8B29CC, 0x00000000, 0x00000000, 0x00000000, 0x000000FF, 0x00000000, 0x00000043, 0x00000001, func_80242F08_8B2F78, 0x00000043, 0x00000008, func_80242BC0_8B2C30, 0x0000001E, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x000000C3, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000009C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000008C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, kmr_02_SyncStatusMenu, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000008F, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080009, 0x00000043, 0x00000004, GetPlayerPos, 0xFFFFFF24, 0x00000021, 0xFFFFFEAA, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000C, 0x00002041, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFF3A, 0x00000073, 0xFFFFFEF0, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0xFFFFFF3A, 0x0000008C, 0xFFFFFEF0, 0x00000024, 0x00000002, 0xFD050F81, 0x00000078, 0x00000026, 0x00000002, 0xFD050F80, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0x0000000C, mac_02_Quizmo_AnswerResult_8BE5C8, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000078, 0x00000050, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x0000000C, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000B40, 0x00000050, 0x00000004, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0x0000000C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000008C, 0x0000003C, 0x00000050, 0x00000004, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0xFFFFFF3A, 0xFE363C80, 0xFFFFFEF0, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2469280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AF280, 0xF24A2280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF247FA80, 0xF245A280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000C, 0x00120002, 0x00120001, 0x00000000, 0x000B0009, 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x0000003C, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x00000005, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFD050F80, 0x00000032, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2449E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2478280, 0xF245A280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x0000003C, 0x00000000, 0x00000028, 0x00000000, 0x00000003, 0x00000001, 0x00000006, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000007, func_802CFD30, 0x0000000C, 0x00000007, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000006, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0x0000000C, D_8024E548_8BE5B8, 0x00000043, 0x00000005, GetNpcPos, 0x0000000C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000C, 0x00002041, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000C, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000044, 0x00000001, 0x80243B30, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80242F08_8B2F78, 0x00000043, 0x00000008, func_80242BC0_8B2C30, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080024, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetGroupEnabled, 0x000000C3, 0x00000001, 0x00000043, 0x00000001, func_80242F28_8B2F98, 0x00000043, 0x00000003, EnableModel, 0x0000008C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B8, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000C1, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF4C, 0x00000013, 0xFFFFFEB1, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000008F, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000008F, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000143, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000008F, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000143, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000008F, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000143, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFFFFFF3B, 0x00000027, 0xFFFFFF44, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00830002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000099, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000A, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000099, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x000001C2, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFFFFFF40, 0xFFFFFF1A, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000A, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFFFFFF60, 0xFFFFFECA, 0x00000021, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00830001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000B, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001E, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0x00000000, 0xF245CA80, 0xF24ACA80, 0xF24A5280, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080016, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B000F, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010028, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000037, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B0010, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00830004, 0x00830001, 0x00000000, 0x000B0011, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2449E80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010007, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, BindNpcInteract, 0x00000006, D_8024D3F0_8BD460, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E538_8BE5A8 -.short 0x0001, 0x0003, 0x0005, 0x0007, 0x0007, 0x0005, 0x0003, 0x0000 - -dlabel D_8024E548_8BE5B8 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel mac_02_Quizmo_AnswerResult_8BE5C8 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80242F7C_8B2FEC, 0x00000057, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0xFE363C80, 0x0000003E, 0x00000002, 0x00000001, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000056, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000001E, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000026, 0x00000002, 0xF4ACD480, 0xF24AA280, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C81, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000050, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0xFE363C81, 0x00000026, 0x00000002, 0xF4ACD480, 0xF24BE280, 0x0000002C, 0x00000002, 0xF4ACD480, 0xFD050F80, 0x00000008, 0x00000001, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD480, 0xF24C0A80, 0x0000002C, 0x00000002, 0xF4ACD480, 0xFD050F80, 0x00000008, 0x00000001, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD480, 0xF24C8280, 0x0000002C, 0x00000002, 0xF4ACD480, 0xFD050F80, 0x00000008, 0x00000001, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD480, 0xF24C5A80, 0x0000002C, 0x00000002, 0xF4ACD480, 0xFD050F80, 0x00000008, 0x00000001, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD480, 0xF24C3280, 0x0000002C, 0x00000002, 0xF4ACD480, 0xFD050F80, 0x00000008, 0x00000001, 0x00000001, 0x00000026, 0x00000002, 0xF4ACD480, 0xF24C0A80, 0x0000002C, 0x00000002, 0xF4ACD480, 0xFD050F80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000003, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000032, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x0000000D, 0x00000000, 0xF4ACD480, 0x00000000, 0xFD050F81, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000032, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x0000000D, 0x00000000, 0xF4ACD480, 0x00000000, 0xFD050F81, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E864_8BE8D4 -.word 0x00000000, D_80247CE4_8B7D54, 0x43FD0000, 0x41F00000, 0xC3B60000, 0x00002809, D_8024BCFC_8BBD6C, 0x00000000, 0x00000000, 0x0000002D, 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, 0x000001FA, 0x0000001E, 0xFFFFFE94, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000019C, 0x0000001C, 0xFFFFFE3B, 0x00000064, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x009D0001, 0x009D0002, 0x009D0003, 0x009D0003, 0x009D0001, 0x009D0001, 0x009D0000, 0x009D0000, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x00000000, 0x00000000, 0x00000000, 0x001A0063, 0x00000001, D_80247CE4_8B7D54, 0x42B80000, 0x00000000, 0x42980000, 0x00002809, D_80249544_8B95B4, 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, 0x0000005C, 0x00000000, 0x0000004C, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000007C, 0x00000000, 0xFFFFFFDD, 0x00000064, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x009E0001, 0x009E0005, 0x009E0007, 0x009E0007, 0x009E0001, 0x009E0001, 0x009E0000, 0x009E0000, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x00000000, 0x00000000, 0x00000000, 0x001A0067, 0x00000002, D_80247CE4_8B7D54, 0xC2480000, 0x00000000, 0xC1F00000, 0x00002809, D_80248C48_8B8CB8, 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, 0xFFFFFFCE, 0x00000000, 0xFFFFFFE2, 0x00000046, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFCE, 0x00000000, 0xFFFFFFE2, 0x00000064, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010001, 0x00010002, 0x00010003, 0x00010003, 0x00010001, 0x00010001, 0x00010000, 0x00010000, 0x00010003, 0x00010003, 0x00010003, 0x00010003, 0x00010003, 0x00010003, 0x00010003, 0x00010003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, D_80247CE4_8B7D54, 0x42C80000, 0x00000000, 0xC3800000, 0x00002809, D_8024D134_8BD1A4, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0xFFFFFF00, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000064, 0x00000000, 0xFFFFFF00, 0x0000001E, 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, 0x009F0001, 0x009F0002, 0x009F0003, 0x009F0003, 0x009F0001, 0x009F0001, 0x009F0000, 0x009F0000, 0x009F0003, 0x009F0003, 0x009F0003, 0x009F0003, 0x009F0003, 0x009F0003, 0x009F0003, 0x009F0003, 0x00000000, 0x00000000, 0x00000000, 0x001A0064, 0x00000003, D_80247CE4_8B7D54, 0x43230000, 0x00000000, 0x438D8000, 0x00002809, D_8024C644_8BC6B4, 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, 0x000000A3, 0x00000000, 0x0000011B, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000010B, 0x00000000, 0x000000F5, 0x00000064, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00A00001, 0x00A00002, 0x00A00003, 0x00A00003, 0x00A00001, 0x00A00001, 0x00A00000, 0x00A00000, 0x00A00003, 0x00A00003, 0x00A00003, 0x00A00003, 0x00A00003, 0x00A00003, 0x00A00003, 0x00A00003, 0x00000000, 0x00000000, 0x00000000, 0x001A0065 - -dlabel D_8024F214_8BF284 -.word 0x00000004, D_80247CE4_8B7D54, 0xC3480000, 0x00000000, 0x42C80000, 0x00002809, D_8024CC34_8BCCA4, 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, 0xFFFFFF38, 0x00000000, 0x00000064, 0x00000046, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF38, 0x00000000, 0x00000064, 0x00000064, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00A10001, 0x00A10002, 0x00A10003, 0x00A10003, 0x00A10001, 0x00A10001, 0x00A10000, 0x00A10000, 0x00A10003, 0x00A10003, 0x00A10003, 0x00A10003, 0x00A10003, 0x00A10003, 0x00A10003, 0x00A10003, 0x00000000, 0x00000000, 0x00000000, 0x001A0066 - -dlabel D_8024F404_8BF474 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802549AC_8C4A1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024F428_8BF498 -.word 0x00000006, D_80247C3C_8B7CAC, 0xC30A0000, 0x41980000, 0xC3948000, 0x00002901, D_8024F404_8BF474, 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, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A0068 - -dlabel D_8024F618_8BF688 -.word 0x00600015, 0x00600010, 0x0060000E, 0x0060000F, 0x00600016, 0x00600013, 0xFFFFFFFF - -dlabel D_8024F634_8BF6A4 -.word 0x00000007, D_80247D80_8B7DF0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000809, D_8024D3B8_8BD428, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00600001, 0x00600002, 0x00600003, 0x00600003, 0x00600001, 0x00600001, 0x00600000, 0x00600000, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00600003, 0x00000000, 0x00000000, D_8024F618_8BF688, 0x00000000 - -dlabel D_8024F824_8BF894 -.word 0x00000008, D_80247BA0_8B7C10, 0xC3960000, 0x00000000, 0x432F0000, 0x00406D01, 0x00000000, 0x00000001, 0x00000100, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00AF0001, 0x00AF0002, 0x00AF0003, 0x00AF0003, 0x00AF0001, 0x00AF0001, 0x00AF0000, 0x00AF0000, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00AF0003, 0x00000000, 0x00000000, 0x00000000, 0x001A0002 - -dlabel D_8024FA14_8BFA84 -.word 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFF81, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024D420_8BD490, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024FAB4_8BFB24 -.word 0x0000000B, 0x00000002, 0xF5DE0180, 0xFFFFFF81, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024E548_8BE5B8, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024FB20_8BFB90 -.word 0x00120001, 0x00120002, 0x009D0000, 0xFFFFFFFF - -dlabel D_8024FB30_8BFBA0 -.word 0x0000000B, D_80247DAC_8B7E1C, 0x00000000, 0xC47A0000, 0x00000000, 0x00206909, D_8024FA14_8BFA84, 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, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120000, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00000000, 0x00000000, D_8024FB20_8BFB90, 0x00000000, 0x0000000C, D_80247DAC_8B7E1C, 0x00000000, 0xC47A0000, 0x00000000, 0x00002909, D_8024FAB4_8BFB24, 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, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120000, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00000000, 0x00000000, D_8024FB20_8BFB90, 0x00000000 - -dlabel D_8024FF10_8BFF80 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010004, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A8280, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000005, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024FFAC_8C001C -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0012, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A8280, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000005, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0007, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250048_8C00B8 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x0000000B, 0x0000003F, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFFFFFFD6, 0x00000011, 0x00000000, 0x00000046, 0x00000001, D_8024FF10_8BFF80, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x0000000B, 0xFFFFFFB9, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000075, 0xFFFFFFCA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000097, 0x00000038, 0x00000000, 0x00000046, 0x00000001, D_8024FF10_8BFF80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000046, 0x00000033, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x0000000B, 0x0000003F, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250170_8C01E0 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0007, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000054, 0x00000045, 0x00000000, 0x00000046, 0x00000001, D_8024FFAC_8C001C, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000000A, 0x00000030, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFFFFFFD0, 0xFFFFFFC6, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000002A, 0xFFFFFF9A, 0x00000000, 0x00000046, 0x00000001, D_8024FFAC_8C001C, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000085, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000088, 0x00000021, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000054, 0x00000045, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250284_8C02F4 -.word 0x00000044, 0x00000001, D_80250170_8C01E0, 0x00000046, 0x00000001, D_80250048_8C00B8, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000D, 0xF24A8680, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x000000D2, 0x00000073, 0x00000046, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00040006, 0x00040001, 0x00000005, 0x0001000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00040002, 0x00000043, 0x00000008, NpcFlyTo, 0x0000000D, 0x0000002E, 0x0000000F, 0x00000042, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00040001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000002E, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000002E, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF245CA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000005, 0x00010010, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00040006, 0x00040001, 0x00000005, 0x00010011, 0x00000056, 0x00000000, 0x00000043, 0x00000007, DropTinyItemEntity, 0x00000054, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80243034_8B30A4, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0x0000000D, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFF4, 0x00000027, 0x00000002, 0xFE363C82, 0x00000004, 0x00000027, 0x00000002, 0xFE363C83, 0x00000005, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000D, 0x0000001E, 0x00000042, 0x00000014, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000D, 0x0000002E, 0x00000042, 0x00000014, 0x00000043, 0x00000003, SetNpcYaw, 0x0000000D, 0x0000010E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000005, 0x00010012, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000D, 0x00040006, 0x00040001, 0x00000005, 0x00010013, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000D, 0x00040002, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000D, 0xF24A8680, 0x00000043, 0x00000008, NpcFlyTo, 0x0000000D, 0x000000D2, 0x00000073, 0x00000046, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000005, 0x00010014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000001CC, 0x00000136, 0x00000019, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF245CA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A6080, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x0001000A, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000002E, 0x00000042, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000005, 0x00010015, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x0001000A, 0x0001000A, 0x00000005, 0x00010016, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, GotoMap, 0x80257EE8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250990_8C0A00 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000003C, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000003C, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x0000000B, 0x00000000, 0x0000003F, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000054, 0x00000000, 0x00000045, 0x00000043, 0x00000005, SetNpcPos, 0x0000000D, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000D, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000D, 0x00000200, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80250284_8C02F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250B34_8C0BA4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250B44_8C0BB4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250B54_8C0BC4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80250B64_8C0BD4 -.word 0x0000000B, D_80247DAC_8B7E1C, 0x00000000, 0xC47A0000, 0x00000000, 0x00206909, D_80250990_8C0A00, 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, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120000, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00120001, 0x00000000, 0x00000000, D_8024FB20_8BFB90, 0x00000000, 0x0000000D, D_80247D10_8B7D80, 0x00000000, 0xC47A0000, 0x00000000, 0x00200909, D_80250B54_8C0BC4, 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, 0x00000000, 0x00000002, D_80247D10_8B7D80, 0x00000000, 0xC47A0000, 0x00000000, 0x00202909, D_80250B34_8C0BA4, 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, 0x00010001, 0x00010002, 0x00010003, 0x00010003, 0x00010001, 0x00010001, 0x00010000, 0x00010000, 0x00010003, 0x00010003, 0x00010003, 0x00010003, 0x00010003, 0x00010003, 0x00010003, 0x00010003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80247D10_8B7D80, 0x00000000, 0xC47A0000, 0x00000000, 0x00202909, D_80250B44_8C0BB4, 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, 0x009E0001, 0x009E0005, 0x009E0007, 0x009E0007, 0x009E0001, 0x009E0001, 0x009E0000, 0x009E0000, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x009E0007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_8024FB30_8BFBA0, 0x00000000, 0x00000005, D_8024E864_8BE8D4, 0x00000000, 0x00000001, D_8024F428_8BF498, 0x00000000, 0x00000001, D_8024F634_8BF6A4, 0x00000000, 0x00000001, D_8024F214_8BF284, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, D_8024E864_8BE8D4, 0x00000000, 0x00000001, D_8024F428_8BF498, 0x00000000, 0x00000001, D_8024F214_8BF284, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, D_8024E864_8BE8D4, 0x00000000, 0x00000001, D_8024F428_8BF498, 0x00000000, 0x00000001, D_8024F824_8BF894, 0x00000000, 0x00000001, D_8024F214_8BF284, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80250B64_8C0BD4, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802513F0_8C1460 -.word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80251420_8C1490 -.word 0x00000043, 0x00000002, BasicAI_Main, D_802513F0_8C1460, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_80251420_8C1490, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_8025146C_8C14DC -.word 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8025149C_8C150C -.word 0x00000043, 0x00000006, RotateModel, 0x0000005F, 0xFE363C80, 0xF24B54BE, 0x00000000, 0xF24AF880, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802514CC_8C153C -.word 0x00000043, 0x00000006, RotateModel, 0x0000005C, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000059, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005B, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000005A, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000058, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000054, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000059, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000058, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000059, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005B, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000058, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80251684_8C16F4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80251694_8C1704 -.word 0x00000046, 0x00000001, D_80251420_8C1490, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802516B0_8C1720 -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000052, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF84, 0x0000000A, 0x00000002, 0xF8405BA0, 0x00000001, 0x0000000A, 0x00000002, 0xF8405BE8, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0x00000002, D_80251684_8C16F4, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFFCA, 0x00000000, 0xFFFFFFC9, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000052, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF84, 0x0000000A, 0x00000002, 0xF8405BA0, 0x00000001, 0x0000000A, 0x00000002, 0xF8405BE8, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010002, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000008, 0xFFFFFFA2, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000002, 0x00010008, 0x00010001, 0x00000000, 0x000B0050, 0x00000043, 0x00000003, BindNpcAI, 0x00000002, D_80251694_8C1704, 0x00000024, 0x00000002, 0xF8405BE8, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80251880_8C18F0 -.word 0x00000043, 0x00000006, RotateModel, 0x00000061, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802518B0_8C1920 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802518C0_8C1930 -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000006E, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x0000000D, 0x00000002, 0xF5DE0180, 0xFFFFFF85, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF98, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0169, 0x000000A0, 0x00000028, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000006E, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000001F3, 0x00000000, 0xFFFFFE86, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001F3, 0x00000046, 0xFFFFFE86, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000172, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF85, 0x00000018, 0x00000001, 0xFFFFFF86, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000006E, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000018, 0x00000001, 0xFFFFFF98, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000006E, 0x00000000, 0x0000001B, 0x00000001, 0xFFFFFF98, 0x00000043, 0x00000003, EnableModel, 0x00000069, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000025, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF85, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF98, 0x00000008, 0x00000001, 0x0000000C, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFF85, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010021, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000006E, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000006E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080016, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E9, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000035, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000E9, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000035, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080017, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF86, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080018, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, GetCamPosition, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000096, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000161, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000028, 0x00000002, 0xFE363C81, 0x00000010, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x0000000D, 0x00000002, 0xF5DE0180, 0xFFFFFF85, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000028, 0x00000002, 0xFE363C81, 0x00000010, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, GotoMap, 0x80257EF0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80251E78_8C1EE8 -.word 0x00000005, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000005, D_8025146C_8C14DC, D_802514CC_8C153C, D_8025149C_8C150C, D_802516B0_8C1720, 0x0000000F, 0x00000010, 0x0000006F, D_80251E78_8C1EE8, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000007, D_80251880_8C18F0, D_802518B0_8C1920, 0x00000000, D_802518C0_8C1930, 0x0000000D, 0x0000000E, 0x0000006F, D_80251E78_8C1EE8, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000044, 0x00000001, D_802516B0_8C1720, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000006E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80251F24_8C1F94 -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02EE0000, D_80252258_8C22C8, 0x00000000 - -dlabel D_80251F50_8C1FC0 -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80251F24_8C1F94, 0x00000000, 0x02BC0000, D_80252258_8C22C8, 0x00000000 - -dlabel D_80251F7C_8C1FEC -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80251F50_8C1FC0, 0x00000000, 0x028A0000, D_80252258_8C22C8, 0x00000000 - -dlabel D_80251FA8_8C2018 -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80251F7C_8C1FEC, 0x00000000, 0x02580000, D_80252258_8C22C8, 0x00000000 - -dlabel D_80251FD4_8C2044 -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80251FA8_8C2018, 0x00000000, 0x02260000, D_80252258_8C22C8, 0x00000000 - -dlabel D_80252000_8C2070 -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80251FD4_8C2044, 0x00000000, 0x01F40000, D_80252258_8C22C8, 0x00000000 - -dlabel D_8025202C_8C209C -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80252000_8C2070, 0x00000000, 0x01C20000, D_80252258_8C22C8, 0x00000000 - -dlabel D_80252058_8C20C8 -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8025202C_8C209C, 0x00000000, 0x01900000, D_80252258_8C22C8, 0x00000000 - -dlabel D_80252084_8C20F4 -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80252058_8C20C8, 0x00000000, 0x015E0000, D_80252258_8C22C8, 0x00000000 - -dlabel D_802520B0_8C2120 -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80252084_8C20F4, 0x00000000, 0x012C0000, D_80252258_8C22C8, 0x00000000 - -dlabel D_802520DC_8C214C -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802520B0_8C2120, 0x00000000, 0x00FA0000, D_80252258_8C22C8, 0x00000000 - -dlabel D_80252108_8C2178 -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802520DC_8C214C, 0x00000000, 0x00C80000, D_80252258_8C22C8, 0x00000000 - -dlabel D_80252134_8C21A4 -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80252108_8C2178, 0x00000000, 0x00960000, D_80252258_8C22C8, 0x00000000 - -dlabel D_80252160_8C21D0 -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80252134_8C21A4, 0x00000000, 0x00640000, D_80252258_8C22C8, 0x00000000 - -dlabel D_8025218C_8C21FC -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80252160_8C21D0, 0x00000000, 0x00320000, D_80252258_8C22C8, 0x00000000 - -dlabel D_802521B8_8C2228 -.word D_80253838_8C38A8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8025218C_8C21FC, 0x00000000, 0x00000000, D_80252258_8C22C8, 0x00000000 - -dlabel D_802521E4_8C2254 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802521B8_8C2228, 0xFFFF0000, 0x00000000, 0x00000000, D_802521E4_8C2254, D_802521B8_8C2228, D_8025218C_8C21FC, D_80252160_8C21D0, D_80252134_8C21A4, D_80252108_8C2178, D_802520DC_8C214C, D_802520B0_8C2120, D_80252084_8C20F4, D_80252058_8C20C8, D_8025202C_8C209C, D_80252000_8C2070, D_80251FD4_8C2044, D_80251FA8_8C2018, D_80251F7C_8C1FEC, D_80251F50_8C1FC0, D_80251F24_8C1F94, 0x00000000 - -dlabel D_80252258_8C22C8 -.word 0x00000000, 0x00000000, 0x04000000, 0xDB1396FF, 0x00000000, 0x00000000, 0x04120038, 0xB615A5FF, 0x00000000, 0x00000000, 0x04000038, 0xD05CC5FF, 0x00000000, 0x00000000, 0x03ED0000, 0xF94FB2FF, 0x00000000, 0x00000000, 0x04000071, 0xBB15A1FF, 0x00000000, 0x00000000, 0x03ED0071, 0xD75CC0FF, 0x00000000, 0x00000000, 0x041200AA, 0xB615A5FF, 0x00000000, 0x00000000, 0x040000AA, 0xD05CC5FF, 0x00000000, 0x00000000, 0x040000E3, 0xAE15ACFF, 0x00000000, 0x00000000, 0x03ED00E3, 0xC65BCFFF, 0x00000000, 0x00000000, 0x0412011C, 0xB615A5FF, 0x00000000, 0x00000000, 0x0400011C, 0xD05CC5FF, 0x00000000, 0x00000000, 0x04000155, 0xBF159FFF, 0x00000000, 0x00000000, 0x03ED0155, 0xDC5BBDFF, 0x00000000, 0x00000000, 0x0412018E, 0xB615A5FF, 0x00000000, 0x00000000, 0x0400018E, 0xD05CC5FF, 0x00000000, 0x00000000, 0x040001C7, 0xA515BAFF, 0x00000000, 0x00000000, 0x03ED01C7, 0xBB56DEFF, 0x00000000, 0x00000000, 0x0400041C, 0x8E20F5FF, 0x00000000, 0x00000000, 0x03ED0400, 0xAC55F8FF, 0x00000000, 0x00000000, 0x001201C7, 0x14564BFF, 0x00000000, 0x00000000, 0x001203FF, 0xF85554FF, 0x00000000, 0x00000000, 0x0000041C, 0xF52072FF, 0x00000000, 0x00000000, 0x000001C7, 0x321567FF, 0x00000000, 0x00000000, 0x00000038, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120000, 0x4B4F16FF, 0x00000000, 0x00000000, 0x00120071, 0x365C35FF, 0x00000000, 0x00000000, 0x000000AA, 0x305C3BFF, 0x00000000, 0x00000000, 0x001200E3, 0x245B43FF, 0x00000000, 0x00000000, 0x0000011C, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120155, 0x3A5B31FF, 0x00000000, 0x00000000, 0x0000018E, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120000, 0x4B4F16FF, 0x00000000, 0x00000000, 0x00000038, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE0038, 0x4A155BFF, 0x00000000, 0x00000000, 0x00000000, 0x601339FF, 0x00000000, 0x00000000, 0x00120071, 0x365C35FF, 0x00000000, 0x00000000, 0x00000071, 0x4F1557FF, 0x00000000, 0x00000000, 0x000000AA, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE00AA, 0x4A155BFF, 0x00000000, 0x00000000, 0x001200E3, 0x245B43FF, 0x00000000, 0x00000000, 0x000000E3, 0x411561FF, 0x00000000, 0x00000000, 0x0000011C, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE011C, 0x4A155BFF, 0x00000000, 0x00000000, 0x00120155, 0x3A5B31FF, 0x00000000, 0x00000000, 0x00000155, 0x521554FF, 0x00000000, 0x00000000, 0x0000018E, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE018E, 0x4A155BFF, 0x00000000, 0x00000000, 0x001201C7, 0x14564BFF, 0x00000000, 0x00000000, 0x000001C7, 0x321567FF - -dlabel D_80252578_8C25E8 -.word 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D - -dlabel D_80253838_8C38A8 -.word 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xFC121824, 0xFF33FFFF, 0xFD100000, D_802539A0_8C3A10, 0xF5100000, 0x07094140, 0xE6000000, 0x00000000, 0xF3000000, 0x071FF200, 0xE7000000, 0x00000000, 0xF5100800, 0x00094140, 0xF2000000, 0x0003C07C, 0xD9FFFFFF, 0x00020000, 0x01020040, D_80252578_8C25E8, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0x06080C0E, 0x00080E0A, 0x060C1012, 0x000C120E, 0x06101416, 0x00101612, 0x0614181A, 0x00141A16, 0x06181C1E, 0x00181E1A, 0x061C2022, 0x001C221E, 0x06202426, 0x00202622, 0x06282A2C, 0x00282C2E, 0x06060430, 0x00063032, 0x06040A34, 0x00043430, 0x060A0E36, 0x000A3634, 0x060E1238, 0x000E3836, 0x0612163A, 0x00123A38, 0x06161A3C, 0x00163C3A, 0x061A1E3E, 0x001A3E3C, 0x061E2228, 0x001E283E, 0x0622262A, 0x00222A28, 0x0626242C, 0x00262C2A, 0x01012024, D_80252578_8C25E8, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0x06080C0E, 0x00080E0A, 0x060C1012, 0x000C120E, 0x06101416, 0x00101612, 0x0614181A, 0x00141A16, 0x06181C1E, 0x00181E1A, 0x061C2022, 0x001C221E, 0xE7000000, 0x00000000, 0xFC323864, 0xFF73FFFF, 0xD7000000, 0x00010001, 0xDF000000, 0x00000000 - -dlabel D_802539A0_8C3A10 -.word 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1DBDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0x9D1DBDE5, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0x9D1DBDE5, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0x9D1DBDE5, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0x9D1DBDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0x33E93C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B44F1, 0x44F144F1, 0x44F15D73, 0x5D7344F1, 0x44F15D73, 0x5D7344F1, 0x44F144F1, 0x44F144F1, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x5D735D73, 0x5D735D73, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x44F15D73, 0x5D7344F1, 0x44F144F1, 0x44F13C6B, 0x33E99D1D, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1D9D1D, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x44F144F1, 0x44F13C6B, 0x33E99D1D, 0x9D1D9B01, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1DBDE5, 0x9B01C405, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F13C6B, 0x23659D1D, 0xBDE59D1D, 0x9B01C405, 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x3C6B2365, 0x9D1DBDE5, 0x9D1D9B01, 0xC405D48B, 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x23659D1D, 0x9D1D9D1D, 0x9D1D9B01, 0xC405D48B, 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D9B01, 0x9B019B01, 0x9B019B01, 0x9B01C405, 0xD48BD48B, 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E99B01, 0xC405C405, 0xC405C405, 0xC405D48B, 0xD48BD48B, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0xD48BD48B, 0x9B01D48B, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F13C6B, 0x33E99B01, 0x9B01C405, 0xC405D48B, 0x9B01D48B, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x3C6B33E9, 0x23659B01, 0xC405D48B, 0x9B01D48B, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x44F13C6B, 0x33E99B01, 0xC405D48B, 0xD48BD48B, 0x9D1D33E9, 0x3C6B44F1, 0x44F15D73, 0x44F144F1, 0x3C6B33E9, 0x23659B01, 0xC405D48B, 0xD48BD48B, 0x33E93C6B, 0x44F144F1, 0x5D735D73, 0x44F144F1, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0xC405C405, 0x33E93C6B, 0x44F144F1, 0x5D735D73, 0x44F144F1, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0x9B019B01, 0x9D1D33E9, 0x3C6B44F1, 0x44F15D73, 0x44F13C6B, 0x33E99B01, 0xC405C405, 0xC4059B01, 0x23659D1D, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F13C6B, 0x33E99B01, 0xC4059B01, 0x9B012365, 0x9D1DBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F13C6B, 0x33E99B01, 0x9B0133E9, 0x23659D1D, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x3C6B33E9, 0x33E92365, 0x9D1DBDE5, 0xBDE5BDE5, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x3C6B3C6B, 0x33E99D1D, 0xBDE5BDE5, 0xBDE5D6AB, 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x3C6B33E9, 0x9D1DBDE5, 0xBDE5BDE5, 0xD6ABD6AB, 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x33E99D1D, 0xBDE5BDE5, 0xBDE5D6AB, 0xD6AB05EF, 0x00130005, 0x00010000, 0x00000000, 0x00080001, 0x00000000, 0x00000011, 0x000100B6, 0x00B600B6, 0x00050002, 0x00000000, 0x00000008, 0x00020000, 0x00000000, 0x00110002, 0x00B600B6, 0x00B60005, 0x00030000, 0x00000000, 0x00080003, 0x00000000, 0x00000011, 0x000300B6, 0x00B600B6, 0x00050004, 0x00000000, 0x00000008, 0x00040000, 0x00000000, 0x00110004, 0x00B600B6, 0x00B60005, 0x00050000, 0x00000000, 0x00080005, 0x00000000, 0x00000011, 0x000500B6, 0x00B600B6, 0x00050006, 0x00000000, 0x00000008, 0x00060000, 0x00000000, 0x00110006, 0x00B600B6, 0x00B60005, 0x00070000, 0x00000000, 0x00080007, 0x00000000, 0x00000011, 0x000700B6, 0x00B600B6, 0x00050008, 0x00000000, 0x00000008, 0x00080000, 0x00000000, 0x00110008, 0x00B600B6, 0x00B60005, 0x00090000, 0x00000000, 0x00080009, 0x00000000, 0x00000011, 0x000900B6, 0x00B600B6, 0x0005000A, 0x00000000, 0x00000008, 0x000A0000, 0x00000000, 0x0011000A, 0x00B600B6, 0x00B60005, 0x000B0000, 0x00000000, 0x0008000B, 0x00000000, 0x00000011, 0x000B00B6, 0x00B600B6, 0x0005000C, 0x00000000, 0x00000008, 0x000C0000, 0x00000000, 0x0011000C, 0x00B600B6, 0x00B60005, 0x000D0000, 0x00000000, 0x0008000D, 0x00000000, 0x00000011, 0x000D00B6, 0x00B600B6, 0x0005000E, 0x00000000, 0x00000008, 0x000E0000, 0x00000000, 0x0011000E, 0x00B600B6, 0x00B60005, 0x000F0000, 0x00000000, 0x0008000F, 0x00000000, 0x00000011, 0x000F00B6, 0x00B600B6, 0x00050010, 0x00000000, 0x00000008, 0x00100000, 0x00000000, 0x00110010, 0x00B600B6, 0x00B60005, 0x00110000, 0x00000000, 0x00080011, 0x00000000, 0x00000011, 0x001100B6, 0x00B600B6, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00030000 - -dlabel D_80254094_8C4104 -.word 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C85, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C87, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8025410C_8C417C -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80254264_8C42D4 -.word 0x00000043, 0x00000004, kmr_02_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_8025460C_8C467C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kmr_02_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kmr_02_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8025410C_8C417C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_02_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_802546BC_8C472C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_02_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80254094_8C4104, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_02_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_02_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_8025492C_8C499C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kmr_02_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8025460C_8C467C -.word 0x0000000A, 0x00000002, 0xF8405BAA, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000B0013, 0x00000024, 0x00000002, 0xFE363C88, 0x000B0013, 0x00000024, 0x00000002, 0xF8405BAA, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000B0014, 0x00000024, 0x00000002, 0xFE363C88, 0x000B0015, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x000B0016, 0x00000024, 0x00000002, 0xFE363C82, 0x000B0017, 0x00000024, 0x00000002, 0xFE363C83, 0x000B0018, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802546BC_8C472C -.word 0x00000044, 0x00000001, 0x80243C6C, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, kmr_02_ToadHouse_CamSetFOV, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000022, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000DC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF249C280, 0xF2459E80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF24660E7, 0xF245681A, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF2C, 0xFFFFFE88, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000BF, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF2C, 0x00000015, 0xFFFFFE88, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000072, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000003D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, kmr_02_ToadHouse_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8025492C_8C499C -.word 0x00000044, 0x00000001, 0x80243B74, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF49, 0x00000013, 0xFFFFFEAB, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF7C, 0xFFFFFEBB, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802549AC_8C4A1C -.word 0x00000046, 0x00000001, D_80254264_8C42D4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s deleted file mode 100644 index cae1a3279e..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8C4A40.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel kmr_02_D_802549D0_8C4A40 -.word 0x00000043, 0x00000003, GotoMap, 0x80257F00, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80254A00_8C4A70 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0066, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80243370_8B33E0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0067, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF8E, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207A, 0x00000000, 0x00000175, 0x00000058, 0x000000FF, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000000, 0x00000175, 0x00000058, 0x000000FF, 0x00000001, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207B, 0x00000000, 0x00000146, 0x00000096, 0x00000105, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000013, 0x00000001, 0x00000146, 0x00000096, 0x00000105, 0x00000001, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1Block, 0x00000146, 0x00000078, 0x00000105, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000002, AssignScript, D_80254A00_8C4A70, 0x00000043, 0x00000001, func_80243514_8B3584, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, kmr_02_GetEntityPosition, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0x0000012C, 0x00000014, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kmr_02_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207C, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFE363C82, 0x00000000, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x0000207D, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0x0000012C, 0x00000000, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kmr_02_SetEntityPositionF, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B8, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000B4, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000000DD, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF85, 0x00000018, 0x00000001, 0xFFFFFF8E, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer1Block_WideX, 0x00000146, 0x00000000, 0x00000105, 0x0000010E, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80254A00_8C4A70, 0x00000018, 0x00000001, 0xFFFFFF98, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000014, 0x7FFFFE00, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xF8406311, 0x00000000, 0x0000000A, 0x00000002, 0xF840630D, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xF8406311, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeEntity, Entity_BlueWarpPipe, 0x00000000, 0x00000000, 0x00000163, 0x00000000, 0x00000003, kmr_02_D_802549D0_8C4A40, 0x00000791, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x000000FA, 0x0000003C, 0x0000004B, 0xFFFFFFF1, 0x80000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFF98, 0x00000043, 0x00000007, MakeItemEntity, 0x00000083, 0x000001FE, 0x00000000, 0xFFFFFEAC, 0x00000011, 0xF8405BAE, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8C51D0.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8C51D0.data.s deleted file mode 100644 index b3a7c8ad94..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8C51D0.data.s +++ /dev/null @@ -1,66 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80255160_8C51D0 -.word 0x00000043, 0x00000006, RotateModel, 0x00000099, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80255190_8C5200 -.word 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, RotateModel, 0x00000090, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000092, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000094, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000096, 0xFE363C81, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80255240_8C52B0 -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000008D, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000036, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000057, 0x00000000, 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, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000008D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000080, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000007F, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000008D, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0x00000090, 0x000000B4, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000092, 0x000000B4, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000094, 0x000000B4, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000096, 0x000000B4, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000008C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000036, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80255450_8C54C0 -.word 0x00000003, 0x00000001, 0x00000009, 0x00000043, 0x00000005, MakeLerp, 0x0000000A, 0xFFFFFFF6, 0x0000001E, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x000000A4, 0xFE363C80, 0xF24B087E, 0x00000000, 0xF24A5475, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFF6, 0x0000000A, 0x0000001E, 0x0000000A, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x000000A4, 0xFE363C80, 0xF24B087E, 0x00000000, 0xF24A5475, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80255580_8C55F0 -.word 0x00000006, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000008E, 0x000000B4, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000008D, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000000, D_80255160_8C51D0, D_80255190_8C5200, 0x00000000, D_80255240_8C52B0, 0x00000011, 0x00000012, 0x0000009C, D_80255580_8C55F0, 0x00000044, 0x00000001, D_80255450_8C54C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80255630_8C56A0 -.word 0x3FC00000, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80255660_8C56D0 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80255630_8C56A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, D_80255660_8C56D0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_802556AC_8C571C -.word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_802556E4_8C5754 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_8025571C_8C578C -.word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80255754_8C57C4 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000096, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_8025578C_8C57FC -.word D_802556AC_8C571C, D_802556E4_8C5754, D_8025571C_8C578C, D_80255754_8C57C4 - -dlabel D_8025579C_8C580C -.word 0x40000000, 0x0000000F, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_802557CC_8C583C -.word 0x00000043, 0x00000002, BasicAI_Main, D_8025579C_8C580C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802557EC_8C585C -.word 0x43EC8000, 0x43160000, 0x43968000, 0x436A0000, 0x42A00000, 0x43480000, 0x42380000, 0x43160000, 0x43340000 - -dlabel D_80255810_8C5880 -.word 0x42380000, 0x43160000, 0x43340000, 0xC2BA0000, 0x43830000, 0x42E40000, 0x42EC0000, 0x42F20000, 0x430D0000, 0x43AA0000, 0x430D0000, 0x43CB0000, 0x44098000, 0x42D80000, 0x43A00000 - -dlabel D_8025584C_8C58BC -.word 0x43E88000, 0x42D80000, 0x43A00000, 0x43D88000, 0x429C0000, 0x43990000, 0x43C78000, 0x42600000, 0x43900000 - -dlabel D_80255870_8C58E0 -.word 0x43C78000, 0x42600000, 0x43900000, 0x43C30000, 0x42540000, 0x438E0000, 0x43BE0000, 0x42480000, 0x438D0000 - -dlabel D_80255894_8C5904 -.word 0x43BE0000, 0x42480000, 0x438D0000, 0x43910000, 0x42C80000, 0x43700000, 0x434C0000, 0x430E0000, 0x434A0000, 0xC3C38000, 0x44020000, 0xC3540000 - -dlabel D_802558C4_8C5934 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x00000295, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8025590C_8C597C -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000001, kmr_02_UnkFunc42, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0x00000007, 0xFE363C8A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000007, 0xFE363C8B, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000002, 0x00000007, 0xFE363C8B, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000004, 0x00000007, 0xFE363C8B, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000007, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00010001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00A10001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000007, 0x00000001, 0x00000043, 0x00000003, SetNpcAux, 0x00000007, D_8024D16C_8BD1DC, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000B0059, 0x000000A0, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600015, 0x00000056, 0x00000000, 0x00000045, 0x00000002, D_802558C4_8C5934, 0xFD050F84, 0x00000045, 0x00000002, D_8025590C_8C597C, 0xFD050F85, 0x00000043, 0x00000005, LoadPath, 0x00000028, D_802557EC_8C585C, 0x00000003, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000003, 0x00000000, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000A6, 0x000002F4, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x0000009F, 0x00000000, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF24C314D, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000004C4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000043, 0x00000005, LoadPath, 0x00000078, D_80255810_8C5880, 0x00000005, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000008, 0xFFFFFFF6, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000029, 0x000002D9, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x0000012C, 0x000000F5, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001B8, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000007, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000007, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0x00000007, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0x000000DC, 0x00000000, 0x000000D5, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x000000FF, 0x00000000, 0x000000E8, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000BE, 0x00000000, 0x000000D4, 0x00000043, 0x00000005, LoadPath, 0x0000000A, D_8025584C_8C58BC, 0x00000003, 0x00000000, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFD050F84, 0x00000049, 0x00000001, 0xFD050F85, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x0000032B, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600010, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFFB, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF1, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF1, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF1, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0xFFFFFFF1, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000000A, D_80255870_8C58E0, 0x00000003, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00600016, 0x00600013, 0x00000200, 0x000B005A, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000007, 0xFFFFFFF6, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x00000029, 0x000002D9, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x000000DC, 0x000000D5, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000113, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000D, 0x009E0003, 0x00000005, 0x000B005B, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A6280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF22F6CE7, 0xF259B61A, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF250B680, 0xF24ECEE7, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF24B6A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00600016, 0x00600013, 0x00000200, 0x000B005C, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00005, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF253DA80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF250B61A, 0xF24E454D, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF24AA280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x0060000E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, 0x80254AE0, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080012, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00080012, 0x00000005, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000007, func_802D2520, 0x00080012, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080013, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00080013, 0x00000005, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000007, func_802D2520, 0x00080013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7DB4, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0011, 0x00000043, 0x00000003, func_802CFE2C, 0x00000001, 0x00000100, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000005, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A8080, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0003, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802CFE2C, 0x00000003, 0x00000100, 0x00000043, 0x00000007, func_802CFD30, 0x00000003, 0x00000005, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00009, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7F4D, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00005, 0x00000043, 0x00000007, func_802CFD30, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600013, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24A9280, 0xF24A6280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF22F6CE7, 0xF259B61A, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF250B680, 0xF24ECEE7, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF24B6A80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EC680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00600016, 0x00600013, 0x00000200, 0x000B005D, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000003, 0x00000000, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0x000000A6, 0x000002F4, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0x0000009F, 0x00000000, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0xF24C314D, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000004C4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000096, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000007, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000001, 0x00000007, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetAngleBetweenNPCs, 0x00000003, 0x00000007, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00600015, 0x00000045, 0x00000002, D_8025590C_8C597C, 0xFD050F85, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000007, 0x00600016, 0x00600013, 0x00000200, 0x000B005E, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x00000BB8, 0x00000045, 0x00000002, D_802558C4_8C5934, 0xFD050F84, 0x00000043, 0x00000005, LoadPath, 0x0000005A, D_80255894_8C5904, 0x00000004, 0x00000001, 0x00000003, 0x00000001, 0x00000046, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000046, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFD050F84, 0x00000049, 0x00000001, 0xFD050F85, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, 0x80243B74, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x009E0001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000A6, 0x00000000, 0x000000BC, 0x00000043, 0x00000004, SetPlayerPos, 0x000000E7, 0x00000000, 0x000000C4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, GetAngleToPlayer, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0xFE363C80, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24BE280, 0x00000000, 0xF245CA80, 0xF24AAA80, 0xF24A5880, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00008, 0x00A00007, 0x00000000, 0x000B005F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0060, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x009E000B, 0x009E0001, 0x00000000, 0x000B0061, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000003, 0x00A00004, 0x00A00001, 0x00000000, 0x000B0062, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8280, 0x00000043, 0x00000003, EnableNpcAI, 0x00000002, 0x00000001, 0x00000043, 0x00000003, EnableNpcAI, 0x00000004, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000040, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000008, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFF85, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8680, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00A00001, 0x00000043, 0x00000003, func_8024366C_8B36DC, 0x00000004, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0x00000004, D_802557CC_8C583C, 0x00000043, 0x00000003, func_8024366C_8B36DC, 0x00000002, 0x00000002, 0x00000043, 0x00000003, BindNpcAI, 0x00000002, D_802557CC_8C583C, 0x00000043, 0x00000003, func_8024366C_8B36DC, 0x00000001, 0x00000003, 0x00000043, 0x00000003, BindNpcAI, 0x00000001, D_802557CC_8C583C, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000100, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8C7010.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8C7010.data.s deleted file mode 100644 index fcd84598cb..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8C7010.data.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80256FA0_8C7010 -.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, kmr_02_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, kmr_02_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80257300_8C7370 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, kmr_02_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, kmr_02_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, kmr_02_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, kmr_02_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_80257904_8C7974 -.word 0x00000001, 0x0000000F - -dlabel D_8025790C_8C797C -.word 0x00000001, 0xFFFFFE5E, 0x00000010, 0x000000ED - -dlabel D_8025791C_8C798C -.word D_80257904_8C7974, 0x00000000, D_8025790C_8C797C, 0x00000000 - -dlabel D_8025792C_8C799C -.word 0x00000001, 0x00000010 - -dlabel D_80257934_8C79A4 -.word 0x00000001, 0x00000157, 0x0000007C, 0x00000010, 0x000001BB, 0x00000006, 0xF8405BAF, 0xFAA2B58A - -dlabel D_80257954_8C79C4 -.word 0x00000001, 0x0000007C, 0x00000010, 0x000001BB - -dlabel D_80257964_8C79D4 -.word D_8025792C_8C799C, D_80257934_8C79A4, D_80257954_8C79C4, 0x00000000 - -dlabel D_80257974_8C79E4 -.word 0x00000001, 0x00000011 - -dlabel D_8025797C_8C79EC -.word 0x00000001, 0xFFFFFFDE, 0x00000015, 0xFFFFFF44 - -dlabel D_8025798C_8C79FC -.word D_80257974_8C79E4, 0x00000000, D_8025797C_8C79EC, 0x00000000 - -dlabel D_8025799C_8C7A0C -.word 0x00000001, 0x00000018 - -dlabel D_802579A4_8C7A14 -.word 0x00000001, 0x00000017 - -dlabel D_802579AC_8C7A1C -.word 0x00000001, 0x000000A5, 0x00000135, 0x00000091, 0x00000042, 0x0000000E, 0xF8405BB0, 0xFAA2B58B - -dlabel D_802579CC_8C7A3C -.word 0x00000002, 0x00000163, 0x000000A0, 0x00000041, 0x000001B8, 0x000000A0, 0x00000089 - -dlabel D_802579E8_8C7A58 -.word D_8025799C_8C7A0C, D_802579A4_8C7A14, D_802579AC_8C7A1C, D_802579CC_8C7A3C, 0x00000000 - -dlabel D_802579FC_8C7A6C -.word 0x43C18000, 0x00000000, 0x42B80000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8025791C_8C798C, 0x00000047, 0x00000005, D_80256FA0_8C7010, 0x00000100, 0x00000048, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80257964_8C79D4, 0x00000047, 0x00000005, D_80256FA0_8C7010, 0x00000100, 0x0000004C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8025798C_8C79FC, 0x00000047, 0x00000005, D_80256FA0_8C7010, 0x00000100, 0x00000059, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405BB0, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802579E8_8C7A58, 0x00000047, 0x00000005, D_80257300_8C7370, 0x00001000, 0x0000002A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80257300_8C7370, 0x00100000, D_802579FC_8C7A6C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_02/8C7B70.data.s b/ver/us/asm/data/world/area_kmr/kmr_02/8C7B70.data.s deleted file mode 100644 index ce367a97c8..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_02/8C7B70.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80257B00_8C7B70 -.word 0x11111111, 0x11111111, 0x11111111, 0x11111111, 0x11111111, 0x11111111, 0x11111111, 0x11111111, 0x1111111B, 0x22222222, 0x222222AA, 0xAAAAA111, 0x11111B20, 0x00000000, 0x00000000, 0x00000051, 0x11B22550, 0x00000000, 0x00000000, 0x00002055, 0x00222227, 0x20000000, 0x00000000, 0x0027B200, 0x05CDDDD3, 0xB02ABBBB, 0xBBBBA220, 0x0AC43200, 0x00C3DDDD, 0xB22BDDC1, 0x413DB022, 0x74334200, 0x00C33333, 0xB229999E, 0xCBE99500, 0xA4344200, 0x00C33333, 0xC9966669, 0x99689555, 0xA4444200, 0x00C33334, 0xB9668886, 0x968FE555, 0x24444700, 0x00C33334, 0xE9668888, 0x688FE555, 0x94444700, 0x00C33334, 0xE9668888, 0x888FE555, 0x94444700, 0x00C33334, 0xE9668888, 0x8888E555, 0x94444700, 0x00C33334, 0xE9668886, 0x86889555, 0x94444700, 0x00C33334, 0xB9666696, 0x86669555, 0x24444700, 0x00C33333, 0xC9966668, 0x88669555, 0x74444720, 0x00733333, 0xC7966688, 0x8888E555, 0xA4444720, 0x00733333, 0xC7996668, 0x88889550, 0xA4444720, 0x00733333, 0xC7AE9666, 0x68669522, 0xA4444720, 0x05733333, 0xC7ADE966, 0x66699222, 0xA4444722, 0x05733333, 0xC7AD1E99, 0x6999A222, 0xA4444722, 0x05733333, 0xC7AD44DE, 0xE9B1C222, 0xA4444722, 0x05733333, 0xC77A3444, 0x4444B222, 0xA4344A22, 0x057333DB, 0x72227777, 0x77772000, 0x7CCCDA20, 0x05733B72, 0x22222222, 0x22220555, 0x0222220A, 0x057B7222, 0x22222222, 0x22220555, 0x02220071, 0x05222222, 0x22222222, 0x22220555, 0x02002111, 0x00000000, 0x00000022, 0x22220555, 0x000B1111, 0x11111117, 0x22222220, 0x00000555, 0x02111111, 0x11111111, 0x11111111, 0x111AA777, 0xB1111111, 0x11111111, 0x11111111, 0x11111111, 0x11111111 - -dlabel D_80257D00_8C7D70 -.word 0x32D90000, 0x4B5FC631, 0xC6732213, 0xAA556421, 0xC31981D3, 0x74A59529, 0xA5ADB5EF, 0x9B9DD45F diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8EE9D0.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8EE9D0.data.s deleted file mode 100644 index f0fbdf6578..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8EE9D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242BB0_8EE9D0 -.word 0x43700000, 0x41F00000, 0xC2A00000, 0x42B40000, 0x43700000, 0x41F00000, 0xC28C0000, 0x42B40000, 0x42C80000, 0x42300000, 0xC2200000, 0x42B40000, 0x42C80000, 0x42300000, 0xC2200000, 0x42B40000, 0x44148000, 0x41F00000, 0xC3580000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243B90, D_80242BB0_8EE9D0, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190044, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0xFFFFFF80, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000020, 0x00000000, 0x0000001B, 0x00000001, 0x00000060, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000094, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000012C, 0x00000043, 0x00000002, PlayAmbientSounds, 0x0000000C, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x0000000C, 0x00000023, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240000_8EBE20, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8EEBC0.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8EEBC0.data.s deleted file mode 100644 index f909e7b2b7..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8EEBC0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242DA0_8EEBC0 -.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, kmr_20_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kmr_20_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, kmr_20_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, kmr_20_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802434E4_8EF304 -.word 0x00000043, 0x00000001, kmr_20_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802435C0_8EF3E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802435C0_8EF3E0 -.word 0x00000043, 0x00000001, kmr_20_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, kmr_20_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, kmr_20_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, kmr_20_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, kmr_20_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243AD0_8EF8F0 -.word 0x00000044, 0x00000001, 0x80242D78, 0x00000043, 0x00000003, GotoMap, 0x80253000, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243B0C_8EF92C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C8C, D_80243AD0_8EF8F0, 0x00000046, 0x00000001, D_802434E4_8EF304, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243B64_8EF984 -.word 0x00000047, 0x00000005, D_80243B0C_8EF92C, 0x00000080, 0x0000000D, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000002C, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000060, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x0000000A, 0x00000002, 0xF8405BE2, 0x00000000, 0x00000024, 0x00000002, 0xF8405BE2, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58C, 0x00000000, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0x80242C40, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024A88C, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024DEDC, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80245C70, 0x00000043, 0x00000003, EnableGroup, 0x0000006B, 0x00000000, 0x00000044, 0x00000001, 0x80246794, 0x00000044, 0x00000001, 0x8024721C, 0x00000044, 0x00000001, 0x80244228, 0x00000044, 0x00000001, 0x80245638, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000060, 0x00000044, 0x00000001, 0x8024A3A0, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240310_8EC130, 0x00000044, 0x00000001, 0x8024FD70, 0x00000008, 0x00000001, 0x00000005, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80250C5C, 0x00000016, 0x00000001, 0x00000002, 0x00000008, 0x00000001, 0x0000003C, 0x00000044, 0x00000001, 0x8025232C, 0x00000016, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_80243B64_8EF984, 0x00000044, 0x00000001, 0x80252490, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xF840634B, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000044, 0x00000001, 0x8024AC34, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B58B, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_80243B64_8EF984, 0x00000044, 0x00000001, D_80242DA0_8EEBC0, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_80243B64_8EF984, 0x00000044, 0x00000001, D_80242DA0_8EEBC0, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8EFDA0.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8EFDA0.data.s deleted file mode 100644 index 9621e8188e..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8EFDA0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243F80_8EFDA0 -.word 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243FB0_8EFDD0 -.word 0x00000043, 0x00000006, RotateGroup, 0x00000075, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000005A, 0x00000024, 0x00000002, 0xFAA2B58C, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000075, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000000, 0x00000016, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B58C, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000080, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B58C, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000075, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244100_8EFF20 -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240330_8EC150, 0x00000043, 0x00000003, EnableGroup, 0x00000091, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A5, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000B2, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000010C, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000001, func_80240358_8EC178, 0x00000043, 0x00000003, EnableGroup, 0x00000091, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A5, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B2, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000010C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000080, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244220_8F0040 -.word 0x00000000, 0xFFFFFFFF, 0x00000043, 0x0000000A, MakeDoorAdvanced, 0x00000000, D_80243F80_8EFDA0, D_80243FB0_8EFDD0, 0x00000000, D_80244100_8EFF20, 0x00000017, 0x00000016, 0x0000010D, D_80244220_8F0040, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, EnableGroup, 0x00000091, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A5, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000B2, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000010C, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000080, 0x00000000, 0x00000043, 0x00000001, func_80241C9C_8EDABC, 0x00000043, 0x00000006, RotateGroup, 0x00000075, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000075, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000000, 0x00000043, 0x00000001, func_80240330_8EC150, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000044, 0x00000001, D_80244100_8EFF20, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8F01E0.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8F01E0.data.s deleted file mode 100644 index 2cd68ffe51..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8F01E0.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802443C0_8F01E0 -.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, kmr_20_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, kmr_20_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, kmr_20_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, kmr_20_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, kmr_20_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, kmr_20_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_80244D24_8F0B44 -.word 0xFFFFFF80, 0xFFFFFFFF, 0xFFFFFFB3, 0xFFFFFFC9, 0xFFFFFFF1, 0xFFFFFFF1, 0x00000005, 0xFFFFFFFE, 0x00000029, 0x0000003B, 0xFFFFFFFD, 0x00000057 - -dlabel D_80244D54_8F0B74 -.word 0x00200001, 0x00200003, 0x00200005, 0x00200007, 0x00200009, 0x0020000B, 0x0020000D, 0x0020000F, 0x00200011, 0x00200013, 0x00200015, 0x00200017 - -dlabel D_80244D84_8F0BA4 -.word 0x00200000, 0x00200002, 0x00200004, 0x00200006, 0x00200008, 0x0020000A, 0x0020000C, 0x0020000E, 0x00200010, 0x00200012, 0x00200014, 0x00200016 - -dlabel D_80244DB4_8F0BD4 -.word 0x0000B290, 0x0000D158, 0x0000D178, 0x0000EB78, 0x0000ED78, 0x00010778, 0x00010978, 0x00012378, 0x00012578, 0x00013F78, 0x00014178, 0x00015B78, 0x00015D78, 0x00017778, 0x00017978, 0x00019378, 0x00019578, 0x0001AF78, 0x0001B178, 0x0001CB78, 0x0001CD78, 0x0001E778, 0x0001E978, 0x00020378, 0x00020578, 0x00021F78 - -dlabel D_80244E1C_8F0C3C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFF98, 0x00000024, 0x00000002, 0xF8405BEC, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000B0102, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8405BEC, 0x00000000, 0x00000024, 0x00000002, 0xF8405BEC, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000B0101, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802406BC_8EC4DC, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802406C8_8EC4E8, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0xFE363C80, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, func_80240B20_8EC940, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244FA0_8F0DC0 -.word 0xFFFFFFD8, 0xFFFFFFD8, 0x00000007, 0x00000007, 0x00000028, 0x00000028, 0x0000003C, 0x0000003C, 0x00000059, 0x00000059, 0x00000060, 0x00000060 - -dlabel D_80244FD0_8F0DF0 -.word 0x00200051, 0x00200052, 0x00200053, 0x00200054, 0x00200055, 0x00200056, 0x00200057, 0x00200058, 0x00200059, 0x0020005A, 0x0020005B, 0x0020005C - -dlabel D_80245000_8F0E20 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF1, 0x0000000A, 0x00000002, 0xF971888C, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000B00EC, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405BEB, 0x00000000, 0x00000024, 0x00000002, 0xF8405BEB, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x000B0100, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240B48_8EC968, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240B54_8EC974, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0xFE363C80, 0x000000A0, 0x00000028, 0x00000004, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245178_8F0F98 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000E, 0x000000E0, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245374_8F1194 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000020, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000020, 0x000020AB, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000870, 0x0000003C, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000098, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000020, 0x000020AC, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000020, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024546C_8F128C -.word 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000E, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000010, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80240DA4_8ECBC4, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF1, 0x0000000A, 0x00000002, 0xF971888C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x000000AE, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_80245374_8F1194, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF6A, 0x0000001E, 0xFFFFFFDD, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B58D, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B58D, 0x00000000, 0x00000044, 0x00000001, 0x8024BD40, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244E1C_8F0C3C, 0x00000100, 0x00000022, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245000_8F0E20, 0x00000100, 0x00000028, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245178_8F0F98, 0x00000100, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024546C_8F128C, 0x00000080, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80252E8C, 0x00000100, 0x0000001D, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8F1500.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8F1500.data.s deleted file mode 100644 index 961f65371e..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8F1500.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802456E0_8F1500 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000020, 0x7FFFFE00, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000020, 0x000020AB, 0x00000000, 0x00000043, 0x00000001, func_80240DD0_8ECBF0, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFF790, 0x0000003C, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x00000098, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000020, 0x000020AC, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000020, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802457E4_8F1604 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245848_8F1668 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_802457E4_8F1604, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x0000000A, 0x00000002, 0xF971888B, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF92, 0xFFFFFFB0, 0xFFFFFFDD, 0x00000014, 0x00000024, 0x00000002, 0xF971888B, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000001, kmr_20_UnsetCamera0MoveFlag1, 0x00000044, 0x00000001, D_802456E0_8F1500, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFF6A, 0x0000001E, 0xFFFFFFA6, 0x0000001E, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000B4, 0x00000000, 0x00000024, 0x00000002, 0xF971888B, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802459A0_8F17C0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000D, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245AA8_8F18C8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetEnemyFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000D, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245BC0_8F19E0 -.word 0x00000043, 0x00000003, SetNpcAux, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802459A0_8F17C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245BF0_8F1A10 -.word 0x00000043, 0x00000003, SetNpcAux, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_802459A0_8F17C0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245C30_8F1A50 -.word 0x00000043, 0x00000003, SetNpcAux, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000046, 0x00000001, D_80245AA8_8F18C8, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0xFFFFFF6A, 0xFFFFFFB0, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245848_8F1668, 0x00000043, 0x00000002, SetEntityCullMode, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFB5, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x00000043, 0x00000007, MakeEntity, Entity_BombableRock, 0x0000012C, 0x00000000, 0x00000096, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245BC0_8F19E0, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000018, 0x00000001, 0x00000007, 0x00000018, 0x00000001, 0x00000027, 0x00000018, 0x00000001, 0x00000039, 0x00000043, 0x00000007, MakeEntity, Entity_Hammer3Block, 0x0000012C, 0x00000000, 0x00000096, 0x00000037, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245BF0_8F1A10, 0x00000018, 0x00000001, 0x00000059, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x0000012C, 0x0000005A, 0x00000096, 0x00000037, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245C30_8F1A50, 0x00000018, 0x00000001, 0x00000060, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8F1C00.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8F1C00.data.s deleted file mode 100644 index 703a1ed1f2..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8F1C00.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80245DE0_8F1C00 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_kmr_20_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_kmr_20_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246140_8F1F60 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_kmr_20_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, dup_kmr_20_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, dup_kmr_20_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, dup_kmr_20_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_80246744_8F2564 -.word 0x00000001, 0x00000009 - -dlabel D_8024674C_8F256C -.word 0x00000001, 0x0000000A - -dlabel D_80246754_8F2574 -.word 0x00000002, 0xFFFFFF76, 0x00000072, 0x000000E8, 0xFFFFFFCB, 0x00000072, 0x000000DE - -dlabel D_80246770_8F2590 -.word D_80246744_8F2564, D_8024674C_8F256C, 0x00000000, D_80246754_8F2574, 0x00000000 - -dlabel D_80246784_8F25A4 -.word 0xC2D40000, 0x00000000, 0x43490000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246770_8F2590, 0x00000047, 0x00000005, D_80246140_8F1F60, 0x00001000, 0x0000000F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246140_8F1F60, 0x00100000, D_80246784_8F25A4, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8F2610.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8F2610.data.s deleted file mode 100644 index 57a69e9e30..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8F2610.data.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802467F0_8F2610 -.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, dup2_kmr_20_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, dup2_kmr_20_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, dup2_kmr_20_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, dup2_kmr_20_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, dup2_kmr_20_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, dup2_kmr_20_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_80247154_8F2F74 -.word 0x00000001, 0x00000017 - -dlabel D_8024715C_8F2F7C -.word 0x00000001, 0xFFFFFFDF, 0x0000000D, 0xFFFFFF17 - -dlabel D_8024716C_8F2F8C -.word D_80247154_8F2F74, 0x00000000, D_8024715C_8F2F7C, 0x00000000 - -dlabel D_8024717C_8F2F9C -.word 0x00000001, 0x00000019 - -dlabel D_80247184_8F2FA4 -.word 0x00000001, 0x00000053, 0x00000010, 0x00000028 - -dlabel D_80247194_8F2FB4 -.word D_8024717C_8F2F9C, 0x00000000, D_80247184_8F2FA4, 0x00000000 - -dlabel D_802471A4_8F2FC4 -.word 0x00000001, 0x0000001B - -dlabel D_802471AC_8F2FCC -.word 0x00000001, 0x00000201, 0x00000010, 0x00000064 - -dlabel D_802471BC_8F2FDC -.word D_802471A4_8F2FC4, 0x00000000, D_802471AC_8F2FCC, 0x00000000 - -dlabel D_802471CC_8F2FEC -.word 0x00000001, 0x0000001D - -dlabel D_802471D4_8F2FF4 -.word 0x00000001, 0x00000284, 0x0000000E, 0x00000039 - -dlabel D_802471E4_8F3004 -.word D_802471CC_8F2FEC, 0x00000000, D_802471D4_8F2FF4, 0x00000000 - -dlabel D_802471F4_8F3014 -.word 0x00000001, 0x0000001F - -dlabel D_802471FC_8F301C -.word 0x00000001, 0x000002C4, 0x00000010, 0xFFFFFF17 - -dlabel D_8024720C_8F302C -.word D_802471F4_8F3014, 0x00000000, D_802471FC_8F301C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024716C_8F2F8C, 0x00000047, 0x00000005, D_802467F0_8F2610, 0x00000100, 0x00000010, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80247194_8F2FB4, 0x00000047, 0x00000005, D_802467F0_8F2610, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802471BC_8F2FDC, 0x00000047, 0x00000005, D_802467F0_8F2610, 0x00000100, 0x00000012, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802471E4_8F3004, 0x00000047, 0x00000005, D_802467F0_8F2610, 0x00000100, 0x00000013, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024720C_8F302C, 0x00000047, 0x00000005, D_802467F0_8F2610, 0x00000100, 0x00000014, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8F3130.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8F3130.data.s deleted file mode 100644 index d7e659027c..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8F3130.data.s +++ /dev/null @@ -1,84 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80247310_8F3130 -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02EE0000, D_80247648_8F3468, 0x00000000 - -dlabel D_8024733C_8F315C -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80247310_8F3130, 0x00000000, 0x02BC0000, D_80247648_8F3468, 0x00000000 - -dlabel D_80247368_8F3188 -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024733C_8F315C, 0x00000000, 0x028A0000, D_80247648_8F3468, 0x00000000 - -dlabel D_80247394_8F31B4 -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80247368_8F3188, 0x00000000, 0x02580000, D_80247648_8F3468, 0x00000000 - -dlabel D_802473C0_8F31E0 -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80247394_8F31B4, 0x00000000, 0x02260000, D_80247648_8F3468, 0x00000000 - -dlabel D_802473EC_8F320C -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802473C0_8F31E0, 0x00000000, 0x01F40000, D_80247648_8F3468, 0x00000000 - -dlabel D_80247418_8F3238 -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802473EC_8F320C, 0x00000000, 0x01C20000, D_80247648_8F3468, 0x00000000 - -dlabel D_80247444_8F3264 -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80247418_8F3238, 0x00000000, 0x01900000, D_80247648_8F3468, 0x00000000 - -dlabel D_80247470_8F3290 -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80247444_8F3264, 0x00000000, 0x015E0000, D_80247648_8F3468, 0x00000000 - -dlabel D_8024749C_8F32BC -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80247470_8F3290, 0x00000000, 0x012C0000, D_80247648_8F3468, 0x00000000 - -dlabel D_802474C8_8F32E8 -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024749C_8F32BC, 0x00000000, 0x00FA0000, D_80247648_8F3468, 0x00000000 - -dlabel D_802474F4_8F3314 -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802474C8_8F32E8, 0x00000000, 0x00C80000, D_80247648_8F3468, 0x00000000 - -dlabel D_80247520_8F3340 -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802474F4_8F3314, 0x00000000, 0x00960000, D_80247648_8F3468, 0x00000000 - -dlabel D_8024754C_8F336C -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80247520_8F3340, 0x00000000, 0x00640000, D_80247648_8F3468, 0x00000000 - -dlabel D_80247578_8F3398 -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024754C_8F336C, 0x00000000, 0x00320000, D_80247648_8F3468, 0x00000000 - -dlabel D_802475A4_8F33C4 -.word D_80248C28_8F4A48, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80247578_8F3398, 0x00000000, 0x00000000, D_80247648_8F3468, 0x00000000 - -dlabel D_802475D0_8F33F0 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802475A4_8F33C4, 0xFFFF0000, 0x00000000, 0x00000000, D_802475D0_8F33F0, D_802475A4_8F33C4, D_80247578_8F3398, D_8024754C_8F336C, D_80247520_8F3340, D_802474F4_8F3314, D_802474C8_8F32E8, D_8024749C_8F32BC, D_80247470_8F3290, D_80247444_8F3264, D_80247418_8F3238, D_802473EC_8F320C, D_802473C0_8F31E0, D_80247394_8F31B4, D_80247368_8F3188, D_8024733C_8F315C, D_80247310_8F3130, 0x00000000, 0x00000000 - -dlabel D_80247648_8F3468 -.word 0x00000000, 0x00000000, 0x04000000, 0xDB1396FF, 0x00000000, 0x00000000, 0x04120038, 0xB615A5FF, 0x00000000, 0x00000000, 0x04000038, 0xD05CC5FF, 0x00000000, 0x00000000, 0x03ED0000, 0xF94FB2FF, 0x00000000, 0x00000000, 0x04000071, 0xBB15A1FF, 0x00000000, 0x00000000, 0x03ED0071, 0xD75CC0FF, 0x00000000, 0x00000000, 0x041200AA, 0xB615A5FF, 0x00000000, 0x00000000, 0x040000AA, 0xD05CC5FF, 0x00000000, 0x00000000, 0x040000E3, 0xAE15ACFF, 0x00000000, 0x00000000, 0x03ED00E3, 0xC65BCFFF, 0x00000000, 0x00000000, 0x0412011C, 0xB615A5FF, 0x00000000, 0x00000000, 0x0400011C, 0xD05CC5FF, 0x00000000, 0x00000000, 0x04000155, 0xBF159FFF, 0x00000000, 0x00000000, 0x03ED0155, 0xDC5BBDFF, 0x00000000, 0x00000000, 0x0412018E, 0xB615A5FF, 0x00000000, 0x00000000, 0x0400018E, 0xD05CC5FF, 0x00000000, 0x00000000, 0x040001C7, 0xA515BAFF, 0x00000000, 0x00000000, 0x03ED01C7, 0xBB56DEFF, 0x00000000, 0x00000000, 0x0400041C, 0x8E20F5FF, 0x00000000, 0x00000000, 0x03ED0400, 0xAC55F8FF, 0x00000000, 0x00000000, 0x001201C7, 0x14564BFF, 0x00000000, 0x00000000, 0x001203FF, 0xF85554FF, 0x00000000, 0x00000000, 0x0000041C, 0xF52072FF, 0x00000000, 0x00000000, 0x000001C7, 0x321567FF, 0x00000000, 0x00000000, 0x00000038, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120000, 0x4B4F16FF, 0x00000000, 0x00000000, 0x00120071, 0x365C35FF, 0x00000000, 0x00000000, 0x000000AA, 0x305C3BFF, 0x00000000, 0x00000000, 0x001200E3, 0x245B43FF, 0x00000000, 0x00000000, 0x0000011C, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120155, 0x3A5B31FF, 0x00000000, 0x00000000, 0x0000018E, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120000, 0x4B4F16FF, 0x00000000, 0x00000000, 0x00000038, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE0038, 0x4A155BFF, 0x00000000, 0x00000000, 0x00000000, 0x601339FF, 0x00000000, 0x00000000, 0x00120071, 0x365C35FF, 0x00000000, 0x00000000, 0x00000071, 0x4F1557FF, 0x00000000, 0x00000000, 0x000000AA, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE00AA, 0x4A155BFF, 0x00000000, 0x00000000, 0x001200E3, 0x245B43FF, 0x00000000, 0x00000000, 0x000000E3, 0x411561FF, 0x00000000, 0x00000000, 0x0000011C, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE011C, 0x4A155BFF, 0x00000000, 0x00000000, 0x00120155, 0x3A5B31FF, 0x00000000, 0x00000000, 0x00000155, 0x521554FF, 0x00000000, 0x00000000, 0x0000018E, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE018E, 0x4A155BFF, 0x00000000, 0x00000000, 0x001201C7, 0x14564BFF, 0x00000000, 0x00000000, 0x000001C7, 0x321567FF - -dlabel D_80247968_8F3788 -.word 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D - -dlabel D_80248C28_8F4A48 -.word 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xFC121824, 0xFF33FFFF, 0xFD100000, D_80248D90_8F4BB0, 0xF5100000, 0x07094140, 0xE6000000, 0x00000000, 0xF3000000, 0x071FF200, 0xE7000000, 0x00000000, 0xF5100800, 0x00094140, 0xF2000000, 0x0003C07C, 0xD9FFFFFF, 0x00020000, 0x01020040, D_80247968_8F3788, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0x06080C0E, 0x00080E0A, 0x060C1012, 0x000C120E, 0x06101416, 0x00101612, 0x0614181A, 0x00141A16, 0x06181C1E, 0x00181E1A, 0x061C2022, 0x001C221E, 0x06202426, 0x00202622, 0x06282A2C, 0x00282C2E, 0x06060430, 0x00063032, 0x06040A34, 0x00043430, 0x060A0E36, 0x000A3634, 0x060E1238, 0x000E3836, 0x0612163A, 0x00123A38, 0x06161A3C, 0x00163C3A, 0x061A1E3E, 0x001A3E3C, 0x061E2228, 0x001E283E, 0x0622262A, 0x00222A28, 0x0626242C, 0x00262C2A, 0x01012024, D_80247968_8F3788, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0x06080C0E, 0x00080E0A, 0x060C1012, 0x000C120E, 0x06101416, 0x00101612, 0x0614181A, 0x00141A16, 0x06181C1E, 0x00181E1A, 0x061C2022, 0x001C221E, 0xE7000000, 0x00000000, 0xFC323864, 0xFF73FFFF, 0xD7000000, 0x00010001, 0xDF000000, 0x00000000 - -dlabel D_80248D90_8F4BB0 -.word 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1DBDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0x9D1DBDE5, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0x9D1DBDE5, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0x9D1DBDE5, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0x9D1DBDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0x33E93C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B44F1, 0x44F144F1, 0x44F15D73, 0x5D7344F1, 0x44F15D73, 0x5D7344F1, 0x44F144F1, 0x44F144F1, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x5D735D73, 0x5D735D73, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x44F15D73, 0x5D7344F1, 0x44F144F1, 0x44F13C6B, 0x33E99D1D, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1D9D1D, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x44F144F1, 0x44F13C6B, 0x33E99D1D, 0x9D1D9B01, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1DBDE5, 0x9B01C405, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F13C6B, 0x23659D1D, 0xBDE59D1D, 0x9B01C405, 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x3C6B2365, 0x9D1DBDE5, 0x9D1D9B01, 0xC405D48B, 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x23659D1D, 0x9D1D9D1D, 0x9D1D9B01, 0xC405D48B, 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D9B01, 0x9B019B01, 0x9B019B01, 0x9B01C405, 0xD48BD48B, 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E99B01, 0xC405C405, 0xC405C405, 0xC405D48B, 0xD48BD48B, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0xD48BD48B, 0x9B01D48B, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F13C6B, 0x33E99B01, 0x9B01C405, 0xC405D48B, 0x9B01D48B, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x3C6B33E9, 0x23659B01, 0xC405D48B, 0x9B01D48B, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x44F13C6B, 0x33E99B01, 0xC405D48B, 0xD48BD48B, 0x9D1D33E9, 0x3C6B44F1, 0x44F15D73, 0x44F144F1, 0x3C6B33E9, 0x23659B01, 0xC405D48B, 0xD48BD48B, 0x33E93C6B, 0x44F144F1, 0x5D735D73, 0x44F144F1, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0xC405C405, 0x33E93C6B, 0x44F144F1, 0x5D735D73, 0x44F144F1, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0x9B019B01, 0x9D1D33E9, 0x3C6B44F1, 0x44F15D73, 0x44F13C6B, 0x33E99B01, 0xC405C405, 0xC4059B01, 0x23659D1D, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F13C6B, 0x33E99B01, 0xC4059B01, 0x9B012365, 0x9D1DBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F13C6B, 0x33E99B01, 0x9B0133E9, 0x23659D1D, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x3C6B33E9, 0x33E92365, 0x9D1DBDE5, 0xBDE5BDE5, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x3C6B3C6B, 0x33E99D1D, 0xBDE5BDE5, 0xBDE5D6AB, 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x3C6B33E9, 0x9D1DBDE5, 0xBDE5BDE5, 0xD6ABD6AB, 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x33E99D1D, 0xBDE5BDE5, 0xBDE5D6AB, 0xD6AB05EF, 0x00130005, 0x00010000, 0x00000000, 0x00080001, 0x00000000, 0x00000011, 0x000100B6, 0x00B600B6, 0x00050002, 0x00000000, 0x00000008, 0x00020000, 0x00000000, 0x00110002, 0x00B600B6, 0x00B60005, 0x00030000, 0x00000000, 0x00080003, 0x00000000, 0x00000011, 0x000300B6, 0x00B600B6, 0x00050004, 0x00000000, 0x00000008, 0x00040000, 0x00000000, 0x00110004, 0x00B600B6, 0x00B60005, 0x00050000, 0x00000000, 0x00080005, 0x00000000, 0x00000011, 0x000500B6, 0x00B600B6, 0x00050006, 0x00000000, 0x00000008, 0x00060000, 0x00000000, 0x00110006, 0x00B600B6, 0x00B60005, 0x00070000, 0x00000000, 0x00080007, 0x00000000, 0x00000011, 0x000700B6, 0x00B600B6, 0x00050008, 0x00000000, 0x00000008, 0x00080000, 0x00000000, 0x00110008, 0x00B600B6, 0x00B60005, 0x00090000, 0x00000000, 0x00080009, 0x00000000, 0x00000011, 0x000900B6, 0x00B600B6, 0x0005000A, 0x00000000, 0x00000008, 0x000A0000, 0x00000000, 0x0011000A, 0x00B600B6, 0x00B60005, 0x000B0000, 0x00000000, 0x0008000B, 0x00000000, 0x00000011, 0x000B00B6, 0x00B600B6, 0x0005000C, 0x00000000, 0x00000008, 0x000C0000, 0x00000000, 0x0011000C, 0x00B600B6, 0x00B60005, 0x000D0000, 0x00000000, 0x0008000D, 0x00000000, 0x00000011, 0x000D00B6, 0x00B600B6, 0x0005000E, 0x00000000, 0x00000008, 0x000E0000, 0x00000000, 0x0011000E, 0x00B600B6, 0x00B60005, 0x000F0000, 0x00000000, 0x0008000F, 0x00000000, 0x00000011, 0x000F00B6, 0x00B600B6, 0x00050010, 0x00000000, 0x00000008, 0x00100000, 0x00000000, 0x00110010, 0x00B600B6, 0x00B60005, 0x00110000, 0x00000000, 0x00080011, 0x00000000, 0x00000011, 0x001100B6, 0x00B600B6, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00030000 - -dlabel D_80249484_8F52A4 -.word 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C85, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C87, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802494FC_8F531C -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, kmr_20_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802499FC_8F581C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kmr_20_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kmr_20_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802494FC_8F531C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80249A5C_8F587C, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_20_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80249484_8F52A4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_20_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80249EFC_8F5D1C, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kmr_20_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802499FC_8F581C -.word 0x00000024, 0x00000002, 0xFE363C80, 0x000B0106, 0x00000024, 0x00000002, 0xFE363C88, 0x000B0107, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249A5C_8F587C -.word 0x00000044, 0x00000001, 0x80242D4C, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFE4, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000012C, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, kmr_20_ToadHouse_CamSetFOV, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000023, 0xFFFFFFF6, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000087, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xFFFFFF93, 0xFFFFFFB4, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000000, 0x00000078, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000099, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009A, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009B, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009D, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009E, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000009F, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A0, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A1, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A2, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A3, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x00000043, 0x00000005, MakeLerp, 0x0000001E, 0x00000055, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C84, 0xFE363C80, 0xFE363C86, 0x00000006, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000057, 0x00000000, 0x00000043, 0x00000001, func_8024159C_8ED3BC, 0x00000008, 0x00000001, 0x0000004B, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000041, 0x00000043, 0x00000003, kmr_20_ToadHouse_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000099, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009A, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009B, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009C, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009D, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009E, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009F, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A0, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A1, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A2, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A3, 0x00000001, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249EFC_8F5D1C -.word 0x00000043, 0x00000001, func_802415C4_8ED3E4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFD3, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFFB5, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000044, 0x00000001, 0x80242C40, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249FE4_8F5E04 -.word 0x00000043, 0x00000001, kmr_20_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, kmr_20_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_802499FC_8F581C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kmr_20_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0xFE363C88, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E0007, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000001, kmr_20_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_802494FC_8F531C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000045, 0x00000002, D_80249A5C_8F587C, 0xFE363C89, 0x00000043, 0x00000002, kmr_20_ToadHouse_AwaitScriptComplete, 0xFE363C89, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_20_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80249484_8F52A4, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kmr_20_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kmr_20_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000045, 0x00000002, D_80249EFC_8F5D1C, 0xFE363C89, 0x00000043, 0x00000002, kmr_20_ToadHouse_AwaitScriptComplete, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, kmr_20_ToadHouse_ShowStatusMenu, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80249FE4_8F5E04, 0x00000100, 0x00000023, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8F61F0.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8F61F0.data.s deleted file mode 100644 index 966e658f32..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8F61F0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_8024A3D0_8F61F0 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024A3FC_8F621C -.word 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000002E, 0x0000001A, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00820007, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000C4, 0x0000002C, 0xFFFFFFDB, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A4AC_8F62CC -.word 0x00000000, D_8024A3D0_8F61F0, 0x00000000, 0xC47A0000, 0x00000000, 0x00600D0D, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040001, 0x00040002, 0x00040003, 0x00040003, 0x00040001, 0x00040001, 0x00040000, 0x00040000, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00040001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024A3D0_8F61F0, 0x00000000, 0xC47A0000, 0x00000000, 0x00001F0D, D_8024A3FC_8F621C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_8024A4AC_8F62CC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8F66D0.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8F66D0.data.s deleted file mode 100644 index 0a95c207bf..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8F66D0.data.s +++ /dev/null @@ -1,66 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_8024A8B0_8F66D0 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024A8DC_8F66FC -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel kmr_20_varStash -.word 0x00000000 - -dlabel D_8024A90C_8F672C -.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_8024A96C_8F678C -.word 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024A9B4_8F67D4 -.word 0x0000000B, 0x00000002, 0xF5DE02DC, 0x00000005, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF8405BE3, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00820004, 0x00000046, 0x00000001, D_8024A96C_8F678C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00820014, 0x00820004, 0x00000000, 0x000B0103, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010029, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00820014, 0x00820004, 0x00000000, 0x000B0104, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C81, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C81, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0082001C, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00820004, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00820014, 0x00820004, 0x00000000, 0x000B0105, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000006F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_8024A90C_8F672C, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C80, 0x00000024, 0x00000002, 0xF8405BE3, 0x00000001, 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000004, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0082000A, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820007, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x0000017B, 0x00000014, 0xFFFFFFC4, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x00000027, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000001, 0x0000002B, 0x00000018, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000001EF, 0x0000001E, 0xFFFFFF8D, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001EF, 0x00000000, 0xFFFFFF8D, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2542A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000016, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820007, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820017, 0x00000008, 0x00000001, 0x00000019, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820007, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820017, 0x00820007, 0x00000005, 0x000B00DB, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000002, 0xFFFFFFE2, 0x00000028, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000001EF, 0x0000001E, 0xFFFFFF8D, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001EF, 0x00000000, 0xFFFFFF8D, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2542A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000008, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0xFFFFFFE2, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000D, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820014, 0x00820004, 0x00000000, 0x000B00DC, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000213, 0xFFFFFF80, 0x00000032, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000022C, 0xFFFFFF62, 0x0000001E, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x0000022A, 0xFFFFFF3D, 0x0000001C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000001EF, 0x0000001E, 0xFFFFFF8D, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000001EF, 0x00000000, 0xFFFFFF8D, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2542A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000234, 0x00000000, 0xFFFFFF50, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000022C, 0x00000000, 0xFFFFFF62, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24EB280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820014, 0x00820004, 0x00000005, 0x000B00DD, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082001B, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000002, 0xFFFFFFE2, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000020C, 0xFFFFFF68, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x00000027, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x000000DB, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000004, 0x00000014, 0x00000055, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000002, 0xFFFFFFEC, 0x00000046, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000006E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820014, 0x00820004, 0x00000005, 0x000B00DE, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00000108, 0x00000106, 0x00000005, 0x000B00DF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00000108, 0x00000106, 0x00000005, 0x000B00E0, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00000108, 0x00000106, 0x00000005, 0x000B00E1, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00000108, 0x00000106, 0x00000005, 0x000B00E2, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFC, 0x00000101, 0x00000109, 0x00000005, 0x000B00DB, 0x00000023, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820014, 0x00820004, 0x00000005, 0x000B00E3, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000008, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8880, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024B844_8F7664 -.word 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetNpcVar, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00820007, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000019, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000004, GetNpcVar, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000019, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00820017, 0x00000008, 0x00000001, 0x00000016, 0x00000004, 0x00000001, 0x00000014, 0x00000003, 0x00000001, 0x00000015, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024BA30_8F7850 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00820004, 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFAA2B58C, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xFAA2B58C, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000006, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000003A, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000027, 0x00000002, 0xFE363C8B, 0x00000037, 0x00000028, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B58C, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001C, 0x00000004, 0x00000001, 0x00000014, 0x00000003, 0x00000001, 0x00000015, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024BCAC_8F7ACC -.word 0x00000003, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0xFAA2B58C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000002, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF8405BE9, 0x00000001, 0x00000024, 0x00000002, 0xF971888C, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00820004, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000027, 0x00000002, 0xFE363C8B, 0x0000002D, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x0000000F, PlayEffect, 0x00000026, 0x00000000, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8880, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00820014, 0x00820004, 0x00000005, 0x000B00E9, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000009, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00820014, 0x00820004, 0x00000005, 0x000B00EA, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0x000000AE, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00820014, 0x00820004, 0x00000005, 0x000B00EB, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0082000A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFFFFFF7E, 0xFFFFFFEF, 0x0000000F, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF6F, 0xFFFFFFCA, 0xFFFFFFD3, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x00002086, 0x00000000, 0x00000043, 0x00000001, func_80241738_8ED558, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_80245374_8F1194, 0x00000057, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFF6F, 0x0000001E, 0xFFFFFFD3, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000100, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0x00000014, 0xFFFFFFB0, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00820004, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000030, 0x0000001E, 0xFFFFFFFB, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000000, 0x00000057, 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, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C554_8F8374 -.word 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFAA2B58C, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF8405BEA, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0xFFFFFFE2, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00820004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0082000A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000025, 0xFFFFFFB8, 0x00000010, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000002A, 0xFFFFFFFA, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00820004, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C784_8F85A4 -.word 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0082000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0082000A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000027B, 0xFFFFFF94, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0082000A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000210, 0x00000014, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0082000A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x0000027B, 0xFFFFFF94, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0082000A, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000210, 0x00000014, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000003, 0x00000001, 0x00000064, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00820004, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x00000027, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024C9C0_8F87E0 -.word 0x0000000A, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00820014, 0x00820004, 0x00000000, 0x000B00E5, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF9C, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00820014, 0x00820004, 0x00000000, 0x000B00E6, 0x00000018, 0x00000001, 0xFFFFFFB5, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00820014, 0x00820004, 0x00000000, 0x000B00E7, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00820014, 0x00820004, 0x00000000, 0x000B00E8, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00820014, 0x00820004, 0x00000000, 0x000B00ED, 0x00000018, 0x00000001, 0x00000007, 0x0000000A, 0x00000002, 0xF8405BED, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00820014, 0x00820004, 0x00000000, 0x000B00EE, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00820014, 0x00820004, 0x00000000, 0x000B00EF, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00820014, 0x00820004, 0x00000000, 0x000B00F0, 0x00000018, 0x00000001, 0x00000039, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00820014, 0x00820004, 0x00000000, 0x000B00F1, 0x00000018, 0x00000001, 0x00000059, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00820014, 0x00820004, 0x00000000, 0x000B00F2, 0x00000018, 0x00000001, 0x00000060, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00820014, 0x00820004, 0x00000010, 0x000B00F3, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024A9B4_8F67D4, 0x0000000B, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000059, 0x00000020, 0x00000000, 0x00000018, 0x00000001, 0x00000060, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x00000027, 0x00000005, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024CC60_8F8A80 -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00820004, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000002D, 0x00000018, 0x0000000A, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C9C0_8F87E0, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF9C, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFB5, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF6F, 0x0000001E, 0xFFFFFFCE, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024BCAC_8F7ACC, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x0000000A, 0x00000002, 0xF8405BE9, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFAD, 0xFFFFFFB0, 0xFFFFFFCA, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024BA30_8F7850, 0x00000024, 0x00000002, 0xFAA2B58D, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000030, 0x0000001E, 0xFFFFFFFB, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000018, 0x00000001, 0x00000027, 0x0000000A, 0x00000002, 0xF8405BEA, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00820019, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF9A, 0x0000001E, 0xFFFFFFAB, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024C554_8F8374, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000002A, 0x0000001E, 0xFFFFFFFA, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000039, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000018, 0x00000001, 0x00000059, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000018, 0x00000001, 0x00000060, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024CFB8_8F8DD8 -.word 0x00000043, 0x00000004, SetNpcVar, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00820004, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000002D, 0x00000018, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024C9C0_8F87E0, 0x0000000A, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFF9C, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000001F4, 0x00000000, 0xFFFFFF38, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFB5, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFCB, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000012C, 0x00000032, 0x00000096, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00820007, 0x00000043, 0x00000003, SetNpcAux, 0xFFFFFFFF, D_8024B844_8F7664, 0x00000018, 0x00000001, 0xFFFFFFF1, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000018, 0x00000001, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000230, 0x00000000, 0xFFFFFFB5, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024C784_8F85A4, 0x00000018, 0x00000001, 0x00000027, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000018, 0x00000001, 0x00000039, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000012C, 0x00000032, 0x00000096, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00820007, 0x00000043, 0x00000003, SetNpcAux, 0xFFFFFFFF, D_8024B844_8F7664, 0x00000018, 0x00000001, 0x00000059, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000012C, 0x00000073, 0x00000096, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00820007, 0x00000043, 0x00000003, SetNpcAux, 0xFFFFFFFF, D_8024B844_8F7664, 0x00000018, 0x00000001, 0x00000060, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000132, 0x0000001E, 0xFFFFFF6F, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x00000027, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00400000, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D2D4_8F90F4 -.word 0x00000000, D_8024A8B0_8F66D0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_8024CC60_8F8A80, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, 0x00000000, 0x001A0069 - -dlabel D_8024D4C4_8F92E4 -.word 0x00000001, D_8024A8B0_8F66D0, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_8024CFB8_8F8DD8, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00820000, 0x00000000, 0x00000000, 0x00000000, 0x001A0069 - -dlabel D_8024D6B4_8F94D4 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000001F4, 0x00000000, 0xFFFFFF3D, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0003, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000001E2, 0x00000000, 0xFFFFFEE2, 0x0000000F, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000002D6, 0x00000000, 0xFFFFFF67, 0x0000000F, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x0000025B, 0x00000000, 0x00000000, 0x0000000F, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x0000022D, 0x00000000, 0x00000082, 0x0000000F, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000165, 0x00000000, 0x00000057, 0x0000000F, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000158, 0x0000001E, 0xFFFFFFF8, 0x0000000F, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000114, 0x0000008A, 0x00000016, 0x0000000F, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000168, 0x0000003D, 0xFFFFFF8B, 0x0000000F, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000001AB, 0x00000037, 0xFFFFFF4A, 0x0000000F, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024D984_8F97A4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x003B0003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000203F, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000001EF, 0x00000000, 0xFFFFFF94, 0x0000000F, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000226, 0xFFFFFF56, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000252, 0x0000001E, 0xFFFFFF24, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000163, 0x00000000, 0x00000043, 0x00000003, func_802CFE2C, 0xFFFFFFFF, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0xFFFFFFFF, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000005, 0x00000001, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024DB7C_8F999C -.word 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000203E, 0x00000000, 0x00000024, 0x00000002, 0xF8405BED, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x1F000000, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_8024D984_8F97A4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024DC00_8F9A20 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFF3, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000004, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF8405BED, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024D6B4_8F94D4, 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_8024DB7C_8F999C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024DCEC_8F9B0C -.word 0x00000002, D_8024A8DC_8F66FC, 0x00000000, 0xC47A0000, 0x00000000, 0x11700F08, D_8024DC00_8F9A20, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x003B0001, 0x003B0002, 0x003B0003, 0x003B0003, 0x003B0001, 0x003B0001, 0x003B000C, 0x003B000C, 0x003B0015, 0x003B0012, 0x003B0011, 0x003B0010, 0x003B0005, 0x003B0001, 0x003B0001, 0x003B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_8024D2D4_8F90F4, 0x00000000, 0x00000001, D_8024D4C4_8F92E4, 0x00000000, 0x00000001, D_8024DCEC_8F9B0C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kmr/kmr_20/8F9D30.data.s b/ver/us/asm/data/world/area_kmr/kmr_20/8F9D30.data.s deleted file mode 100644 index 80078161b5..0000000000 --- a/ver/us/asm/data/world/area_kmr/kmr_20/8F9D30.data.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel sam_01_Quizmo_AnswerResult_8F9D30 -.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, dup_kmr_20_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, dup_kmr_20_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dup_kmr_20_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024E730_8FA550, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024E730_8FA550 -.word 0x00000043, 0x00000001, dup_kmr_20_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, dup_kmr_20_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, dup_kmr_20_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 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, dup3_kmr_20_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, dup3_kmr_20_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, dup3_kmr_20_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, dup3_kmr_20_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, dup3_kmr_20_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, dup3_kmr_20_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_8024F5A4_8FB3C4 -.word 0x00000043, 0x00000003, GetNpcAnimation, 0x00000001, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00820008, 0x0000001D, 0x00000001, 0x00820009, 0x0000001D, 0x00000001, 0x0082001D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x0082000A, 0x0000001D, 0x00000001, 0x0082000B, 0x0000001D, 0x00000001, 0x0082001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000005, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0xB0000019, 0x00000000, 0x00000008, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024F6BC_8FB4DC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000163, 0x00000000, 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, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024F840_8FB660 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000008, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000163, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802CFE2C, 0x00000001, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80241CF0_8EDB10, 0xF24A81B4, 0x00000043, 0x00000007, InterpCamTargetPos, 0x00000000, 0x00000001, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x0000000A, 0x00000043, 0x00000002, func_80241CF0_8EDB10, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024FAAC_8FB8CC -.word 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000001, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024FB88_8FB9A8 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000017, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x00000050, 0x00000000, 0x00000008, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000017, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024FCE4_8FBB04 -.word 0x00000043, 0x00000003, EnableGroup, 0x00000080, 0x00000001, 0x00000046, 0x00000001, D_8024FB88_8FB9A8, 0x00000043, 0x00000003, EnableGroup, 0x00000080, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024FD28_8FBB48 -.word 0x00000003, 0x00000022, 0x00000023, 0x00000024 - -dlabel D_8024FD38_8FBB58 -.word 0x00000003, 0x000001A6, 0x00000025, 0xFFFFFF3D, 0x000001A6, 0x00000030, 0xFFFFFF3D, 0x000001A6, 0x0000000C, 0xFFFFFF3D, D_8024FD28_8FBB48, 0x00000000, D_8024FD38_8FBB58, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003E, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFCE, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000DC, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x000002D0, 0x000000DC, 0xFFFFFF6A, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, EnableGroup, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000006B, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000226, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000226, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000226, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A4280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001C2, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000046, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000005A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x0000005C, 0xFE363C82, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000032, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000005E, 0xFE363C80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000060, 0xFE363C82, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000032, 0x00000028, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000062, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000006A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000064, 0xFE363C82, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000066, 0xFE363C82, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000068, 0xFE363C82, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000078, 0x00000043, 0x00000008, NpcFlyTo, 0x00000000, 0x000001AE, 0x00000014, 0xFFFFFF5B, 0x0000003C, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000002D, 0x0000000A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000E0, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000002, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000002, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x000000DC, 0x00000005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00040006, 0x00040001, 0x00000005, 0x0000001E, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000008, NpcFlyTo, 0x00000000, 0x00000168, 0x00000104, 0x0000003C, 0x0000003C, 0xFFFFFFF6, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000044, 0x00000001, D_8024FCE4_8FBB04, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000A, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001C2, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001AE, 0xFFFFFF5B, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000000E0, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000022, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000023, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000B, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001C2, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000122, 0xFFFFFFBA, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, EnableGroup, 0x00000091, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000A5, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x000000B2, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000010C, 0x00000001, 0x00000043, 0x00000001, func_80241C9C_8EDABC, 0x00000043, 0x00000006, RotateGroup, 0x00000075, 0x0000005A, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0x0000005A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000075, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0x0000001E, 0xFFFFFFB0, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, func_80241D1C_8EDB3C, 0x00000044, 0x00000001, D_8024FB88_8FB9A8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820009, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000F0, 0xFFFFFFB0, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820015, 0x00820005, 0x00000000, 0x0000001F, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_8024FAAC_8FB8CC, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820009, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000E6, 0xFFFFFF7E, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000006E, 0xFFFFFF92, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, func_802D1270, 0x00000046, 0xFFFFFFB0, 0xF24A8280, 0x00000043, 0x00000004, func_802D1270, 0x00000046, 0xFFFFFF92, 0xF24A8280, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820015, 0x00820005, 0x00000000, 0x00000020, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820018, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820006, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820016, 0x00820006, 0x00000000, 0x00000021, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820019, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000073, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000043, 0x00000004, GotoMapSpecial, 0x80253008, 0x00000003, 0x00000007, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000DC, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000005A, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000140, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000140, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000001, 0x00000008, 0x00000044, 0x00000001, D_8024FCE4_8FBB04, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000A, 0x00000045, 0x00000002, D_8024F5A4_8FB3C4, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000140, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001CC, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000023A, 0xFFFFFF56, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x00000140, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x000001CC, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, func_802D1270, 0x0000023A, 0xFFFFFF56, 0xF24A8680, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_8024F6BC_8FB4DC, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00002081, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000148, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_8024F840_8FB660, 0x00000044, 0x00000001, 0x80242D78, 0x00000043, 0x00000003, GotoMap, 0x80253010, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 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, dup2_kmr_20_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, dup2_kmr_20_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802517E0_8FD600, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802517E0_8FD600 -.word 0x00000043, 0x00000001, dup2_kmr_20_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, dup2_kmr_20_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80251CF0_8FDB10 -.word 0x00000043, 0x00000003, GetNpcAnimation, 0x00000001, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00820008, 0x0000001D, 0x00000001, 0x00820009, 0x0000001D, 0x00000001, 0x0082001D, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x0082000A, 0x0000001D, 0x00000001, 0x0082000B, 0x0000001D, 0x00000001, 0x0082001E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000005, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0xB0000019, 0x00000000, 0x00000008, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80251E08_8FDC28 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000017, 0x000001C1, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000000A, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80251EB8_8FDCD8 -.word 0x00000043, 0x00000005, MakeLerp, 0x0000005A, 0x00000000, 0x0000000A, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000017, 0x000001C2, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80251F68_8FDD88 -.word 0x00000043, 0x00000003, EnableGroup, 0x00000080, 0x00000001, 0x00000046, 0x00000001, D_80251E08_8FDC28, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, D_80251EB8_8FDCD8, 0x00000043, 0x00000003, EnableGroup, 0x00000080, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80251FC4_8FDDE4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000163, 0x00000000, 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, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80252148_8FDF68 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000008, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000001, dup2_kmr_20_Pipe_GetEntryPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000163, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000007, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, func_802CFE2C, 0x00000001, 0x00000800, 0x00000043, 0x00000007, func_802CFD30, 0x00000001, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80242144_8EDF64, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080024, 0x00000043, 0x00000004, SetPlayerPos, 0x0000005F, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000096, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000096, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820017, 0x00820007, 0x00000000, 0x0001000D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080025, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820017, 0x00820007, 0x00000000, 0x0001000E, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x80253018, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_80242144_8EDF64, 0x00000043, 0x00000004, SetPlayerPos, 0x0000005F, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080024, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000096, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000096, 0x0000002C, 0xFFFFFFD8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000006, PlaySoundAt, 0x000000E0, 0x00000000, 0x000001AE, 0x00000000, 0xFFFFFF47, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000002, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820017, 0x00820007, 0x00000000, 0x00010021, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x000000B4, 0x0000001E, 0xFFFFFFEC, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00002081, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000E, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000148, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820008, 0x00000045, 0x00000002, D_80251CF0_8FDB10, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000F0, 0xFFFFFFEC, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082001D, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000F0, 0xFFFFFFB0, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80251E08_8FDC28, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820008, 0x00000045, 0x00000002, D_80251CF0_8FDB10, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000012C, 0xFFFFFFB0, 0x0000001E, 0x00000046, 0x00000001, D_80251EB8_8FDCD8, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, SetNpcYaw, 0x00000001, 0x0000010E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820009, 0x00000045, 0x00000002, D_80251CF0_8FDB10, 0xFE363C8A, 0x00000044, 0x00000001, D_80251E08_8FDC28, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000000F0, 0xFFFFFFB0, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820005, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000046, 0x00000001, D_80251EB8_8FDCD8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00820015, 0x00820005, 0x00000000, 0x00010022, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_80242084_8EDEA4, 0x00000043, 0x00000003, EnableGroup, 0x00000091, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000A5, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000B2, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000010C, 0x00000000, 0x00000043, 0x00000001, func_80242030_8EDE50, 0x00000043, 0x00000006, RotateGroup, 0x00000075, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000075, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000154, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000154, 0x0000001E, 0xFFFFFFBA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x000000F0, 0x0000001E, 0xFFFFFFB5, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x000000C8, 0x0000001E, 0xFFFFFFB5, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, func_802420EC_8EDF0C, 0x00000043, 0x00000001, func_8024216C_8EDF8C, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000003F, 0x00000000, 0x00000008, 0x00000044, 0x00000001, D_80251F68_8FDD88, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000A, 0x00000045, 0x00000002, D_80251CF0_8FDB10, 0xFE363C8A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000140, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x000001CC, 0xFFFFFFBA, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000023A, 0xFFFFFF56, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000057, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x00000140, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, func_802D1270, 0x000001CC, 0xFFFFFFBA, 0xF24A8680, 0x00000043, 0x00000004, func_802D1270, 0x0000023A, 0xFFFFFF56, 0xF24A8680, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_80251FC4_8FDDE4, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000C, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x0082000D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00002081, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00820004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000148, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x00000252, 0x0000001E, 0xFFFFFF28, 0x0000000F, 0x00000046, 0x00000001, D_80252148_8FDF68, 0x00000044, 0x00000001, 0x80242D78, 0x00000043, 0x00000003, GotoMap, 0x80253020, 0x00000007, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80252D50_8FEB70 -.word 0xE3000A01, 0x00000000, 0xE200001C, 0x00504240, 0xFCFFFFFF, 0xFFFDF6FB, 0xE3001801, 0x000000C0, 0xE3001A01, 0x00000030, 0xE3001700, 0x00000000, 0xE2001E01, 0x00000000, 0x00000000, 0x00000000, 0xFA000000, 0xFF000000, 0xF648C0A4, 0x0007409C, 0xF607C310, 0x0007409C, 0xF648C310, 0x0048809C, 0xF648C310, 0x0007430C, 0xDF000000, 0x00000000 - -dlabel D_80252DC0_8FEBE0 -.word 0xF8405CB6, 0xF8405CB7, 0xF8405CB8, 0xF8405CB9, 0xF8405CBA, 0xF8405CBB, 0xF8405CBC, 0xF8405CBD, 0xF8405CBE, 0xF8405CBF, 0xF8405CC0, 0xF8405CC1, 0xF8405CC2, 0xF8405CC3, 0xF8405CC4, 0xF8405CC5, 0xF8405CC6, 0xF8405CC7, 0xF8405CC9, 0xF8405CCA, 0xF8405CCB, 0xF8405CCC, 0xF8405CCD, 0xF8405CCE, 0xF8405CCF, 0xF8405CD0, 0xF8405CD1, 0xF8405CD2, 0xF8405CD3, 0xF8405CD4, 0xF8405CD5, 0xF8405CD6, 0xF8405CD7, 0xF8405CD8, 0xF8405CD9, 0xF8405CDA, 0xF8405CDB, 0xF8405CDC, 0xF8405CDD, 0xF8405CDE, 0xF8405CDF, 0xF8405CE0, 0xF8405CE1, 0xF8405CE2, 0xF8405CE3, 0xF8405CE5, 0xF8405CE6, 0xF8405CE7, 0xF8405CE8, 0xF8405CE9, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C8A, 0x0000001E, 0xFE363C8C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C8A, 0x0000001E, 0xFE363C8C, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F7A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8B4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000001, func_80242B04_8EE924, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8B4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_01/A479B0.data.s b/ver/us/asm/data/world/area_kpa/kpa_01/A479B0.data.s deleted file mode 100644 index aa7928f8c8..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_01/A479B0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240A50_A479B0 -.word 0x442C8000, 0xC3BD0000, 0x43A88000, 0x42B40000, 0xC3FF8000, 0x43150000, 0x42640000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240D34, D_80240A50_A479B0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190168, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000065, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_01/A47A60.data.s b/ver/us/asm/data/world/area_kpa/kpa_01/A47A60.data.s deleted file mode 100644 index 42aa3debdc..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_01/A47A60.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240B00_A47A60 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, kpa_01_DarkRoomUpdate, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B2C_A47A8C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000008, 0x00000024, 0x00000002, 0xFE363C82, 0x00000006, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802415F0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BD0_A47B30 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802415F8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C2C_A47B8C -.word 0x00000047, 0x00000005, D_80240B2C_A47A8C, 0x00000100, 0x00000008, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240BD0_A47B30, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C74_A47BD4 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000008, 0x00000024, 0x00000002, 0xFE363C82, 0x00000006, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFFF, 0x00000044, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, D_80240C2C_A47B8C, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80240C2C_A47B8C, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80241574, 0x00000046, 0x00000001, 0x802415A0, 0x00000044, 0x00000001, D_80240B00_A47A60, 0x00000044, 0x00000001, D_80240C74_A47BD4, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240AB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_01/A47D70.data.s b/ver/us/asm/data/world/area_kpa/kpa_01/A47D70.data.s deleted file mode 100644 index c597c245c9..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_01/A47D70.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240E10_A47D70 -.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_80240E40_A47DA0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_01_TackleAI_Main, D_80240E10_A47D70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EB0_A47E10 -.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_80240EE0_A47E40 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kpa_01_TackleAI_Main, D_80240EB0_A47E10, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F50_A47EB0 -.word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 - -dlabel D_80240F80_A47EE0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kpa_01_TackleAI_Main, D_80240F50_A47EB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FF0_A47F50 -.word 0x00000043, 0x00000001, kpa_01_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_01_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_01_func_802408B4_97BEE4, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_01_TackleAI_Main, D_80240E10_A47D70, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240E40_A47DA0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240FF0_A47F50, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80240EE0_A47E40, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 - -dlabel D_80241168_A480C8 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_80240F80_A47EE0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80241194_A480F4 -.word 0x00000000, D_80241168_A480C8, 0x44D98000, 0xC3570000, 0x42700000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x000006CC, 0xFFFFFF29, 0x0000003C, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x000006CC, 0xFFFFFF29, 0x0000003C, 0x0000012C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00550004, 0x0055000C, 0x0055000E, 0x0055000E, 0x00550004, 0x00550004, 0x00550018, 0x00550018, 0x00550010, 0x00550016, 0x00550012, 0x00550004, 0x00550004, 0x00550004, 0x00550004, 0x00550004, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241384_A482E4 -.word 0x00000001, D_80241168_A480C8, 0x43730000, 0x40A00000, 0x43660000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x000000F3, 0x00000005, 0x000000E6, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000F3, 0x00000005, 0x000000E6, 0x0000012C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00550004, 0x0055000C, 0x0055000E, 0x0055000E, 0x00550004, 0x00550004, 0x00550018, 0x00550018, 0x00550010, 0x00550016, 0x00550012, 0x00550004, 0x00550004, 0x00550004, 0x00550004, 0x00550004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241194_A480F4, 0x22000004, 0x00000001, D_80241384_A482E4, 0x22010004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_01/A48500.data.s b/ver/us/asm/data/world/area_kpa/kpa_01/A48500.data.s deleted file mode 100644 index f765f4ed03..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_01/A48500.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802415A0_A48500 -.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000DC, 0x000000D0, 0xFFFFFF83, 0x00000000, 0x00000090, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406189, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_03/A4A480.data.s b/ver/us/asm/data/world/area_kpa/kpa_03/A4A480.data.s deleted file mode 100644 index 98a67a0e1e..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_03/A4A480.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241EC0_A4A480 -.word 0x44EC0000, 0xC3CD0000, 0xC2BA0000, 0x43870000, 0xC4C4E000, 0xC2D20000, 0xC31E0000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802420B8, D_80241EC0_A4A480, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190169, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000065, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_03/A4A520.data.s b/ver/us/asm/data/world/area_kpa/kpa_03/A4A520.data.s deleted file mode 100644 index 7859299702..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_03/A4A520.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241F60_A4A520 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, kpa_03_DarkRoomUpdate, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F8C_A4A54C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243870, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FE8_A4A5A8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243878, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242044_A4A604 -.word 0x00000047, 0x00000005, D_80241F8C_A4A54C, 0x00080000, 0x0000002A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241FE8_A4A5A8, 0x00080000, 0x00000025, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024208C_A4A64C -.word 0x00000024, 0x00000002, 0xFE363C80, D_80242044_A4A604, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802435B8, 0x00000046, 0x00000001, 0x802437D0, 0x00000044, 0x00000001, D_80241F60_A4A520, 0x00000044, 0x00000001, D_8024208C_A4A64C, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241F20, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s b/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s deleted file mode 100644 index 455d4af842..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_03/A4A750.data.s +++ /dev/null @@ -1,105 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242190_A4A750 -.word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_802421C0_A4A780 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_03_TackleAI_Main, D_80242190_A4A750, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242230_A4A7F0 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_802421C0_A4A780, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_8024225C_A4A81C -.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_8024228C_A4A84C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_03_TackleAI_Main, D_8024225C_A4A81C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802422FC_A4A8BC -.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_8024232C_A4A8EC -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kpa_03_TackleAI_Main, D_802422FC_A4A8BC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024239C_A4A95C -.word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 - -dlabel D_802423CC_A4A98C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kpa_03_TackleAI_Main, D_8024239C_A4A95C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024243C_A4A9FC -.word 0x00000043, 0x00000001, kpa_03_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_03_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_03_func_802408B4_97BEE4, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_03_TackleAI_Main, D_8024225C_A4A81C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024228C_A4A84C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024243C_A4A9FC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_8024232C_A4A8EC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 - -dlabel D_802425B4_A4AB74 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_802423CC_A4A98C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel kpa_03_MagikoopaAI_TeleportAnim -.float 0.8 - -dlabel D_802425E4_A4ABA4 -.float 1.0 - -dlabel D_802425E8_A4ABA8 -.byte 0xC8, 0x00, 0x00, 0x00, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x3E, 0xCC, 0xCC, 0xCD, 0x3F, 0x80, 0x00, 0x00, 0x8C, 0x00, 0x00, 0x00, 0x3E, 0x99, 0x99, 0x9A, 0x3F, 0x8C, 0xCC, 0xCD, 0x78, 0x00, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, 0x3F, 0xA6, 0x66, 0x66, 0x6E, 0x00, 0x00, 0x00, 0x3E, 0x19, 0x99, 0x9A, 0x3F, 0xCC, 0xCC, 0xCD, 0x64, 0x00, 0x00, 0x00, 0x3D, 0xF5, 0xC2, 0x8F, 0x40, 0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x3D, 0xE1, 0x47, 0xAE, 0x40, 0x40, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x3D, 0xCC, 0xCC, 0xCD, 0x40, 0x80, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -dlabel D_80242664_A4AC24 -.word 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40400000, 0x0000005A, 0x0000000F, 0x43480000, 0x00000000, 0x00000001 - -dlabel D_80242694_A4AC54 -.word 0x00000043, 0x00000002, kpa_03_MagikoopaAI_Main, D_80242664_A4AC24, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426B4_A4AC74 -.word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242740_A4AD00 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_03_MagikoopaAI_OnPlayerWon, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, kpa_03_MagikoopaAI_OnPlayerFled, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802427C0_A4AD80 -.word 0x00000000, 0x0020001C, 0x00000000, 0x00000000, D_80242694_A4AC54, D_802426B4_A4AC74, 0x00000000, D_80242740_A4AD00, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_802427EC_A4ADAC -.word 0x00560000, 0x00560001, 0x00560001, 0x00560001, 0x00560002, 0x00560003, 0x00560004, 0xFFFFFFFF - -dlabel D_8024280C_A4ADCC -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242844_A4AE04 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024287C_A4AE3C -.word 0x00000043, 0x00000001, kpa_03_MagikoopaAI_SpellMain, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242898_A4AE58 -.word 0x00000043, 0x00000001, kpa_03_MagikoopaAI_OnHitInit, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_03_MagikoopaAI_OnHit, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428EC_A4AEAC -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802429A8_A4AF68 -.word 0x00560000, 0x00000000, D_8024280C_A4ADCC, 0x00000000, D_8024287C_A4AE3C, D_80242898_A4AE58, 0x00000000, D_802428EC_A4AEAC, 0x00000000, 0x00000000, 0x00000000, 0x00570000, 0x00000000, D_80242844_A4AE04, 0x00000000, D_8024287C_A4AE3C, D_80242898_A4AE58, 0x00000000, D_802428EC_A4AEAC, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242A00_A4AFC0 -.word 0x00580001, 0x00580004, 0x00580006, 0x00580010, 0x0058000B, 0xFFFFFFFF - -dlabel D_80242A18_A4AFD8 -.word 0x00000000, D_80242230_A4A7F0, 0x4482A000, 0xC37F0000, 0xC3420000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980005, 0x3FFF2666, 0x4CCC0005, 0x3FFF3FFF, 0x3FFF0005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000415, 0xFFFFFF01, 0xFFFFFF3E, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000415, 0xFFFFFF01, 0xFFFFFF3E, 0x0000012C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000003, 0x00000000, D_80242A00_A4AFC0, 0x00000000 - -dlabel D_80242C08_A4B1C8 -.word 0x00000001, D_80242230_A4A7F0, 0x446D8000, 0xC3848000, 0x00000000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980005, 0x3FFF2666, 0x4CCC0005, 0x3FFF3FFF, 0x3FFF0005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000003B6, 0xFFFFFEF7, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000003B6, 0xFFFFFEF7, 0x00000000, 0x0000012C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000003, 0x00000000, D_80242A00_A4AFC0, 0x00000000 - -dlabel D_80242DF8_A4B3B8 -.word 0x00000002, D_802425B4_A4AB74, 0xC46B0000, 0x430C0000, 0xC3110000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980005, 0x3FFF2666, 0x4CCC0005, 0x3FFF3FFF, 0x3FFF0005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFC54, 0x0000008C, 0xFFFFFF6F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFC54, 0x0000008C, 0xFFFFFF6F, 0x0000012C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00550004, 0x0055000C, 0x0055000E, 0x0055000E, 0x00550004, 0x00550004, 0x00550018, 0x00550018, 0x00550010, 0x00550016, 0x00550012, 0x00550004, 0x00550004, 0x00550004, 0x00550004, 0x00550004, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242FE8_A4B5A8 -.word 0x00000003, D_802425B4_A4AB74, 0x432F0000, 0xC3020000, 0x00000000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x000000AF, 0xFFFFFF7E, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000AF, 0xFFFFFF7E, 0x00000000, 0x0000012C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00550004, 0x0055000C, 0x0055000E, 0x0055000E, 0x00550004, 0x00550004, 0x00550018, 0x00550018, 0x00550010, 0x00550016, 0x00550012, 0x00550004, 0x00550004, 0x00550004, 0x00550004, 0x00550004, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802431D8_A4B798 -.word 0x00000004, D_802427C0_A4AD80, 0xC47A0000, 0xC3200000, 0xC3160000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x00050000, 0x00A30005, 0x00000082, 0x00050000, 0x00920005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0005, 0x33322666, 0x33320005, 0x33323FFF, 0x33320005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFC18, 0xFFFFFF60, 0xFFFFFF6A, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFC18, 0xFFFFFF60, 0xFFFFFF6A, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560004, 0x00560004, 0x00560002, 0x00560003, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00000003, 0x00000000, D_802427EC_A4ADAC, 0x00000000, 0x00000005, D_802429A8_A4AF68, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242A18_A4AFD8, 0x22200004, 0x00000001, D_80242C08_A4B1C8, 0x221F0004, 0x00000001, D_80242DF8_A4B3B8, 0x22010004, 0x00000001, D_80242FE8_A4B5A8, 0x22040004, 0x00000002, D_802431D8_A4B798, 0x222F0004, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243600_A4BBC0 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243690_A4BC50 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000006, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFEED, 0x00000045, 0x00000002, D_80243600_A4BBC0, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7D4D, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFE05, 0xFFFFFEE0, 0xFFFFFF61, 0x00000014, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000045, 0x00000002, D_80243600_A4BBC0, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7EE7, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFE0C, 0x00000000, 0xFFFFFF6A, 0x00000028, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80241E50_A4A410, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_ScriptSpring, 0xFFFFFE70, 0xFFFFFED4, 0xFFFFFF6A, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80243690_A4BC50, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x0000026C, 0xFFFFFFBF, 0xFFFFFF38, 0x00000000, 0x00000083, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840618A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_04/A4C0D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_04/A4C0D0.data.s deleted file mode 100644 index 5b2b0787de..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_04/A4C0D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240170_A4C0D0 -.word 0x43540000, 0x00000000, 0x43160000, 0x43870000, 0x00000000, 0x00000000, 0x438F8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024036C, D_80240170_A4C0D0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019016A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_04/A4C1A0.data.s b/ver/us/asm/data/world/area_kpa/kpa_04/A4C1A0.data.s deleted file mode 100644 index 58600f6855..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_04/A4C1A0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240240_A4C1A0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240AB0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024029C_A4C1FC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240AB8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402F8_A4C258 -.word 0x00000047, 0x00000005, D_80240240_A4C1A0, 0x00080000, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024029C_A4C1FC, 0x00080000, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240340_A4C2A0 -.word 0x00000024, 0x00000002, 0xFE363C80, D_802402F8_A4C258, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000044, 0x00000001, D_80240990_A4C8F0, 0x00000044, 0x00000001, D_80240340_A4C2A0, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802401D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240430_A4C390 -.word 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_04_UnkFunc11, 0x00000019, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000019, 0x80000010, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000025, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000006, 0x00000064, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24A7A8B, 0x00000043, 0x00000005, ScaleGroup, 0x00000025, 0xFE363C8A, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, func_802400BC_A4C01C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFE363C8B, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240808_A4C768 -.word 0x0000000B, 0x00000002, 0xF5DE02B0, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C82, 0x00000082, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C82, 0x000000AA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8B, 0xFFFFFFCE, 0x00000046, 0x00000001, D_80240430_A4C390, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000032, 0x00000046, 0x00000001, D_80240430_A4C390, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE02B0, 0xFE363C89, 0x0000000B, 0x00000002, 0xF5DE02B0, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000023, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240990_A4C8F0 -.word 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000019, 0x00000014, 0x00000001, 0xF5DE02B0, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240808_A4C768, 0x00000040, 0x00000019, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000025, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x0000001A, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000F, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_08/A4DEC0.data.s b/ver/us/asm/data/world/area_kpa/kpa_08/A4DEC0.data.s deleted file mode 100644 index 8fc13b7688..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_08/A4DEC0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802414A0_A4DEC0 -.word 0xC3F18000, 0x00000000, 0xC1980000, 0x42B40000, 0x434B0000, 0x42C80000, 0xC1B00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241768, D_802414A0_A4DEC0, 0x0000000B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190172, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000007, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_08/A4DF90.data.s b/ver/us/asm/data/world/area_kpa/kpa_08/A4DF90.data.s deleted file mode 100644 index 39fe7d136e..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_08/A4DF90.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241570_A4DF90 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000006, 0x00000024, 0x00000002, 0xFE363C82, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004D, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80242510, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241614_A4E034 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242518, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241670_A4E090 -.word 0x00000047, 0x00000005, D_80241570_A4DF90, 0x00000100, 0x00000006, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241614_A4E034, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802416B8_A4E0D8 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004D, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80241670_A4E090, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80241670_A4E090, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802424F0, 0x00000046, 0x00000001, 0x80241C18, 0x00000044, 0x00000001, D_802416B8_A4E0D8, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241500, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_08/A4E250.data.s b/ver/us/asm/data/world/area_kpa/kpa_08/A4E250.data.s deleted file mode 100644 index 6d41e6da63..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_08/A4E250.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241830_A4E250 -.word 0x0000000B, 0x00000002, 0xF9718883, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x00000043, 0x00000001, kpa_08_UnsetCamera0MoveFlag1, 0x00000056, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x00000227, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0x00000000, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4CA3C, 0x0000000F, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000F, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000F, 0x00000228, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFCE, 0x00000014, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4CA3C, 0x0000000F, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000F, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x00000227, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF9D, 0x00000000, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4CA3C, 0x00000011, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000011, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x00000228, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF9D, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4CA3C, 0x00000011, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000011, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0xFFFFFF9D, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241830_A4E250, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000000F, 0x0000003F, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000000F, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000011, 0x00000042, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0xFFFFFF9D, 0xFFFFFFFF, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000011, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_08/A4E710.data.s b/ver/us/asm/data/world/area_kpa/kpa_08/A4E710.data.s deleted file mode 100644 index bedb849498..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_08/A4E710.data.s +++ /dev/null @@ -1,51 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel kpa_08_MagikoopaAI_TeleportAnim -.float 0.8 - -dlabel D_80241CF4_A4E714 -.float 1.0 - -dlabel D_80241CF8_A4E718 -.byte 0xC8, 0x00, 0x00, 0x00, 0x3F, 0x19, 0x99, 0x9A, 0x3F, 0x80, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0xA0, 0x00, 0x00, 0x00, 0x3E, 0xCC, 0xCC, 0xCD, 0x3F, 0x80, 0x00, 0x00, 0x8C, 0x00, 0x00, 0x00, 0x3E, 0x99, 0x99, 0x9A, 0x3F, 0x8C, 0xCC, 0xCD, 0x78, 0x00, 0x00, 0x00, 0x3E, 0x4C, 0xCC, 0xCD, 0x3F, 0xA6, 0x66, 0x66, 0x6E, 0x00, 0x00, 0x00, 0x3E, 0x19, 0x99, 0x9A, 0x3F, 0xCC, 0xCC, 0xCD, 0x64, 0x00, 0x00, 0x00, 0x3D, 0xF5, 0xC2, 0x8F, 0x40, 0x00, 0x00, 0x00, 0x5A, 0x00, 0x00, 0x00, 0x3D, 0xE1, 0x47, 0xAE, 0x40, 0x40, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x3D, 0xCC, 0xCC, 0xCD, 0x40, 0x80, 0x00, 0x00, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -dlabel D_80241D74_A4E794 -.word 0x3F800000, 0x00000078, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40400000, 0x0000005A, 0x0000000F, 0x43480000, 0x00000000, 0x00000001 - -dlabel D_80241DA4_A4E7C4 -.word 0x00000043, 0x00000002, kpa_08_MagikoopaAI_Main, D_80241D74_A4E794, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DC4_A4E7E4 -.word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, GetSelfAnimationFromTable, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800936DC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E50_A4E870 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, kpa_08_MagikoopaAI_OnPlayerWon, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000001, kpa_08_MagikoopaAI_OnPlayerFled, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241ED0_A4E8F0 -.word 0x00000000, 0x0020001C, 0x00000000, 0x00000000, D_80241DA4_A4E7C4, D_80241DC4_A4E7E4, 0x00000000, D_80241E50_A4E870, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_80241EFC_A4E91C -.word 0x00560000, 0x00560001, 0x00560001, 0x00560001, 0x00560002, 0x00560003, 0x00560004, 0xFFFFFFFF - -dlabel D_80241F1C_A4E93C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F54_A4E974 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F8C_A4E9AC -.word 0x00000043, 0x00000001, kpa_08_MagikoopaAI_SpellMain, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FA8_A4E9C8 -.word 0x00000043, 0x00000001, kpa_08_MagikoopaAI_OnHitInit, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_08_MagikoopaAI_OnHit, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FFC_A4EA1C -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420B8_A4EAD8 -.word 0x00560000, 0x00000000, D_80241F1C_A4E93C, 0x00000000, D_80241F8C_A4E9AC, D_80241FA8_A4E9C8, 0x00000000, D_80241FFC_A4EA1C, 0x00000000, 0x00000000, 0x00000000, 0x00570000, 0x00000000, D_80241F54_A4E974, 0x00000000, D_80241F8C_A4E9AC, D_80241FA8_A4E9C8, 0x00000000, D_80241FFC_A4EA1C, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242110_A4EB30 -.word 0x00000000, D_80241ED0_A4E8F0, 0xC3520000, 0x00000000, 0x41C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x00050000, 0x00A30005, 0x00000082, 0x00050000, 0x00920005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0005, 0x33322666, 0x33320005, 0x33323FFF, 0x33320005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFF2E, 0x00000000, 0x00000019, 0x0000001E, 0x0000000A, 0xFFFF8001, 0x00000001, 0xFFFFFF2E, 0x00000000, 0x00000019, 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, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560004, 0x00560004, 0x00560002, 0x00560003, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00560001, 0x00000003, 0x00000000, D_80241EFC_A4E91C, 0x00000000, 0x00000001, D_802420B8_A4EAD8, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00560000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80242110_A4EB30, 0x222B0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_09/A502F0.data.s b/ver/us/asm/data/world/area_kpa/kpa_09/A502F0.data.s deleted file mode 100644 index 446c079bbd..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_09/A502F0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802412F0_A502F0 -.word 0xC3F18000, 0x42C80000, 0xC1880000, 0x42B40000, 0x434A0000, 0x00000000, 0xC1800000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802415C4, D_802412F0_A502F0, 0x0000000B, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019017B, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000007, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_09/A503C0.data.s b/ver/us/asm/data/world/area_kpa/kpa_09/A503C0.data.s deleted file mode 100644 index 0c35a4888e..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_09/A503C0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802413C0_A503C0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802427B0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024141C_A5041C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000007, 0x00000024, 0x00000002, 0xFE363C82, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004C, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x802427B8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414C0_A504C0 -.word 0x00000047, 0x00000005, D_802413C0_A503C0, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024141C_A5041C, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241508_A50508 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802414C0_A504C0, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004C, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_802414C0_A504C0, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242790, 0x00000046, 0x00000001, 0x80241AB0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000007, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000050, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000052, 0x00000000, 0x00000044, 0x00000001, D_80241508_A50508, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241350, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_09/A506D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_09/A506D0.data.s deleted file mode 100644 index 933795410d..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_09/A506D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802416D0_A506D0 -.word 0x0000000B, 0x00000002, 0xF9718884, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718884, 0x00000001, 0x00000043, 0x00000001, kpa_09_UnsetCamera0MoveFlag1, 0x00000056, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000010, 0x00000227, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0x00000000, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4F01C, 0x00000010, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000041, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000010, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000010, 0x00000228, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFCE, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4F01C, 0x00000010, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000041, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000010, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x00000227, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000044, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFCE, 0x00000000, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4F01C, 0x00000012, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000044, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000012, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000012, 0x00000228, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFCE, 0x0000000F, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, func_8024001C_A4F01C, 0x00000012, 0x00000064, 0x00000043, 0x00000005, TranslateGroup, 0x00000044, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000012, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_RedSwitch, 0xFFFFFEBB, 0x00000000, 0xFFFFFFF8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802416D0_A506D0, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000010, 0x00000040, 0x00000043, 0x00000005, TranslateGroup, 0x00000041, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000010, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000012, 0x00000043, 0x00000043, 0x00000005, TranslateGroup, 0x00000044, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000012, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_09/A50B90.data.s b/ver/us/asm/data/world/area_kpa/kpa_09/A50B90.data.s deleted file mode 100644 index 87c13cec54..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_09/A50B90.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241B90_A50B90 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000005, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C60_A50C60 -.word 0x40000000, 0x00000014, 0x00000003, 0x42F00000, 0x42F00000, 0x00000002, 0x3F800000, 0x00000000, 0x00000000, 0x43160000, 0x43160000, 0x00000001 - -dlabel D_80241C90_A50C90 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, kpa_09_RangedAttackAI_Main, D_80241C60_A50C60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D00_A50D00 -.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, D_80241C90_A50C90, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001E0000 - -dlabel D_80241D2C_A50D2C -.word 0x40F00000, 0x00000000, 0x00000000, 0x3F8CCCCD, 0x3E3851EC, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241D5C_A50D5C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000F, 0x00000043, 0x00000002, kpa_09_ProjectileAI_Main, D_80241D2C_A50D2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DCC_A50DCC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DDC_A50DDC -.word 0x00000043, 0x00000001, kpa_09_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241DCC_A50DCC, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_09_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241D5C_A50D5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FA4_A50FA4 -.word 0x00000000, 0x000C000C, 0x00000000, 0x00000000, D_80241D5C_A50D5C, D_80241DDC_A50DDC, 0x00000000, D_80241B90_A50B90, 0x00000000, 0x00000000, 0x00000008 - -dlabel D_80241FD0_A50FD0 -.word 0x00000000, D_80241D00_A50D00, 0xC2920000, 0x00000000, 0x00000000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0xFFFFFFB7, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFB7, 0x00000000, 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, 0x00530002, 0x00530003, 0x00530004, 0x00530004, 0x00530002, 0x00530002, 0x00530007, 0x00530007, 0x00530005, 0x00530006, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241FA4_A50FA4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80241FA4_A50FA4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_80241FA4_A50FA4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80241FD0_A50FD0, 0x220B0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_10/A51C90.data.s b/ver/us/asm/data/world/area_kpa/kpa_10/A51C90.data.s deleted file mode 100644 index d0a9af5306..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_10/A51C90.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240310_A51C90 -.word 0x41C80000, 0x42C80000, 0xC30C0000, 0x42B40000, 0x44AF4000, 0x41F00000, 0xC4874000, 0x43340000, 0x44AC4000, 0x41F00000, 0xC4350000, 0x42B40000, 0x41700000, 0xC1A00000, 0xC1A00000, 0x42B40000, 0x44BF2000, 0xC1A00000, 0xC4874000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240794, D_80240310_A51C90, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190158, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s b/ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s deleted file mode 100644 index d2ec931d8e..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_10/A51D90.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240410_A51D90 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_10_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_10_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404AC_A51E2C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240F20, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240508_A51E88 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240F28, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240564_A51EE4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240F30, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405C0_A51F40 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240F20, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024061C_A51F9C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000004, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240F28, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240678_A51FF8 -.word 0x00000047, 0x00000005, D_802404AC_A51E2C, 0x00080000, 0x00000060, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240508_A51E88, 0x00080000, 0x0000005A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240564_A51EE4, 0x00080000, 0x0000006A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802405C0_A51F40, 0x00080000, 0x00000063, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024061C_A51F9C, 0x00080000, 0x0000005D, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240714_A52094 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80240678_A51FF8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240678_A51FF8, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, D_80240E98_A52818, 0x00000046, 0x00000001, D_80240EB0_A52830, 0x00000044, 0x00000001, D_80240714_A52094, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000006C, 0x7FFFFE00, 0x00000044, 0x00000001, 0x802403A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240870_A521F0 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802408C8_A52248 -.word 0x00000000, D_80240870_A521F0, 0x44534000, 0x41F00000, 0xC38E8000, 0x00002D01, 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, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A0113, 0x00000001, D_80240870_A521F0, 0x445A0000, 0x41F00000, 0xC39D8000, 0x00002D01, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x001A0114, 0x00000002, D_80240870_A521F0, 0x44610000, 0x41F00000, 0xC38E8000, 0x00002D01, 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, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00000000, 0x00000000, 0x00000000, 0x001A0115 - -dlabel D_80240E98_A52818 -.word 0x00000003, D_802408C8_A52248, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240EB0_A52830 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000578, 0x0000005A, 0xFFFFFC95, 0x00000000, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000578, 0x0000005A, 0xFFFFFE89, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840618B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_100/A931B0.data.s b/ver/us/asm/data/world/area_kpa/kpa_100/A931B0.data.s deleted file mode 100644 index 4936cbdfe7..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_100/A931B0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240050_A931B0 -.word 0xC3500000, 0x00000000, 0x42C80000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240198, D_80240050_A931B0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190173, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000007, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_100/A93270.data.s b/ver/us/asm/data/world/area_kpa/kpa_100/A93270.data.s deleted file mode 100644 index aa0b461d6c..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_100/A93270.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240110_A93270 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802402CC, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024016C_A932CC -.word 0x00000047, 0x00000005, D_80240110_A93270, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80240270, 0x00000024, 0x00000002, 0xFE363C80, D_8024016C_A932CC, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802400A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_100/A933D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_100/A933D0.data.s deleted file mode 100644 index 3c2dec738c..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_100/A933D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240270_A933D0 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x0000001A, 0xFFFFFF9C, 0x00000000, 0x00000064, 0x00000000, 0xF84061AB, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_101/A93490.data.s b/ver/us/asm/data/world/area_kpa/kpa_101/A93490.data.s deleted file mode 100644 index 53efc6e706..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_101/A93490.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240050_A93490 -.word 0x40C00000, 0x00000000, 0x42C80000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240198, D_80240050_A93490, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019017C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000007, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_101/A93550.data.s b/ver/us/asm/data/world/area_kpa/kpa_101/A93550.data.s deleted file mode 100644 index 16444a564d..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_101/A93550.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240110_A93550 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802402EC, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024016C_A935AC -.word 0x00000047, 0x00000005, D_80240110_A93550, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80240290, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_8024016C_A935AC, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802400A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_101/A936D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_101/A936D0.data.s deleted file mode 100644 index 83c8aa625b..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_101/A936D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240290_A936D0 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x0000008E, 0xFFFFFF9C, 0x00000014, 0x00000064, 0x00000011, 0xF84061AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_102/A96CD0.data.s b/ver/us/asm/data/world/area_kpa/kpa_102/A96CD0.data.s deleted file mode 100644 index 347deb940c..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_102/A96CD0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243590_A96CD0 -.word 0xC3F00000, 0x00000000, 0xC3570000, 0x42B40000, 0x443F0000, 0x00000000, 0xC3570000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243900, D_80243590_A96CD0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019017D, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000007, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_102/A96DA0.data.s b/ver/us/asm/data/world/area_kpa/kpa_102/A96DA0.data.s deleted file mode 100644 index f2cbcfa1eb..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_102/A96DA0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243660_A96DA0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_102_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_102_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802436FC_A96E3C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245B10, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243758_A96E98 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000006, 0x00000024, 0x00000002, 0xFE363C82, 0x00000008, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245B18, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802437FC_A96F3C -.word 0x00000047, 0x00000005, D_802436FC_A96E3C, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243758_A96E98, 0x00000100, 0x00000006, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243844_A96F84 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802437FC_A96F3C, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000008, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_802437FC_A96F3C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80245ADC, 0x00000044, 0x00000001, D_80243844_A96F84, 0x00000044, 0x00000001, 0x802435F0, 0x00000043, 0x00000003, EnableTexPanning, 0x00000047, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000049, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000004B, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000004D, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80243660_A96DA0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80243660_A96DA0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80243660_A96DA0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000014, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80243660_A96DA0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000047, 0xF24A7E80, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000005, ScaleModel, 0x00000049, 0xF24A7E80, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000005, ScaleModel, 0x0000004B, 0xF24A7E80, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000005, ScaleModel, 0x0000004D, 0xF24A7E80, 0x00000001, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, ScaleModel, 0x00000047, 0xF24A7E6C, 0x00000001, 0xF24A7E6C, 0x00000043, 0x00000005, ScaleModel, 0x00000049, 0xF24A7E6C, 0x00000001, 0xF24A7E6C, 0x00000043, 0x00000005, ScaleModel, 0x0000004B, 0xF24A7E6C, 0x00000001, 0xF24A7E6C, 0x00000043, 0x00000005, ScaleModel, 0x0000004D, 0xF24A7E6C, 0x00000001, 0xF24A7E6C, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, ScaleModel, 0x00000047, 0xF24A7E58, 0x00000001, 0xF24A7E58, 0x00000043, 0x00000005, ScaleModel, 0x00000049, 0xF24A7E58, 0x00000001, 0xF24A7E58, 0x00000043, 0x00000005, ScaleModel, 0x0000004B, 0xF24A7E58, 0x00000001, 0xF24A7E58, 0x00000043, 0x00000005, ScaleModel, 0x0000004D, 0xF24A7E58, 0x00000001, 0xF24A7E58, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s b/ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s deleted file mode 100644 index 9295004ff0..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_102/A97690.data.s +++ /dev/null @@ -1,84 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243F50_A97690 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000005, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244020_A97760 -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42F00000, 0x41A00000, 0x00000005, 0x40400000, 0x0000005A, 0x00000003, 0x430C0000, 0x41A00000, 0x00000000 - -dlabel D_80244050_A97790 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000046, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, kpa_102_RangedAttackAI_Main, D_80244020_A97760, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802440C0_A97800 -.word 0x00000000, 0x00240018, 0x00000000, 0x00000000, D_80244050_A97790, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001B0000 - -dlabel D_802440EC_A9782C -.word 0x40ACCCCD, 0x00000000, 0x00000000, 0x41500000, 0x3FB33333, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024411C_A9785C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000014, 0x00000043, 0x00000002, kpa_102_ProjectileAI_Main, D_802440EC_A9782C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244178_A978B8 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244188_A978C8 -.word 0x00000043, 0x00000001, kpa_102_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244178_A978B8, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_102_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_8024411C_A9785C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244350_A97A90 -.word 0x00000000, 0x000C000C, 0x00000000, 0x00000000, D_8024411C_A9785C, D_80244188_A978C8, 0x00000000, D_80243F50_A97690, 0x00000000, 0x00000000, 0x00000008 - -dlabel D_8024437C_A97ABC -.word 0x005A000D, 0xFFFFFFFF - -dlabel D_80244384_A97AC4 -.word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_802443B4_A97AF4 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_102_TackleAI_Main, D_80244384_A97AC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244424_A97B64 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_802443B4_A97AF4, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80244450_A97B90 -.word 0x3FC00000, 0x0000003C, 0x0000001E, 0x42C80000, 0x41A00000, 0x00000003, 0x40A00000, 0x0000003C, 0x0000000A, 0x43160000, 0x41A00000, 0x00000001 - -dlabel D_80244480_A97BC0 -.word 0x00000043, 0x00000002, kpa_102_FlyingMagikoopaAI_Main, D_80244450_A97B90, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802444A0_A97BE0 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024453C_A97C7C -.word 0x00000000, 0x00210020, 0x00000000, 0x00000000, D_80244480_A97BC0, EnemyNpcHit, 0x00000000, D_802444A0_A97BE0, 0x00000000, 0x00000000, 0x001A0000 - -dlabel D_80244568_A97CA8 -.word 0x00570000, 0x00570001, 0x00570001, 0x00570001, 0x00570002, 0x00570003, 0x00570004, 0xFFFFFFFF - -dlabel D_80244588_A97CC8 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802445C0_A97D00 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000037, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802445F8_A97D38 -.word 0x00000043, 0x00000001, kpa_102_MagikoopaAI_SpellMain, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244614_A97D54 -.word 0x00000043, 0x00000001, kpa_102_FlyingMagikoopaAI_OnHitInit, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_102_FlyingMagikoopaAI_OnHit, 0x00000044, 0x00000001, EnemyNpcHit, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244668_A97DA8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00560000, 0x00000000, D_80244588_A97CC8, 0x00000000, D_802445F8_A97D38, D_80244614_A97D54, 0x00000000, D_80244668_A97DA8, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244750_A97E90 -.word 0x00570000, 0x00000000, D_802445C0_A97D00, 0x00000000, D_802445F8_A97D38, D_80244614_A97D54, 0x00000000, D_80244668_A97DA8, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024477C_A97EBC -.word 0x00000000, D_80244424_A97B64, 0xC3480000, 0x00000000, 0xC3610000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980005, 0x3FFF2666, 0x4CCC0005, 0x3FFF3FFF, 0x3FFF0005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFF38, 0x00000000, 0xFFFFFF1F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF38, 0x00000000, 0xFFFFFF1F, 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, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024496C_A980AC -.word 0x00000001, D_8024453C_A97C7C, 0x42FA0000, 0x42480000, 0xC3610000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x00050000, 0x00A30005, 0x00000082, 0x00050000, 0x00920005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0005, 0x33322666, 0x33320005, 0x33323FFF, 0x33320005, 0x33326665, 0x33320005, 0x33327FFF, 0x26660005, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x0000007D, 0x00000032, 0xFFFFFF1F, 0x00000078, 0x00000019, 0xFFFF8001, 0x00000001, 0x0000007D, 0x00000032, 0xFFFFFF1F, 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, 0x00570000, 0x00570001, 0x00570001, 0x00570001, 0x00570001, 0x00570001, 0x00570004, 0x00570004, 0x00570002, 0x00570003, 0x00570001, 0x00570001, 0x00570001, 0x00570001, 0x00570001, 0x00570001, 0x00000003, 0x00000000, D_80244568_A97CA8, 0x00000000, 0x00000002, D_80244750_A97E90, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00570000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244D4C_A9848C -.word 0x00000032, D_802440C0_A97800, 0x43E10000, 0x00000000, 0xC3610000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x00050000, 0x00A30005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000001C2, 0x00000000, 0xFFFFFF1F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001C2, 0x00000000, 0xFFFFFF1F, 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, 0x005A0002, 0x005A0004, 0x005A0007, 0x005A0007, 0x005A0002, 0x005A0002, 0x005A000E, 0x005A000E, 0x005A0018, 0x005A0019, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000033, D_80244350_A97A90, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024437C_A97ABC, 0x00000000, 0x00000034, D_80244350_A97A90, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024437C_A97ABC, 0x00000000, 0x00000035, D_80244350_A97A90, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024437C_A97ABC, 0x00000000, 0x00000036, D_80244350_A97A90, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024437C_A97ABC, 0x00000000, 0x00000037, D_80244350_A97A90, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024437C_A97ABC, 0x00000000, 0x00000038, D_80244350_A97A90, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024437C_A97ABC, 0x00000000, 0x00000001, D_8024477C_A97EBC, 0x2224000B, 0x00000002, D_8024496C_A980AC, 0x2232000B, 0x00000007, D_80244D4C_A9848C, 0x2216000B, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_11/A533B0.data.s b/ver/us/asm/data/world/area_kpa/kpa_11/A533B0.data.s deleted file mode 100644 index a3bf8df5fa..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_11/A533B0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240AF0_A533B0 -.word 0x41F00000, 0x42C80000, 0xC30C0000, 0x42B40000, 0x44AF4000, 0x41F00000, 0xC485C000, 0x43340000, 0x44AC4000, 0x41F00000, 0xC4350000, 0x42B40000, 0x41700000, 0xC1A00000, 0xC1A00000, 0x42B40000, 0x44BF2000, 0xC1A00000, 0xC4874000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802411E0, D_80240AF0_A533B0, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190158, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000004, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_11/A534C0.data.s b/ver/us/asm/data/world/area_kpa/kpa_11/A534C0.data.s deleted file mode 100644 index c6cbdd3e17..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_11/A534C0.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240C00_A534C0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_11_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_11_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C9C_A5355C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242010, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CF8_A535B8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242018, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D54_A53614 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242020, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240DB0_A53670 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242010, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E0C_A536CC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000004, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242018, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E68_A53728 -.word 0x00000047, 0x00000005, D_80240C9C_A5355C, 0x00080000, 0x00000060, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240CF8_A535B8, 0x00080000, 0x0000005A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240D54_A53614, 0x00080000, 0x0000006A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240DB0_A53670, 0x00080000, 0x00000063, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240E0C_A536CC, 0x00080000, 0x0000005D, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F04_A537C4 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80240E68_A53728, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240E68_A53728, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F84_A53844 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFCE0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240C00_A534C0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000004F, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000050, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000051, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000052, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000053, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000054, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000055, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000058, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000059, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000005B, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000005C, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000005D, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000005E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411C0_A53A80 -.word 0x00000008, 0x44AF0000, 0x41F00000, 0xC3A28000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80241FE4, 0x00000046, 0x00000001, 0x802414C0, 0x00000044, 0x00000001, D_80240F84_A53844, 0x0000000A, 0x00000002, 0xF8406196, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000009F, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000006C, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80240F04_A537C4, 0x00000044, 0x00000001, 0x80240B80, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000018, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000017, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000016, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000015, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000014, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000013, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000012, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000B, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000C, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000D, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000E, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000F, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000010, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000011, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000005D, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000063, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_802411C0_A53A80, 0x00000057, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_11/A53D80.data.s b/ver/us/asm/data/world/area_kpa/kpa_11/A53D80.data.s deleted file mode 100644 index 6b8ecc0f79..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_11/A53D80.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802414C0_A53D80 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000578, 0x0000005A, 0xFFFFFC95, 0x00000000, 0x80000000, 0x0000000A, 0x00000002, 0xF840618C, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001A, 0x00000226, 0x0000001E, 0xFFFFFF6F, 0x00000011, 0xF840618D, 0x00000013, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000578, 0x0000005A, 0xFFFFFE89, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840618B, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_11/A53E30.data.s b/ver/us/asm/data/world/area_kpa/kpa_11/A53E30.data.s deleted file mode 100644 index 8d4cadb190..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_11/A53E30.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241570_A53E30 -.word 0x3F800000, 0x0000001E, 0x00000032, 0x42B40000, 0x42200000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_802415A0_A53E60 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000005, 0x00000043, 0x00000002, kpa_11_TackleAI_Main, D_80241570_A53E30, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241610_A53ED0 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_802415A0_A53E60, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_8024163C_A53EFC -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241694_A53F54 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF840618C, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0xF840618D, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xF840618C, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0xF840618D, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417C0_A54080 -.word 0x0000000A, 0x00000002, 0xF840618C, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80241694_A53F54, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241814_A540D4 -.word 0x00000000, D_80241610_A53ED0, 0x44098000, 0x41F00000, 0xC3110000, 0x00842C00, D_802417C0_A54080, 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, 0x00000226, 0x0000001E, 0xFFFFFF6F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000226, 0x0000001E, 0xFFFFFF6F, 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, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241A04_A542C4 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A14_A542D4 -.word 0x00000001, D_8024163C_A53EFC, 0x44534000, 0x41F00000, 0xC38E8000, 0x00002D01, D_80241A04_A542C4, 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, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A0113, 0x00000002, D_8024163C_A53EFC, 0x445A0000, 0x41F00000, 0xC39D8000, 0x00002D01, D_80241A04_A542C4, 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, 0x00830201, 0x00830202, 0x00830203, 0x00830203, 0x00830201, 0x00830201, 0x00830206, 0x00830206, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00830203, 0x00000000, 0x00000000, 0x00000000, 0x001A0114, 0x00000003, D_8024163C_A53EFC, 0x44610000, 0x41F00000, 0xC38E8000, 0x00002D01, D_80241A04_A542C4, 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, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00870301, 0x00000000, 0x00000000, 0x00000000, 0x001A0115, 0x00000001, D_80241814_A540D4, 0x22180003, 0x00000003, D_80241A14_A542D4, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_111/A9A950.data.s b/ver/us/asm/data/world/area_kpa/kpa_111/A9A950.data.s deleted file mode 100644 index 2135d3f9da..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_111/A9A950.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802413C0_A9A950 -.word 0xC3500000, 0x00000000, 0x42D20000, 0x42B40000, 0x43960000, 0x00000000, 0x41C80000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241694, D_802413C0_A9A950, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019017F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_111/A9AA20.data.s b/ver/us/asm/data/world/area_kpa/kpa_111/A9AA20.data.s deleted file mode 100644 index 5379d8267f..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_111/A9AA20.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241490_A9AA20 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000020, 0x00000024, 0x00000002, 0xFE363C82, 0x00000032, 0x00000024, 0x00000002, 0xFE363C83, 0x00000030, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243230, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241534_A9AAC4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243238, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241590_A9AB20 -.word 0x00000047, 0x00000005, D_80241490_A9AA20, 0x00000100, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241534_A9AAC4, 0x00080000, 0x00000022, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415D8_A9AB68 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000032, 0x00000024, 0x00000002, 0xFE363C83, 0x00000030, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80241590_A9AB20, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80241590_A9AB20, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80243180, 0x00000046, 0x00000001, 0x802431B0, 0x00000044, 0x00000001, 0x80241CD8, 0x00000044, 0x00000001, 0x80241420, 0x00000044, 0x00000001, D_802415D8_A9AB68, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_111/A9ACF0.data.s b/ver/us/asm/data/world/area_kpa/kpa_111/A9ACF0.data.s deleted file mode 100644 index 394b468a65..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_111/A9ACF0.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241760_A9ACF0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_111_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, kpa_111_UnkFunc12, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000027, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001B, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000019, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241AF0_A9B080 -.word 0x0000000A, 0x00000002, 0xF5DE02AD, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AD, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000019, 0x00000046, 0x00000001, D_80241760_A9ACF0, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AD, 0xFE363C88, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BE4_A9B174 -.word 0x0000000A, 0x00000002, 0xF5DE02AD, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AD, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001A, 0x00000046, 0x00000001, D_80241760_A9ACF0, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AD, 0xFE363C88, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE02AD, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000027, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x00000027, 0x00000032, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001B, 0x00000026, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000026, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001A, 0x00000026, 0x00000047, 0x00000005, D_80241AF0_A9B080, 0x00000040, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241BE4_A9B174, 0x00000040, 0x0000001A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DC0_A9B350 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000005, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E90_A9B420 -.word 0x40000000, 0x00000014, 0x00000003, 0x42F00000, 0x42F00000, 0x00000002, 0x3F800000, 0x00000000, 0x00000000, 0x43160000, 0x43160000, 0x00000001 - -dlabel D_80241EC0_A9B450 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000002, kpa_111_RangedAttackAI_Main, D_80241E90_A9B420, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F30_A9B4C0 -.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, D_80241EC0_A9B450, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001E0000 - -dlabel D_80241F5C_A9B4EC -.word 0x40F00000, 0x00000000, 0x00000000, 0x3F8CCCCD, 0x3E3851EC, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241F8C_A9B51C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000F, 0x00000043, 0x00000002, kpa_111_ProjectileAI_Main, D_80241F5C_A9B4EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FFC_A9B58C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024200C_A9B59C -.word 0x00000043, 0x00000001, kpa_111_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241FFC_A9B58C, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_111_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241F8C_A9B51C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421D4_A9B764 -.word 0x00000000, 0x000C000C, 0x00000000, 0x00000000, D_80241F8C_A9B51C, D_8024200C_A9B59C, 0x00000000, D_80241DC0_A9B350, 0x00000000, 0x00000000, 0x00000008 - -dlabel D_80242200_A9B790 -.word 0x00000000, D_80241F30_A9B4C0, 0xC1200000, 0x00000000, 0x42C80000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0xFFFFFFF6, 0x00000000, 0x00000064, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFF6, 0x00000000, 0x00000064, 0x000000B4, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00530002, 0x00530003, 0x00530004, 0x00530004, 0x00530002, 0x00530002, 0x00530007, 0x00530007, 0x00530005, 0x00530006, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802421D4_A9B764, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_802421D4_A9B764, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_802421D4_A9B764, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802429C0_A9BF50 -.word 0x00000004, D_80241F30_A9B4C0, 0x43480000, 0x00000000, 0x430C0000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x000000C8, 0x00000000, 0x0000008C, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000C8, 0x00000000, 0x0000008C, 0x000000B4, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00530002, 0x00530003, 0x00530004, 0x00530004, 0x00530002, 0x00530002, 0x00530007, 0x00530007, 0x00530005, 0x00530006, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00530002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, D_802421D4_A9B764, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, D_802421D4_A9B764, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, D_802421D4_A9B764, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00540000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80242200_A9B790, 0x2207000D, 0x00000004, D_802429C0_A9BF50, 0x220C000D, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_111/A9C740.data.s b/ver/us/asm/data/world/area_kpa/kpa_111/A9C740.data.s deleted file mode 100644 index debd107184..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_111/A9C740.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802431B0_A9C740 -.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000CD, 0x0000003C, 0x0000006E, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061AD, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000005, 0x0000003C, 0x0000006E, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061AE, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_112/A9C990.data.s b/ver/us/asm/data/world/area_kpa/kpa_112/A9C990.data.s deleted file mode 100644 index 50550b0b2e..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_112/A9C990.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_A9C990 -.word 0xC3160000, 0x00000000, 0x42DC0000, 0x00000000, 0x43EC8000, 0x00000000, 0x42E00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401D0, D_80240000_A9C990, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190180, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_112/A9CA60.data.s b/ver/us/asm/data/world/area_kpa/kpa_112/A9CA60.data.s deleted file mode 100644 index 2bf9212d75..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_112/A9CA60.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400D0_A9CA60 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240290, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024012C_A9CABC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240298, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240188_A9CB18 -.word 0x00000047, 0x00000005, D_802400D0_A9CA60, 0x00080000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024012C_A9CABC, 0x00080000, 0x0000000F, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000044, 0x00000001, 0x80240060, 0x00000024, 0x00000002, 0xFE363C80, D_80240188_A9CB18, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_113/A9D6D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_113/A9D6D0.data.s deleted file mode 100644 index b247cc612f..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_113/A9D6D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240AA0_A9D6D0 -.word 0xC3500000, 0x00000000, 0x42C80000, 0x42B40000, 0x43CC0000, 0x00000000, 0x42C80000, 0x43870000, 0xC2CC0000, 0x00000000, 0x41A00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240D5C, D_80240AA0_A9D6D0, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190181, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_113/A9D7B0.data.s b/ver/us/asm/data/world/area_kpa/kpa_113/A9D7B0.data.s deleted file mode 100644 index fe727372d8..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_113/A9D7B0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240B80_A9D7B0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241CD0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BDC_A9D80C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241CD8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C38_A9D868 -.word 0x00000047, 0x00000005, D_80240B80_A9D7B0, 0x00080000, 0x0000001E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240BDC_A9D80C, 0x00080000, 0x00000021, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C80_A9D8B0 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80240C38_A9D868, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000033, 0x00000024, 0x00000002, 0xFE363C83, 0x00000035, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240C38_A9D868, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240C38_A9D868, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80241CB4, 0x00000046, 0x00000001, 0x80241000, 0x00000044, 0x00000001, 0x80241658, 0x00000044, 0x00000001, 0x80240B10, 0x00000044, 0x00000001, D_80240C80_A9D8B0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_113/A9DA60.data.s b/ver/us/asm/data/world/area_kpa/kpa_113/A9DA60.data.s deleted file mode 100644 index c53ce859e9..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_113/A9DA60.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240E30_A9DA60 -.word 0x0000001A, 0x00000000 - -dlabel D_80240E38_A9DA68 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000026, 0x00000024, 0x00000002, 0xFE363C82, 0x00000033, 0x00000024, 0x00000002, 0xFE363C83, 0x00000035, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241CE0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EDC_A9DB0C -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000269, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061AF, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F81, 0x00000043, 0x00000001, kpa_113_RemovePadlock, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, D_80240E38_A9DA68, 0x00000100, 0x00000026, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061AF, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000001A2, 0x0000000A, 0x00000064, 0x00000118, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x0000004E, 0x00000006, D_80240EDC_A9DB0C, 0x00000100, 0x00004000, D_80240E30_A9DA60, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80240E38_A9DA68, 0x00000100, 0x00000026, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000177, 0x0000003C, 0x00000032, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s b/ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s deleted file mode 100644 index a40ac2dcb8..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_113/A9DD00.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802410D0_A9DD00 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_113_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, kpa_113_UnkFunc12, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000023, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000013, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000011, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000012, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241470_A9E0A0 -.word 0x0000000A, 0x00000002, 0xF5DE02AE, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AE, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000011, 0x00000046, 0x00000001, D_802410D0_A9DD00, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AE, 0xFE363C88, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241564_A9E194 -.word 0x0000000A, 0x00000002, 0xF5DE02AE, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AE, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000012, 0x00000046, 0x00000001, D_802410D0_A9DD00, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AE, 0xFE363C88, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE02AE, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000023, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x00000023, 0x00000032, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000013, 0x00000022, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000011, 0x00000022, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000012, 0x00000022, 0x00000047, 0x00000005, D_80241470_A9E0A0, 0x00000040, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241564_A9E194, 0x00000040, 0x00000012, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241740_A9E370 -.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_80241770_A9E3A0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_113_TackleAI_Main, D_80241740_A9E370, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802417E0_A9E410 -.word 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001 - -dlabel D_80241810_A9E440 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000003, 0x00000043, 0x00000002, kpa_113_TackleAI_Main, D_802417E0_A9E410, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241880_A9E4B0 -.word 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001 - -dlabel D_802418B0_A9E4E0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000006, 0x00000043, 0x00000002, kpa_113_TackleAI_Main, D_80241880_A9E4B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241920_A9E550 -.word 0x00000043, 0x00000001, kpa_113_func_80240814_97BE44, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, kpa_113_AwaitPlayerNearNpc, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, kpa_113_func_802408B4_97BEE4, 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000002, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000002, 0x00000043, 0x00000002, kpa_113_TackleAI_Main, D_80241740_A9E370, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241770_A9E3A0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241920_A9E550, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241810_A9E440, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00110000 - -dlabel D_80241A98_A9E6C8 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, D_802418B0_A9E4E0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80241AC4_A9E6F4 -.word 0x00000000, D_80241A98_A9E6C8, 0x42C80000, 0x00000000, 0x42A60000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00040000, 0x00000064, 0x00000000, 0x00000053, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000041, 0x00000000, 0x00000064, 0x00000104, 0x00000064, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00550004, 0x0055000C, 0x0055000E, 0x0055000E, 0x00550004, 0x00550004, 0x00550018, 0x00550018, 0x00550010, 0x00550016, 0x00550012, 0x00550004, 0x00550004, 0x00550004, 0x00550004, 0x00550004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241AC4_A9E6F4, 0x2206000D, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_114/A9E9D0.data.s b/ver/us/asm/data/world/area_kpa/kpa_114/A9E9D0.data.s deleted file mode 100644 index df26e8694f..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_114/A9E9D0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240050_A9E9D0 -.word 0xC3160000, 0x00000000, 0x42DC0000, 0x00000000, 0x43EC8000, 0x00000000, 0x42E00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802402A0, D_80240050_A9E9D0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190182, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_114/A9EAA0.data.s b/ver/us/asm/data/world/area_kpa/kpa_114/A9EAA0.data.s deleted file mode 100644 index e8c609a5b9..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_114/A9EAA0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240120_A9EAA0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403AC, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024017C_A9EAFC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403B4, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401D8_A9EB58 -.word 0x00000047, 0x00000005, D_80240120_A9EAA0, 0x00080000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024017C_A9EAFC, 0x00080000, 0x0000000F, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240220_A9EBA0 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_802401D8_A9EB58, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802401D8_A9EB58, 0x00000044, 0x00000001, EnterWalkShort, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_80240350_A9ECD0, 0x00000044, 0x00000001, 0x802400B0, 0x00000044, 0x00000001, D_80240220_A9EBA0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240350_A9ECD0 -.word 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0xFFFFFF06, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_115/AA0100.data.s b/ver/us/asm/data/world/area_kpa/kpa_115/AA0100.data.s deleted file mode 100644 index aa661f828a..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_115/AA0100.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802413C0_AA0100 -.word 0xC3500000, 0x00000000, 0x42C80000, 0x42B40000, 0x42C80000, 0x00000000, 0x41A00000, 0x43340000, 0x42480000, 0x00000000, 0x41A00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241618, D_802413C0_AA0100, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190183, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_115/AA01E0.data.s b/ver/us/asm/data/world/area_kpa/kpa_115/AA01E0.data.s deleted file mode 100644 index 66d6ca3710..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_115/AA01E0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802414A0_AA01E0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242FC0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414FC_AA023C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242FC8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241558_AA0298 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80242FD0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415B4_AA02F4 -.word 0x00000047, 0x00000005, D_802414A0_AA01E0, 0x00080000, 0x0000001F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241558_AA0298, 0x00080000, 0x00000022, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802414FC_AA023C, 0x00080000, 0x00000025, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242FA4, 0x00000044, 0x00000001, 0x80241CC8, 0x00000024, 0x00000002, 0xFE363C80, D_802415B4_AA02F4, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241430, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_115/AA0430.data.s b/ver/us/asm/data/world/area_kpa/kpa_115/AA0430.data.s deleted file mode 100644 index e1ba8c07ff..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_115/AA0430.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802416F0_AA0430 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_115_UnkFunc11, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000064, 0xF24A7CE7, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C87, 0x00000028, 0x00000002, 0xFE363C82, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFE363C81, 0x00000064, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000001, kpa_115_UnkFunc12, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0xFE363C87, 0x00000064, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtCollider, 0xFE363C89, 0x80000010, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000028, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000018, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000016, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000017, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A80_AA07C0 -.word 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000064, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000016, 0x00000046, 0x00000001, D_802416F0_AA0430, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AF, 0xFE363C88, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BA4_AA08E4 -.word 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000064, 0x00000024, 0x00000002, 0xFE363C87, 0x00000032, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000017, 0x00000046, 0x00000001, D_802416F0_AA0430, 0x0000000B, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xF5DE02AF, 0xFE363C88, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02AF, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000028, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE02AF, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000028, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x00000028, 0x00000064, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000018, 0x00000027, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000016, 0x00000027, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000017, 0x00000027, 0x00000047, 0x00000005, D_80241A80_AA07C0, 0x00000040, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241BA4_AA08E4, 0x00000040, 0x00000017, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_115/AA0B20.data.s b/ver/us/asm/data/world/area_kpa/kpa_115/AA0B20.data.s deleted file mode 100644 index 55fac79722..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_115/AA0B20.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241DE0_AA0B20 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000005, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241EB0_AA0BF0 -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x42F00000, 0x41A00000, 0x00000005, 0x40400000, 0x0000005A, 0x00000003, 0x430C0000, 0x41A00000, 0x00000000 - -dlabel D_80241EE0_AA0C20 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000046, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000006, 0x00000043, 0x00000002, kpa_115_RangedAttackAI_Main, D_80241EB0_AA0BF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F50_AA0C90 -.word 0x00000000, 0x00240018, 0x00000000, 0x00000000, D_80241EE0_AA0C20, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x001B0000 - -dlabel D_80241F7C_AA0CBC -.word 0x40ACCCCD, 0x00000000, 0x00000000, 0x41500000, 0x3FB33333, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241FAC_AA0CEC -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000014, 0x00000043, 0x00000002, kpa_115_ProjectileAI_Main, D_80241F7C_AA0CBC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242008_AA0D48 -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242018_AA0D58 -.word 0x00000043, 0x00000001, kpa_115_GetEncounterEnemyIsOwner, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80242008_AA0D48, 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000001, kpa_115_ProjectileAI_Reflect, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000020, 0x00000000, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000020, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000001, func_800457F8, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241FAC_AA0CEC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421E0_AA0F20 -.word 0x00000000, 0x000C000C, 0x00000000, 0x00000000, D_80241FAC_AA0CEC, D_80242018_AA0D58, 0x00000000, D_80241DE0_AA0B20, 0x00000000, 0x00000000, 0x00000008 - -dlabel D_8024220C_AA0F4C -.word 0x005A000D, 0xFFFFFFFF - -dlabel D_80242214_AA0F54 -.word 0x00000014, D_80241F50_AA0C90, 0x42C80000, 0x00000000, 0x42F00000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008C, 0x00050000, 0x00A30005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000064, 0x00000000, 0x00000078, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000064, 0x00000000, 0x00000078, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A0002, 0x005A0004, 0x005A0007, 0x005A0007, 0x005A0002, 0x005A0002, 0x005A000E, 0x005A000E, 0x005A0018, 0x005A0019, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x005A0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000015, D_802421E0_AA0F20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024220C_AA0F4C, 0x00000000, 0x00000016, D_802421E0_AA0F20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024220C_AA0F4C, 0x00000000, 0x00000017, D_802421E0_AA0F20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024220C_AA0F4C, 0x00000000, 0x00000018, D_802421E0_AA0F20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024220C_AA0F4C, 0x00000000, 0x00000019, D_802421E0_AA0F20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024220C_AA0F4C, 0x00000000, 0x0000001A, D_802421E0_AA0F20, 0x00000000, 0xC47A0000, 0x00000000, 0x00800C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x005A000D, 0x00000000, 0x00000000, D_8024220C_AA0F4C, 0x00000000, 0x00000007, D_80242214_AA0F54, 0x2214000D, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_116/AA1EE0.data.s b/ver/us/asm/data/world/area_kpa/kpa_116/AA1EE0.data.s deleted file mode 100644 index 68131fc17a..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_116/AA1EE0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_AA1EE0 -.word 0xC3160000, 0x00000000, 0x42DC0000, 0x00000000, 0x43EC8000, 0x00000000, 0x42E00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401D0, D_80240000_AA1EE0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190184, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_116/AA1FB0.data.s b/ver/us/asm/data/world/area_kpa/kpa_116/AA1FB0.data.s deleted file mode 100644 index d55fd02330..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_116/AA1FB0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400D0_AA1FB0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240290, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024012C_AA200C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240298, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240188_AA2068 -.word 0x00000047, 0x00000005, D_802400D0_AA1FB0, 0x00080000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024012C_AA200C, 0x00080000, 0x0000000E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80240188_AA2068, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_118/AA23C0.data.s b/ver/us/asm/data/world/area_kpa/kpa_118/AA23C0.data.s deleted file mode 100644 index 9b13b4a8b0..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_118/AA23C0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_AA23C0 -.word 0x43100000, 0x00000000, 0x42C80000, 0x00000000, 0xC3EB8000, 0x00000000, 0x42C80000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401D0, D_80240000_AA23C0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190186, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_118/AA2490.data.s b/ver/us/asm/data/world/area_kpa/kpa_118/AA2490.data.s deleted file mode 100644 index 161df94ac8..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_118/AA2490.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400D0_AA2490 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240290, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024012C_AA24EC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240298, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240188_AA2548 -.word 0x00000047, 0x00000005, D_802400D0_AA2490, 0x00080000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024012C_AA24EC, 0x00080000, 0x0000000E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80240188_AA2548, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_119/AA2660.data.s b/ver/us/asm/data/world/area_kpa/kpa_119/AA2660.data.s deleted file mode 100644 index eee86728b0..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_119/AA2660.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_AA2660 -.word 0x40C00000, 0x00000000, 0x42C80000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240188, D_80240000_AA2660, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190187, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_119/AA2720.data.s b/ver/us/asm/data/world/area_kpa/kpa_119/AA2720.data.s deleted file mode 100644 index 2b52dba10e..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_119/AA2720.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400C0_AA2720 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x0000001A, 0xFFFFFF9C, 0x00000014, 0x00000064, 0x00000000, 0xF84061B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_119/AA2760.data.s b/ver/us/asm/data/world/area_kpa/kpa_119/AA2760.data.s deleted file mode 100644 index fbb6e8e417..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_119/AA2760.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240100_AA2760 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240280, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024015C_AA27BC -.word 0x00000047, 0x00000005, D_80240100_AA2760, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, D_802400C0_AA2720, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_8024015C_AA27BC, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240050, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_12/A54DC0.data.s b/ver/us/asm/data/world/area_kpa/kpa_12/A54DC0.data.s deleted file mode 100644 index 3926803ab8..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_12/A54DC0.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240470_A54DC0 -.word 0x41F00000, 0x41F00000, 0xC3160000, 0x42B40000, 0x44B7C000, 0x41F00000, 0xC3160000, 0x43870000, 0x41880000, 0xC1A00000, 0xC1880000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802409F8_A55348, D_80240470_A54DC0, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, kpa_12_get_tattle - -dlabel D_802404E0_A54E30 -.word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240570_A54EC0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_12_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_12_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024060C_A54F5C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802415B8, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802415B0, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024069C_A54FEC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802415B8, 0x00000004, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802415B0, 0x00000004, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024072C_A5507C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802415C0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240788_A550D8 -.word 0x00000047, 0x00000005, D_8024060C_A54F5C, 0x00080000, 0x00000049, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024069C_A54FEC, 0x00080000, 0x0000004C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024072C_A5507C, 0x00080000, 0x00000046, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407EC_A5513C -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFCE0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240570_A54EC0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000069, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000006A, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000006B, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000006C, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000006D, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000006E, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000006F, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000070, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240988_A552D8 -.word 0x00000003, 0x42C80000, 0x41F00000, 0xC3160000, 0x00000004, 0x43750000, 0x41F00000, 0xC3160000, 0x00000005, 0x43C80000, 0x41F00000, 0xC3160000, 0x00000006, 0x442F0000, 0x41F00000, 0xC3160000, 0x00000007, 0x4455C000, 0x41F00000, 0xC2C80000, 0x00000002, 0x44B4A000, 0x41F00000, 0xC3070000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802409F8_A55348 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000E5, 0x00000000, 0x00000044, 0x00000001, D_802407EC_A5513C, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000072, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802404E0_A54E30, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000044, 0x00000001, 0x802414C4, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240788_A550D8, 0x00000044, 0x00000001, EnterWalk, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000009, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000A, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000B, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000C, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000D, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000E, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000F, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000010, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000011, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000012, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000013, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000050, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000051, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000004C, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_80240988_A552D8, 0x00000057, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_12/A55620.data.s b/ver/us/asm/data/world/area_kpa/kpa_12/A55620.data.s deleted file mode 100644 index 6f142454f0..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_12/A55620.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240CD0_A55620 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C83, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7C80, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, kpa_12_func_80240350_A54CA0, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A7E80, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C81, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, kpa_12_func_80240350_A54CA0, 0xFE363C8B, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C83, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EA8_A557F8 -.word 0x00000024, 0x00000002, 0xFE363C81, 0x0000005B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000015, 0x00000046, 0x00000001, D_80240CD0_A55620, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EE4_A55834 -.word 0x00000024, 0x00000002, 0xFE363C81, 0x0000005E, 0x00000024, 0x00000002, 0xFE363C83, 0x00000017, 0x00000046, 0x00000001, D_80240CD0_A55620, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F20_A55870 -.word 0x00000024, 0x00000002, 0xFE363C81, 0x00000061, 0x00000024, 0x00000002, 0xFE363C83, 0x00000019, 0x00000046, 0x00000001, D_80240CD0_A55620, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F5C_A558AC -.word 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001B, 0x00000046, 0x00000001, D_80240CD0_A55620, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F98_A558E8 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFFD, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFFD, 0x00000000, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0xFE363C82, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410CC_A55A1C -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005B, 0x00000046, 0x00000001, D_80240F98_A558E8, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005E, 0x00000046, 0x00000001, D_80240F98_A558E8, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000061, 0x00000046, 0x00000001, D_80240F98_A558E8, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000046, 0x00000001, D_80240F98_A558E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411A0_A55AF0 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001D, 0x00000065, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000007D, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000007D, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A54CCC, 0xFE363C84, 0x0000001D, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000043, 0x00000001, kpa_12_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_12_func_80240350_A54CA0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000051, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000000, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000067, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x0000001D, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A54CCC, 0xFE363C84, 0x0000001D, 0x0000000C, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000001, kpa_12_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_12_func_80240350_A54CA0, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000050, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000015, 0x0000005A, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000017, 0x0000005D, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000019, 0x00000060, 0x00000043, 0x00000003, ParentColliderToModel, 0x0000001B, 0x00000063, 0x00000047, 0x00000005, D_80240EA8_A557F8, 0x00000080, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240EE4_A55834, 0x00000080, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240F20_A55870, 0x00000080, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240F5C_A558AC, 0x00000080, 0x0000001B, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802410CC_A55A1C, 0x00000044, 0x00000001, D_802411A0_A55AF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_121/AA28F0.data.s b/ver/us/asm/data/world/area_kpa/kpa_121/AA28F0.data.s deleted file mode 100644 index 39f50d14ca..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_121/AA28F0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_AA28F0 -.word 0xC3BA8000, 0xC3700000, 0x42C80000, 0x42B40000, 0x43E88000, 0x00000000, 0x42BE0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240364, D_80240000_AA28F0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190188, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000007, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_121/AA29C0.data.s b/ver/us/asm/data/world/area_kpa/kpa_121/AA29C0.data.s deleted file mode 100644 index 91cd8401d2..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_121/AA29C0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400D0_AA29C0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000010, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C83, 0x00000030, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240420, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240174_AA2A64 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000005F, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000044, 0x00000001, ExitSingleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240428, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240240_AA2B30 -.word 0x00000047, 0x00000005, D_802400D0_AA29C0, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240174_AA2A64, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240288_AA2B78 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000030, 0x00000024, 0x00000002, 0xFE363C83, 0x0000002E, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240240_AA2B30, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000002B, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000046, 0x00000001, EnterSingleDoor, 0x00000044, 0x00000001, D_80240240_AA2B30, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000044, 0x00000001, 0x80240060, 0x00000044, 0x00000001, D_80240288_AA2B78, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_13/A56390.data.s b/ver/us/asm/data/world/area_kpa/kpa_13/A56390.data.s deleted file mode 100644 index 2439e8c3be..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_13/A56390.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240470_A56390 -.word 0x41F00000, 0x41F00000, 0xC3160000, 0x42B40000, 0x44F00000, 0x41F00000, 0xC3160000, 0x43870000, 0x4421C000, 0x00000000, 0xC32D0000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802409A0_A568C0, D_80240470_A56390, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, kpa_13_get_tattle - -dlabel D_802404E0_A56400 -.word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000004, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000005, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240570_A56490 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_13_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_13_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024060C_A5652C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241570, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240668_A56588 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241578, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406C4_A565E4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241580, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240720_A56640 -.word 0x00000047, 0x00000005, D_8024060C_A5652C, 0x00080000, 0x00000050, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240668_A56588, 0x00080000, 0x00000056, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802406C4_A565E4, 0x00080000, 0x00000053, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240784_A566A4 -.word 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFCE0, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240570_A56490, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000077, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000078, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000079, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000007A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408D0_A567F0 -.word 0x00000011, 0x42DC0000, 0x41F00000, 0xC3160000, 0x00000012, 0x438E8000, 0x41F00000, 0xC1A00000, 0x00000013, 0x43FA0000, 0x41F00000, 0xC2B40000, 0x0000000F, 0x44480000, 0x41F00000, 0xC3160000, 0x00000015, 0x4469C000, 0x41F00000, 0xC1A00000, 0x0000000E, 0x448FC000, 0x41F00000, 0xC3160000, 0x00000014, 0x44A0A000, 0x41F00000, 0xC32F0000, 0x00000019, 0x44B0E000, 0x41F00000, 0xC32F0000, 0x0000001B, 0x44BD6000, 0x41F00000, 0xC32F0000, 0x0000001D, 0x44CEE000, 0x41F00000, 0xC32F0000, 0x0000001F, 0x44DB6000, 0x41F00000, 0xC32F0000, 0x00000010, 0x44E88000, 0x41F00000, 0xC2F00000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802409A0_A568C0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80240CB0, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x000000EF, 0x00000000, 0x00000044, 0x00000001, D_80240784_A566A4, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000007D, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_802404E0_A56400, 0x00000024, 0x00000002, 0xFE363C80, D_80240720_A56640, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000044, 0x00000001, 0x80240D80, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8406194, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000C, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000000, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000001, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000002, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000003, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000004, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000005, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000006, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000007, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000008, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000009, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000A, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000B, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000005A, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000005B, 0x00000003, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000056, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_802408D0_A567F0, 0x00000057, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_13/A56BD0.data.s b/ver/us/asm/data/world/area_kpa/kpa_13/A56BD0.data.s deleted file mode 100644 index 74b4051552..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_13/A56BD0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240CB0_A56BD0 -.word 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x0000000A, 0x00000002, 0xF840618E, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x0000011D, 0x0000000A, 0xFFFFFFC9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000005, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF840618F, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x000003A7, 0x0000000A, 0xFFFFFFC9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000006, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_13/A56CA0.data.s b/ver/us/asm/data/world/area_kpa/kpa_13/A56CA0.data.s deleted file mode 100644 index 64e29fc22d..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_13/A56CA0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240D80_A56CA0 -.word 0x0000004D, 0x00000001, 0x0000000B, 0x00000056, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000021, 0x00000070, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0x0000007D, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x0000000A, 0x00000002, 0xF840618E, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7C80, 0x00000024, 0x00000002, 0xF840618E, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000007D, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF9C, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000021, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFBA, 0x00000043, 0x00000001, kpa_13_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C81, 0x0000007D, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000007D, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000021, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000021, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005F, 0x00000043, 0x00000001, kpa_13_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005B, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000023, 0x00000073, 0x00000043, 0x00000005, TranslateGroup, 0x00000075, 0x0000004B, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x0000000A, 0x00000002, 0xF840618F, 0x00000000, 0x00000003, 0x00000001, 0x0000000C, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000C, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7C80, 0x00000024, 0x00000002, 0xF840618F, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF9C, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0xFFFFFF9C, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000075, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000023, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFBA, 0x00000043, 0x00000001, kpa_13_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004B, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x0000004B, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000075, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000023, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, func_8024037C_A5629C, 0xFE363C84, 0x00000023, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000043, 0x00000001, kpa_13_IsPartnerLakilester, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000001, 0x00000043, 0x00000002, kpa_13_func_80240350_A56270, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C82, 0x0000005B, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_130/AA3460.data.s b/ver/us/asm/data/world/area_kpa/kpa_130/AA3460.data.s deleted file mode 100644 index 0da6137ffc..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_130/AA3460.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240740_AA3460 -.word 0xC473C000, 0x00000000, 0xC0A00000, 0x42B40000, 0x4473C000, 0x44340000, 0xC2C80000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240A7C, D_80240740_AA3460, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019016D, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_130/AA3530.data.s b/ver/us/asm/data/world/area_kpa/kpa_130/AA3530.data.s deleted file mode 100644 index ae0ad1e9da..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_130/AA3530.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240810_AA3530 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000010, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000E, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80244740, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408B4_AA35D4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000008, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000012, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80244748, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240958_AA3678 -.word 0x00000047, 0x00000005, D_80240810_AA3530, 0x00000100, 0x00000002, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802408B4_AA35D4, 0x00000100, 0x00000008, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409A0_AA36C0 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000010, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000E, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240958_AA3678, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000012, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240958_AA3678, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80244688, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000002, 0x7FFFFE00, 0x00000044, 0x00000001, D_802409A0_AA36C0, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802407A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_130/AA3870.data.s b/ver/us/asm/data/world/area_kpa/kpa_130/AA3870.data.s deleted file mode 100644 index f47056bdd5..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_130/AA3870.data.s +++ /dev/null @@ -1,90 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240B50_AA3870 -.word 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240B74_AA3894 -.word 0x00000043, 0x00000002, kpa_130_BillBlasterAI_Main, D_80240B50_AA3870, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B94_AA38B4 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x40400000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80240BC4_AA38E4 -.word 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, kpa_130_BulletBillAI_Main, D_80240B94_AA38B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C24_AA3944 -.word 0x00000000, 0x00000000, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240C48_AA3968 -.word 0x00000043, 0x00000002, kpa_130_BillBlasterAI_Main, D_80240C24_AA3944, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C68_AA3988 -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x40E9999A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_80240C98_AA39B8 -.word 0x00000043, 0x00000002, SelfEnemyOverrideSyncPos, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, kpa_130_BulletBillAI_Main, D_80240C68_AA3988, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240CF8_AA3A18 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D94_AA3AB4 -.word 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80240BC4_AA38E4, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E84_AA3BA4 -.word 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000064, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, OnPlayerFled, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001A0020, 0x00000000, 0x00000000, D_80240B74_AA3894, EnemyNpcHit, 0x00000000, D_80240CF8_AA3A18, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x000E001F, 0x00000000, 0x00000000, D_80240BC4_AA38E4, EnemyNpcHit, 0x00000000, D_80240D94_AA3AB4, 0x00000000, 0x00000000, 0x00050000 - -dlabel D_80240FA8_AA3CC8 -.word 0x00000000, 0x001A0020, 0x00000000, 0x00000000, D_80240C48_AA3968, EnemyNpcHit, 0x00000000, D_80240CF8_AA3A18, 0x00000000, 0x00000000, 0x001B0000 - -dlabel D_80240FD4_AA3CF4 -.word 0x00000000, 0x000E001F, 0x00000000, 0x00000000, D_80240C98_AA39B8, EnemyNpcHit, 0x00000000, D_80240E84_AA3BA4, 0x00000000, 0x00000000, 0x00180000 - -dlabel D_80241000_AA3D20 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0xFFFFFC1D, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241024_AA3D44 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241048_AA3D68 -.word 0x00000000, D_80240FA8_AA3CC8, 0xC3900000, 0x42F00000, 0x42F00000, 0x00002D00, D_80241000_AA3D20, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0103, 0x002E0103, 0x002E0102, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240FA8_AA3CC8, 0xC3900000, 0x42F00000, 0x429C0000, 0x00002D00, D_80241000_AA3D20, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0103, 0x002E0103, 0x002E0102, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241428_AA4148 -.word 0x00000002, D_80240FA8_AA3CC8, 0xC43B0000, 0x43960000, 0xC1B00000, 0x00002D00, D_80241024_AA3D44, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0103, 0x002E0103, 0x002E0102, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_80240FA8_AA3CC8, 0xC43B0000, 0x43960000, 0x41B00000, 0x00002D00, D_80241024_AA3D44, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0103, 0x002E0103, 0x002E0102, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241808_AA4528 -.word 0x00000004, D_80240FA8_AA3CC8, 0x41F00000, 0x43F00000, 0xC2F40000, 0x00002D00, D_80241000_AA3D20, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0103, 0x002E0103, 0x002E0102, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, D_80240FA8_AA3CC8, 0x41F00000, 0x43F00000, 0xC29C0000, 0x00002D00, D_80241000_AA3D20, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0103, 0x002E0103, 0x002E0102, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241BE8_AA4908 -.word 0x00000006, D_80240FA8_AA3CC8, 0x444D0000, 0x44160000, 0xC2F40000, 0x00002D00, D_80241000_AA3D20, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980004, 0x3FFF2666, 0x4CCC0004, 0x3FFF3FFF, 0x3FFF0004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0103, 0x002E0103, 0x002E0102, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, D_80240FA8_AA3CC8, 0x444D0000, 0x44160000, 0xC29C0000, 0x00002D00, D_80241000_AA3D20, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0103, 0x002E0103, 0x002E0102, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x002E0101, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241FC8_AA4CE8 -.word 0x00000032, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802421B8_AA4ED8 -.word 0x00000033, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802423A8_AA50C8 -.word 0x00000034, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242598_AA52B8 -.word 0x00000035, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242788_AA54A8 -.word 0x00000036, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242978_AA5698 -.word 0x00000037, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242B68_AA5888 -.word 0x00000038, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242D58_AA5A78 -.word 0x00000039, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242F48_AA5C68 -.word 0x0000003A, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243138_AA5E58 -.word 0x0000003B, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003C, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003D, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003E, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000003F, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000040, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000041, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000042, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000044, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000045, D_80240FD4_AA3CF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00280D04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8003008C, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0100, 0x002D0102, 0x002D0103, 0x002D0103, 0x002D0100, 0x002D0104, 0x002D0105, 0x002D0105, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x002D0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80241048_AA3D68, 0x25020005, 0x00000002, D_80241428_AA4148, 0x25020006, 0x00000002, D_80241808_AA4528, 0x25030006, 0x00000002, D_80241BE8_AA4908, 0x25040006, 0x00000001, D_80241FC8_AA4CE8, 0x25010005, 0x00000001, D_802421B8_AA4ED8, 0x25010005, 0x00000001, D_802423A8_AA50C8, 0x25010005, 0x00000001, D_80242598_AA52B8, 0x25010005, 0x00000001, D_80242788_AA54A8, 0x25010005, 0x00000001, D_80242978_AA5698, 0x25010005, 0x00000001, D_80242B68_AA5888, 0x25010005, 0x00000001, D_80242D58_AA5A78, 0x25010005, 0x00000001, D_80242F48_AA5C68, 0x25010005, 0x00000001, D_80243138_AA5E58, 0x25010005, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_133/AA78F0.data.s b/ver/us/asm/data/world/area_kpa/kpa_133/AA78F0.data.s deleted file mode 100644 index 89f1d9572a..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_133/AA78F0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240470_AA78F0 -.word 0xC3C18000, 0x00000000, 0x42E60000, 0x42B40000, 0x43B90000, 0x00000000, 0x42F00000, 0x43870000, 0x43B90000, 0x42C80000, 0x42F00000, 0x43870000, 0x43B68000, 0x43700000, 0xC1A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240A7C, D_80240470_AA78F0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019016E, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_133/AA79E0.data.s b/ver/us/asm/data/world/area_kpa/kpa_133/AA79E0.data.s deleted file mode 100644 index a85dc37548..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_133/AA79E0.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240560_AA79E0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_133_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_133_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405FC_AA7A7C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000018, 0x00000024, 0x00000002, 0xFE363C82, 0x00000032, 0x00000024, 0x00000002, 0xFE363C83, 0x00000030, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80241B10, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406A0_AA7B20 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241B18, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406FC_AA7B7C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241B18, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240758_AA7BD8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241B18, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407B4_AA7C34 -.word 0x00000047, 0x00000005, D_802405FC_AA7A7C, 0x00000100, 0x00000018, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802406A0_AA7B20, 0x00080000, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802406FC_AA7B7C, 0x00080000, 0x0000001C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240758_AA7BD8, 0x00080000, 0x00000021, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240834_AA7CB4 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000032, 0x00000024, 0x00000002, 0xFE363C83, 0x00000030, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_802407B4_AA7C34, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_802407B4_AA7C34, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_802407B4_AA7C34, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, D_802407B4_AA7C34, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240934_AA7DB4 -.word 0x43C20000, 0x43700000, 0xC1C80000, 0x00000000 - -dlabel D_80240944_AA7DC4 -.word 0x00000043, 0x0000000F, PlayEffect, 0x00000042, 0x00000000, 0x00000038, 0x00000038, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000039, 0x00000001, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000003A, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000023, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF84061B1, 0x00000001, 0x00000050, 0x00000001, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802417D0, 0x00000046, 0x00000001, 0x80240E10, 0x0000000A, 0x00000002, 0xF84061B1, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000039, 0x00000000, 0x00000047, 0x00000005, D_80240944_AA7DC4, 0x00100000, D_80240934_AA7DB4, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000038, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003A, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000023, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x802417F0, 0x00000047, 0x00000005, 0x80241A90, 0x00020000, 0xF9718888, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x0000003D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000003F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000041, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000046, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240560_AA79E0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240560_AA79E0, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x802404F0, 0x00000044, 0x00000001, D_80240834_AA7CB4, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_133/AA8290.data.s b/ver/us/asm/data/world/area_kpa/kpa_133/AA8290.data.s deleted file mode 100644 index 7bcc47e863..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_133/AA8290.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240E10_AA8290 -.word 0x0000000A, 0x00000002, 0xF84061B3, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x0000003C, 0x00000073, 0x0000000A, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000008, 0x00000043, 0x00000002, AssignScript, D_80241540_AA89C0, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B3, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0x00000096, 0x00000073, 0x00000000, 0x0000005A, 0x0000003C, 0x80000000, 0x00000012, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0x00000096, 0x00000096, 0xFFFFFF97, 0x0000005A, 0x0000003C, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000004, func_80240310_AA7790, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000044, 0x00000001, D_80240F44_AA83C4, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000001A, 0xFFFFFEA2, 0x000000D7, 0xFFFFFFCE, 0x00000000, 0xF84061B2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F44_AA83C4 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFD050F81, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF84061B3, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000073, 0x0000000E, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000096, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFD8, 0x00000024, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C83, 0x00000028, 0x00000024, 0x00000002, 0xFE363C84, 0x0000010E, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000005, PlayerJump1, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000050, 0x0000000F, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000045, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000087, 0x00000073, 0xFFFFFFBA, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x000000B4, 0x00000073, 0xFFFFFFBA, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000087, 0x00000073, 0xFFFFFFC9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x000000B4, 0x00000073, 0xFFFFFFC9, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000087, 0x00000073, 0xFFFFFFD8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x000000B4, 0x00000073, 0xFFFFFFD8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, EnableModel, 0x00000045, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000001EF, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFFA6, 0x00000000, 0x0000000F, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, func_80240310_AA7790, 0xFE363C80, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000017, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, func_802403C0_AA7840, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000096, 0x00000096, 0xFFFFFF97, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000096, 0x00000073, 0x00000000, 0x00000011, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241540_AA89C0 -.word 0x00000024, 0x00000002, 0xFD050F81, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241560_AA89E0 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802415B8_AA8A38 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415E0_AA8A60 -.word 0x00000000, D_80241560_AA89E0, 0x00000000, 0xC47A0000, 0x00000000, 0x00206F01, D_802415B8_AA8A38, 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, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802415E0_AA8A60, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_133/AA8C70.data.s b/ver/us/asm/data/world/area_kpa/kpa_133/AA8C70.data.s deleted file mode 100644 index f58415e647..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_133/AA8C70.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802417F0_AA8C70 -.word 0x00000043, 0x00000003, SetRenderMode, 0x0000003F, 0x00000016, 0x00000043, 0x00000003, SetRenderMode, 0x00000041, 0x00000016, 0x00000014, 0x00000001, 0xF5DE02A9, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000043, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000026, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000027, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000A, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002C, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0x00000078, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003F, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000027, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000A, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000A, 0x00080000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, TranslateGroup, 0x00000043, 0x00000000, 0x000000DC, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000041, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000026, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000A, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000004, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000E, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000012, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000012, 0x00080000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_133/AA8F10.data.s b/ver/us/asm/data/world/area_kpa/kpa_133/AA8F10.data.s deleted file mode 100644 index 215616b3fc..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_133/AA8F10.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241A90_AA8F10 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000002D, 0x00000008, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_134/AA96A0.data.s b/ver/us/asm/data/world/area_kpa/kpa_134/AA96A0.data.s deleted file mode 100644 index 4617410568..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_134/AA96A0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240700_AA96A0 -.word 0xC3B90000, 0x00000000, 0x42E60000, 0x42B40000, 0x44368000, 0x00000000, 0x42E60000, 0x43870000, 0xC3B90000, 0x42C80000, 0x43000000, 0x42B40000, 0xC3B68000, 0x43700000, 0xC1B00000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240BA8, D_80240700_AA96A0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019016F, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_134/AA9790.data.s b/ver/us/asm/data/world/area_kpa/kpa_134/AA9790.data.s deleted file mode 100644 index 9b00bb9506..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_134/AA9790.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802407F0_AA9790 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, kpa_134_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, kpa_134_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024088C_AA982C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243880, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000027, 0x00000024, 0x00000002, 0xFE363C82, 0x00000062, 0x00000024, 0x00000002, 0xFE363C83, 0x00000064, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80243888, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024098C_AA992C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243880, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409E8_AA9988 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x00000028, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243880, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A44_AA99E4 -.word 0x00000047, 0x00000005, D_8024088C_AA982C, 0x00080000, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024098C_AA992C, 0x00080000, 0x00000021, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802409E8_AA9988, 0x00080000, 0x0000002F, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240AA8_AA9A48 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240A44_AA99E4, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000062, 0x00000024, 0x00000002, 0xFE363C83, 0x00000064, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240A44_AA99E4, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, D_80240A44_AA99E4, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, D_80240A44_AA99E4, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242F40, 0x00000046, 0x00000001, 0x802436F0, 0x00000044, 0x00000001, 0x802410C0, 0x0000000A, 0x00000002, 0xF84061B6, 0x00000000, 0x00000047, 0x00000005, 0x80243190, 0x00020000, 0xF9718889, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000017, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001B, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000051, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000049, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000047, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000045, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000043, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000041, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003D, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000039, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000037, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B1, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000059, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005B, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000030, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000005A, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableTexPanning, 0x00000068, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000006A, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000006C, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000046, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802407F0_AA9790, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000014, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFEC, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_802407F0_AA9790, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80240780, 0x00000044, 0x00000001, D_80240AA8_AA9A48, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_134/AAA060.data.s b/ver/us/asm/data/world/area_kpa/kpa_134/AAA060.data.s deleted file mode 100644 index 480f5dd021..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_134/AAA060.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802410C0_AAA060 -.word 0x00000043, 0x00000003, SetRenderMode, 0x0000006A, 0x00000016, 0x00000043, 0x00000003, SetRenderMode, 0x0000006C, 0x00000016, 0x00000043, 0x00000003, EnableModel, 0x0000006F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000073, 0x00000000, 0x0000001E, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000075, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0xF5DE02A9, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x0000006E, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000034, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000023, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000036, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000006A, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0x00000000, 0x00000078, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006C, 0x00000000, 0x00000078, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000023, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002B, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002B, 0x00080000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000034, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x0000006C, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0x00000000, 0x000000DC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006A, 0x00000000, 0x000000DC, 0x00000000, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_80241364_AAA304, 0x00000044, 0x00000001, D_80242090_AAB030, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241314_AAA2B4 -.word 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFF, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFE, 0xFFFFFFFE, 0xFFFFFFFF - -dlabel D_80241364_AAA304 -.word 0x00000043, 0x00000001, func_80240310_AA92B0, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_8024033C_AA92DC, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000229, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000D, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000096, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000030, 0x00000001, D_80241314_AAA2B4, 0x00000005, 0x00000001, 0x00000014, 0x00000031, 0x00000001, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0x00000032, 0xFE363C80, 0xFFFFFFDE, 0x00000043, 0x00000005, TranslateModel, 0x00000073, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02A9, 0x00000000, 0x00000046, 0x00000001, D_80241968_AAA908, 0x00000024, 0x00000002, 0xF5DE02A9, 0x00000001, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_80241570_AAA510, 0x00000024, 0x00000002, 0xF5DE02A9, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000073, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241570_AAA510 -.word 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000078, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000006, func_802CA988, 0x00000000, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0x00000258, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, func_802CABE8, 0x00000000, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0xFE363C87, 0xFFFFFFEC, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, func_802CABE8, 0x00000000, 0xFE363C84, 0xFE363C85, 0xFE363C82, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000069, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000006C, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000053, 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x00000014, 0x00000078, 0x00000000, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000062B, 0x00000043, 0x00000002, func_802D62E4, 0x0000022B, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000069, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000034, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000036, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002B, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000011, 0x00000005, 0x00000001, 0x0000000D, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000073, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241968_AAA908 -.word 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x000000DC, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, func_802CA988, 0x00000000, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0x00000258, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, func_802CABE8, 0x00000000, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0xFE363C87, 0xFFFFFFEC, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, func_802CABE8, 0x00000000, 0xFE363C84, 0xFE363C85, 0xFE363C82, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x80000052, 0x00000000, 0x00000076, 0x00000073, 0xFFFFFFF5, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000006F, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x00000071, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x000003E8, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0x00000000, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x000003E8, 0x00000027, 0x00000002, 0xFE363C81, 0x00000FA0, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFA24, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006F, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000190, 0x00000000, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000006F, 0xFFFFFF9C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000069, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000006C, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000014, 0x00000078, 0x000000B4, 0x00000000, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000071, 0xFFFFFF9C, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006F, 0xFFFFFF9C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x00000001, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x00000064, 0x00000043, 0x00000005, TranslateModel, 0x00000071, 0xFFFFFF9C, 0x00000078, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006F, 0xFFFFFF9C, 0x00000078, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000071, 0xFE363C82, 0xF24A7E80, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x0000006F, 0xFE363C82, 0xF24A7E80, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000062A, 0x00000043, 0x00000002, func_802D62E4, 0x0000022A, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006F, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x000000E6, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000034, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000036, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002B, 0x00008000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002B, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002B, 0x00080000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000011, 0x00000005, 0x00000001, 0x0000000D, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000073, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242090_AAB030 -.word 0x00000043, 0x00000001, func_80240408_AA93A8, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_80240434_AA93D4, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000229, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000D, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000113, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000030, 0x00000001, D_80241314_AAA2B4, 0x00000005, 0x00000001, 0x00000014, 0x00000031, 0x00000001, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0x000002A8, 0xFE363C80, 0xFFFFFFDD, 0x00000043, 0x00000005, TranslateModel, 0x00000075, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE02A9, 0x00000001, 0x00000046, 0x00000001, D_80242624_AAB5C4, 0x00000024, 0x00000002, 0xF5DE02A9, 0x00000002, 0x00000012, 0x00000000, 0x00000046, 0x00000001, D_8024229C_AAB23C, 0x00000024, 0x00000002, 0xF5DE02A9, 0x00000001, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x000000F0, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024229C_AAB23C -.word 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000078, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006A, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006C, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000006, func_802CA988, 0x00000000, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0x00000258, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, func_802CABE8, 0x00000000, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0xFE363C87, 0xFFFFFFEC, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, func_802CABE8, 0x00000000, 0xFE363C84, 0xFE363C85, 0xFE363C82, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000069, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x80000053, 0x00000043, 0x00000005, MakeLerp, 0x000000DC, 0x00000078, 0x00000078, 0x00000000, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000062B, 0x00000043, 0x00000002, func_802D62E4, 0x0000022B, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFF3, 0x00000005, 0x00000001, 0x0000000D, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000075, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242624_AAB5C4 -.word 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x000000DC, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006A, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000006C, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, func_802CA988, 0x00000000, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, MakeLerp, 0xFE363C86, 0x00000258, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, func_802CABE8, 0x00000000, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, MakeLerp, 0xFE363C87, 0xFFFFFFEC, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, func_802CABE8, 0x00000000, 0xFE363C84, 0xFE363C85, 0xFE363C82, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000000F, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x80000052, 0x00000000, 0x000001F4, 0x000000F0, 0xFFFFFFE7, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000006F, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x00000071, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x000003E8, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0x00000000, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x000003E8, 0x00000027, 0x00000002, 0xFE363C81, 0x00000FA0, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFA24, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006F, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000190, 0x00000000, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x0000006F, 0x0000012C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000069, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000078, 0x000000DC, 0x000000B4, 0x00000000, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000069, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006F, 0x0000012C, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000071, 0x0000012C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000064, 0x00000001, 0x00000014, 0x00000000, 0x00000003, 0x00000001, 0x00000028, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x00000064, 0x00000043, 0x00000005, TranslateModel, 0x00000071, 0x0000012C, 0x000000DC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006F, 0x0000012C, 0x000000DC, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0x00000071, 0xFE363C82, 0xF24A7E80, 0xFE363C82, 0x00000043, 0x00000005, ScaleModel, 0x0000006F, 0xFE363C82, 0xF24A7E80, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000062A, 0x00000043, 0x00000002, func_802D62E4, 0x0000022A, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006F, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x000000E6, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFF3, 0x00000005, 0x00000001, 0x0000000D, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x00000075, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242CD0_AABC70 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80242D28_AABCC8 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D50_AABCF0 -.word 0x00000000, D_80242CD0_AABC70, 0x00000000, 0xC47A0000, 0x00000000, 0x00206D01, D_80242D28_AABCC8, 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, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242D50_AABCF0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_134/AABF00.data.s b/ver/us/asm/data/world/area_kpa/kpa_134/AABF00.data.s deleted file mode 100644 index 8b68f0dced..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_134/AABF00.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242F60_AABF00 -.word 0x00000037, 0xFFFFFF1A, 0x00000110, 0xFFFFFF9C, 0x00000039, 0xFFFFFF60, 0x00000110, 0xFFFFFF9C, 0x0000003B, 0xFFFFFF99, 0x00000110, 0xFFFFFF9C, 0x0000003D, 0xFFFFFFD2, 0x00000110, 0xFFFFFF9C, 0x0000003F, 0x0000000A, 0x00000110, 0xFFFFFF9C, 0x00000041, 0x00000043, 0x00000110, 0xFFFFFF9C, 0x00000043, 0x00000087, 0x00000110, 0xFFFFFF9C, 0x00000045, 0x000000F5, 0x00000110, 0xFFFFFF9C, 0x00000047, 0x0000013E, 0x00000110, 0xFFFFFF9C, 0x00000049, 0x00000177, 0x00000110, 0xFFFFFF9C, 0x0000004B, 0x000001B0, 0x00000110, 0xFFFFFF9C, 0x0000004D, 0x000001EA, 0x00000110, 0xFFFFFF9C, 0x0000004F, 0x00000223, 0x00000110, 0xFFFFFF9C, 0x00000051, 0x00000267, 0x00000110, 0xFFFFFF9C, 0xFFFFFFFF - -dlabel D_80243044_AABFE4 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2518280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB880, 0xF24A5A80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802430E4_AAC084 -.word 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000001C2, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C85, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000015, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000017, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001B, 0x7FFFFE00, 0x00000030, 0x00000001, D_80242F60_AABF00, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000024, 0x00000002, 0xFE363C86, 0x00000267, 0x00000044, 0x00000001, D_80243044_AABFE4, 0x00000005, 0x00000001, 0x00000000, 0x00000034, 0x00000004, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x0000000A, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00002040, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000044, 0x00000001, D_802430E4_AAC084, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000002, StopSound, 0x00002040, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF84061B6, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_134/AAC3B0.data.s b/ver/us/asm/data/world/area_kpa/kpa_134/AAC3B0.data.s deleted file mode 100644 index 9354831161..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_134/AAC3B0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243410_AAC3B0 -.word 0x0000000A, 0x00000002, 0xF84061B6, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFF20, 0x00000043, 0x00000005, MakeLerp, 0x00000163, 0x00000172, 0x00000004, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kpa_134_SetEntityPosition, 0xFD050F80, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x000000F0, 0x00000010, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, kpa_134_SetEntityPosition, 0xFD050F80, 0xFE363C85, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C85, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243598_AAC538 -.word 0x0000001A, 0x00000000 - -dlabel D_802435A0_AAC540 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061B5, 0x00000001, 0x00000043, 0x00000005, kpa_134_GetEntityPosition, 0xFD050F81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F81, 0x00000043, 0x00000001, kpa_134_RemovePadlock, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000047, 0x00000005, 0x802408E8, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B5, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x000002E7, 0x0000000A, 0x00000073, 0x0000010E, 0x80000000, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x0000004E, 0x00000006, D_802435A0_AAC540, 0x00000100, 0x00004000, D_80243598_AAC538, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x802408E8, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061B6, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0xFFFFFF20, 0x00000163, 0xFFFFFFE7, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000009, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF20, 0x0000014A, 0xFFFFFFE7, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80243410_AAC3B0, 0x00000043, 0x00000008, MakeEntity, Entity_SimpleSpring, 0x000001DB, 0x00000000, 0xFFFFFFEC, 0x0000005A, 0x0000003C, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x000000C3, 0x0000012C, 0xFFFFFFB5, 0x00000000, 0x000000A3, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF84061B7, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_90/A867B0.data.s b/ver/us/asm/data/world/area_kpa/kpa_90/A867B0.data.s deleted file mode 100644 index 79f95b87fe..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_90/A867B0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_A867B0 -.word 0xC3EB0000, 0x00000000, 0x42C80000, 0x42B40000, 0x43848000, 0xC3700000, 0x42C80000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401D0, D_80240000_A867B0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019015B, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_90/A86880.data.s b/ver/us/asm/data/world/area_kpa/kpa_90/A86880.data.s deleted file mode 100644 index 458b574b15..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_90/A86880.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400D0_A86880 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240290, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024012C_A868DC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240298, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240188_A86938 -.word 0x00000047, 0x00000005, D_802400D0_A86880, 0x00080000, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024012C_A868DC, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_80240188_A86938, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_91/A88360.data.s b/ver/us/asm/data/world/area_kpa/kpa_91/A88360.data.s deleted file mode 100644 index eb25593e1e..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_91/A88360.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241910_A88360 -.word 0xC3480000, 0x00000000, 0x42C80000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241BA8, D_80241910_A88360, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019015C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_91/A88420.data.s b/ver/us/asm/data/world/area_kpa/kpa_91/A88420.data.s deleted file mode 100644 index 24b0b1dc52..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_91/A88420.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802419D0_A88420 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245A20, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A2C_A8847C -.word 0x00000047, 0x00000005, D_802419D0_A88420, 0x00080000, 0x00000020, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFE2, 0x0000000F, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000025, 0x000001C9, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000008C, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000042, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000044, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000025, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E87, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802457B8, 0x00000046, 0x00000001, 0x80245938, 0x00000024, 0x00000002, 0xFE363C80, D_80241A2C_A8847C, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241960, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_91/A88730.data.s b/ver/us/asm/data/world/area_kpa/kpa_91/A88730.data.s deleted file mode 100644 index ec3e4dc8c8..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_91/A88730.data.s +++ /dev/null @@ -1,135 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241CE0_A88730 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241D38_A88788 -.word 0x00000000, 0x001A0017, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241D64_A887B4 -.word 0x3F800000, 0x00000022, 0x00000032, 0x42B40000, 0x42480000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42700000, 0x00000001 - -dlabel D_80241D94_A887E4 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000002, kpa_91_KoopaPatrolAI_Main, D_80241D64_A887B4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DF0_A88840 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80241D94_A887E4, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_80241E1C_A8886C -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02EE0000, D_80242150_A88BA0, 0x00000000 - -dlabel D_80241E48_A88898 -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241E1C_A8886C, 0x00000000, 0x02BC0000, D_80242150_A88BA0, 0x00000000 - -dlabel D_80241E74_A888C4 -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241E48_A88898, 0x00000000, 0x028A0000, D_80242150_A88BA0, 0x00000000 - -dlabel D_80241EA0_A888F0 -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241E74_A888C4, 0x00000000, 0x02580000, D_80242150_A88BA0, 0x00000000 - -dlabel D_80241ECC_A8891C -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241EA0_A888F0, 0x00000000, 0x02260000, D_80242150_A88BA0, 0x00000000 - -dlabel D_80241EF8_A88948 -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241ECC_A8891C, 0x00000000, 0x01F40000, D_80242150_A88BA0, 0x00000000 - -dlabel D_80241F24_A88974 -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241EF8_A88948, 0x00000000, 0x01C20000, D_80242150_A88BA0, 0x00000000 - -dlabel D_80241F50_A889A0 -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241F24_A88974, 0x00000000, 0x01900000, D_80242150_A88BA0, 0x00000000 - -dlabel D_80241F7C_A889CC -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241F50_A889A0, 0x00000000, 0x015E0000, D_80242150_A88BA0, 0x00000000 - -dlabel D_80241FA8_A889F8 -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241F7C_A889CC, 0x00000000, 0x012C0000, D_80242150_A88BA0, 0x00000000 - -dlabel D_80241FD4_A88A24 -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241FA8_A889F8, 0x00000000, 0x00FA0000, D_80242150_A88BA0, 0x00000000 - -dlabel D_80242000_A88A50 -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241FD4_A88A24, 0x00000000, 0x00C80000, D_80242150_A88BA0, 0x00000000 - -dlabel D_8024202C_A88A7C -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242000_A88A50, 0x00000000, 0x00960000, D_80242150_A88BA0, 0x00000000 - -dlabel D_80242058_A88AA8 -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024202C_A88A7C, 0x00000000, 0x00640000, D_80242150_A88BA0, 0x00000000 - -dlabel D_80242084_A88AD4 -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242058_A88AA8, 0x00000000, 0x00320000, D_80242150_A88BA0, 0x00000000 - -dlabel D_802420B0_A88B00 -.word D_80243730_A8A180, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242084_A88AD4, 0x00000000, 0x00000000, D_80242150_A88BA0, 0x00000000 - -dlabel D_802420DC_A88B2C -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802420B0_A88B00, 0xFFFF0000, 0x00000000, 0x00000000, D_802420DC_A88B2C, D_802420B0_A88B00, D_80242084_A88AD4, D_80242058_A88AA8, D_8024202C_A88A7C, D_80242000_A88A50, D_80241FD4_A88A24, D_80241FA8_A889F8, D_80241F7C_A889CC, D_80241F50_A889A0, D_80241F24_A88974, D_80241EF8_A88948, D_80241ECC_A8891C, D_80241EA0_A888F0, D_80241E74_A888C4, D_80241E48_A88898, D_80241E1C_A8886C, 0x00000000 - -dlabel D_80242150_A88BA0 -.word 0x00000000, 0x00000000, 0x04000000, 0xDB1396FF, 0x00000000, 0x00000000, 0x04120038, 0xB615A5FF, 0x00000000, 0x00000000, 0x04000038, 0xD05CC5FF, 0x00000000, 0x00000000, 0x03ED0000, 0xF94FB2FF, 0x00000000, 0x00000000, 0x04000071, 0xBB15A1FF, 0x00000000, 0x00000000, 0x03ED0071, 0xD75CC0FF, 0x00000000, 0x00000000, 0x041200AA, 0xB615A5FF, 0x00000000, 0x00000000, 0x040000AA, 0xD05CC5FF, 0x00000000, 0x00000000, 0x040000E3, 0xAE15ACFF, 0x00000000, 0x00000000, 0x03ED00E3, 0xC65BCFFF, 0x00000000, 0x00000000, 0x0412011C, 0xB615A5FF, 0x00000000, 0x00000000, 0x0400011C, 0xD05CC5FF, 0x00000000, 0x00000000, 0x04000155, 0xBF159FFF, 0x00000000, 0x00000000, 0x03ED0155, 0xDC5BBDFF, 0x00000000, 0x00000000, 0x0412018E, 0xB615A5FF, 0x00000000, 0x00000000, 0x0400018E, 0xD05CC5FF, 0x00000000, 0x00000000, 0x040001C7, 0xA515BAFF, 0x00000000, 0x00000000, 0x03ED01C7, 0xBB56DEFF, 0x00000000, 0x00000000, 0x0400041C, 0x8E20F5FF, 0x00000000, 0x00000000, 0x03ED0400, 0xAC55F8FF, 0x00000000, 0x00000000, 0x001201C7, 0x14564BFF, 0x00000000, 0x00000000, 0x001203FF, 0xF85554FF, 0x00000000, 0x00000000, 0x0000041C, 0xF52072FF, 0x00000000, 0x00000000, 0x000001C7, 0x321567FF, 0x00000000, 0x00000000, 0x00000038, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120000, 0x4B4F16FF, 0x00000000, 0x00000000, 0x00120071, 0x365C35FF, 0x00000000, 0x00000000, 0x000000AA, 0x305C3BFF, 0x00000000, 0x00000000, 0x001200E3, 0x245B43FF, 0x00000000, 0x00000000, 0x0000011C, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120155, 0x3A5B31FF, 0x00000000, 0x00000000, 0x0000018E, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120000, 0x4B4F16FF, 0x00000000, 0x00000000, 0x00000038, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE0038, 0x4A155BFF, 0x00000000, 0x00000000, 0x00000000, 0x601339FF, 0x00000000, 0x00000000, 0x00120071, 0x365C35FF, 0x00000000, 0x00000000, 0x00000071, 0x4F1557FF, 0x00000000, 0x00000000, 0x000000AA, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE00AA, 0x4A155BFF, 0x00000000, 0x00000000, 0x001200E3, 0x245B43FF, 0x00000000, 0x00000000, 0x000000E3, 0x411561FF, 0x00000000, 0x00000000, 0x0000011C, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE011C, 0x4A155BFF, 0x00000000, 0x00000000, 0x00120155, 0x3A5B31FF, 0x00000000, 0x00000000, 0x00000155, 0x521554FF, 0x00000000, 0x00000000, 0x0000018E, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE018E, 0x4A155BFF, 0x00000000, 0x00000000, 0x001201C7, 0x14564BFF, 0x00000000, 0x00000000, 0x000001C7, 0x321567FF - -dlabel D_80242470_A88EC0 -.word 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D - -dlabel D_80243730_A8A180 -.word 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xFC121824, 0xFF33FFFF, 0xFD100000, D_80243898_A8A2E8, 0xF5100000, 0x07094140, 0xE6000000, 0x00000000, 0xF3000000, 0x071FF200, 0xE7000000, 0x00000000, 0xF5100800, 0x00094140, 0xF2000000, 0x0003C07C, 0xD9FFFFFF, 0x00020000, 0x01020040, D_80242470_A88EC0, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0x06080C0E, 0x00080E0A, 0x060C1012, 0x000C120E, 0x06101416, 0x00101612, 0x0614181A, 0x00141A16, 0x06181C1E, 0x00181E1A, 0x061C2022, 0x001C221E, 0x06202426, 0x00202622, 0x06282A2C, 0x00282C2E, 0x06060430, 0x00063032, 0x06040A34, 0x00043430, 0x060A0E36, 0x000A3634, 0x060E1238, 0x000E3836, 0x0612163A, 0x00123A38, 0x06161A3C, 0x00163C3A, 0x061A1E3E, 0x001A3E3C, 0x061E2228, 0x001E283E, 0x0622262A, 0x00222A28, 0x0626242C, 0x00262C2A, 0x01012024, D_80242470_A88EC0, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0x06080C0E, 0x00080E0A, 0x060C1012, 0x000C120E, 0x06101416, 0x00101612, 0x0614181A, 0x00141A16, 0x06181C1E, 0x00181E1A, 0x061C2022, 0x001C221E, 0xE7000000, 0x00000000, 0xFC323864, 0xFF73FFFF, 0xD7000000, 0x00010001, 0xDF000000, 0x00000000 - -dlabel D_80243898_A8A2E8 -.word 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1DBDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0x9D1DBDE5, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0x9D1DBDE5, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0x9D1DBDE5, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0x9D1DBDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0x33E93C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B44F1, 0x44F144F1, 0x44F15D73, 0x5D7344F1, 0x44F15D73, 0x5D7344F1, 0x44F144F1, 0x44F144F1, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x5D735D73, 0x5D735D73, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x44F15D73, 0x5D7344F1, 0x44F144F1, 0x44F13C6B, 0x33E99D1D, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1D9D1D, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x44F144F1, 0x44F13C6B, 0x33E99D1D, 0x9D1D9B01, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1DBDE5, 0x9B01C405, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F13C6B, 0x23659D1D, 0xBDE59D1D, 0x9B01C405, 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x3C6B2365, 0x9D1DBDE5, 0x9D1D9B01, 0xC405D48B, 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x23659D1D, 0x9D1D9D1D, 0x9D1D9B01, 0xC405D48B, 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D9B01, 0x9B019B01, 0x9B019B01, 0x9B01C405, 0xD48BD48B, 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E99B01, 0xC405C405, 0xC405C405, 0xC405D48B, 0xD48BD48B, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0xD48BD48B, 0x9B01D48B, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F13C6B, 0x33E99B01, 0x9B01C405, 0xC405D48B, 0x9B01D48B, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x3C6B33E9, 0x23659B01, 0xC405D48B, 0x9B01D48B, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x44F13C6B, 0x33E99B01, 0xC405D48B, 0xD48BD48B, 0x9D1D33E9, 0x3C6B44F1, 0x44F15D73, 0x44F144F1, 0x3C6B33E9, 0x23659B01, 0xC405D48B, 0xD48BD48B, 0x33E93C6B, 0x44F144F1, 0x5D735D73, 0x44F144F1, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0xC405C405, 0x33E93C6B, 0x44F144F1, 0x5D735D73, 0x44F144F1, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0x9B019B01, 0x9D1D33E9, 0x3C6B44F1, 0x44F15D73, 0x44F13C6B, 0x33E99B01, 0xC405C405, 0xC4059B01, 0x23659D1D, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F13C6B, 0x33E99B01, 0xC4059B01, 0x9B012365, 0x9D1DBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F13C6B, 0x33E99B01, 0x9B0133E9, 0x23659D1D, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x3C6B33E9, 0x33E92365, 0x9D1DBDE5, 0xBDE5BDE5, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x3C6B3C6B, 0x33E99D1D, 0xBDE5BDE5, 0xBDE5D6AB, 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x3C6B33E9, 0x9D1DBDE5, 0xBDE5BDE5, 0xD6ABD6AB, 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x33E99D1D, 0xBDE5BDE5, 0xBDE5D6AB, 0xD6AB05EF, 0x00130005, 0x00010000, 0x00000000, 0x00080001, 0x00000000, 0x00000011, 0x000100B6, 0x00B600B6, 0x00050002, 0x00000000, 0x00000008, 0x00020000, 0x00000000, 0x00110002, 0x00B600B6, 0x00B60005, 0x00030000, 0x00000000, 0x00080003, 0x00000000, 0x00000011, 0x000300B6, 0x00B600B6, 0x00050004, 0x00000000, 0x00000008, 0x00040000, 0x00000000, 0x00110004, 0x00B600B6, 0x00B60005, 0x00050000, 0x00000000, 0x00080005, 0x00000000, 0x00000011, 0x000500B6, 0x00B600B6, 0x00050006, 0x00000000, 0x00000008, 0x00060000, 0x00000000, 0x00110006, 0x00B600B6, 0x00B60005, 0x00070000, 0x00000000, 0x00080007, 0x00000000, 0x00000011, 0x000700B6, 0x00B600B6, 0x00050008, 0x00000000, 0x00000008, 0x00080000, 0x00000000, 0x00110008, 0x00B600B6, 0x00B60005, 0x00090000, 0x00000000, 0x00080009, 0x00000000, 0x00000011, 0x000900B6, 0x00B600B6, 0x0005000A, 0x00000000, 0x00000008, 0x000A0000, 0x00000000, 0x0011000A, 0x00B600B6, 0x00B60005, 0x000B0000, 0x00000000, 0x0008000B, 0x00000000, 0x00000011, 0x000B00B6, 0x00B600B6, 0x0005000C, 0x00000000, 0x00000008, 0x000C0000, 0x00000000, 0x0011000C, 0x00B600B6, 0x00B60005, 0x000D0000, 0x00000000, 0x0008000D, 0x00000000, 0x00000011, 0x000D00B6, 0x00B600B6, 0x0005000E, 0x00000000, 0x00000008, 0x000E0000, 0x00000000, 0x0011000E, 0x00B600B6, 0x00B60005, 0x000F0000, 0x00000000, 0x0008000F, 0x00000000, 0x00000011, 0x000F00B6, 0x00B600B6, 0x00050010, 0x00000000, 0x00000008, 0x00100000, 0x00000000, 0x00110010, 0x00B600B6, 0x00B60005, 0x00110000, 0x00000000, 0x00080011, 0x00000000, 0x00000011, 0x001100B6, 0x00B600B6, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00030000 - -dlabel D_80243F8C_A8A9DC -.word 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C85, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C87, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244004_A8AA54 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024415C_A8ABAC -.word 0x00000043, 0x00000004, kpa_91_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80244504_A8AF54, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kpa_91_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kpa_91_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80244004_A8AA54, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_91_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80244564_A8AFB4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kpa_91_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80243F8C_A8A9DC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_91_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kpa_91_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80244800_A8B250, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kpa_91_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244504_A8AF54 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00130044, 0x00000024, 0x00000002, 0xFE363C88, 0x00130045, 0x00000024, 0x00000002, 0xFE363C81, 0x00130046, 0x00000024, 0x00000002, 0xFE363C82, 0x00130047, 0x00000024, 0x00000002, 0xFE363C83, 0x00130048, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244564_A8AFB4 -.word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, kpa_91_ToadHouse_CamSetFOV, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000022, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000DC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24A6E80, 0xF246BA80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2482280, 0xF2499A80, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF4C, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000BF, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF60, 0x00000016, 0xFFFFFF85, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000072, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00002800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000003D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244800_A8B250 -.word 0x00000043, 0x00000003, kpa_91_ToadHouse_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF75, 0x00000000, 0xFFFFFFA6, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF9A, 0xFFFFFF7E, 0x00000014, 0x00000044, 0x00000001, 0x80241960, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802448E0_A8B330 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000046, 0x00000001, D_8024415C_A8ABAC, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024492C_A8B37C -.word 0x00000014, 0x00000001, 0xF70F2E85, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830304, 0x00830301, 0x00000000, 0x00130049, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830304, 0x00830301, 0x00000000, 0x0013004A, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802449C8_A8B418 -.word 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00870204, 0x00870201, 0x00000000, 0x0013004B, 0x00000024, 0x00000002, 0xF70F2E86, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00870204, 0x00870201, 0x00000000, 0x0013004C, 0x00000024, 0x00000002, 0xF70F2E86, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244A64_A8B4B4 -.word 0x00000014, 0x00000001, 0xF70F2E87, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00930004, 0x00930001, 0x00000000, 0x0013004D, 0x00000024, 0x00000002, 0xF70F2E87, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00930004, 0x00930001, 0x00000000, 0x0013004E, 0x00000024, 0x00000002, 0xF70F2E87, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244B00_A8B550 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802448E0_A8B330, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFBA, 0x00000000, 0xFFFFFF74, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244B58_A8B5A8 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024492C_A8B37C, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000006E, 0x00000000, 0xFFFFFF7E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00830301, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244BC4_A8B614 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802449C8_A8B418, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000000A, 0x00000000, 0xFFFFFF4C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00870201, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244C30_A8B680 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244A64_A8B4B4, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000AF, 0x00000000, 0xFFFFFFBF, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244C88_A8B6D8 -.word 0x00000000, D_80241CE0_A88730, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_80244B00_A8B550, 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, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A0117, 0x00000001, D_80241CE0_A88730, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_80244B58_A8B5A8, 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, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A0118, 0x00000002, D_80241CE0_A88730, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_80244BC4_A8B614, 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, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00000000, 0x00000000, 0x00000000, 0x001A0119, 0x00000003, D_80241D38_A88788, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_80244C30_A8B680, 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, 0x00930001, 0x00930002, 0x00930003, 0x00930003, 0x00930001, 0x00930001, 0x00930000, 0x00930000, 0x00930001, 0x00930001, 0x00930001, 0x00930001, 0x00930001, 0x00930001, 0x00930001, 0x00930001, 0x00000000, 0x00000000, 0x00000000, 0x001A011A - -dlabel D_80245448_A8BE98 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84061A6, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, MakeItemEntity, 0x0000007A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0xF84061A7, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xF84061A6, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, MakeItemEntity, 0x0000007A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0xF84061A7, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245574_A8BFC4 -.word 0x0000000A, 0x00000002, 0xF84061A6, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80245448_A8BE98, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802455C8_A8C018 -.word 0x00000004, D_80241DF0_A88840, 0x42700000, 0x00000000, 0x425C0000, 0x00842C00, D_80245574_A8BFC4, 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, 0x00000002, 0x0000003C, 0x00000000, 0x00000037, 0x0000008C, 0x00000000, 0x00000037, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x0000003C, 0x00000000, 0x00000037, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80244C88_A8B6D8, 0x00000000, 0x00000001, D_802455C8_A8C018, 0x2217000E, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_91/A8C230.data.s b/ver/us/asm/data/world/area_kpa/kpa_91/A8C230.data.s deleted file mode 100644 index 348d9e7cef..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_91/A8C230.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802457E0_A8C230 -.word 0x0000007A, 0x00000000 - -dlabel D_802457E8_A8C238 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061A5, 0x00000001, 0x00000043, 0x00000005, kpa_91_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_91_RemovePadlock, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000047, 0x00000005, 0x80241A58, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061A5, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFFFB, 0x0000000A, 0x0000000D, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_802457E8_A8C238, 0x00000100, 0x00004000, D_802457E0_A8C230, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x80241A58, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061A6, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000007A, 0x0000003C, 0x00000000, 0x00000037, 0x00000011, 0xF84061A7, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_94/A8C7C0.data.s b/ver/us/asm/data/world/area_kpa/kpa_94/A8C7C0.data.s deleted file mode 100644 index c750d83295..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_94/A8C7C0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_A8C7C0 -.word 0xC3870000, 0xC3700000, 0x42C80000, 0x42B40000, 0x43EB0000, 0x00000000, 0x42C80000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401D0, D_80240000_A8C7C0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190179, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000007, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_94/A8C890.data.s b/ver/us/asm/data/world/area_kpa/kpa_94/A8C890.data.s deleted file mode 100644 index 9b4624e57f..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_94/A8C890.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400D0_A8C890 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802402B0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024012C_A8C8EC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802402B8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240188_A8C948 -.word 0x00000047, 0x00000005, D_802400D0_A8C890, 0x00080000, 0x0000000F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024012C_A8C8EC, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000029, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240188_A8C948, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_95/A8E390.data.s b/ver/us/asm/data/world/area_kpa/kpa_95/A8E390.data.s deleted file mode 100644 index 4c125a3b93..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_95/A8E390.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241910_A8E390 -.word 0x434D0000, 0x00000000, 0x42C80000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241DE8, D_80241910_A8E390, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019017A, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000007, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_95/A8E450.data.s b/ver/us/asm/data/world/area_kpa/kpa_95/A8E450.data.s deleted file mode 100644 index e50f8714a3..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_95/A8E450.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802419D0_A8E450 -.word 0x0000007A, 0x00000000 - -dlabel D_802419D8_A8E458 -.word 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000024, 0x00000002, 0xF84061A8, 0x00000001, 0x00000043, 0x00000005, kpa_95_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, kpa_95_RemovePadlock, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000047, 0x00000005, 0x80241C10, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84061A8, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFFFB, 0x0000000A, 0x0000000D, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x0000004E, 0x00000006, D_802419D8_A8E458, 0x00000100, 0x00004000, D_802419D0_A8E450, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, 0x80241C10, 0x00000100, 0x00000025, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84061A9, 0x00000001, 0x00000043, 0x00000007, MakeItemEntity, 0x0000007A, 0xFFFFFFBA, 0x00000000, 0x00000037, 0x00000011, 0xF84061AA, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_95/A8E690.data.s b/ver/us/asm/data/world/area_kpa/kpa_95/A8E690.data.s deleted file mode 100644 index 8a07c56e19..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_95/A8E690.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241C10_A8E690 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFE2, 0x0000000F, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000002, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000025, 0x000001C9, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000008C, 0x0000003C, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0x00000042, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000044, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000025, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000002D, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D60_A8E7E0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802459F0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DBC_A8E83C -.word 0x00000047, 0x00000005, D_80241D60_A8E7E0, 0x00080000, 0x00000020, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x802459C8, 0x00000046, 0x00000001, 0x80241B28, 0x00000024, 0x00000002, 0xFE363C80, D_80241DBC_A8E83C, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241960, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002D, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_95/A8E970.data.s b/ver/us/asm/data/world/area_kpa/kpa_95/A8E970.data.s deleted file mode 100644 index 05ca6cc132..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_95/A8E970.data.s +++ /dev/null @@ -1,135 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241EF0_A8E970 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241F48_A8E9C8 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241F74_A8E9F4 -.word 0x3F800000, 0x00000022, 0x00000032, 0x42B40000, 0x42480000, 0x00000002, 0x41300000, 0x00000000, 0x00000000, 0x42C80000, 0x42700000, 0x00000001 - -dlabel D_80241FA4_A8EA24 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000002, kpa_95_KoopaPatrolAI_Main, D_80241F74_A8E9F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242000_A8EA80 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_80241FA4_A8EA24, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00190000 - -dlabel D_8024202C_A8EAAC -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02EE0000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_80242058_A8EAD8 -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024202C_A8EAAC, 0x00000000, 0x02BC0000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_80242084_A8EB04 -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242058_A8EAD8, 0x00000000, 0x028A0000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_802420B0_A8EB30 -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242084_A8EB04, 0x00000000, 0x02580000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_802420DC_A8EB5C -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802420B0_A8EB30, 0x00000000, 0x02260000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_80242108_A8EB88 -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802420DC_A8EB5C, 0x00000000, 0x01F40000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_80242134_A8EBB4 -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242108_A8EB88, 0x00000000, 0x01C20000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_80242160_A8EBE0 -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242134_A8EBB4, 0x00000000, 0x01900000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_8024218C_A8EC0C -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242160_A8EBE0, 0x00000000, 0x015E0000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_802421B8_A8EC38 -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024218C_A8EC0C, 0x00000000, 0x012C0000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_802421E4_A8EC64 -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802421B8_A8EC38, 0x00000000, 0x00FA0000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_80242210_A8EC90 -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802421E4_A8EC64, 0x00000000, 0x00C80000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_8024223C_A8ECBC -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242210_A8EC90, 0x00000000, 0x00960000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_80242268_A8ECE8 -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_8024223C_A8ECBC, 0x00000000, 0x00640000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_80242294_A8ED14 -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242268_A8ECE8, 0x00000000, 0x00320000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_802422C0_A8ED40 -.word D_80243940_A903C0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242294_A8ED14, 0x00000000, 0x00000000, D_80242360_A8EDE0, 0x00000000 - -dlabel D_802422EC_A8ED6C -.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802422C0_A8ED40, 0xFFFF0000, 0x00000000, 0x00000000, D_802422EC_A8ED6C, D_802422C0_A8ED40, D_80242294_A8ED14, D_80242268_A8ECE8, D_8024223C_A8ECBC, D_80242210_A8EC90, D_802421E4_A8EC64, D_802421B8_A8EC38, D_8024218C_A8EC0C, D_80242160_A8EBE0, D_80242134_A8EBB4, D_80242108_A8EB88, D_802420DC_A8EB5C, D_802420B0_A8EB30, D_80242084_A8EB04, D_80242058_A8EAD8, D_8024202C_A8EAAC, 0x00000000 - -dlabel D_80242360_A8EDE0 -.word 0x00000000, 0x00000000, 0x04000000, 0xDB1396FF, 0x00000000, 0x00000000, 0x04120038, 0xB615A5FF, 0x00000000, 0x00000000, 0x04000038, 0xD05CC5FF, 0x00000000, 0x00000000, 0x03ED0000, 0xF94FB2FF, 0x00000000, 0x00000000, 0x04000071, 0xBB15A1FF, 0x00000000, 0x00000000, 0x03ED0071, 0xD75CC0FF, 0x00000000, 0x00000000, 0x041200AA, 0xB615A5FF, 0x00000000, 0x00000000, 0x040000AA, 0xD05CC5FF, 0x00000000, 0x00000000, 0x040000E3, 0xAE15ACFF, 0x00000000, 0x00000000, 0x03ED00E3, 0xC65BCFFF, 0x00000000, 0x00000000, 0x0412011C, 0xB615A5FF, 0x00000000, 0x00000000, 0x0400011C, 0xD05CC5FF, 0x00000000, 0x00000000, 0x04000155, 0xBF159FFF, 0x00000000, 0x00000000, 0x03ED0155, 0xDC5BBDFF, 0x00000000, 0x00000000, 0x0412018E, 0xB615A5FF, 0x00000000, 0x00000000, 0x0400018E, 0xD05CC5FF, 0x00000000, 0x00000000, 0x040001C7, 0xA515BAFF, 0x00000000, 0x00000000, 0x03ED01C7, 0xBB56DEFF, 0x00000000, 0x00000000, 0x0400041C, 0x8E20F5FF, 0x00000000, 0x00000000, 0x03ED0400, 0xAC55F8FF, 0x00000000, 0x00000000, 0x001201C7, 0x14564BFF, 0x00000000, 0x00000000, 0x001203FF, 0xF85554FF, 0x00000000, 0x00000000, 0x0000041C, 0xF52072FF, 0x00000000, 0x00000000, 0x000001C7, 0x321567FF, 0x00000000, 0x00000000, 0x00000038, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120000, 0x4B4F16FF, 0x00000000, 0x00000000, 0x00120071, 0x365C35FF, 0x00000000, 0x00000000, 0x000000AA, 0x305C3BFF, 0x00000000, 0x00000000, 0x001200E3, 0x245B43FF, 0x00000000, 0x00000000, 0x0000011C, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120155, 0x3A5B31FF, 0x00000000, 0x00000000, 0x0000018E, 0x305C3BFF, 0x00000000, 0x00000000, 0x00120000, 0x4B4F16FF, 0x00000000, 0x00000000, 0x00000038, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE0038, 0x4A155BFF, 0x00000000, 0x00000000, 0x00000000, 0x601339FF, 0x00000000, 0x00000000, 0x00120071, 0x365C35FF, 0x00000000, 0x00000000, 0x00000071, 0x4F1557FF, 0x00000000, 0x00000000, 0x000000AA, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE00AA, 0x4A155BFF, 0x00000000, 0x00000000, 0x001200E3, 0x245B43FF, 0x00000000, 0x00000000, 0x000000E3, 0x411561FF, 0x00000000, 0x00000000, 0x0000011C, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE011C, 0x4A155BFF, 0x00000000, 0x00000000, 0x00120155, 0x3A5B31FF, 0x00000000, 0x00000000, 0x00000155, 0x521554FF, 0x00000000, 0x00000000, 0x0000018E, 0x305C3BFF, 0x00000000, 0x00000000, 0xFFEE018E, 0x4A155BFF, 0x00000000, 0x00000000, 0x001201C7, 0x14564BFF, 0x00000000, 0x00000000, 0x000001C7, 0x321567FF - -dlabel D_80242680_A8F100 -.word 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D, 0xFE6F008C, 0xFE14FE4D, 0x008CFE21, 0xFE5300C8, 0xFE29FE75, 0x00BEFE1B, 0xFE39008C, 0xFE3FFE3F, 0x00BEFE47, 0xFE1C008C, 0xFE49FE22, 0x00C8FE51, 0xFE0C008C, 0xFE64FE12, 0x00BEFE6C, 0xFDE6008C, 0xFE75FDED, 0x00C8FE7C, 0xFDCE008C, 0xFE96FDD4, 0x00BEFE9E, 0xFDB1008C, 0xFEA0FDB7, 0x00C8FEA8, 0xFDA1008C, 0xFEBBFDA8, 0x00BEFEC3, 0xFD2D008C, 0xFF1AFD3B, 0x00BEFF1B, 0xFEF000BE, 0x0055FE84, 0x00BE00AD, 0xFE83008C, 0x00BBFEF6, 0x008C005D, 0xFFAA00C8, 0xFFCDFFBE, 0x00BEFFAE, 0xFF8800BE, 0xFFDAFF79, 0x00C8FFF5, 0xFF5B00BE, 0xFFFFFF43, 0x00C8001F, 0xFF1D00BE, 0x0030FF0E, 0x00C8004B, 0xFFBE00BE, 0xFFAEFFAA, 0x00C8FFCD, 0xFFB0008C, 0xFFD4FFC4, 0x008CFFB6, 0xFF8800BE, 0xFFDAFF8E, 0x008CFFE2, 0xFF7900C8, 0xFFF5FF7F, 0x008CFFFC, 0xFF5B00BE, 0xFFFFFF61, 0x008C0005, 0xFF4300C8, 0x001FFF49, 0x008C0027, 0xFF1D00BE, 0x0030FF23, 0x008C0038, 0xFF0E00C8, 0x004BFF14, 0x008C0053, 0xFEF000BE, 0x0055FEF6, 0x008C005D - -dlabel D_80243940_A903C0 -.word 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xFC121824, 0xFF33FFFF, 0xFD100000, D_80243AA8_A90528, 0xF5100000, 0x07094140, 0xE6000000, 0x00000000, 0xF3000000, 0x071FF200, 0xE7000000, 0x00000000, 0xF5100800, 0x00094140, 0xF2000000, 0x0003C07C, 0xD9FFFFFF, 0x00020000, 0x01020040, D_80242680_A8F100, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0x06080C0E, 0x00080E0A, 0x060C1012, 0x000C120E, 0x06101416, 0x00101612, 0x0614181A, 0x00141A16, 0x06181C1E, 0x00181E1A, 0x061C2022, 0x001C221E, 0x06202426, 0x00202622, 0x06282A2C, 0x00282C2E, 0x06060430, 0x00063032, 0x06040A34, 0x00043430, 0x060A0E36, 0x000A3634, 0x060E1238, 0x000E3836, 0x0612163A, 0x00123A38, 0x06161A3C, 0x00163C3A, 0x061A1E3E, 0x001A3E3C, 0x061E2228, 0x001E283E, 0x0622262A, 0x00222A28, 0x0626242C, 0x00262C2A, 0x01012024, D_80242680_A8F100, 0x06000204, 0x00000406, 0x0602080A, 0x00020A04, 0x06080C0E, 0x00080E0A, 0x060C1012, 0x000C120E, 0x06101416, 0x00101612, 0x0614181A, 0x00141A16, 0x06181C1E, 0x00181E1A, 0x061C2022, 0x001C221E, 0xE7000000, 0x00000000, 0xFC323864, 0xFF73FFFF, 0xD7000000, 0x00010001, 0xDF000000, 0x00000000 - -dlabel D_80243AA8_A90528 -.word 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1D9D1D, 0x9D1DBDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0x9D1DBDE5, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0x9D1DBDE5, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0xD6ABDEF7, 0x9D1DBDE5, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0xDEF7D6AB, 0x9D1DBDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE5BDE5, 0x33E93C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B3C6B, 0x3C6B44F1, 0x44F144F1, 0x44F15D73, 0x5D7344F1, 0x44F15D73, 0x5D7344F1, 0x44F144F1, 0x44F144F1, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x5D735D73, 0x5D735D73, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x44F15D73, 0x5D7344F1, 0x44F144F1, 0x44F13C6B, 0x33E99D1D, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1D9D1D, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x44F144F1, 0x44F13C6B, 0x33E99D1D, 0x9D1D9B01, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x3C6B33E9, 0x9D1DBDE5, 0x9B01C405, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F13C6B, 0x23659D1D, 0xBDE59D1D, 0x9B01C405, 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x3C6B2365, 0x9D1DBDE5, 0x9D1D9B01, 0xC405D48B, 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x23659D1D, 0x9D1D9D1D, 0x9D1D9B01, 0xC405D48B, 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D9B01, 0x9B019B01, 0x9B019B01, 0x9B01C405, 0xD48BD48B, 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E99B01, 0xC405C405, 0xC405C405, 0xC405D48B, 0xD48BD48B, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0xD48BD48B, 0x9B01D48B, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F13C6B, 0x33E99B01, 0x9B01C405, 0xC405D48B, 0x9B01D48B, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F144F1, 0x3C6B33E9, 0x23659B01, 0xC405D48B, 0x9B01D48B, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F144F1, 0x44F13C6B, 0x33E99B01, 0xC405D48B, 0xD48BD48B, 0x9D1D33E9, 0x3C6B44F1, 0x44F15D73, 0x44F144F1, 0x3C6B33E9, 0x23659B01, 0xC405D48B, 0xD48BD48B, 0x33E93C6B, 0x44F144F1, 0x5D735D73, 0x44F144F1, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0xC405C405, 0x33E93C6B, 0x44F144F1, 0x5D735D73, 0x44F144F1, 0x3C6B33E9, 0x9B01C405, 0xC405C405, 0x9B019B01, 0x9D1D33E9, 0x3C6B44F1, 0x44F15D73, 0x44F13C6B, 0x33E99B01, 0xC405C405, 0xC4059B01, 0x23659D1D, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x44F13C6B, 0x33E99B01, 0xC4059B01, 0x9B012365, 0x9D1DBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x44F13C6B, 0x33E99B01, 0x9B0133E9, 0x23659D1D, 0xBDE5BDE5, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x44F144F1, 0x3C6B33E9, 0x33E92365, 0x9D1DBDE5, 0xBDE5BDE5, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x3C6B44F1, 0x3C6B3C6B, 0x33E99D1D, 0xBDE5BDE5, 0xBDE5D6AB, 0xD6ABD6AB, 0xBDE5BDE5, 0xBDE59D1D, 0x33E93C6B, 0x3C6B33E9, 0x9D1DBDE5, 0xBDE5BDE5, 0xD6ABD6AB, 0xBDE5D6AB, 0xD6ABBDE5, 0xBDE5BDE5, 0x9D1D33E9, 0x33E99D1D, 0xBDE5BDE5, 0xBDE5D6AB, 0xD6AB05EF, 0x00130005, 0x00010000, 0x00000000, 0x00080001, 0x00000000, 0x00000011, 0x000100B6, 0x00B600B6, 0x00050002, 0x00000000, 0x00000008, 0x00020000, 0x00000000, 0x00110002, 0x00B600B6, 0x00B60005, 0x00030000, 0x00000000, 0x00080003, 0x00000000, 0x00000011, 0x000300B6, 0x00B600B6, 0x00050004, 0x00000000, 0x00000008, 0x00040000, 0x00000000, 0x00110004, 0x00B600B6, 0x00B60005, 0x00050000, 0x00000000, 0x00080005, 0x00000000, 0x00000011, 0x000500B6, 0x00B600B6, 0x00050006, 0x00000000, 0x00000008, 0x00060000, 0x00000000, 0x00110006, 0x00B600B6, 0x00B60005, 0x00070000, 0x00000000, 0x00080007, 0x00000000, 0x00000011, 0x000700B6, 0x00B600B6, 0x00050008, 0x00000000, 0x00000008, 0x00080000, 0x00000000, 0x00110008, 0x00B600B6, 0x00B60005, 0x00090000, 0x00000000, 0x00080009, 0x00000000, 0x00000011, 0x000900B6, 0x00B600B6, 0x0005000A, 0x00000000, 0x00000008, 0x000A0000, 0x00000000, 0x0011000A, 0x00B600B6, 0x00B60005, 0x000B0000, 0x00000000, 0x0008000B, 0x00000000, 0x00000011, 0x000B00B6, 0x00B600B6, 0x0005000C, 0x00000000, 0x00000008, 0x000C0000, 0x00000000, 0x0011000C, 0x00B600B6, 0x00B60005, 0x000D0000, 0x00000000, 0x0008000D, 0x00000000, 0x00000011, 0x000D00B6, 0x00B600B6, 0x0005000E, 0x00000000, 0x00000008, 0x000E0000, 0x00000000, 0x0011000E, 0x00B600B6, 0x00B60005, 0x000F0000, 0x00000000, 0x0008000F, 0x00000000, 0x00000011, 0x000F00B6, 0x00B600B6, 0x00050010, 0x00000000, 0x00000008, 0x00100000, 0x00000000, 0x00110010, 0x00B600B6, 0x00B60005, 0x00110000, 0x00000000, 0x00080011, 0x00000000, 0x00000011, 0x001100B6, 0x00B600B6, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00030000 - -dlabel D_8024419C_A90C1C -.word 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C85, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C86, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateModel, 0xFE363C87, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244214_A90C94 -.word 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000008, 0x00000001, 0x00000046, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, EnableModel, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000006, RotateModel, 0xFE363C88, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0xFE363C89, 0xFE363C80, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024436C_A90DEC -.word 0x00000043, 0x00000004, kpa_95_ToadHouse_InitScreenOverlay, 0x00000000, 0x00000000, 0x00000000, 0x00000046, 0x00000001, D_80244714_A91194, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C83, 0x00000043, 0x00000001, kpa_95_ToadHouse_DoesPlayerNeedSleep, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C80, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C88, 0x00000043, 0x00000002, ShowChoice, 0x001E0006, 0x00000008, 0x00000001, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8A, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000001, kpa_95_ToadHouse_DisableStatusMenu, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_80244214_A90C94, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_95_ToadHouse_PutPartnerAway, 0xFE363C8A, 0x00000008, 0x00000001, 0x00000014, 0x00000046, 0x00000001, D_80244774_A911F4, 0x00000056, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000FF, 0x0000003C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kpa_95_ToadHouse_UpdateScreenOverlay, 0x00000003, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, FullyRestoreHPandFP, 0x00000043, 0x00000001, FullyRestoreSP, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, D_8024419C_A90C1C, 0x00000013, 0x00000000, 0x00000043, 0x00000002, kpa_95_ToadHouse_GetPartnerBackOut, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, MakeLerp, 0x000000FF, 0x00000000, 0x0000001E, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000003, kpa_95_ToadHouse_UpdateScreenOverlay, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000069, 0x00000046, 0x00000001, D_80244A10_A91490, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830004, 0x00830001, 0x00000000, 0xFE363C8B, 0x00000043, 0x00000001, kpa_95_ToadHouse_ShowStatusMenu, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244714_A91194 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00130064, 0x00000024, 0x00000002, 0xFE363C88, 0x00130065, 0x00000024, 0x00000002, 0xFE363C81, 0x00130066, 0x00000024, 0x00000002, 0xFE363C82, 0x00130067, 0x00000024, 0x00000002, 0xFE363C83, 0x00130068, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244774_A911F4 -.word 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000088, 0x00000000, 0x00000008, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, kpa_95_ToadHouse_CamSetFOV, 0x00000000, 0x00000028, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000004, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000022, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000000DC, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24A6E80, 0xF246BA80, 0x00000043, 0x00000004, SetCamPosB, 0x00000000, 0xF2482280, 0xF2499A80, 0x00000043, 0x00000004, SetCamPosC, 0x00000000, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF4C, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x000000BF, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF60, 0x00000016, 0xFFFFFF85, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, InterpPlayerYaw, 0x00000072, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, func_802D286C, 0x00002800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000007, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000003D, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008001D, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000003F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244A10_A91490 -.word 0x00000043, 0x00000003, kpa_95_ToadHouse_CamSetFOV, 0x00000000, 0x00000019, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF75, 0x00000000, 0xFFFFFFA6, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFF9A, 0xFFFFFF7E, 0x00000014, 0x00000044, 0x00000001, 0x80241960, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244AF0_A91570 -.word 0x00000043, 0x00000004, GetPlayerPos, 0xFD050F81, 0xFD050F82, 0xFD050F83, 0x00000046, 0x00000001, D_8024436C_A90DEC, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244B3C_A915BC -.word 0x00000014, 0x00000001, 0xF70F2E88, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830204, 0x00830201, 0x00000000, 0x00130069, 0x00000024, 0x00000002, 0xF70F2E88, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00830204, 0x00830201, 0x00000000, 0x0013006A, 0x00000024, 0x00000002, 0xF70F2E88, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244BD8_A91658 -.word 0x00000014, 0x00000001, 0xF70F2E89, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00870104, 0x00870101, 0x00000000, 0x0013006B, 0x00000024, 0x00000002, 0xF70F2E89, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00870104, 0x00870101, 0x00000000, 0x0013006C, 0x00000024, 0x00000002, 0xF70F2E89, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244C74_A916F4 -.word 0x00000014, 0x00000001, 0xF70F2E8A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x009A0004, 0x009A0001, 0x00000000, 0x0013006D, 0x00000024, 0x00000002, 0xF70F2E8A, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x009A0004, 0x009A0001, 0x00000000, 0x0013006E, 0x00000024, 0x00000002, 0xF70F2E8A, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244D10_A91790 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244AF0_A91570, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFBA, 0x00000000, 0xFFFFFF74, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244D68_A917E8 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244B3C_A915BC, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000064, 0x00000000, 0xFFFFFFA6, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00830201, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244DD4_A91854 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244BD8_A91658, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000001E, 0x00000000, 0xFFFFFF56, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00870101, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244E40_A918C0 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244C74_A916F4, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000000AA, 0x00000000, 0xFFFFFF4C, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244E98_A91918 -.word 0x00000000, D_80241EF0_A8E970, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_80244D10_A91790, 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, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A011B, 0x00000001, D_80241EF0_A8E970, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_80244D68_A917E8, 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, 0x00830001, 0x00830002, 0x00830003, 0x00830003, 0x00830001, 0x00830001, 0x00830006, 0x00830006, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00830003, 0x00000000, 0x00000000, 0x00000000, 0x001A011C, 0x00000002, D_80241EF0_A8E970, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_80244DD4_A91854, 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, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00870001, 0x00000000, 0x00000000, 0x00000000, 0x001A011D, 0x00000003, D_80241F48_A8E9C8, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D01, D_80244E40_A918C0, 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, 0x009A0001, 0x009A0002, 0x009A0003, 0x009A0003, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x009A0001, 0x00000000, 0x00000000, 0x00000000, 0x001A011E - -dlabel D_80245658_A920D8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84061A9, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, MakeItemEntity, 0x0000007A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0xF84061AA, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xF84061A9, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, MakeItemEntity, 0x0000007A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0xF84061AA, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245784_A92204 -.word 0x0000000A, 0x00000002, 0xF84061A9, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80245658_A920D8, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802457D8_A92258 -.word 0x00000004, D_80242000_A8EA80, 0xC28C0000, 0x00000000, 0x425C0000, 0x00842C00, D_80245784_A92204, 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, 0x00000002, 0xFFFFFFBA, 0x00000000, 0x00000037, 0xFFFFFF74, 0x00000000, 0x00000037, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0xFFFFFFBA, 0x00000000, 0x00000037, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00580001, 0x00580004, 0x00580006, 0x00580006, 0x00580001, 0x00580001, 0x00580010, 0x00580010, 0x0058000C, 0x0058000B, 0x0058000D, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00580001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80244E98_A91918, 0x00000000, 0x00000001, D_802457D8_A92258, 0x2217000E, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_96/A927F0.data.s b/ver/us/asm/data/world/area_kpa/kpa_96/A927F0.data.s deleted file mode 100644 index ba4669d957..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_96/A927F0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240030_A927F0 -.word 0x43520000, 0x00000000, 0x42C80000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240218, D_80240030_A927F0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019016C, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000064, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetMusicTrackVolumes, 0x00000006, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_kpa/kpa_96/A928B0.data.s b/ver/us/asm/data/world/area_kpa/kpa_96/A928B0.data.s deleted file mode 100644 index 28a2921a00..0000000000 --- a/ver/us/asm/data/world/area_kpa/kpa_96/A928B0.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802400F0_A928B0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C82, 0x00000032, 0x00000024, 0x00000002, 0xFE363C83, 0x00000034, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80240990, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240194_A92954 -.word 0x00000047, 0x00000005, D_802400F0_A928B0, 0x00000100, 0x0000001E, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401C0_A92980 -.word 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000032, 0x00000024, 0x00000002, 0xFE363C83, 0x00000034, 0x00000044, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80240194_A92954, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000016, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, D_80240970_A93130, 0x00000044, 0x00000001, D_80240494_A92C54, 0x00000044, 0x00000001, D_802401C0_A92980, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80240080, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402F0_A92AB0 -.word 0x002700BC, 0x002700BD, 0x002700BE, 0x002700BF, 0x002700C0, 0x002700C1, 0x002700C2, 0x002700C3, 0x002700C4, 0x002700C5, 0x002700C6, 0x002700C7, 0x002700C8, 0x002700C9, 0x002700CA, 0x002700CB, 0x002700CC, 0x002700CD, 0x002700CE, 0x002700CF, 0x002700D0, 0x002700D1, 0x002700D2 - -dlabel D_8024034C_A92B0C -.word 0x00000096, 0x00000005, 0x0024002B, 0x0000009A, 0x00000019, 0x00240029, 0x00000090, 0x0000000F, 0x00240027, 0x00000082, 0x0000001E, 0x00240002, 0x000000A3, 0x0000001E, 0x00240017, 0x0000008C, 0x0000001E, 0x0024000A, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802403A0_A92B60 -.word 0x00000098, 0x0000000F, 0x00000000, 0x000000C8, 0x0000001E, 0x00000000, 0x00000085, 0x00000014, 0x00000000, 0x000000C2, 0x00000014, 0x00000000, 0x00000095, 0x00000019, 0x00000000, 0x00000083, 0x00000014, 0x00000000, 0x0000009B, 0x0000000A, 0x00000000, 0x00000092, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024040C_A92BCC -.word 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000003, 0x00000016, 0x00000001, 0x00000004, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240460_A92C20 -.word 0x00290005, 0x002A0004, 0x002B0003, 0x002C0002, 0x002D0001, 0x002E0000 - -dlabel D_80240478_A92C38 -.word 0x00000000, 0x00270001, 0x00270002, D_8024040C_A92BCC, 0x00000000, 0x00000000, D_802402F0_A92AB0 - -dlabel D_80240494_A92C54 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000000, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000003, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000004, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000005, MakeShop, D_80240460_A92C20, D_8024034C_A92B0C, D_802403A0_A92B60, 0x00000000, 0x00000043, 0x00000002, MakeShopOwner, D_80240478_A92C38, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240560_A92D20 -.word 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630010 - -dlabel D_8024058C_A92D4C -.word 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00270002, 0x00270001, 0x00000000, 0x0013004F, 0x00000043, 0x00000002, ShowChoice, 0x001E0013, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_80240000_A927C0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00270002, 0x00270001, 0x00000000, 0x00130051, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000000, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000002, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000003, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000004, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000007, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00270002, 0x00270001, 0x00000000, 0x00130052, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, ContinueSpeech, 0xFFFFFFFF, 0x00270002, 0x00270001, 0x00000000, 0x00130050, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000046, 0x00000001, 0x80284054, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024075C_A92F1C -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024058C_A92D4C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240780_A92F40 -.word 0x00000000, D_80240560_A92D20, 0xC2F40000, 0x00000000, 0x43230000, 0x00512D09, D_8024075C_A92F1C, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00270001, 0x00270002, 0x00270003, 0x00270003, 0x00270001, 0x00270001, 0x00270005, 0x00270005, 0x00270003, 0x00270003, 0x00270003, 0x00270003, 0x00270003, 0x00270003, 0x00270003, 0x00270003, 0x00000000, 0x00000000, 0x00000000, 0x001A011F - -dlabel D_80240970_A93130 -.word 0x00000001, D_80240780_A92F40, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s deleted file mode 100644 index b0d88515d9..0000000000 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024226C_8B22DC -/* 8B22DC 8024226C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B22E0 80242270 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B22E4 80242274 10A00003 */ beqz $a1, .L80242284 -/* 8B22E8 80242278 8C86000C */ lw $a2, 0xc($a0) -/* 8B22EC 8024227C 3C018024 */ lui $at, %hi(kmr_02_ItemChoice_HasSelectedItem) -/* 8B22F0 80242280 AC207E30 */ sw $zero, %lo(kmr_02_ItemChoice_HasSelectedItem)($at) -.L80242284: -/* 8B22F4 80242284 3C038024 */ lui $v1, %hi(kmr_02_ItemChoice_HasSelectedItem) -/* 8B22F8 80242288 24637E30 */ addiu $v1, $v1, %lo(kmr_02_ItemChoice_HasSelectedItem) -/* 8B22FC 8024228C 8C620000 */ lw $v0, ($v1) -/* 8B2300 80242290 54400003 */ bnel $v0, $zero, .L802422A0 -/* 8B2304 80242294 AC600000 */ sw $zero, ($v1) -/* 8B2308 80242298 080908AD */ j .L802422B4 -/* 8B230C 8024229C 0000102D */ daddu $v0, $zero, $zero -.L802422A0: -/* 8B2310 802422A0 8CC50000 */ lw $a1, ($a2) -/* 8B2314 802422A4 3C068024 */ lui $a2, %hi(kmr_02_ItemChoice_SelectedItemID) -/* 8B2318 802422A8 0C0B2026 */ jal evt_set_variable -/* 8B231C 802422AC 8CC67E34 */ lw $a2, %lo(kmr_02_ItemChoice_SelectedItemID)($a2) -/* 8B2320 802422B0 24020002 */ addiu $v0, $zero, 2 -.L802422B4: -/* 8B2324 802422B4 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B2328 802422B8 03E00008 */ jr $ra -/* 8B232C 802422BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s index 0b69afccf6..baf4e56341 100644 --- a/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s +++ b/ver/us/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s @@ -38,21 +38,21 @@ glabel func_8024295C_8B29CC /* 8B2A50 802429E0 0040A82D */ daddu $s5, $v0, $zero /* 8B2A54 802429E4 1220000B */ beqz $s1, .L80242A14 /* 8B2A58 802429E8 0040802D */ daddu $s0, $v0, $zero -/* 8B2A5C 802429EC 3C048025 */ lui $a0, %hi(D_80257F20) -/* 8B2A60 802429F0 24847F20 */ addiu $a0, $a0, %lo(D_80257F20) -/* 8B2A64 802429F4 3C058025 */ lui $a1, %hi(D_80257F21) -/* 8B2A68 802429F8 24A57F21 */ addiu $a1, $a1, %lo(D_80257F21) -/* 8B2A6C 802429FC 3C068025 */ lui $a2, %hi(D_80257F22) -/* 8B2A70 80242A00 24C67F22 */ addiu $a2, $a2, %lo(D_80257F22) -/* 8B2A74 80242A04 3C078025 */ lui $a3, %hi(D_80257F23) +/* 8B2A5C 802429EC 3C048025 */ lui $a0, %hi(kmr_02_savedColR) +/* 8B2A60 802429F0 24847F20 */ addiu $a0, $a0, %lo(kmr_02_savedColR) +/* 8B2A64 802429F4 3C058025 */ lui $a1, %hi(kmr_02_savedColG) +/* 8B2A68 802429F8 24A57F21 */ addiu $a1, $a1, %lo(kmr_02_savedColG) +/* 8B2A6C 802429FC 3C068025 */ lui $a2, %hi(kmr_02_savedColB) +/* 8B2A70 80242A00 24C67F22 */ addiu $a2, $a2, %lo(kmr_02_savedColB) +/* 8B2A74 80242A04 3C078025 */ lui $a3, %hi(kmr_02_savedColA) /* 8B2A78 80242A08 0C046FA0 */ jal get_background_color_blend -/* 8B2A7C 80242A0C 24E77F23 */ addiu $a3, $a3, %lo(D_80257F23) +/* 8B2A7C 80242A0C 24E77F23 */ addiu $a3, $a3, %lo(kmr_02_savedColA) /* 8B2A80 80242A10 AE400070 */ sw $zero, 0x70($s2) .L80242A14: /* 8B2A84 80242A14 1A000053 */ blez $s0, .L80242B64 /* 8B2A88 80242A18 32C400FF */ andi $a0, $s6, 0xff -/* 8B2A8C 80242A1C 3C048025 */ lui $a0, %hi(D_80257F20) -/* 8B2A90 80242A20 90847F20 */ lbu $a0, %lo(D_80257F20)($a0) +/* 8B2A8C 80242A1C 3C048025 */ lui $a0, %hi(kmr_02_savedColR) +/* 8B2A90 80242A20 90847F20 */ lbu $a0, %lo(kmr_02_savedColR)($a0) /* 8B2A94 80242A24 8E430070 */ lw $v1, 0x70($s2) /* 8B2A98 80242A28 02C41023 */ subu $v0, $s6, $a0 /* 8B2A9C 80242A2C 00430018 */ mult $v0, $v1 @@ -70,8 +70,8 @@ glabel func_8024295C_8B29CC /* 8B2AC8 80242A58 0006000D */ break 6 .L80242A5C: /* 8B2ACC 80242A5C 00005012 */ mflo $t2 -/* 8B2AD0 80242A60 3C058025 */ lui $a1, %hi(D_80257F21) -/* 8B2AD4 80242A64 90A57F21 */ lbu $a1, %lo(D_80257F21)($a1) +/* 8B2AD0 80242A60 3C058025 */ lui $a1, %hi(kmr_02_savedColG) +/* 8B2AD4 80242A64 90A57F21 */ lbu $a1, %lo(kmr_02_savedColG)($a1) /* 8B2AD8 80242A68 02851023 */ subu $v0, $s4, $a1 /* 8B2ADC 80242A6C 00430018 */ mult $v0, $v1 /* 8B2AE0 80242A70 00004012 */ mflo $t0 @@ -88,8 +88,8 @@ glabel func_8024295C_8B29CC /* 8B2B08 80242A98 0006000D */ break 6 .L80242A9C: /* 8B2B0C 80242A9C 00004812 */ mflo $t1 -/* 8B2B10 80242AA0 3C068025 */ lui $a2, %hi(D_80257F22) -/* 8B2B14 80242AA4 90C67F22 */ lbu $a2, %lo(D_80257F22)($a2) +/* 8B2B10 80242AA0 3C068025 */ lui $a2, %hi(kmr_02_savedColB) +/* 8B2B14 80242AA4 90C67F22 */ lbu $a2, %lo(kmr_02_savedColB)($a2) /* 8B2B18 80242AA8 02661023 */ subu $v0, $s3, $a2 /* 8B2B1C 80242AAC 00430018 */ mult $v0, $v1 /* 8B2B20 80242AB0 00004012 */ mflo $t0 @@ -106,8 +106,8 @@ glabel func_8024295C_8B29CC /* 8B2B48 80242AD8 0006000D */ break 6 .L80242ADC: /* 8B2B4C 80242ADC 00004012 */ mflo $t0 -/* 8B2B50 80242AE0 3C078025 */ lui $a3, %hi(D_80257F23) -/* 8B2B54 80242AE4 90E77F23 */ lbu $a3, %lo(D_80257F23)($a3) +/* 8B2B50 80242AE0 3C078025 */ lui $a3, %hi(kmr_02_savedColA) +/* 8B2B54 80242AE4 90E77F23 */ lbu $a3, %lo(kmr_02_savedColA)($a3) /* 8B2B58 80242AE8 02A71023 */ subu $v0, $s5, $a3 /* 8B2B5C 80242AEC 00430018 */ mult $v0, $v1 /* 8B2B60 80242AF0 00001812 */ mflo $v1 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index fb76763f4e..9ef8a840d1 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -9544,20 +9544,32 @@ segments: start: 0x8B0070 vram: 0x80240000 subsegments: - - [0x8B0070, c] - - [0x8B30E0, c] - - [0x8B33E0, c] - - [0x8B36B0, c] - - [0x8B37D0, c] - - [0x8B3A10, c] - - [0x8B3AB0, data] - - [0x8B3D10, data] - - [0x8B5640, data] - - [0x8C4A40, data] - - [0x8C51D0, data] - - [0x8C7010, data] - - [0x8C7B70, data] - - [0x8C7D90] + - [0x8B0070, c, kmr_02_0_header] + - [0x8B0070, c, kmr_02_1_music] + - [0x8B0070, c, kmr_02_2_main] + - [0x8B30E0, c, kmr_02_3_npc] + - [0x8B33E0, c, kmr_02_4_rooms_1] + - [0x8B33E0, c, kmr_02_5_entity] + - [0x8B36B0, c, kmr_02_6_rooms_2] + - [0x8B36B0, c, kmr_02_7_kammy] + - [0x8B37D0, c, kmr_02_8_foliage] + - [0x8B3A10, c, kmr_02_9_images] + - [0x8B3AB0, .data, kmr_02_0_header] + - [0x8B3BA0, .data, kmr_02_1_music] + - [0x8B3D10, .data, kmr_02_2_main] + - [0x8B5640, .data, kmr_02_3_npc] + - [0x8C1460, .data, kmr_02_4_rooms_1] + - [0x8C4A40, .data, kmr_02_5_entity] + - [0x8C51D0, .data, kmr_02_6_rooms_2] + - [0x8C56A0, .data, kmr_02_7_kammy] + - [0x8C7010, .data, kmr_02_8_foliage] + - start: 0x8C7B70 + type: .data + name: kmr_02_9_images + subsegments: + - [0x8C7B70, ci4, heart_block, 32, 32] + - [0x8C7D70, palette, heart_block] + - [0x8C7D90] - name: kmr_03 dir: world/area_kmr/kmr_03 type: code @@ -9696,28 +9708,39 @@ segments: start: 0x8EBE20 vram: 0x80240000 subsegments: - - [0x8EBE20, c] - - [0x8EBE50, c] - - [0x8ECBF0, c] - - [0x8ECC40, c] - - [0x8ECE80, c] - - [0x8ED0C0, c] - - [0x8ED440, c] - - [0x8ED5A0, c] - - [0x8EDB70, c] - - [0x8EDFC0, c] - - [0x8EE9D0, data] - - [0x8EEBC0, data] - - [0x8EFDA0, data] - - [0x8F01E0, data] - - [0x8F1500, data] - - [0x8F1C00, data] - - [0x8F2610, data] - - [0x8F3130, data] - - [0x8F61F0, data] - - [0x8F66D0, data] - - [0x8F9D30, data] - - [0x8FEE20] + - [0x8EBE20, c, kmr_20_0_header] + - [0x8EBE20, c, kmr_20_1_music] + - [0x8EBE50, c, kmr_20_2_main] + - [0x8EC150, c, kmr_20_3_rooms] + - [0x8EC1A0, c, kmr_20_4_documents] + - [0x8ECBF0, c, kmr_20_5_entity] + - [0x8ECC40, c, kmr_20_6_trees] + - [0x8ECE80, c, kmr_20_7_bushes] + - [0x8ED0C0, c, kmr_20_8_bed] + - [0x8ED440, c, kmr_20_9_npc_scenes] + - [0x8ED440, c, kmr_20_10_npc] + - [0x8ED5A0, c, kmr_20_11_npc_intro] + - [0x8EDB70, c, kmr_20_12_npc_epilogue] + - [0x8EDFC0, c, kmr_20_13_records] + - [0x8EE9D0, .data, kmr_20_0_header] + - [0x8EEA60, .data, kmr_20_1_music] + - [0x8EEBC0, .data, kmr_20_2_main] + - [0x8EFDA0, .data, kmr_20_3_rooms] + - [0x8F01E0, .data, kmr_20_4_documents] + - [0x8F1500, .data, kmr_20_5_entity] + - [0x8F1C00, .data, kmr_20_6_trees] + - [0x8F2610, .data, kmr_20_7_bushes] + - [0x8F3130, .data, kmr_20_8_bed] + - [0x8F61F0, .data, kmr_20_9_npc_scenes] + - [0x8F66D0, .data, kmr_20_10_npc] + - [0x8F9D30, .data, kmr_20_11_npc_intro] + - [0x8FCDE0, .data, kmr_20_12_npc_epilogue] + - start: 0x8FEB70 + type: .data + name: kmr_20_13_records + subsegments: + - [0x8FEB70, gfx, records_screen] + - [0x8FEBE0] - name: kmr_21 dir: world/area_kmr/kmr_21 type: code @@ -11029,110 +11052,106 @@ segments: start: 0xA46F60 vram: 0x80240000 subsegments: - - [0xA46F60, c] - - [0xA470C0, c] - - [0xA479B0, data] - - [0xA47A60, data] - - [0xA47D70, data] - - [0xA48500, data] - - [0xA48550] + - [0xA46F60, c, kpa_01_0_header] + - [0xA46F60, c, kpa_01_1_music] + - [0xA46F60, c, kpa_01_2_main] + - [0xA470C0, c, kpa_01_3_npc] + - [0xA479B0, c, kpa_01_4_entity] + - [0xA479B0] - name: kpa_03 dir: world/area_kpa/kpa_03 type: code start: 0xA485C0 vram: 0x80240000 subsegments: - - [0xA485C0, c] - - [0xA48720, c] - - [0xA4A410, c] - - [0xA4A480, data] - - [0xA4A520, data] - - [0xA4A750, data] - - [0xA4BE30] + - [0xA485C0, c, kpa_03_0_header] + - [0xA485C0, c, kpa_03_1_music] + - [0xA485C0, c, kpa_03_2_main] + - [0xA48720, c, kpa_03_3_npc] + - [0xA4A410, c, kpa_03_4_entity] + - [0xA4A480] - name: kpa_04 dir: world/area_kpa/kpa_04 type: code start: 0xA4BF60 vram: 0x80240000 subsegments: - - [0xA4BF60, c] - - [0xA4C0D0, data] - - [0xA4C1A0, data] - - [0xA4CA10] + - [0xA4BF60, c, kpa_04_0_header] + - [0xA4BF60, c, kpa_04_1_music] + - [0xA4BF60, c, kpa_04_2_main] + - [0xA4BF60, c, kpa_04_3_statues] + - [0xA4C0D0] - name: kpa_08 dir: world/area_kpa/kpa_08 type: code start: 0xA4CA20 vram: 0x80240000 subsegments: - - [0xA4CA20, c] - - [0xA4CAC0, c] - - [0xA4DEC0, data] - - [0xA4DF90, data] - - [0xA4E250, data] - - [0xA4E710, data] - - [0xA4EF30] + - [0xA4CA20, c, kpa_08_0_header] + - [0xA4CA20, c, kpa_08_1_music] + - [0xA4CA20, c, kpa_08_2_main] + - [0xA4CA20, c, kpa_08_3_entity] + - [0xA4CAC0, c, kpa_08_4_npc] + - [0xA4DEC0] - name: kpa_09 dir: world/area_kpa/kpa_09 type: code start: 0xA4F000 vram: 0x80240000 subsegments: - - [0xA4F000, c] - - [0xA4F0A0, c] - - [0xA502F0, data] - - [0xA503C0, data] - - [0xA506D0, data] - - [0xA50B90, data] - - [0xA517B0] + - [0xA4F000, c, kpa_09_0_header] + - [0xA4F000, c, kpa_09_1_music] + - [0xA4F000, c, kpa_09_2_main] + - [0xA4F000, c, kpa_09_3_entity] + - [0xA4F0A0, c, kpa_09_4_npc] + - [0xA502F0] - name: kpa_10 dir: world/area_kpa/kpa_10 type: code start: 0xA51980 vram: 0x80240000 subsegments: - - [0xA51980, c] - - [0xA51C90, data] - - [0xA51D90, data] - - [0xA528A0] + - [0xA51980, c, kpa_10_0_header] + - [0xA51980, c, kpa_10_1_music] + - [0xA51980, c, kpa_10_2_main] + - [0xA51980, c, kpa_10_3_npc] + - [0xA51980, c, kpa_10_4_entity] + - [0xA51C90] - name: kpa_11 dir: world/area_kpa/kpa_11 type: code start: 0xA528C0 vram: 0x80240000 subsegments: - - [0xA528C0, c] - - [0xA52BD0, c] - - [0xA533B0, data] - - [0xA534C0, data] - - [0xA53D80, data] - - [0xA53E30, data] - - [0xA548D0] + - [0xA528C0, c, kpa_11_0_header] + - [0xA528C0, c, kpa_11_1_music] + - [0xA528C0, c, kpa_11_2_main] + - [0xA52BD0, c, kpa_11_3_entity] + - [0xA52BD0, c, kpa_11_4_npc] + - [0xA533B0] - name: kpa_12 dir: world/area_kpa/kpa_12 type: code start: 0xA54950 vram: 0x80240000 subsegments: - - [0xA54950, c] - - [0xA54990, c] - - [0xA54CA0, c] - - [0xA54DC0, data] - - [0xA55620, data] - - [0xA55F00] + - [0xA54950, c, kpa_12_0_header] + - [0xA54990, c, kpa_12_1_music] + - [0xA54990, c, kpa_12_2_main] + - [0xA54CA0, c, kpa_12_3_platforms] + - [0xA54DC0] - name: kpa_13 dir: world/area_kpa/kpa_13 type: code start: 0xA55F20 vram: 0x80240000 subsegments: - - [0xA55F20, c] - - [0xA55F60, c] - - [0xA56270, c] - - [0xA56390, data] - - [0xA56BD0, data] - - [0xA56CA0, data] - - [0xA57490] + - [0xA55F20, c, kpa_13_0_header] + - [0xA55F60, c, kpa_13_1_music] + - [0xA55F60, c, kpa_13_2_main] + - [0xA56270, c, kpa_13_3_entity] + - [0xA56270, c, kpa_13_4_platforms] + - [0xA56390] - name: kpa_14 dir: world/area_kpa/kpa_14 type: code @@ -11370,77 +11389,76 @@ segments: start: 0xA867B0 vram: 0x80240000 subsegments: - - [0xA867B0, c] - - [0xA867B0, data] - - [0xA86880, data] - - [0xA86A40] + - [0xA867B0, c, kpa_90_0_header] + - [0xA867B0, c, kpa_90_1_music] + - [0xA867B0, c, kpa_90_2_main] + - [0xA867B0] - name: kpa_91 dir: world/area_kpa/kpa_91 type: code start: 0xA86A50 vram: 0x80240000 subsegments: - - [0xA86A50, c] - - [0xA88280, c] - - [0xA88360, data] - - [0xA88420, data] - - [0xA88730, data] - - [0xA8C230, data] - - [0xA8C470] + - [0xA86A50, c, kpa_91_0_header] + - [0xA86A50, c, kpa_91_1_music] + - [0xA86A50, c, kpa_91_2_main] + - [0xA86A50, c, kpa_91_3_npc] + - [0xA88280, c, kpa_91_4_entity] + - [0xA88360] - name: kpa_94 dir: world/area_kpa/kpa_94 type: code start: 0xA8C7C0 vram: 0x80240000 subsegments: - - [0xA8C7C0, c] - - [0xA8C7C0, data] - - [0xA8C890, data] - - [0xA8CA70] + - [0xA8C7C0, c, kpa_94_0_header] + - [0xA8C7C0, c, kpa_94_1_music] + - [0xA8C7C0, c, kpa_94_2_main] + - [0xA8C7C0] - name: kpa_95 dir: world/area_kpa/kpa_95 type: code start: 0xA8CA80 vram: 0x80240000 subsegments: - - [0xA8CA80, c] - - [0xA8CB60, c] - - [0xA8E390, data] - - [0xA8E450, data] - - [0xA8E690, data] - - [0xA8E970, data] - - [0xA92470] + - [0xA8CA80, c, kpa_95_0_header] + - [0xA8CA80, c, kpa_95_1_music] + - [0xA8CA80, c, kpa_95_2_entity] + - [0xA8CB60, c, kpa_95_3_main] + - [0xA8CB60, c, kpa_95_4_npc] + - [0xA8E390] - name: kpa_96 dir: world/area_kpa/kpa_96 type: code start: 0xA927C0 vram: 0x80240000 subsegments: - - [0xA927C0, c] - - [0xA927F0, data] - - [0xA928B0, data] - - [0xA93150] + - [0xA927C0, c, kpa_96_0_header] + - [0xA927C0, c, kpa_96_1_music] + - [0xA927C0, c, kpa_96_2_main] + - [0xA927C0, c, kpa_96_3_npc] + - [0xA927F0] - name: kpa_100 dir: world/area_kpa/kpa_100 type: code start: 0xA93160 vram: 0x80240000 subsegments: - - [0xA93160, c] - - [0xA931B0, data] - - [0xA93270, data] - - [0xA933D0, data] - - [0xA93410] + - [0xA93160, c, kpa_100_0_header] + - [0xA931B0, c, kpa_100_1_music] + - [0xA931B0, c, kpa_100_2_main] + - [0xA931B0, c, kpa_100_3_entity] + - [0xA931B0] - name: kpa_101 dir: world/area_kpa/kpa_101 type: code start: 0xA93440 vram: 0x80240000 subsegments: - - [0xA93440, c] - - [0xA93490, data] - - [0xA93550, data] - - [0xA936D0, data] + - [0xA93440, c, kpa_101_0_header] + - [0xA93440, c, kpa_101_1_music] + - [0xA93440, c, kpa_101_2_main] + - [0xA93710, c, kpa_101_3_entity] - [0xA93710] - name: kpa_102 dir: world/area_kpa/kpa_102 @@ -11448,79 +11466,80 @@ segments: start: 0xA93740 vram: 0x80240000 subsegments: - - [0xA93740, c] - - [0xA93A50, c] - - [0xA96CD0, data] - - [0xA96DA0, data] - - [0xA97690, data] - - [0xA99250] + - [0xA93740, c, kpa_102_0_header] + - [0xA93740, c, kpa_102_1_music] + - [0xA93740, c, kpa_102_2_main] + - [0xA93A50, c, kpa_102_3_npc] + - [0xA96CD0] - name: kpa_111 dir: world/area_kpa/kpa_111 type: code start: 0xA99590 vram: 0x80240000 subsegments: - - [0xA99590, c] - - [0xA9A950, data] - - [0xA9AA20, data] - - [0xA9ACF0, data] - - [0xA9C740, data] - - [0xA9C7C0] + - [0xA99590, c, kpa_111_0_header] + - [0xA99590, c, kpa_111_1_music] + - [0xA99590, c, kpa_111_2_main] + - [0xA99590, c, kpa_111_3_statues] + - [0xA99700, c, kpa_111_4_npc] + - [0xA9A950, c, kpa_111_5_entity] + - [0xA9A950] - name: kpa_112 dir: world/area_kpa/kpa_112 type: code start: 0xA9C990 vram: 0x80240000 subsegments: - - [0xA9C990, c] - - [0xA9C990, data] - - [0xA9CA60, data] - - [0xA9CC20] + - [0xA9C990, c, kpa_112_0_header] + - [0xA9C990, c, kpa_112_1_music] + - [0xA9C990, c, kpa_112_2_main] + - [0xA9C990] - name: kpa_113 dir: world/area_kpa/kpa_113 type: code start: 0xA9CC30 vram: 0x80240000 subsegments: - - [0xA9CC30, c] - - [0xA9CC70, c] - - [0xA9D6D0, data] - - [0xA9D7B0, data] - - [0xA9DA60, data] - - [0xA9DD00, data] - - [0xA9E900] + - [0xA9CC30, c, kpa_113_0_header] + - [0xA9CC30, c, kpa_113_1_music] + - [0xA9CC30, c, kpa_113_2_main] + - [0xA9CC30, c, kpa_113_3_entity] + - [0xA9CC70, c, kpa_113_4_statues] + - [0xA9CDE0, c, kpa_113_5_npc] + - [0xA9D6D0] - name: kpa_114 dir: world/area_kpa/kpa_114 type: code start: 0xA9E980 vram: 0x80240000 subsegments: - - [0xA9E980, c] - - [0xA9E9D0, data] - - [0xA9EAA0, data] - - [0xA9ED10] + - [0xA9E980, c, kpa_114_0_header] + - [0xA9E9D0, c, kpa_114_1_music] + - [0xA9E9D0, c, kpa_114_2_main] + - [0xA9E9D0, c, kpa_114_3_entity] + - [0xA9E9D0] - name: kpa_115 dir: world/area_kpa/kpa_115 type: code start: 0xA9ED40 vram: 0x80240000 subsegments: - - [0xA9ED40, c] - - [0xAA0100, data] - - [0xAA01E0, data] - - [0xAA0430, data] - - [0xAA0B20, data] - - [0xAA1D00] + - [0xA9ED40, c, kpa_115_0_header] + - [0xA9ED40, c, kpa_115_1_music] + - [0xA9ED40, c, kpa_115_2_main] + - [0xA9ED40, c, kpa_115_3_statues] + - [0xA9EEB0, c, kpa_115_4_npc] + - [0xAA0100] - name: kpa_116 dir: world/area_kpa/kpa_116 type: code start: 0xAA1EE0 vram: 0x80240000 subsegments: - - [0xAA1EE0, c] - - [0xAA1EE0, data] - - [0xAA1FB0, data] - - [0xAA2170] + - [0xAA1EE0, c, kpa_116_0_header] + - [0xAA1EE0, c, kpa_116_1_music] + - [0xAA1EE0, c, kpa_116_2_main] + - [0xAA1EE0] - name: kpa_117 dir: world/area_kpa/kpa_117 type: code @@ -11528,7 +11547,8 @@ segments: vram: 0x80240000 subsegments: - [0xAA2180, c, kpa_117_0_header] - - [0xAA2180, c, kpa_117_1_main] + - [0xAA2180, c, kpa_117_1_music] + - [0xAA2180, c, kpa_117_2_main] - [0xAA2180] - name: kpa_118 dir: world/area_kpa/kpa_118 @@ -11536,71 +11556,70 @@ segments: start: 0xAA23C0 vram: 0x80240000 subsegments: - - [0xAA23C0, c] - - [0xAA23C0, data] - - [0xAA2490, data] - - [0xAA2650] + - [0xAA23C0, c, kpa_118_0_header] + - [0xAA23C0, c, kpa_118_1_music] + - [0xAA23C0, c, kpa_118_2_main] + - [0xAA23C0] - name: kpa_119 dir: world/area_kpa/kpa_119 type: code start: 0xAA2660 vram: 0x80240000 subsegments: - - [0xAA2660, c] - - [0xAA2660, data] - - [0xAA2720, data] - - [0xAA2760, data] - - [0xAA28E0] + - [0xAA2660, c, kpa_119_0_header] + - [0xAA2660, c, kpa_119_1_music] + - [0xAA2660, c, kpa_119_2_entity] + - [0xAA2660, c, kpa_119_3_main] + - [0xAA2660] - name: kpa_121 dir: world/area_kpa/kpa_121 type: code start: 0xAA28F0 vram: 0x80240000 subsegments: - - [0xAA28F0, c] - - [0xAA28F0, data] - - [0xAA29C0, data] - - [0xAA2D10] + - [0xAA28F0, c, kpa_121_0_header] + - [0xAA28F0, c, kpa_121_1_music] + - [0xAA28F0, c, kpa_121_2_main] + - [0xAA28F0] - name: kpa_130 dir: world/area_kpa/kpa_130 type: code start: 0xAA2D20 vram: 0x80240000 subsegments: - - [0xAA2D20, c] - - [0xAA3460, data] - - [0xAA3530, data] - - [0xAA3870, data] - - [0xAA7460] + - [0xAA2D20, c, kpa_130_0_header] + - [0xAA2D20, c, kpa_130_1_music] + - [0xAA2D20, c, kpa_130_2_main] + - [0xAA2D20, c, kpa_130_3_npc] + - [0xAA3460] - name: kpa_133 dir: world/area_kpa/kpa_133 type: code start: 0xAA7480 vram: 0x80240000 subsegments: - - [0xAA7480, c] - - [0xAA7790, c] - - [0xAA78F0, data] - - [0xAA79E0, data] - - [0xAA8290, data] - - [0xAA8C70, data] - - [0xAA8F10, data] - - [0xAA8F90] + - [0xAA7480, c, kpa_133_0_header] + - [0xAA7480, c, kpa_133_1_music] + - [0xAA7480, c, kpa_133_2_main] + - [0xAA7790, c, kpa_133_3_entity] + - [0xAA78F0, c, kpa_133_4_npc] + - [0xAA78F0, c, kpa_133_5_water] + - [0xAA78F0, c, kpa_133_6] + - [0xAA78F0] - name: kpa_134 dir: world/area_kpa/kpa_134 type: code start: 0xAA8FA0 vram: 0x80240000 subsegments: - - [0xAA8FA0, c] - - [0xAA92B0, c] - - [0xAA94B0, c] - - [0xAA96A0, data] - - [0xAA9790, data] - - [0xAAA060, data] - - [0xAABF00, data] - - [0xAAC3B0, data] - - [0xAAC820] + - [0xAA8FA0, c, kpa_134_0_header] + - [0xAA8FA0, c, kpa_134_1_music] + - [0xAA8FA0, c, kpa_134_2_main] + - [0xAA92B0, c, kpa_134_3_chains] + - [0xAA94B0, c, kpa_134_4_npc] + - [0xAA94B0, c, kpa_134_5_panels] + - [0xAA94B0, c, kpa_134_6_entity] + - [0xAA96A0] - name: osr_00 dir: world/area_osr/osr_00 type: code diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index d47af1dd08..74abc00a82 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -3806,14 +3806,14 @@ D_8010C92C = 0x8010C92C; // type:data rom:0xA5DDC wPartnerNpc = 0x8010C930; // type:data rom:0xA5DE0 TweesterTouchingPlayer = 0x8010C934; // type:data rom:0xA5DE4 D_8010C938 = 0x8010C938; // type:data rom:0xA5DE8 -D_8010C93C = 0x8010C93C; // type:data rom:0xA5DEC -D_8010C940 = 0x8010C940; // type:data rom:0xA5DF0 +ISpyNotificationCallback = 0x8010C93C; // type:data rom:0xA5DEC +TalkNotificationCallback = 0x8010C940; // type:data rom:0xA5DF0 gSpinHistoryBufferPos = 0x8010C944; // type:data rom:0xA5DF4 D_8010C948 = 0x8010C948; // type:data rom:0xA5DF8 D_8010C94C = 0x8010C94C; // type:data rom:0xA5DFC D_8010C950 = 0x8010C950; // type:data rom:0xA5E00 TweesterTouchingPartner = 0x8010C954; // type:data rom:0xA5E04 -D_8010C958 = 0x8010C958; // type:data rom:0xA5E08 +InteractNotificationCallback = 0x8010C958; // type:data rom:0xA5E08 PrevPlayerDirection = 0x8010C95C; // type:data rom:0xA5E0C JumpedOnSwitchX = 0x8010C960; // type:data rom:0xA5E10 D_8010C964 = 0x8010C964; // type:data rom:0xA5E14 @@ -3850,8 +3850,8 @@ D_8010CD12 = 0x8010CD12; // type:data rom:0xA61C2 D_8010CD14 = 0x8010CD14; // type:data rom:0xA61C4 D_8010CD20 = 0x8010CD20; // type:data rom:0xA61D0 D_8010CD24 = 0x8010CD24; // type:data rom:0xA61D4 -D_8010CD30 = 0x8010CD30; // type:data rom:0xA61E0 -D_8010CD34 = 0x8010CD34; // type:data rom:0xA61E4 +PartnerCommand = 0x8010CD30; // type:data rom:0xA61E0 +PartnerCommandState = 0x8010CD34; // type:data rom:0xA61E4 D_8010CD38 = 0x8010CD38; // type:data rom:0xA61E8 D_8010CD3C = 0x8010CD3C; // type:data rom:0xA61EC set_entity_commandlist = 0x8010FBC0; // type:func rom:0xA62C0 @@ -3869,7 +3869,7 @@ D_8010CFD4 = 0x8010CFD4; // type:data rom:0xA6484 wCurrentPartnerId = 0x8010CFD8; // type:data rom:0xA6488 D_8010CFDC = 0x8010CFDC; // type:data rom:0xA648C D_8010CFE0 = 0x8010CFE0; // type:data rom:0xA6490 -D_8010CFE4 = 0x8010CFE4; // type:data rom:0xA6494 +NextPartnerID = 0x8010CFE4; // type:data rom:0xA6494 func_8010FD98 = 0x8010FD98; // type:func rom:0xA6498 wPartner = 0x8010CFEC; // type:data rom:0xA649C D_8010CFF0 = 0x8010CFF0; // type:data rom:0xA64A0 @@ -9577,7 +9577,7 @@ b_area_kmr_part_2_goomnut_tree_init_80223488 = 0x80223488; // type:data rom:0x44 b_area_kmr_part_2_goomnut_tree_idle_80223678 = 0x80223678; // type:data rom:0x445108 b_area_kmr_part_2_goomnut_tree_handleEvent_80223688 = 0x80223688; // type:data rom:0x445118 b_area_kmr_part_2_goomnut_tree_takeTurn_80223804 = 0x80223804; // type:data rom:0x445294 -b_area_kmr_part_2_goomnut_tree_shakeTree = 0x80223890; // type:data rom:0x445320 +b_area_kmr_part_2_goomnut_tree_EVS_ShakeTree = 0x80223890; // type:data rom:0x445320 b_area_kmr_part_2_goomnut_tree_tree_leaves = 0x80223D44; // type:data rom:0x4457D4 b_area_kmr_part_2_goomnut_tree_tree_trunk = 0x80223D50; // type:data rom:0x4457E0 b_area_kmr_part_2_goomnut_tree_D_80223D60_41D7F0 = 0x80223D60; // type:data rom:0x4457F0 @@ -16096,13 +16096,13 @@ kmr_02_LetterDelivery_Init = 0x80242424; // type:func rom:0x8B2494 kmr_02_LetterDelivery_CalcLetterPos = 0x80242514; // type:func rom:0x8B2584 kmr_02_LetterDelivery_SaveNpcAnim = 0x802426A0; // type:func rom:0x8B2710 kmr_02_LetterDelivery_RestoreNpcAnim = 0x802426E4; // type:func rom:0x8B2754 -func_80242710_8B2780 = 0x80242710; // type:func rom:0x8B2780 +IsPlayerHPFull = 0x80242710; // type:func rom:0x8B2780 func_80242734_8B27A4 = 0x80242734; // type:func rom:0x8B27A4 -func_80242788_8B27F8 = 0x80242788; // type:func rom:0x8B27F8 -func_802427B0_8B2820 = 0x802427B0; // type:func rom:0x8B2820 -func_802427CC_8B283C = 0x802427CC; // type:func rom:0x8B283C -func_802427EC_8B285C = 0x802427EC; // type:func rom:0x8B285C -func_8024280C_8B287C = 0x8024280C; // type:func rom:0x8B287C +RemoveGoompaPartner = 0x80242788; // type:func rom:0x8B27F8 +WaitForStartInput = 0x802427B0; // type:func rom:0x8B2820 +OpenPauseMenu = 0x802427CC; // type:func rom:0x8B283C +CloseStatusMenu = 0x802427EC; // type:func rom:0x8B285C +AddGoompaRenderYaw = 0x8024280C; // type:func rom:0x8B287C kmr_02_GetKammyBroomEmitterPos = 0x80242860; // type:func rom:0x8B28D0 kmr_02_SyncStatusMenu = 0x8024293C; // type:func rom:0x8B29AC func_8024295C_8B29CC = 0x8024295C; // type:func rom:0x8B29CC @@ -16111,7 +16111,9 @@ func_80242BC0_8B2C30 = 0x80242BC0; // type:func rom:0x8B2C30 func_80242F08_8B2F78 = 0x80242F08; // type:func rom:0x8B2F78 func_80242F28_8B2F98 = 0x80242F28; // type:func rom:0x8B2F98 func_80242F7C_8B2FEC = 0x80242F7C; // type:func rom:0x8B2FEC -func_80243034_8B30A4 = 0x80243034; // type:func rom:0x8B30A4 +kmr_02_ShrinkItemEntity = 0x80243034; // type:func rom:0x8B30A4 +kmr_02_heart_block_img = 0x80257B00; // type:data rom:0x8C7B70 +kmr_02_heart_block_pal = 0x80257D00; // type:data rom:0x8C7D70 kmr_02_ToadHouse_DisableStatusMenu = 0x80243070; // type:func rom:0x8B30E0 kmr_02_ToadHouse_ShowStatusMenu = 0x80243090; // type:func rom:0x8B3100 kmr_02_ToadHouse_UpdateScreenOverlay = 0x802430B8; // type:func rom:0x8B3128 @@ -16124,7 +16126,7 @@ kmr_02_ToadHouse_InitScreenOverlay = 0x80243284; // type:func rom:0x8B32F4 kmr_02_ToadHouse_PutPartnerAway = 0x80243300; // type:func rom:0x8B3370 kmr_02_ToadHouse_GetPartnerBackOut = 0x80243334; // type:func rom:0x8B33A4 kmr_02_ToadHouse_Stub = 0x80243364; // type:func rom:0x8B33D4 -func_80243370_8B33E0 = 0x80243370; // type:func rom:0x8B33E0 +PlayerHasBadgeEquipped = 0x80243370; // type:func rom:0x8B33E0 kmr_02_SetEntityPositionF = 0x802433AC; // type:func rom:0x8B341C kmr_02_GetEntityPosition = 0x80243474; // type:func rom:0x8B34E4 func_80243514_8B3584 = 0x80243514; // type:func rom:0x8B3584 @@ -16178,8 +16180,8 @@ kmr_03_80241470 = 0x80241470; // type:data rom:0x8C9400 kmr_03_802414A8 = 0x802414A8; // type:data rom:0x8C9438 kmr_03_802414C8 = 0x802414C8; // type:data rom:0x8C9458 kmr_03_makeEntities = 0x80241530; // type:data rom:0x8C94C0 -kmr_03_searchBush = 0x802417F0; // type:data rom:0x8C9780 -kmr_03_shakeTree = 0x80241B50; // type:data rom:0x8C9AE0 +kmr_03_EVS_SearchBush = 0x802417F0; // type:data rom:0x8C9780 +kmr_03_EVS_ShakeTree = 0x80241B50; // type:data rom:0x8C9AE0 kmr_03_treeModelList_Bush1_Bush = 0x80242154; // type:data rom:0x8CA0E4 kmr_03_treeEffectVectors_Bush1 = 0x8024215C; // type:data rom:0x8CA0EC kmr_03_bush1 = 0x8024216C; // type:data rom:0x8CA0FC @@ -16333,16 +16335,16 @@ kmr_20_Pipe_GetEntryPos = 0x80240120; // type:func rom:0x8EBF40 kmr_20_Pipe_GetCameraYaw = 0x80240200; // type:func rom:0x8EC020 kmr_20_Pipe_GetPointAheadOfPlayer = 0x8024026C; // type:func rom:0x8EC08C func_80240310_8EC130 = 0x80240310; // type:func rom:0x8EC130 -func_80240330_8EC150 = 0x80240330; // type:func rom:0x8EC150 -func_80240358_8EC178 = 0x80240358; // type:func rom:0x8EC178 +SetAmbienceVolumeHalf = 0x80240330; // type:func rom:0x8EC150 +SetAmbienceVolumeFull = 0x80240358; // type:func rom:0x8EC178 kmr_20_foliage_setup_shear_mtx = 0x80240380; // type:func rom:0x8EC1A0 kmr_20_TransformFoliage = 0x802403F0; // type:func rom:0x8EC210 -func_802405BC_8EC3DC = 0x802405BC; // type:func rom:0x8EC3DC -func_802406BC_8EC4DC = 0x802406BC; // type:func rom:0x8EC4DC -func_802406C8_8EC4E8 = 0x802406C8; // type:func rom:0x8EC4E8 -func_80240B20_8EC940 = 0x80240B20; // type:func rom:0x8EC940 -func_80240B48_8EC968 = 0x80240B48; // type:func rom:0x8EC968 -func_80240B54_8EC974 = 0x80240B54; // type:func rom:0x8EC974 +kmr_20_worker_draw_letter = 0x802405BC; // type:func rom:0x8EC3DC +InitLetters = 0x802406BC; // type:func rom:0x8EC4DC +ReadLetters = 0x802406C8; // type:func rom:0x8EC4E8 +CleanupLetters = 0x80240B20; // type:func rom:0x8EC940 +InitDiary = 0x80240B48; // type:func rom:0x8EC968 +ReadDiary = 0x80240B54; // type:func rom:0x8EC974 func_80240DA4_8ECBC4 = 0x80240DA4; // type:func rom:0x8ECBC4 func_80240DD0_8ECBF0 = 0x80240DD0; // type:func rom:0x8ECBF0 kmr_20_UnsetCamera0MoveFlag1 = 0x80240DF8; // type:func rom:0x8ECC18 @@ -16378,7 +16380,7 @@ dup3_kmr_20_foliage_setup_shear_mtx = 0x80241A60; // type:func rom:0x8ED880 dup3_kmr_20_TransformFoliage = 0x80241AD0; // type:func rom:0x8ED8F0 func_80241C9C_8EDABC = 0x80241C9C; // type:func rom:0x8EDABC func_80241CF0_8EDB10 = 0x80241CF0; // type:func rom:0x8EDB10 -func_80241D1C_8EDB3C = 0x80241D1C; // type:func rom:0x8EDB3C +SetAmbienceVolumeHalf_Intro = 0x80241D1C; // type:func rom:0x8EDB3C dup2_kmr_20_Pipe_SetAnimFlag = 0x80241D50; // type:func rom:0x8EDB70 dup2_kmr_20_Pipe_GetCurrentFloor = 0x80241D70; // type:func rom:0x8EDB90 dup2_kmr_20_Pipe_AwaitDownInput = 0x80241D84; // type:func rom:0x8EDBA4 @@ -16388,12 +16390,12 @@ dup2_kmr_20_Pipe_GetPointAheadOfPlayer = 0x80241F8C; // type:func rom:0x8EDDAC func_80242030_8EDE50 = 0x80242030; // type:func rom:0x8EDE50 func_80242084_8EDEA4 = 0x80242084; // type:func rom:0x8EDEA4 func_802420EC_8EDF0C = 0x802420EC; // type:func rom:0x8EDF0C -func_80242144_8EDF64 = 0x80242144; // type:func rom:0x8EDF64 -func_8024216C_8EDF8C = 0x8024216C; // type:func rom:0x8EDF8C -func_802421A0_8EDFC0 = 0x802421A0; // type:func rom:0x8EDFC0 -func_80242870_8EE690 = 0x80242870; // type:func rom:0x8EE690 +SetAmbienceVolumeHalf_Epilogue = 0x80242144; // type:func rom:0x8EDF64 +SetAmbienceVolumeFull_Epilogue = 0x8024216C; // type:func rom:0x8EDF8C +appendGfx_records_impl = 0x802421A0; // type:func rom:0x8EDFC0 +appendGfx_records = 0x80242870; // type:func rom:0x8EE690 func_80242A04_8EE824 = 0x80242A04; // type:func rom:0x8EE824 -func_80242A3C_8EE85C = 0x80242A3C; // type:func rom:0x8EE85C +calculate_records = 0x80242A3C; // type:func rom:0x8EE85C func_80242B04_8EE924 = 0x80242B04; // type:func rom:0x8EE924 D_80244D24_8F0B44 = 0x80244D24; // type:data rom:0x8F0B44 D_80244D54_8F0B74 = 0x80244D54; // type:data rom:0x8F0B74 @@ -16402,7 +16404,7 @@ D_80244DB4_8F0BD4 = 0x80244DB4; // type:data rom:0x8F0BD4 D_80244FA0_8F0DC0 = 0x80244FA0; // type:data rom:0x8F0DC0 D_80244FD0_8F0DF0 = 0x80244FD0; // type:data rom:0x8F0DF0 kmr_20_varStash = 0x8024A908; // type:data rom:0x8F6728 -D_80252D50_8FEB70 = 0x80252D50; // type:data rom:0x8FEB70 +kmr_20_records_screen_gfx = 0x80252D50; // type:data rom:0x8FEB70 D_80252DC0_8FEBE0 = 0x80252DC0; // type:data rom:0x8FEBE0 D_80253030_8FEE50 = 0x80253030; // type:data rom:0x8FEE50 D_80253038_8FEE58 = 0x80253038; // type:data rom:0x8FEE58 @@ -17005,7 +17007,7 @@ dro_01_EVS_Quizmo_NPC_Interact = 0x8024769C; // type:data rom:0x96289C dro_01_EVS_Quizmo_NPC_Aux = 0x8024771C; // type:data rom:0x96291C dro_01_Quizmo_MobileAISettings = 0x80247738; // type:data rom:0x962938 dro_01_EVS_Quizmo_Npc_AI = 0x80247768; // type:data rom:0x962968 -dro_01_Quizmo_NpcSettings = 0x80247788; // type:data rom:0x962988 +dro_01_NpcSettings_ChuckQuizmo = 0x80247788; // type:data rom:0x962988 dro_01_Quizmo_AltNpcSettings = 0x802477B4; // type:data rom:0x9629B4 dro_01_D_802477E0_9629E0 = 0x802477E0; // type:data rom:0x9629E0 dro_01_D_802477E4_9629E4 = 0x802477E4; // type:data rom:0x9629E4 @@ -17085,8 +17087,8 @@ dro_01_8024CF7C = 0x8024CF7C; // type:data rom:0x96817C dro_01_8024D2B0 = 0x8024D2B0; // type:data rom:0x9684B0 dro_01_makeEntities = 0x8024D2F0; // type:data rom:0x9684F0 dro_01_pad_D3BC = 0x8024D3BC; // type:data rom:0x9685BC -dro_01_searchBush = 0x8024D3C0; // type:data rom:0x9685C0 -dro_01_shakeTree = 0x8024D720; // type:data rom:0x968920 +dro_01_EVS_SearchBush = 0x8024D3C0; // type:data rom:0x9685C0 +dro_01_EVS_ShakeTree = 0x8024D720; // type:data rom:0x968920 dro_01_tree1_Leaves = 0x8024DD24; // type:data rom:0x968F24 dro_01_tree1_Trunk = 0x8024DD2C; // type:data rom:0x968F2C dro_01_tree1_Drops = 0x8024DD34; // type:data rom:0x968F34 @@ -17211,7 +17213,7 @@ dro_02_EVS_Quizmo_NPC_Interact = 0x802472C4; // type:data rom:0x970484 dro_02_EVS_Quizmo_NPC_Aux = 0x80247344; // type:data rom:0x970504 dro_02_Quizmo_MobileAISettings = 0x80247360; // type:data rom:0x970520 dro_02_EVS_Quizmo_Npc_AI = 0x80247390; // type:data rom:0x970550 -dro_02_Quizmo_NpcSettings = 0x802473B0; // type:data rom:0x970570 +dro_02_NpcSettings_ChuckQuizmo = 0x802473B0; // type:data rom:0x970570 dro_02_Quizmo_AltNpcSettings = 0x802473DC; // type:data rom:0x97059C dro_02_npcAISettings_80247408 = 0x80247408; // type:data rom:0x9705C8 dro_02_npcAI_80247438 = 0x80247438; // type:data rom:0x9705F8 @@ -18504,14 +18506,14 @@ D_80242030_A548F0 = 0x80242030; // type:data rom:0xA548F0 kpa_12_get_tattle = 0x80240000; // type:func rom:0xA54950 kpa_12_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xA54990 kpa_12_UpdateTexturePanStepped = 0x80240164; // type:func rom:0xA54AB4 -kpa_12_func_80240350_A54CA0 = 0x80240350; // type:func rom:0xA54CA0 -func_8024037C_A54CCC = 0x8024037C; // type:func rom:0xA54CCC +kpa_12_GetCurrentFloor = 0x80240350; // type:func rom:0xA54CA0 +AddPlatformPushVelocity = 0x8024037C; // type:func rom:0xA54CCC func_80240444_A54D94 = 0x80240444; // type:func rom:0xA54D94 kpa_13_get_tattle = 0x80240000; // type:func rom:0xA55F20 kpa_13_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xA55F60 kpa_13_UpdateTexturePanStepped = 0x80240164; // type:func rom:0xA56084 -kpa_13_func_80240350_A56270 = 0x80240350; // type:func rom:0xA56270 -func_8024037C_A5629C = 0x8024037C; // type:func rom:0xA5629C +kpa_13_GetFloorBelow = 0x80240350; // type:func rom:0xA56270 +AddPlatformPushVelocity = 0x8024037C; // type:func rom:0xA5629C func_80240444_A56364 = 0x80240444; // type:func rom:0xA56364 kpa_14_get_tattle = 0x80240000; // type:func rom:0xA574B0 kpa_14_UpdateTexturePanSmooth = 0x80240040; // type:func rom:0xA574F0 @@ -18768,7 +18770,7 @@ kpa_95_ToadHouse_Stub = 0x802418FC; // type:func rom:0xA8E37C D_80245A00_A92480 = 0x80245A00; // type:data rom:0xA92480 D_80245A08_A92488 = 0x80245A08; // type:data rom:0xA92488 D_80245BA0_A92620 = 0x80245BA0; // type:data rom:0xA92620 -func_80240000_A927C0 = 0x80240000; // type:func rom:0xA927C0 +CheckPlayerHasCoins = 0x80240000; // type:func rom:0xA927C0 func_80240000_A93160 = 0x80240000; // type:func rom:0xA93160 D_802402B0_A93410 = 0x802402B0; // type:data rom:0xA93410 D_802402C0_A93420 = 0x802402C0; // type:data rom:0xA93420 @@ -18888,7 +18890,7 @@ func_80240310_AA92B0 = 0x80240310; // type:func rom:0xAA92B0 func_8024033C_AA92DC = 0x8024033C; // type:func rom:0xAA92DC func_80240408_AA93A8 = 0x80240408; // type:func rom:0xAA93A8 func_80240434_AA93D4 = 0x80240434; // type:func rom:0xAA93D4 -func_80240510_AA94B0 = 0x80240510; // type:func rom:0xAA94B0 +UnusedSetEntityPosition = 0x80240510; // type:func rom:0xAA94B0 kpa_134_SetEntityPosition = 0x80240564; // type:func rom:0xAA9504 kpa_134_RemovePadlock = 0x80240628; // type:func rom:0xAA95C8 kpa_134_GetEntityPosition = 0x8024065C; // type:func rom:0xAA95FC @@ -22623,8 +22625,8 @@ flo_03_npcGroup_80243E5C = 0x80243E5C; // type:data rom:0xCAB0FC flo_03_npcGroup_8024404C = 0x8024404C; // type:data rom:0xCAB2EC flo_03_npcGroup_8024423C = 0x8024423C; // type:data rom:0xCAB4DC flo_03_npcGroupList_8024442C = 0x8024442C; // type:data rom:0xCAB6CC -flo_03_searchBush = 0x80244480; // type:data rom:0xCAB720 -flo_03_shakeTree = 0x802447E0; // type:data rom:0xCABA80 +flo_03_EVS_SearchBush = 0x80244480; // type:data rom:0xCAB720 +flo_03_EVS_ShakeTree = 0x802447E0; // type:data rom:0xCABA80 flo_03_tree1_Leaves = 0x80244DE4; // type:data rom:0xCAC084 flo_03_tree1_Trunk = 0x80244DEC; // type:data rom:0xCAC08C flo_03_tree1_Drops = 0x80244DF4; // type:data rom:0xCAC094 @@ -22653,8 +22655,8 @@ flo_07_exitWalk_80240C18 = 0x80240C18; // type:data rom:0xCACE08 flo_07_80240C74 = 0x80240C74; // type:data rom:0xCACE64 flo_07_main = 0x80240CA0; // type:data rom:0xCACE90 flo_07_npcSettings_80241220 = 0x80241220; // type:data rom:0xCAD410 -flo_07_searchBush = 0x8024124C; // type:data rom:0xCAD43C -flo_07_shakeTree = 0x802415AC; // type:data rom:0xCAD79C +flo_07_EVS_SearchBush = 0x8024124C; // type:data rom:0xCAD43C +flo_07_EVS_ShakeTree = 0x802415AC; // type:data rom:0xCAD79C flo_07_varStash = 0x80241BB0; // type:data rom:0xCADDA0 flo_07_80241BB4 = 0x80241BB4; // type:data rom:0xCADDA4 flo_07_80241BE4 = 0x80241BE4; // type:data rom:0xCADDD4 @@ -22748,8 +22750,8 @@ flo_08_npcGroup_802449D8 = 0x802449D8; // type:data rom:0xCB3718 flo_08_init_80244BC8 = 0x80244BC8; // type:data rom:0xCB3908 flo_08_npcGroup_80244CD4 = 0x80244CD4; // type:data rom:0xCB3A14 flo_08_npcGroupList_80244EC4 = 0x80244EC4; // type:data rom:0xCB3C04 -flo_08_searchBush = 0x80244F40; // type:data rom:0xCB3C80 -flo_08_shakeTree = 0x802452A0; // type:data rom:0xCB3FE0 +flo_08_EVS_SearchBush = 0x80244F40; // type:data rom:0xCB3C80 +flo_08_EVS_ShakeTree = 0x802452A0; // type:data rom:0xCB3FE0 flo_08_tree1_Leaves = 0x802458A4; // type:data rom:0xCB45E4 flo_08_tree1_Trunk = 0x802458AC; // type:data rom:0xCB45EC flo_08_tree1_Drops = 0x802458B4; // type:data rom:0xCB45F4 @@ -22785,8 +22787,8 @@ flo_09_main = 0x80241C9C; // type:data rom:0xCB6C9C flo_09_80242010 = 0x80242010; // type:data rom:0xCB7010 flo_09_802422BC = 0x802422BC; // type:data rom:0xCB72BC flo_09_802425DC = 0x802425DC; // type:data rom:0xCB75DC -flo_09_searchBush = 0x80242880; // type:data rom:0xCB7880 -flo_09_shakeTree = 0x80242BE0; // type:data rom:0xCB7BE0 +flo_09_EVS_SearchBush = 0x80242880; // type:data rom:0xCB7880 +flo_09_EVS_ShakeTree = 0x80242BE0; // type:data rom:0xCB7BE0 flo_09_802431E4 = 0x802431E4; // type:data rom:0xCB81E4 flo_09_tree1_Callback = 0x80243264; // type:data rom:0xCB8264 flo_09_tree2_Callback = 0x8024330C; // type:data rom:0xCB830C @@ -22872,8 +22874,8 @@ flo_10_npcGroup_80243E64 = 0x80243E64; // type:data rom:0xCBD064 flo_10_npcGroupList_80244054 = 0x80244054; // type:data rom:0xCBD254 flo_10_D_80244070_CBD270 = 0x80244070; // type:data rom:0xCBD270 flo_10_80244074 = 0x80244074; // type:data rom:0xCBD274 -flo_10_searchBush = 0x80244090; // type:data rom:0xCBD290 -flo_10_shakeTree = 0x802443F0; // type:data rom:0xCBD5F0 +flo_10_EVS_SearchBush = 0x80244090; // type:data rom:0xCBD290 +flo_10_EVS_ShakeTree = 0x802443F0; // type:data rom:0xCBD5F0 flo_10_tree1_Leaves = 0x802449F4; // type:data rom:0xCBDBF4 flo_10_tree1_Trunk = 0x80244A04; // type:data rom:0xCBDC04 flo_10_tree1_Drops = 0x80244A0C; // type:data rom:0xCBDC0C @@ -22952,8 +22954,8 @@ flo_12_80240B78 = 0x80240B78; // type:data rom:0xCC19A8 flo_12_main = 0x80240BA4; // type:data rom:0xCC19D4 flo_12_npcSettings_80240E30 = 0x80240E30; // type:data rom:0xCC1C60 flo_12_npcSettings_80240E5C = 0x80240E5C; // type:data rom:0xCC1C8C -flo_12_searchBush = 0x80240E88; // type:data rom:0xCC1CB8 -flo_12_shakeTree = 0x802411E8; // type:data rom:0xCC2018 +flo_12_EVS_SearchBush = 0x80240E88; // type:data rom:0xCC1CB8 +flo_12_EVS_ShakeTree = 0x802411E8; // type:data rom:0xCC2018 flo_12_varStash = 0x802417EC; // type:data rom:0xCC261C flo_12_802417F0 = 0x802417F0; // type:data rom:0xCC2620 flo_12_80241820 = 0x80241820; // type:data rom:0xCC2650 @@ -23343,7 +23345,7 @@ flo_18_init_80245C04 = 0x80245C04; // type:data rom:0xCE22A4 flo_18_init_80245C78 = 0x80245C78; // type:data rom:0xCE2318 flo_18_npcGroup_80245CEC = 0x80245CEC; // type:data rom:0xCE238C flo_18_npcGroupList_8024669C = 0x8024669C; // type:data rom:0xCE2D3C -flo_18_searchBush = 0x802466C0; // type:data rom:0xCE2D60 +flo_18_EVS_SearchBush = 0x802466C0; // type:data rom:0xCE2D60 pra_09_80246A20 = 0x80246A20; // type:data rom:0xCE30C0 flo_18_80247024 = 0x80247024; // type:data rom:0xCE36C4 flo_19_UpdateTexturePanSmooth = 0x80240000; // type:func rom:0xCE36F0 @@ -23459,8 +23461,8 @@ flo_22_80240E24 = 0x80240E24; // type:data rom:0xCED064 flo_22_80240E84 = 0x80240E84; // type:data rom:0xCED0C4 flo_22_80241028 = 0x80241028; // type:data rom:0xCED268 flo_22_80241528 = 0x80241528; // type:data rom:0xCED768 -flo_22_searchBush = 0x802415A0; // type:data rom:0xCED7E0 -flo_22_shakeTree = 0x80241900; // type:data rom:0xCEDB40 +flo_22_EVS_SearchBush = 0x802415A0; // type:data rom:0xCED7E0 +flo_22_EVS_ShakeTree = 0x80241900; // type:data rom:0xCEDB40 flo_22_tree1_Trunk = 0x80241F04; // type:data rom:0xCEE144 flo_22_tree1 = 0x80241F14; // type:data rom:0xCEE154 flo_22_triggerCoord_80241F28 = 0x80241F28; // type:data rom:0xCEE168 @@ -23519,8 +23521,8 @@ flo_24_exitWalk_8024093C = 0x8024093C; // type:data rom:0xCF127C flo_24_exitWalk_80240998 = 0x80240998; // type:data rom:0xCF12D8 flo_24_802409F4 = 0x802409F4; // type:data rom:0xCF1334 flo_24_main = 0x80240A3C; // type:data rom:0xCF137C -flo_24_searchBush = 0x80240D40; // type:data rom:0xCF1680 -flo_24_shakeTree = 0x802410A0; // type:data rom:0xCF19E0 +flo_24_EVS_SearchBush = 0x80240D40; // type:data rom:0xCF1680 +flo_24_EVS_ShakeTree = 0x802410A0; // type:data rom:0xCF19E0 flo_24_tree1_Leaves = 0x802416A4; // type:data rom:0xCF1FE4 flo_24_tree1_Trunk = 0x802416C0; // type:data rom:0xCF2000 flo_24_tree1_Drops = 0x802416C8; // type:data rom:0xCF2008 @@ -23586,8 +23588,8 @@ flo_25_npcGroup_8024387C = 0x8024387C; // type:data rom:0xCF644C flo_25_npcGroup_80243A6C = 0x80243A6C; // type:data rom:0xCF663C flo_25_npcGroupList_80243C5C = 0x80243C5C; // type:data rom:0xCF682C flo_25_makeEntities = 0x80243C90; // type:data rom:0xCF6860 -flo_25_searchBush = 0x80243CE0; // type:data rom:0xCF68B0 -flo_25_shakeTree = 0x80244040; // type:data rom:0xCF6C10 +flo_25_EVS_SearchBush = 0x80243CE0; // type:data rom:0xCF68B0 +flo_25_EVS_ShakeTree = 0x80244040; // type:data rom:0xCF6C10 flo_25_tree1_Leaves = 0x80244644; // type:data rom:0xCF7214 flo_25_tree1_Trunk = 0x80244654; // type:data rom:0xCF7224 flo_25_tree1_Drops = 0x8024465C; // type:data rom:0xCF722C @@ -25917,20 +25919,20 @@ D_80109710 = 0x80109710; // type:data D_801097D8 = 0x801097D8; // type:data D_80109800 = 0x80109800; // type:data D_80109820 = 0x80109820; // type:data -D_8010C920 = 0x8010C920; // type:data +PulseStoneNotificationCallback = 0x8010C920; // type:data D_8010C924 = 0x8010C924; // type:data D_8010C928 = 0x8010C928; // type:data D_8010C92C = 0x8010C92C; // type:data wPartnerNpc = 0x8010C930; // type:data TweesterTouchingPlayer = 0x8010C934; // type:data D_8010C938 = 0x8010C938; // type:data -D_8010C93C = 0x8010C93C; // type:data -D_8010C940 = 0x8010C940; // type:data +ISpyNotificationCallback = 0x8010C93C; // type:data +TalkNotificationCallback = 0x8010C940; // type:data gSpinHistoryBufferPos = 0x8010C944; // type:data D_8010C94C = 0x8010C94C; // type:data D_8010C950 = 0x8010C950; // type:data TweesterTouchingPartner = 0x8010C954; // type:data -D_8010C958 = 0x8010C958; // type:data +InteractNotificationCallback = 0x8010C958; // type:data PrevPlayerDirection = 0x8010C95C; // type:data JumpedOnSwitchX = 0x8010C960; // type:data D_8010C964 = 0x8010C964; // type:data @@ -25957,8 +25959,8 @@ D_8010CD00 = 0x8010CD00; // type:data D_8010CD10 = 0x8010CD10; // type:data D_8010CD12 = 0x8010CD12; // type:data D_8010CD20 = 0x8010CD20; // type:data -D_8010CD30 = 0x8010CD30; // type:data -D_8010CD34 = 0x8010CD34; // type:data +PartnerCommand = 0x8010CD30; // type:data +PartnerCommandState = 0x8010CD34; // type:data gPlayerMoveHistory = 0x8010CD38; // type:data gPlayerMoveHistoryIndex = 0x8010CFB8; // type:data D_8010CFBC = 0x8010CFBC; // type:data @@ -25973,8 +25975,8 @@ wPartnerCurrentScript = 0x8010CFD4; // type:data wCurrentPartnerId = 0x8010CFD8; // type:data wPartnerCurrentScriptID = 0x8010CFDC; // type:data D_8010CFE0 = 0x8010CFE0; // type:data -D_8010CFE4 = 0x8010CFE4; // type:data -D_8010CFE8 = 0x8010CFE8; // type:data +NextPartnerID = 0x8010CFE4; // type:data +NextPartnerCommand = 0x8010CFE8; // type:data _render_transition_stencil = 0x80136A80; // type:func get_default_variation_for_song = 0x8014A430; // D_8014F120 = 0x8014F120; // type:data @@ -26587,10 +26589,10 @@ D_80257B48 = 0x80257B48; // type:data D_80257B68 = 0x80257B68; // type:data D_80257B88 = 0x80257B88; // type:data D_80257DA4 = 0x80257DA4; // type:data -D_80257F20 = 0x80257F20; // type:data -D_80257F21 = 0x80257F21; // type:data -D_80257F22 = 0x80257F22; // type:data -D_80257F23 = 0x80257F23; // type:data +kmr_02_savedColR = 0x80257F20; // type:data +kmr_02_savedColG = 0x80257F21; // type:data +kmr_02_savedColB = 0x80257F22; // type:data +kmr_02_savedColA = 0x80257F23; // type:data D_80257F24 = 0x80257F24; // type:data D_80257F25 = 0x80257F25; // type:data D_80257F26 = 0x80257F26; // type:data