From 43c9a7c91da90169c4067dd2bf8d1a2dea39dd54 Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Wed, 5 Oct 2022 16:11:24 -0400 Subject: [PATCH] sbk map data (#802) * jan_00 ok * whale cleanup * sbk * format cleanup * fixes, revisions, and some trd * stop warnings Co-authored-by: HailSanta --- include/entity.h | 2 + include/macros.h | 4 + include/map.h | 2 + include/script_api/common.h | 2 +- include/script_api/macros.h | 30 +- src/C50A0.c | 4 +- src/world/area_dgb/dgb_04/C36530.c | 3 +- src/world/area_flo/flo_08/CAFAC0.c | 3 +- src/world/area_flo/flo_16/CD1F10.c | 3 +- src/world/area_gv/gv_01/gv_01.c | 3 +- src/world/area_jan/jan.h | 4 + src/world/area_jan/jan_00/B20540.c | 34 - src/world/area_jan/jan_00/B216E0.c | 24 - src/world/area_jan/jan_00/B21EA0.c | 4 - src/world/area_jan/jan_00/jan_00.h | 21 +- src/world/area_jan/jan_00/jan_00_0_header.c | 25 + src/world/area_jan/jan_00/jan_00_1_main.c | 73 ++ src/world/area_jan/jan_00/jan_00_2_npc.c | 795 ++++++++++++++++++ src/world/area_jan/jan_00/jan_00_3_entity.c | 20 + src/world/area_jan/jan_00/jan_00_4_whale.c | 333 ++++++++ src/world/area_jan/jan_00/jan_00_5_foliage.c | 51 ++ src/world/area_kgr/kgr_01/kgr_01_1_main.c | 3 +- src/world/area_kgr/kgr_02/kgr_02_1_main.c | 3 +- src/world/area_kpa/kpa_117/kpa_117_1_main.c | 2 +- src/world/area_kzn/kzn_02/kzn_02_3_npc.c | 41 +- src/world/area_kzn/kzn_03/kzn_03_2_npc.c | 228 +---- src/world/area_kzn/kzn_04/kzn_04_2_entity.c | 3 +- src/world/area_kzn/kzn_07/kzn_07.h | 2 + src/world/area_kzn/kzn_07/kzn_07_1_main.c | 2 +- src/world/area_kzn/kzn_07/kzn_07_3_enemy.c | 52 +- src/world/area_kzn/kzn_08/kzn_08.h | 2 + src/world/area_kzn/kzn_08/kzn_08_3_enemy.c | 135 +-- src/world/area_kzn/kzn_09/kzn_09_2_entity.c | 3 +- src/world/area_kzn/kzn_09/kzn_09_4_npc.c | 227 +---- src/world/area_kzn/kzn_11/kzn_11_3_npc.c | 43 +- src/world/area_kzn/kzn_17/kzn_17_3_npc.c | 218 +---- src/world/area_kzn/kzn_19/kzn_19_3_npc.c | 2 +- src/world/area_kzn/kzn_20/kzn_20_1_main.c | 3 +- src/world/area_kzn/kzn_20/kzn_20_2_npc.c | 2 +- src/world/area_mac/mac_06/mac_06_1_main.c | 4 +- src/world/area_mac/mac_06/mac_06_2.c | 46 +- src/world/area_mac/mac_06/mac_06_3.c | 192 ++++- src/world/area_mgm/mgm_00/mgm_00_1_main.c | 3 +- src/world/area_mgm/mgm_01/mgm_01_1_main.c | 3 +- src/world/area_mgm/mgm_02/mgm_02_1_main.c | 3 +- src/world/area_mgm/mgm_03/mgm_03_1_main.c | 3 +- src/world/area_sbk/sbk.h | 92 +- src/world/area_sbk/sbk_00/929270.c | 50 -- src/world/area_sbk/sbk_00/9292B0.c | 131 --- src/world/area_sbk/sbk_00/sbk_00.h | 16 +- src/world/area_sbk/sbk_00/sbk_00_1_main.c | 49 ++ src/world/area_sbk/sbk_00/sbk_00_2_npc.c | 111 +++ src/world/area_sbk/sbk_00/sbk_00_3_entity.c | 11 + src/world/area_sbk/sbk_01/929A90.c | 55 -- src/world/area_sbk/sbk_01/929AD0.c | 117 --- src/world/area_sbk/sbk_01/sbk_01.h | 15 +- src/world/area_sbk/sbk_01/sbk_01_1_main.c | 49 ++ src/world/area_sbk/sbk_01/sbk_01_2_npc.c | 112 +++ src/world/area_sbk/sbk_02/92A2B0.c | 4 +- src/world/area_sbk/sbk_02/92A9A0.c | 13 +- src/world/area_sbk/sbk_02/sbk_02.h | 17 +- src/world/area_sbk/sbk_02/sbk_02_0_header.c | 45 + src/world/area_sbk/sbk_02/sbk_02_1_main.c | 84 ++ src/world/area_sbk/sbk_02/sbk_02_2_ruins.c | 734 ++++++++++++++++ src/world/area_sbk/sbk_02/sbk_02_3_npc.c | 458 ++++++++++ src/world/area_sbk/sbk_02/sbk_02_4_entity.c | 10 + src/world/area_sbk/sbk_03/92F8B0.c | 8 - src/world/area_sbk/sbk_03/92F8F0.c | 2 - src/world/area_sbk/sbk_03/sbk_03.h | 14 +- src/world/area_sbk/sbk_03/sbk_03_1_main.c | 49 ++ src/world/area_sbk/sbk_03/sbk_03_2_npc.c | 215 +++++ src/world/area_sbk/sbk_04/9304D0.c | 8 - src/world/area_sbk/sbk_04/930510.c | 2 - src/world/area_sbk/sbk_04/sbk_04.h | 12 +- src/world/area_sbk/sbk_04/sbk_04_1_main.c | 49 ++ src/world/area_sbk/sbk_04/sbk_04_2_npc.c | 111 +++ src/world/area_sbk/sbk_05/930CF0.c | 8 - src/world/area_sbk/sbk_05/930D30.c | 2 - src/world/area_sbk/sbk_05/sbk_05.h | 20 +- src/world/area_sbk/sbk_05/sbk_05_1_main.c | 65 ++ src/world/area_sbk/sbk_05/sbk_05_2_entity.c | 7 + src/world/area_sbk/sbk_05/sbk_05_3_npc.c | 527 ++++++++++++ src/world/area_sbk/sbk_06/9325C0.c | 6 - src/world/area_sbk/sbk_06/932600.c | 4 - src/world/area_sbk/sbk_06/sbk_06.h | 11 +- src/world/area_sbk/sbk_06/sbk_06_1_main.c | 51 ++ src/world/area_sbk/sbk_06/sbk_06_2_npc.c | 58 ++ src/world/area_sbk/sbk_06/sbk_06_3_foliage.c | 48 ++ src/world/area_sbk/sbk_06/sbk_06_4_entity.c | 14 + src/world/area_sbk/sbk_10/933C80.c | 8 - src/world/area_sbk/sbk_10/sbk_10.h | 5 +- src/world/area_sbk/sbk_10/sbk_10_1_main.c | 49 ++ src/world/area_sbk/sbk_10/sbk_10_2_entity.c | 9 + src/world/area_sbk/sbk_11/934040.c | 8 - src/world/area_sbk/sbk_11/934080.c | 4 - src/world/area_sbk/sbk_11/sbk_11.h | 13 +- src/world/area_sbk/sbk_11/sbk_11_1_main.c | 51 ++ src/world/area_sbk/sbk_11/sbk_11_2_npc.c | 111 +++ src/world/area_sbk/sbk_12/934D40.c | 8 - src/world/area_sbk/sbk_12/934D80.c | 2 - src/world/area_sbk/sbk_12/sbk_12.h | 14 +- src/world/area_sbk/sbk_12/sbk_12_1_main.c | 51 ++ src/world/area_sbk/sbk_12/sbk_12_2_npc.c | 163 ++++ src/world/area_sbk/sbk_13/9357E0.c | 8 - src/world/area_sbk/sbk_13/935820.c | 4 - src/world/area_sbk/sbk_13/sbk_13.h | 14 +- src/world/area_sbk/sbk_13/sbk_13_1_main.c | 51 ++ src/world/area_sbk/sbk_13/sbk_13_2_npc.c | 163 ++++ src/world/area_sbk/sbk_14/9366E0.c | 10 - src/world/area_sbk/sbk_14/sbk_14.h | 5 +- src/world/area_sbk/sbk_14/sbk_14_1_main.c | 66 ++ src/world/area_sbk/sbk_14/sbk_14_2_entity.c | 37 + src/world/area_sbk/sbk_15/936CD0.c | 8 - src/world/area_sbk/sbk_15/936D10.c | 2 - src/world/area_sbk/sbk_15/sbk_15.h | 12 +- src/world/area_sbk/sbk_15/sbk_15_1_main.c | 51 ++ src/world/area_sbk/sbk_15/sbk_15_2_npc.c | 111 +++ src/world/area_sbk/sbk_16/937570.c | 8 - src/world/area_sbk/sbk_16/9375B0.c | 4 - src/world/area_sbk/sbk_16/sbk_16.h | 5 +- src/world/area_sbk/sbk_16/sbk_16_1_main.c | 49 ++ src/world/area_sbk/sbk_16/sbk_16_2_foliage.c | 62 ++ src/world/area_sbk/sbk_20/938590.c | 8 - src/world/area_sbk/sbk_20/9385D0.c | 2 - src/world/area_sbk/sbk_20/sbk_20.h | 16 +- src/world/area_sbk/sbk_20/sbk_20_1_main.c | 52 ++ src/world/area_sbk/sbk_20/sbk_20_2_entity.c | 54 ++ src/world/area_sbk/sbk_20/sbk_20_2_npc.c | 109 +++ src/world/area_sbk/sbk_21/939560.c | 8 - src/world/area_sbk/sbk_21/sbk_21.h | 5 +- src/world/area_sbk/sbk_21/sbk_21_1_main.c | 49 ++ src/world/area_sbk/sbk_22/939930.c | 8 - src/world/area_sbk/sbk_22/939970.c | 4 - src/world/area_sbk/sbk_22/sbk_22.h | 13 +- src/world/area_sbk/sbk_22/sbk_22_1_main.c | 53 ++ src/world/area_sbk/sbk_22/sbk_22_2_npc.c | 111 +++ src/world/area_sbk/sbk_22/sbk_22_3_entity.c | 17 + src/world/area_sbk/sbk_23/93A760.c | 10 - src/world/area_sbk/sbk_23/sbk_23.h | 5 +- src/world/area_sbk/sbk_23/sbk_23_1_main.c | 51 ++ src/world/area_sbk/sbk_23/sbk_23_2_entity.c | 31 + src/world/area_sbk/sbk_24/93AC30.c | 8 - src/world/area_sbk/sbk_24/93AC70.c | 4 - src/world/area_sbk/sbk_24/sbk_24.h | 7 +- src/world/area_sbk/sbk_24/sbk_24_1_main.c | 68 ++ src/world/area_sbk/sbk_24/sbk_24_2_npc.c | 3 + src/world/area_sbk/sbk_24/sbk_24_3_entity.c | 9 + src/world/area_sbk/sbk_24/sbk_24_4_foliage.c | 89 ++ src/world/area_sbk/sbk_25/93C280.c | 8 - src/world/area_sbk/sbk_25/93C2C0.c | 5 - src/world/area_sbk/sbk_25/sbk_25.h | 12 +- src/world/area_sbk/sbk_25/sbk_25_1_main.c | 55 ++ src/world/area_sbk/sbk_25/sbk_25_2_npc.c | 109 +++ src/world/area_sbk/sbk_25/sbk_25_3_foliage.c | 62 ++ src/world/area_sbk/sbk_25/sbk_25_4_entity.c | 16 + src/world/area_sbk/sbk_26/93DCD0.c | 8 - src/world/area_sbk/sbk_26/93DD10.c | 4 - src/world/area_sbk/sbk_26/93DE30.c | 4 - src/world/area_sbk/sbk_26/sbk_26.h | 13 +- src/world/area_sbk/sbk_26/sbk_26_1_main.c | 51 ++ src/world/area_sbk/sbk_26/sbk_26_2_npc.c | 111 +++ src/world/area_sbk/sbk_26/sbk_26_3_foliage.c | 48 ++ src/world/area_sbk/sbk_30/93F5B0.c | 2 + src/world/area_sbk/sbk_30/sbk_30.h | 20 +- src/world/area_sbk/sbk_30/sbk_30_1_main.c | 143 ++++ src/world/area_sbk/sbk_30/sbk_30_2_npc.c | 429 ++++++++++ src/world/area_sbk/sbk_30/sbk_30_3_foliage.c | 58 ++ src/world/area_sbk/sbk_31/944000.c | 8 - src/world/area_sbk/sbk_31/944040.c | 2 - src/world/area_sbk/sbk_31/sbk_31.h | 11 +- src/world/area_sbk/sbk_31/sbk_31_1_main.c | 51 ++ src/world/area_sbk/sbk_31/sbk_31_2_npc.c | 58 ++ src/world/area_sbk/sbk_32/944A60.c | 8 - src/world/area_sbk/sbk_32/944AA0.c | 4 - src/world/area_sbk/sbk_32/sbk_32.h | 14 +- src/world/area_sbk/sbk_32/sbk_32_1_main.c | 65 ++ src/world/area_sbk/sbk_32/sbk_32_2_npc.c | 163 ++++ src/world/area_sbk/sbk_33/9459D0.c | 10 - src/world/area_sbk/sbk_33/sbk_33.h | 5 +- src/world/area_sbk/sbk_33/sbk_33_0_header.c | 19 + src/world/area_sbk/sbk_33/sbk_33_1_entity.c | 33 + src/world/area_sbk/sbk_33/sbk_33_2_main.c | 35 + src/world/area_sbk/sbk_34/945ED0.c | 8 - src/world/area_sbk/sbk_34/945F10.c | 18 - src/world/area_sbk/sbk_34/946670.c | 4 - src/world/area_sbk/sbk_34/sbk_34.h | 13 +- src/world/area_sbk/sbk_34/sbk_34_1_main.c | 53 ++ src/world/area_sbk/sbk_34/sbk_34_2_npc.c | 152 ++++ src/world/area_sbk/sbk_34/sbk_34_3_foliage.c | 48 ++ src/world/area_sbk/sbk_35/9486B0.c | 8 - src/world/area_sbk/sbk_35/9486F0.c | 5 - src/world/area_sbk/sbk_35/sbk_35.h | 11 +- src/world/area_sbk/sbk_35/sbk_35_1_main.c | 53 ++ src/world/area_sbk/sbk_35/sbk_35_2_npc.c | 58 ++ src/world/area_sbk/sbk_35/sbk_35_3_foliage.c | 102 +++ src/world/area_sbk/sbk_36/949E60.c | 8 - src/world/area_sbk/sbk_36/949EA0.c | 4 - src/world/area_sbk/sbk_36/sbk_36.h | 9 +- src/world/area_sbk/sbk_36/sbk_36_1_main.c | 53 ++ src/world/area_sbk/sbk_36/sbk_36_2_foliage.c | 304 +++++++ src/world/area_sbk/sbk_36/sbk_36_3_entity.c | 20 + src/world/area_sbk/sbk_40/94B3A0.c | 8 - src/world/area_sbk/sbk_40/94B3E0.c | 2 - src/world/area_sbk/sbk_40/sbk_40.h | 12 +- src/world/area_sbk/sbk_40/sbk_40_1_main.c | 51 ++ src/world/area_sbk/sbk_40/sbk_40_2_npc.c | 109 +++ src/world/area_sbk/sbk_40/sbk_40_3_entity.c | 12 + src/world/area_sbk/sbk_41/94C040.c | 10 - src/world/area_sbk/sbk_41/sbk_41.h | 5 +- src/world/area_sbk/sbk_41/sbk_41_1_main.c | 51 ++ src/world/area_sbk/sbk_41/sbk_41_2_entity.c | 31 + src/world/area_sbk/sbk_42/94C510.c | 8 - src/world/area_sbk/sbk_42/94C550.c | 2 - src/world/area_sbk/sbk_42/sbk_42.h | 12 +- src/world/area_sbk/sbk_42/sbk_42_1_main.c | 51 ++ src/world/area_sbk/sbk_42/sbk_42_2_npc.c | 109 +++ src/world/area_sbk/sbk_43/94D170.c | 8 - src/world/area_sbk/sbk_43/sbk_43.h | 5 +- src/world/area_sbk/sbk_43/sbk_43_1_main.c | 52 ++ src/world/area_sbk/sbk_43/sbk_43_2_entity.c | 9 + src/world/area_sbk/sbk_44/94D5A0.c | 8 - src/world/area_sbk/sbk_44/94D5E0.c | 4 - src/world/area_sbk/sbk_44/sbk_44.h | 14 +- src/world/area_sbk/sbk_44/sbk_44_1_main.c | 51 ++ src/world/area_sbk/sbk_44/sbk_44_2_npc.c | 163 ++++ src/world/area_sbk/sbk_45/94E4A0.c | 8 - src/world/area_sbk/sbk_45/sbk_45.h | 5 +- src/world/area_sbk/sbk_45/sbk_45_1_main.c | 65 ++ src/world/area_sbk/sbk_45/sbk_45_2_entity.c | 12 + src/world/area_sbk/sbk_46/94E9A0.c | 8 - src/world/area_sbk/sbk_46/94E9E0.c | 4 - src/world/area_sbk/sbk_46/94EB00.c | 4 - src/world/area_sbk/sbk_46/sbk_46.h | 14 +- src/world/area_sbk/sbk_46/sbk_46_1_main.c | 53 ++ src/world/area_sbk/sbk_46/sbk_46_2_npc.c | 162 ++++ src/world/area_sbk/sbk_46/sbk_46_3_foliage.c | 102 +++ src/world/area_sbk/sbk_46/sbk_46_4_entity.c | 12 + src/world/area_sbk/sbk_50/950610.c | 8 - src/world/area_sbk/sbk_50/sbk_50.h | 5 +- src/world/area_sbk/sbk_50/sbk_50_1_main.c | 47 ++ src/world/area_sbk/sbk_51/950970.c | 8 - src/world/area_sbk/sbk_51/9509B0.c | 4 - src/world/area_sbk/sbk_51/sbk_51.h | 13 +- src/world/area_sbk/sbk_51/sbk_51_1_main.c | 51 ++ src/world/area_sbk/sbk_51/sbk_51_2_npc.c | 111 +++ src/world/area_sbk/sbk_52/951670.c | 8 - src/world/area_sbk/sbk_52/sbk_52.h | 5 +- src/world/area_sbk/sbk_52/sbk_52_1_main.c | 51 ++ src/world/area_sbk/sbk_52/sbk_52_2_entity.c | 11 + src/world/area_sbk/sbk_53/951AE0.c | 8 - src/world/area_sbk/sbk_53/951B20.c | 2 - src/world/area_sbk/sbk_53/sbk_53.h | 13 +- src/world/area_sbk/sbk_53/sbk_53_1_main.c | 51 ++ src/world/area_sbk/sbk_53/sbk_53_2_npc.c | 163 ++++ src/world/area_sbk/sbk_54/952580.c | 10 - src/world/area_sbk/sbk_54/sbk_54.h | 6 +- src/world/area_sbk/sbk_54/sbk_54_1_main.c | 51 ++ src/world/area_sbk/sbk_54/sbk_54_2_entity.c | 31 + src/world/area_sbk/sbk_55/952A50.c | 8 - src/world/area_sbk/sbk_55/952A90.c | 2 - src/world/area_sbk/sbk_55/952AB0.c | 4 - src/world/area_sbk/sbk_55/sbk_55.h | 12 +- src/world/area_sbk/sbk_55/sbk_55_1_main.c | 55 ++ src/world/area_sbk/sbk_55/sbk_55_2_npc.c | 111 +++ src/world/area_sbk/sbk_55/sbk_55_3_foliage.c | 48 ++ src/world/area_sbk/sbk_55/sbk_55_4_entity.c | 10 + src/world/area_sbk/sbk_56/953FC0.c | 20 - src/world/area_sbk/sbk_56/954D80.c | 4 - src/world/area_sbk/sbk_56/sbk_56.h | 14 +- src/world/area_sbk/sbk_56/sbk_56_1_main.c | 110 +++ src/world/area_sbk/sbk_56/sbk_56_2_entity.c | 15 + src/world/area_sbk/sbk_56/sbk_56_3_foliage.c | 336 ++++++++ src/world/area_sbk/sbk_60/9569F0.c | 6 - src/world/area_sbk/sbk_60/956A30.c | 2 - src/world/area_sbk/sbk_60/sbk_60.h | 12 +- src/world/area_sbk/sbk_60/sbk_60_1_main.c | 47 ++ src/world/area_sbk/sbk_60/sbk_60_2_npc.c | 59 ++ src/world/area_sbk/sbk_61/956F90.c | 8 - src/world/area_sbk/sbk_61/sbk_61.h | 5 +- src/world/area_sbk/sbk_61/sbk_61_1_main.c | 50 ++ src/world/area_sbk/sbk_61/sbk_61_2_entity.c | 9 + src/world/area_sbk/sbk_62/957350.c | 8 - src/world/area_sbk/sbk_62/957390.c | 2 - src/world/area_sbk/sbk_62/sbk_62.h | 13 +- src/world/area_sbk/sbk_62/sbk_62_1_main.c | 49 ++ src/world/area_sbk/sbk_62/sbk_62_2_npc.c | 163 ++++ src/world/area_sbk/sbk_63/957D70.c | 8 - src/world/area_sbk/sbk_63/957DB0.c | 2 - src/world/area_sbk/sbk_63/sbk_63.h | 12 +- src/world/area_sbk/sbk_63/sbk_63_1_main.c | 49 ++ src/world/area_sbk/sbk_63/sbk_63_2_npc.c | 111 +++ src/world/area_sbk/sbk_64/958590.c | 8 - src/world/area_sbk/sbk_64/sbk_64.h | 5 +- src/world/area_sbk/sbk_64/sbk_64_1_main.c | 49 ++ src/world/area_sbk/sbk_64/sbk_64_2_entity.c | 9 + src/world/area_sbk/sbk_65/958950.c | 8 - src/world/area_sbk/sbk_65/sbk_65.h | 5 +- src/world/area_sbk/sbk_65/sbk_65_1_main.c | 47 ++ src/world/area_sbk/sbk_66/958CB0.c | 6 - src/world/area_sbk/sbk_66/958CF0.c | 5 - src/world/area_sbk/sbk_66/sbk_66.h | 16 +- src/world/area_sbk/sbk_66/sbk_66_1_main.c | 51 ++ src/world/area_sbk/sbk_66/sbk_66_2_npc.c | 313 +++++++ src/world/area_sbk/sbk_66/sbk_66_3_foliage.c | 102 +++ src/world/area_sbk/sbk_66/sbk_66_4_entity.c | 19 + src/world/area_sbk/sbk_99/95AEB0.c | 4 - src/world/area_sbk/sbk_99/sbk_99.h | 5 +- src/world/area_sbk/sbk_99/sbk_99_1_main.c | 57 ++ src/world/area_sbk/sbk_99/sbk_99_2_entity.c | 9 + src/world/area_trd/trd.h | 41 +- src/world/area_trd/trd_04/9A83F0.c | 9 - src/world/area_trd/trd_04/9A8700.c | 7 - src/world/area_trd/trd_04/9A88A0.c | 7 - src/world/area_trd/trd_04/trd_04.h | 19 +- src/world/area_trd/trd_04/trd_04_0_header.c | 26 + src/world/area_trd/trd_04/trd_04_1_main.c | 276 ++++++ src/world/area_trd/trd_04/trd_04_2_entity.c | 160 ++++ src/world/area_trd/trd_04/trd_04_3_npc.c | 191 +++++ src/world/area_trd/trd_08/9BB2A0.c | 7 - src/world/area_trd/trd_08/9BB5B0.c | 3 - src/world/area_trd/trd_08/trd_08.h | 18 +- src/world/area_trd/trd_08/trd_08_0_header.c | 21 + src/world/area_trd/trd_08/trd_08_1_main.c | 57 ++ src/world/area_trd/trd_08/trd_08_2_entity.c | 7 + src/world/area_trd/trd_08/trd_08_3_npc.c | 223 +++++ src/world/area_tst/tst_10/tst_10_1_main.c | 24 +- src/world/common/atomic/LetterChoice.inc.c | 12 +- src/world/common/atomic/SuperBlock.data.inc.c | 10 +- src/world/common/atomic/WhaleAnim.data.inc.c | 0 src/world/common/enemy/complete/Bandit.inc.c | 82 ++ .../enemy/complete/KoopaTroopa_Patrol.inc.c | 34 + .../enemy/complete/KoopaTroopa_Wander.inc.c | 35 + .../common/enemy/complete/LavaBubble.inc.c | 40 + .../common/enemy/complete/Paratroopa.inc.c | 42 + src/world/common/enemy/complete/Pokey.inc.c | 32 + .../common/enemy/complete/PutridPiranha.inc.c | 87 ++ .../common/enemy/complete/SpikeTop.inc.c | 129 +++ src/world/entrances.h | 1 + src/world/world.c | 102 +-- .../data/world/area_jan/jan_00/B220E0.data.s | 6 - .../data/world/area_jan/jan_00/B22190.data.s | 15 - .../data/world/area_jan/jan_00/B226D0.data.s | 120 --- .../data/world/area_jan/jan_00/B25E90.data.s | 48 -- .../data/world/area_jan/jan_00/B275B0.data.s | 24 - .../data/world/area_sbk/sbk_03/92F910.data.s | 21 - .../data/world/area_sbk/sbk_03/92FC20.data.s | 24 - .../data/world/area_sbk/sbk_04/930530.data.s | 21 - .../data/world/area_sbk/sbk_04/930840.data.s | 18 - .../data/world/area_sbk/sbk_05/930D50.data.s | 24 - .../data/world/area_sbk/sbk_05/9310F0.data.s | 6 - .../data/world/area_sbk/sbk_05/931130.data.s | 42 - .../data/world/area_sbk/sbk_06/932940.data.s | 18 - .../data/world/area_sbk/sbk_06/932BF0.data.s | 21 - .../data/world/area_sbk/sbk_06/933160.data.s | 24 - .../data/world/area_sbk/sbk_10/933CC0.data.s | 21 - .../data/world/area_sbk/sbk_10/933FD0.data.s | 6 - .../data/world/area_sbk/sbk_11/9341A0.data.s | 24 - .../data/world/area_sbk/sbk_11/934530.data.s | 33 - .../data/world/area_sbk/sbk_12/934DA0.data.s | 24 - .../data/world/area_sbk/sbk_12/935130.data.s | 21 - .../data/world/area_sbk/sbk_13/935940.data.s | 24 - .../data/world/area_sbk/sbk_13/935CD0.data.s | 36 - .../data/world/area_sbk/sbk_14/936720.data.s | 27 - .../data/world/area_sbk/sbk_14/936B20.data.s | 12 - .../data/world/area_sbk/sbk_15/936D30.data.s | 24 - .../data/world/area_sbk/sbk_15/9370C0.data.s | 18 - .../data/world/area_sbk/sbk_16/9377F0.data.s | 21 - .../data/world/area_sbk/sbk_16/937B00.data.s | 33 - .../data/world/area_sbk/sbk_20/9386D0.data.s | 21 - .../data/world/area_sbk/sbk_20/9389F0.data.s | 6 - .../data/world/area_sbk/sbk_20/938DD0.data.s | 24 - .../data/world/area_sbk/sbk_21/9395A0.data.s | 24 - .../data/world/area_sbk/sbk_22/939A90.data.s | 57 -- .../data/world/area_sbk/sbk_22/93A610.data.s | 6 - .../data/world/area_sbk/sbk_23/93A7A0.data.s | 24 - .../data/world/area_sbk/sbk_23/93AB20.data.s | 12 - .../data/world/area_sbk/sbk_24/93AFB0.data.s | 27 - .../data/world/area_sbk/sbk_24/93B3C0.data.s | 15 - .../data/world/area_sbk/sbk_24/93B770.data.s | 45 - .../data/world/area_sbk/sbk_25/93C600.data.s | 24 - .../data/world/area_sbk/sbk_25/93C9A0.data.s | 24 - .../data/world/area_sbk/sbk_25/93D110.data.s | 33 - .../data/world/area_sbk/sbk_25/93DB80.data.s | 6 - .../data/world/area_sbk/sbk_26/93E070.data.s | 21 - .../data/world/area_sbk/sbk_26/93E390.data.s | 33 - .../data/world/area_sbk/sbk_26/93EB80.data.s | 24 - .../data/world/area_sbk/sbk_31/944140.data.s | 24 - .../data/world/area_sbk/sbk_31/9444D0.data.s | 21 - .../data/world/area_sbk/sbk_32/944BC0.data.s | 63 -- .../data/world/area_sbk/sbk_33/945A10.data.s | 15 - .../data/world/area_sbk/sbk_33/945BA0.data.s | 18 - .../data/world/area_sbk/sbk_34/9468B0.data.s | 78 -- .../data/world/area_sbk/sbk_34/947C80.data.s | 24 - .../data/world/area_sbk/sbk_35/948A30.data.s | 45 - .../data/world/area_sbk/sbk_35/949330.data.s | 48 -- .../data/world/area_sbk/sbk_36/94A0E0.data.s | 24 - .../data/world/area_sbk/sbk_36/94A470.data.s | 132 --- .../data/world/area_sbk/sbk_40/94B4E0.data.s | 21 - .../data/world/area_sbk/sbk_40/94B800.data.s | 24 - .../data/world/area_sbk/sbk_40/94BF70.data.s | 6 - .../data/world/area_sbk/sbk_41/94C080.data.s | 24 - .../data/world/area_sbk/sbk_41/94C400.data.s | 12 - .../data/world/area_sbk/sbk_42/94C650.data.s | 24 - .../data/world/area_sbk/sbk_42/94C9E0.data.s | 24 - .../data/world/area_sbk/sbk_43/94D1B0.data.s | 24 - .../data/world/area_sbk/sbk_43/94D530.data.s | 6 - .../data/world/area_sbk/sbk_44/94D700.data.s | 24 - .../data/world/area_sbk/sbk_44/94DA90.data.s | 36 - .../data/world/area_sbk/sbk_45/94E4E0.data.s | 27 - .../data/world/area_sbk/sbk_45/94E8E0.data.s | 6 - .../data/world/area_sbk/sbk_46/94ED40.data.s | 21 - .../data/world/area_sbk/sbk_46/94F070.data.s | 36 - .../data/world/area_sbk/sbk_46/94FA60.data.s | 48 -- .../data/world/area_sbk/sbk_46/950570.data.s | 6 - .../data/world/area_sbk/sbk_50/950650.data.s | 21 - .../data/world/area_sbk/sbk_51/950AD0.data.s | 24 - .../data/world/area_sbk/sbk_51/950E60.data.s | 33 - .../data/world/area_sbk/sbk_52/9516B0.data.s | 24 - .../data/world/area_sbk/sbk_52/951A30.data.s | 6 - .../data/world/area_sbk/sbk_53/951B40.data.s | 24 - .../data/world/area_sbk/sbk_53/951ED0.data.s | 21 - .../data/world/area_sbk/sbk_54/9525C0.data.s | 24 - .../data/world/area_sbk/sbk_54/952940.data.s | 12 - .../data/world/area_sbk/sbk_55/952CF0.data.s | 24 - .../data/world/area_sbk/sbk_55/953090.data.s | 18 - .../data/world/area_sbk/sbk_55/953520.data.s | 24 - .../data/world/area_sbk/sbk_56/954FC0.data.s | 24 - .../data/world/area_sbk/sbk_56/9553F0.data.s | 156 ---- .../data/world/area_sbk/sbk_60/956A50.data.s | 18 - .../data/world/area_sbk/sbk_60/956CF0.data.s | 15 - .../data/world/area_sbk/sbk_61/956FD0.data.s | 21 - .../data/world/area_sbk/sbk_61/9572E0.data.s | 6 - .../data/world/area_sbk/sbk_62/9573B0.data.s | 21 - .../data/world/area_sbk/sbk_62/9576C0.data.s | 21 - .../data/world/area_sbk/sbk_63/957DD0.data.s | 21 - .../data/world/area_sbk/sbk_63/9580E0.data.s | 18 - .../data/world/area_sbk/sbk_64/9585D0.data.s | 21 - .../data/world/area_sbk/sbk_64/9588E0.data.s | 6 - .../data/world/area_sbk/sbk_65/958990.data.s | 21 - .../data/world/area_sbk/sbk_66/959030.data.s | 18 - .../data/world/area_sbk/sbk_66/9592E0.data.s | 36 - .../data/world/area_sbk/sbk_66/95A240.data.s | 48 -- .../data/world/area_sbk/sbk_66/95AD50.data.s | 6 - .../data/world/area_sbk/sbk_99/95AEB0.data.s | 21 - .../data/world/area_sbk/sbk_99/95B190.data.s | 6 - .../data/world/area_trd/trd_04/9ABC90.data.s | 6 - .../data/world/area_trd/trd_04/9ABD70.data.s | 54 -- .../data/world/area_trd/trd_04/9AD960.data.s | 48 -- .../data/world/area_trd/trd_08/9BBCC0.data.s | 6 - .../data/world/area_trd/trd_08/9BBD50.data.s | 18 - .../data/world/area_trd/trd_08/9BC1A0.data.s | 39 - .../jan_00/B20540/func_80240738_B20C78.s | 28 - .../jan_00/B20540/func_8024078C_B20CCC.s | 18 - .../jan_00/B20540/func_802407C4_B20D04.s | 48 -- .../mac_06/mac_06_3/func_80241098_865BD8.s | 142 ---- .../mac_06/mac_06_3/func_80241290_865DD0.s | 11 - .../mac_06/mac_06_3/func_802412AC_865DEC.s | 61 -- .../mac_06/mac_06_3/func_80241388_865EC8.s | 175 ---- .../mac_06/mac_06_3/func_802415FC_86613C.s | 42 - .../sbk_34/945F10/func_80240384_946254.s | 28 - .../sbk_34/945F10/func_802403D8_9462A8.s | 18 - .../sbk_34/945F10/func_80240410_9462E0.s | 48 -- ver/us/splat.yaml | 441 ++++------ ver/us/symbol_addrs.txt | 32 +- 464 files changed, 14412 insertions(+), 5994 deletions(-) delete mode 100644 src/world/area_jan/jan_00/B20540.c delete mode 100644 src/world/area_jan/jan_00/B216E0.c delete mode 100644 src/world/area_jan/jan_00/B21EA0.c create mode 100644 src/world/area_jan/jan_00/jan_00_0_header.c create mode 100644 src/world/area_jan/jan_00/jan_00_1_main.c create mode 100644 src/world/area_jan/jan_00/jan_00_2_npc.c create mode 100644 src/world/area_jan/jan_00/jan_00_3_entity.c create mode 100644 src/world/area_jan/jan_00/jan_00_4_whale.c create mode 100644 src/world/area_jan/jan_00/jan_00_5_foliage.c delete mode 100644 src/world/area_sbk/sbk_00/929270.c delete mode 100644 src/world/area_sbk/sbk_00/9292B0.c create mode 100644 src/world/area_sbk/sbk_00/sbk_00_1_main.c create mode 100644 src/world/area_sbk/sbk_00/sbk_00_2_npc.c create mode 100644 src/world/area_sbk/sbk_00/sbk_00_3_entity.c delete mode 100644 src/world/area_sbk/sbk_01/929A90.c delete mode 100644 src/world/area_sbk/sbk_01/929AD0.c create mode 100644 src/world/area_sbk/sbk_01/sbk_01_1_main.c create mode 100644 src/world/area_sbk/sbk_01/sbk_01_2_npc.c create mode 100644 src/world/area_sbk/sbk_02/sbk_02_0_header.c create mode 100644 src/world/area_sbk/sbk_02/sbk_02_1_main.c create mode 100644 src/world/area_sbk/sbk_02/sbk_02_2_ruins.c create mode 100644 src/world/area_sbk/sbk_02/sbk_02_3_npc.c create mode 100644 src/world/area_sbk/sbk_02/sbk_02_4_entity.c delete mode 100644 src/world/area_sbk/sbk_03/92F8B0.c delete mode 100644 src/world/area_sbk/sbk_03/92F8F0.c create mode 100644 src/world/area_sbk/sbk_03/sbk_03_1_main.c create mode 100644 src/world/area_sbk/sbk_03/sbk_03_2_npc.c delete mode 100644 src/world/area_sbk/sbk_04/9304D0.c delete mode 100644 src/world/area_sbk/sbk_04/930510.c create mode 100644 src/world/area_sbk/sbk_04/sbk_04_1_main.c create mode 100644 src/world/area_sbk/sbk_04/sbk_04_2_npc.c delete mode 100644 src/world/area_sbk/sbk_05/930CF0.c delete mode 100644 src/world/area_sbk/sbk_05/930D30.c create mode 100644 src/world/area_sbk/sbk_05/sbk_05_1_main.c create mode 100644 src/world/area_sbk/sbk_05/sbk_05_2_entity.c create mode 100644 src/world/area_sbk/sbk_05/sbk_05_3_npc.c delete mode 100644 src/world/area_sbk/sbk_06/9325C0.c delete mode 100644 src/world/area_sbk/sbk_06/932600.c create mode 100644 src/world/area_sbk/sbk_06/sbk_06_1_main.c create mode 100644 src/world/area_sbk/sbk_06/sbk_06_2_npc.c create mode 100644 src/world/area_sbk/sbk_06/sbk_06_3_foliage.c create mode 100644 src/world/area_sbk/sbk_06/sbk_06_4_entity.c delete mode 100644 src/world/area_sbk/sbk_10/933C80.c create mode 100644 src/world/area_sbk/sbk_10/sbk_10_1_main.c create mode 100644 src/world/area_sbk/sbk_10/sbk_10_2_entity.c delete mode 100644 src/world/area_sbk/sbk_11/934040.c delete mode 100644 src/world/area_sbk/sbk_11/934080.c create mode 100644 src/world/area_sbk/sbk_11/sbk_11_1_main.c create mode 100644 src/world/area_sbk/sbk_11/sbk_11_2_npc.c delete mode 100644 src/world/area_sbk/sbk_12/934D40.c delete mode 100644 src/world/area_sbk/sbk_12/934D80.c create mode 100644 src/world/area_sbk/sbk_12/sbk_12_1_main.c create mode 100644 src/world/area_sbk/sbk_12/sbk_12_2_npc.c delete mode 100644 src/world/area_sbk/sbk_13/9357E0.c delete mode 100644 src/world/area_sbk/sbk_13/935820.c create mode 100644 src/world/area_sbk/sbk_13/sbk_13_1_main.c create mode 100644 src/world/area_sbk/sbk_13/sbk_13_2_npc.c delete mode 100644 src/world/area_sbk/sbk_14/9366E0.c create mode 100644 src/world/area_sbk/sbk_14/sbk_14_1_main.c create mode 100644 src/world/area_sbk/sbk_14/sbk_14_2_entity.c delete mode 100644 src/world/area_sbk/sbk_15/936CD0.c delete mode 100644 src/world/area_sbk/sbk_15/936D10.c create mode 100644 src/world/area_sbk/sbk_15/sbk_15_1_main.c create mode 100644 src/world/area_sbk/sbk_15/sbk_15_2_npc.c delete mode 100644 src/world/area_sbk/sbk_16/937570.c delete mode 100644 src/world/area_sbk/sbk_16/9375B0.c create mode 100644 src/world/area_sbk/sbk_16/sbk_16_1_main.c create mode 100644 src/world/area_sbk/sbk_16/sbk_16_2_foliage.c delete mode 100644 src/world/area_sbk/sbk_20/938590.c delete mode 100644 src/world/area_sbk/sbk_20/9385D0.c create mode 100644 src/world/area_sbk/sbk_20/sbk_20_1_main.c create mode 100644 src/world/area_sbk/sbk_20/sbk_20_2_entity.c create mode 100644 src/world/area_sbk/sbk_20/sbk_20_2_npc.c delete mode 100644 src/world/area_sbk/sbk_21/939560.c create mode 100644 src/world/area_sbk/sbk_21/sbk_21_1_main.c delete mode 100644 src/world/area_sbk/sbk_22/939930.c delete mode 100644 src/world/area_sbk/sbk_22/939970.c create mode 100644 src/world/area_sbk/sbk_22/sbk_22_1_main.c create mode 100644 src/world/area_sbk/sbk_22/sbk_22_2_npc.c create mode 100644 src/world/area_sbk/sbk_22/sbk_22_3_entity.c delete mode 100644 src/world/area_sbk/sbk_23/93A760.c create mode 100644 src/world/area_sbk/sbk_23/sbk_23_1_main.c create mode 100644 src/world/area_sbk/sbk_23/sbk_23_2_entity.c delete mode 100644 src/world/area_sbk/sbk_24/93AC30.c delete mode 100644 src/world/area_sbk/sbk_24/93AC70.c create mode 100644 src/world/area_sbk/sbk_24/sbk_24_1_main.c create mode 100644 src/world/area_sbk/sbk_24/sbk_24_2_npc.c create mode 100644 src/world/area_sbk/sbk_24/sbk_24_3_entity.c create mode 100644 src/world/area_sbk/sbk_24/sbk_24_4_foliage.c delete mode 100644 src/world/area_sbk/sbk_25/93C280.c delete mode 100644 src/world/area_sbk/sbk_25/93C2C0.c create mode 100644 src/world/area_sbk/sbk_25/sbk_25_1_main.c create mode 100644 src/world/area_sbk/sbk_25/sbk_25_2_npc.c create mode 100644 src/world/area_sbk/sbk_25/sbk_25_3_foliage.c create mode 100644 src/world/area_sbk/sbk_25/sbk_25_4_entity.c delete mode 100644 src/world/area_sbk/sbk_26/93DCD0.c delete mode 100644 src/world/area_sbk/sbk_26/93DD10.c delete mode 100644 src/world/area_sbk/sbk_26/93DE30.c create mode 100644 src/world/area_sbk/sbk_26/sbk_26_1_main.c create mode 100644 src/world/area_sbk/sbk_26/sbk_26_2_npc.c create mode 100644 src/world/area_sbk/sbk_26/sbk_26_3_foliage.c create mode 100644 src/world/area_sbk/sbk_30/sbk_30_1_main.c create mode 100644 src/world/area_sbk/sbk_30/sbk_30_2_npc.c create mode 100644 src/world/area_sbk/sbk_30/sbk_30_3_foliage.c delete mode 100644 src/world/area_sbk/sbk_31/944000.c delete mode 100644 src/world/area_sbk/sbk_31/944040.c create mode 100644 src/world/area_sbk/sbk_31/sbk_31_1_main.c create mode 100644 src/world/area_sbk/sbk_31/sbk_31_2_npc.c delete mode 100644 src/world/area_sbk/sbk_32/944A60.c delete mode 100644 src/world/area_sbk/sbk_32/944AA0.c create mode 100644 src/world/area_sbk/sbk_32/sbk_32_1_main.c create mode 100644 src/world/area_sbk/sbk_32/sbk_32_2_npc.c delete mode 100644 src/world/area_sbk/sbk_33/9459D0.c create mode 100644 src/world/area_sbk/sbk_33/sbk_33_0_header.c create mode 100644 src/world/area_sbk/sbk_33/sbk_33_1_entity.c create mode 100644 src/world/area_sbk/sbk_33/sbk_33_2_main.c delete mode 100644 src/world/area_sbk/sbk_34/945ED0.c delete mode 100644 src/world/area_sbk/sbk_34/945F10.c delete mode 100644 src/world/area_sbk/sbk_34/946670.c create mode 100644 src/world/area_sbk/sbk_34/sbk_34_1_main.c create mode 100644 src/world/area_sbk/sbk_34/sbk_34_2_npc.c create mode 100644 src/world/area_sbk/sbk_34/sbk_34_3_foliage.c delete mode 100644 src/world/area_sbk/sbk_35/9486B0.c delete mode 100644 src/world/area_sbk/sbk_35/9486F0.c create mode 100644 src/world/area_sbk/sbk_35/sbk_35_1_main.c create mode 100644 src/world/area_sbk/sbk_35/sbk_35_2_npc.c create mode 100644 src/world/area_sbk/sbk_35/sbk_35_3_foliage.c delete mode 100644 src/world/area_sbk/sbk_36/949E60.c delete mode 100644 src/world/area_sbk/sbk_36/949EA0.c create mode 100644 src/world/area_sbk/sbk_36/sbk_36_1_main.c create mode 100644 src/world/area_sbk/sbk_36/sbk_36_2_foliage.c create mode 100644 src/world/area_sbk/sbk_36/sbk_36_3_entity.c delete mode 100644 src/world/area_sbk/sbk_40/94B3A0.c delete mode 100644 src/world/area_sbk/sbk_40/94B3E0.c create mode 100644 src/world/area_sbk/sbk_40/sbk_40_1_main.c create mode 100644 src/world/area_sbk/sbk_40/sbk_40_2_npc.c create mode 100644 src/world/area_sbk/sbk_40/sbk_40_3_entity.c delete mode 100644 src/world/area_sbk/sbk_41/94C040.c create mode 100644 src/world/area_sbk/sbk_41/sbk_41_1_main.c create mode 100644 src/world/area_sbk/sbk_41/sbk_41_2_entity.c delete mode 100644 src/world/area_sbk/sbk_42/94C510.c delete mode 100644 src/world/area_sbk/sbk_42/94C550.c create mode 100644 src/world/area_sbk/sbk_42/sbk_42_1_main.c create mode 100644 src/world/area_sbk/sbk_42/sbk_42_2_npc.c delete mode 100644 src/world/area_sbk/sbk_43/94D170.c create mode 100644 src/world/area_sbk/sbk_43/sbk_43_1_main.c create mode 100644 src/world/area_sbk/sbk_43/sbk_43_2_entity.c delete mode 100644 src/world/area_sbk/sbk_44/94D5A0.c delete mode 100644 src/world/area_sbk/sbk_44/94D5E0.c create mode 100644 src/world/area_sbk/sbk_44/sbk_44_1_main.c create mode 100644 src/world/area_sbk/sbk_44/sbk_44_2_npc.c delete mode 100644 src/world/area_sbk/sbk_45/94E4A0.c create mode 100644 src/world/area_sbk/sbk_45/sbk_45_1_main.c create mode 100644 src/world/area_sbk/sbk_45/sbk_45_2_entity.c delete mode 100644 src/world/area_sbk/sbk_46/94E9A0.c delete mode 100644 src/world/area_sbk/sbk_46/94E9E0.c delete mode 100644 src/world/area_sbk/sbk_46/94EB00.c create mode 100644 src/world/area_sbk/sbk_46/sbk_46_1_main.c create mode 100644 src/world/area_sbk/sbk_46/sbk_46_2_npc.c create mode 100644 src/world/area_sbk/sbk_46/sbk_46_3_foliage.c create mode 100644 src/world/area_sbk/sbk_46/sbk_46_4_entity.c delete mode 100644 src/world/area_sbk/sbk_50/950610.c create mode 100644 src/world/area_sbk/sbk_50/sbk_50_1_main.c delete mode 100644 src/world/area_sbk/sbk_51/950970.c delete mode 100644 src/world/area_sbk/sbk_51/9509B0.c create mode 100644 src/world/area_sbk/sbk_51/sbk_51_1_main.c create mode 100644 src/world/area_sbk/sbk_51/sbk_51_2_npc.c delete mode 100644 src/world/area_sbk/sbk_52/951670.c create mode 100644 src/world/area_sbk/sbk_52/sbk_52_1_main.c create mode 100644 src/world/area_sbk/sbk_52/sbk_52_2_entity.c delete mode 100644 src/world/area_sbk/sbk_53/951AE0.c delete mode 100644 src/world/area_sbk/sbk_53/951B20.c create mode 100644 src/world/area_sbk/sbk_53/sbk_53_1_main.c create mode 100644 src/world/area_sbk/sbk_53/sbk_53_2_npc.c delete mode 100644 src/world/area_sbk/sbk_54/952580.c create mode 100644 src/world/area_sbk/sbk_54/sbk_54_1_main.c create mode 100644 src/world/area_sbk/sbk_54/sbk_54_2_entity.c delete mode 100644 src/world/area_sbk/sbk_55/952A50.c delete mode 100644 src/world/area_sbk/sbk_55/952A90.c delete mode 100644 src/world/area_sbk/sbk_55/952AB0.c create mode 100644 src/world/area_sbk/sbk_55/sbk_55_1_main.c create mode 100644 src/world/area_sbk/sbk_55/sbk_55_2_npc.c create mode 100644 src/world/area_sbk/sbk_55/sbk_55_3_foliage.c create mode 100644 src/world/area_sbk/sbk_55/sbk_55_4_entity.c delete mode 100644 src/world/area_sbk/sbk_56/953FC0.c delete mode 100644 src/world/area_sbk/sbk_56/954D80.c create mode 100644 src/world/area_sbk/sbk_56/sbk_56_1_main.c create mode 100644 src/world/area_sbk/sbk_56/sbk_56_2_entity.c create mode 100644 src/world/area_sbk/sbk_56/sbk_56_3_foliage.c delete mode 100644 src/world/area_sbk/sbk_60/9569F0.c delete mode 100644 src/world/area_sbk/sbk_60/956A30.c create mode 100644 src/world/area_sbk/sbk_60/sbk_60_1_main.c create mode 100644 src/world/area_sbk/sbk_60/sbk_60_2_npc.c delete mode 100644 src/world/area_sbk/sbk_61/956F90.c create mode 100644 src/world/area_sbk/sbk_61/sbk_61_1_main.c create mode 100644 src/world/area_sbk/sbk_61/sbk_61_2_entity.c delete mode 100644 src/world/area_sbk/sbk_62/957350.c delete mode 100644 src/world/area_sbk/sbk_62/957390.c create mode 100644 src/world/area_sbk/sbk_62/sbk_62_1_main.c create mode 100644 src/world/area_sbk/sbk_62/sbk_62_2_npc.c delete mode 100644 src/world/area_sbk/sbk_63/957D70.c delete mode 100644 src/world/area_sbk/sbk_63/957DB0.c create mode 100644 src/world/area_sbk/sbk_63/sbk_63_1_main.c create mode 100644 src/world/area_sbk/sbk_63/sbk_63_2_npc.c delete mode 100644 src/world/area_sbk/sbk_64/958590.c create mode 100644 src/world/area_sbk/sbk_64/sbk_64_1_main.c create mode 100644 src/world/area_sbk/sbk_64/sbk_64_2_entity.c delete mode 100644 src/world/area_sbk/sbk_65/958950.c create mode 100644 src/world/area_sbk/sbk_65/sbk_65_1_main.c delete mode 100644 src/world/area_sbk/sbk_66/958CB0.c delete mode 100644 src/world/area_sbk/sbk_66/958CF0.c create mode 100644 src/world/area_sbk/sbk_66/sbk_66_1_main.c create mode 100644 src/world/area_sbk/sbk_66/sbk_66_2_npc.c create mode 100644 src/world/area_sbk/sbk_66/sbk_66_3_foliage.c create mode 100644 src/world/area_sbk/sbk_66/sbk_66_4_entity.c delete mode 100644 src/world/area_sbk/sbk_99/95AEB0.c create mode 100644 src/world/area_sbk/sbk_99/sbk_99_1_main.c create mode 100644 src/world/area_sbk/sbk_99/sbk_99_2_entity.c delete mode 100644 src/world/area_trd/trd_04/9A83F0.c delete mode 100644 src/world/area_trd/trd_04/9A8700.c delete mode 100644 src/world/area_trd/trd_04/9A88A0.c create mode 100644 src/world/area_trd/trd_04/trd_04_0_header.c create mode 100644 src/world/area_trd/trd_04/trd_04_1_main.c create mode 100644 src/world/area_trd/trd_04/trd_04_2_entity.c create mode 100644 src/world/area_trd/trd_04/trd_04_3_npc.c delete mode 100644 src/world/area_trd/trd_08/9BB2A0.c delete mode 100644 src/world/area_trd/trd_08/9BB5B0.c create mode 100644 src/world/area_trd/trd_08/trd_08_0_header.c create mode 100644 src/world/area_trd/trd_08/trd_08_1_main.c create mode 100644 src/world/area_trd/trd_08/trd_08_2_entity.c create mode 100644 src/world/area_trd/trd_08/trd_08_3_npc.c create mode 100644 src/world/common/atomic/WhaleAnim.data.inc.c create mode 100644 src/world/common/enemy/complete/Bandit.inc.c create mode 100644 src/world/common/enemy/complete/KoopaTroopa_Patrol.inc.c create mode 100644 src/world/common/enemy/complete/KoopaTroopa_Wander.inc.c create mode 100644 src/world/common/enemy/complete/LavaBubble.inc.c create mode 100644 src/world/common/enemy/complete/Paratroopa.inc.c create mode 100644 src/world/common/enemy/complete/Pokey.inc.c create mode 100644 src/world/common/enemy/complete/PutridPiranha.inc.c create mode 100644 src/world/common/enemy/complete/SpikeTop.inc.c delete mode 100644 ver/us/asm/data/world/area_jan/jan_00/B220E0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_00/B22190.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_00/B25E90.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_00/B275B0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_03/92F910.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_03/92FC20.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_04/930530.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_04/930840.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_05/930D50.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_05/9310F0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_05/931130.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_06/932940.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_06/932BF0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_06/933160.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_10/933CC0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_10/933FD0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_11/9341A0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_11/934530.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_12/934DA0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_12/935130.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_13/935940.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_13/935CD0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_14/936720.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_14/936B20.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_15/936D30.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_15/9370C0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_16/9377F0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_16/937B00.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_20/9386D0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_20/9389F0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_20/938DD0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_21/9395A0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_22/939A90.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_22/93A610.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_23/93A7A0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_23/93AB20.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_24/93AFB0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_24/93B3C0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_24/93B770.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_25/93C600.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_25/93C9A0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_25/93D110.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_25/93DB80.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_26/93E070.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_26/93E390.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_26/93EB80.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_31/944140.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_31/9444D0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_32/944BC0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_33/945A10.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_33/945BA0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_34/9468B0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_34/947C80.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_35/948A30.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_35/949330.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_36/94A0E0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_36/94A470.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_40/94B4E0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_40/94B800.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_40/94BF70.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_41/94C080.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_41/94C400.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_42/94C650.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_42/94C9E0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_43/94D1B0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_43/94D530.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_44/94D700.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_44/94DA90.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_45/94E4E0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_45/94E8E0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_46/94ED40.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_46/94F070.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_46/94FA60.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_46/950570.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_50/950650.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_51/950AD0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_51/950E60.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_52/9516B0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_52/951A30.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_53/951B40.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_53/951ED0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_54/9525C0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_54/952940.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_55/952CF0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_55/953090.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_55/953520.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_56/954FC0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_60/956A50.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_60/956CF0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_61/956FD0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_61/9572E0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_62/9573B0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_62/9576C0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_63/957DD0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_63/9580E0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_64/9585D0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_64/9588E0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_65/958990.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_66/959030.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_66/9592E0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_66/95A240.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_66/95AD50.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_99/95AEB0.data.s delete mode 100644 ver/us/asm/data/world/area_sbk/sbk_99/95B190.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_04/9ABC90.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_04/9AD960.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_08/9BBCC0.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_08/9BBD50.data.s delete mode 100644 ver/us/asm/data/world/area_trd/trd_08/9BC1A0.data.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240738_B20C78.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024078C_B20CCC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802407C4_B20D04.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241098_865BD8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241290_865DD0.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_802412AC_865DEC.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241388_865EC8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_802415FC_86613C.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8_9462A8.s delete mode 100644 ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240410_9462E0.s diff --git a/include/entity.h b/include/entity.h index de4ed72d07..141ac05f87 100644 --- a/include/entity.h +++ b/include/entity.h @@ -291,6 +291,8 @@ typedef struct BombableRockData { /* 0x88 */ f32 fragmentFallSpeed[6]; } BombableRockData; // size = 0xA0 +typedef s32 TweesterPath[0]; + typedef struct TweesterData { /* 0x00 */ s8 unk_00; /* 0x01 */ s8 faceAnimState; diff --git a/include/macros.h b/include/macros.h index 767de4532b..d2ecd8ab9d 100644 --- a/include/macros.h +++ b/include/macros.h @@ -29,6 +29,10 @@ #define MAP_RODATA_PAD(n,name) const s32 N(rodata_pad_##name)[n] = {}; #define MAP_STATIC_PAD(n,name) static s32 N(static_pad_##name)[n]; +// standardized macro for reseting data section after a INCLUDE_ASM +//TODO these should all be removed after map decomp is done +#define MAP_DATA_SECTION_START __asm__(".section .data\n"); + #define PHYSICAL_TO_VIRTUAL(addr) (void*)((u32)(addr) + 0x80000000) #define VIRTUAL_TO_PHYSICAL(addr) (u32)((u8*)(addr) - 0x80000000) diff --git a/include/map.h b/include/map.h index 00d00916b5..0b386e39e5 100644 --- a/include/map.h +++ b/include/map.h @@ -10,7 +10,9 @@ // temporary: some standard script names #define EVS_MakeEntities EVS_MakeEntities #define EVS_SetupMusic EVS_SetupMusic +#define EVS_SetupFoliage EVS_SetupFoliage #define EVS_BindExitTriggers EVS_BindExitTriggers +#define EVS_EnterMap EVS_EnterMap // TODO: consider moving Npc here diff --git a/include/script_api/common.h b/include/script_api/common.h index a045799223..e516a750ee 100644 --- a/include/script_api/common.h +++ b/include/script_api/common.h @@ -148,7 +148,7 @@ ApiStatus EnablePartnerAI(Evt* script, s32 isInitialCall); ApiStatus BringPartnerOut(Evt* script, s32 isInitialCall); ApiStatus PutPartnerAway(Evt* script, s32 isInitialCall); ApiStatus GetCurrentPartnerID(Evt* script, s32 isInitialCall); -ApiStatus IsCurrentPartnerFlying(Evt* script, s32 isInitialCall); +ApiStatus PartnerIsFlying(Evt* script, s32 isInitialCall); ApiStatus SetNpcDecoration(Evt* script, s32 isInitialCall); ApiStatus PlaySoundAtNpc(Evt* script, s32 isInitialCall); ApiStatus SpeakToPlayer(Evt* script, s32 isInitialCall); diff --git a/include/script_api/macros.h b/include/script_api/macros.h index 2ba805c808..bcd10fd7f1 100644 --- a/include/script_api/macros.h +++ b/include/script_api/macros.h @@ -595,16 +595,42 @@ EVT_END \ } +#define EVT_EXIT_DOUBLE_DOOR(exitIdx, colliderID, leftDoorModelID, rightDoorModelID, map, entryIdx) \ + { \ + EVT_SET_GROUP(EVT_GROUP_1B) \ + EVT_CALL(DisablePlayerInput, TRUE) \ + EVT_SET(LVar0, exitIdx) \ + EVT_SET(LVar1, colliderID) \ + EVT_SET(LVar2, leftDoorModelID) \ + EVT_SET(LVar3, rightDoorModelID) \ + EVT_EXEC(ExitDoubleDoor) \ + EVT_WAIT(17) \ + EVT_CALL(GotoMap, EVT_PTR(map), entryIdx) \ + EVT_WAIT(100) \ + EVT_RETURN \ + EVT_END \ + } + +// only set perspective to standard values +#define EVT_SETUP_CAMERA_MINIMAL() \ + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) #define EVT_SETUP_CAMERA_DEFAULT() \ EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) \ EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) \ - EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) \ + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) #define EVT_SETUP_CAMERA_NO_LEAD() \ EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) \ EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) \ - EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) \ EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) \ + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + +// same as above with calls reordered +#define EVT_SETUP_CAMERA_ALT_NO_LEAD() \ + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) \ + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) \ + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) \ + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) #endif diff --git a/src/C50A0.c b/src/C50A0.c index 28e21a7ff4..c174fd3c5c 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -593,7 +593,7 @@ s32 make_item_entity_delayed(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, return make_item_entity(itemID, x, y, z, itemSpawnMode, pickupDelay, -1, pickupVar); } -s32 make_item_entity_at_player(s32 itemID, s32 arg1, s32 pickupMsgFlags) { +s32 make_item_entity_at_player(s32 itemID, s32 category, s32 pickupMsgFlags) { PlayerStatus* playerStatus = &gPlayerStatus; ItemEntity* item; Shadow* shadow; @@ -619,7 +619,7 @@ s32 make_item_entity_at_player(s32 itemID, s32 arg1, s32 pickupMsgFlags) { itemID &= 0xFFFF; item->renderGroup = -1; item->flags = (ITEM_ENTITY_FLAGS_CAM0 | ITEM_ENTITY_FLAGS_CAM1 | ITEM_ENTITY_FLAGS_CAM2 | ITEM_ENTITY_FLAGS_10 | ITEM_ENTITY_FLAGS_2000000); - if (arg1 != 0) { + if (category != ITEM_TYPE_CONSUMABLE) { item->flags |= ITEM_ENTITY_FLAGS_4000000; } item->pickupMsgFlags = pickupMsgFlags; diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 9193165cc6..17ffe99646 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -277,8 +277,7 @@ NpcGroupList N(npcGroupList_80243D18) = { #include "world/common/atomic/SuperBlock.data.inc.c" EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(Entity_SuperBlock), 500, -360, 110, 0, MAKE_ENTITY_END) - EVT_SETUP_SUPER_BLOCK(SUPER_BLOCK_MAPVAR, SUPER_BLOCK_GAMEFLAG) + EVT_MAKE_SUPER_BLOCK(500, -360, 110, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index 38ef1e2d7f..7cf4356c72 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -51,8 +51,7 @@ EvtScript N(80241F40) = { #include "world/common/atomic/SuperBlock.data.inc.c" EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(Entity_SuperBlock), -780, 120, -110, 0, MAKE_ENTITY_END) - EVT_SETUP_SUPER_BLOCK(SUPER_BLOCK_MAPVAR, SUPER_BLOCK_GAMEFLAG) + EVT_MAKE_SUPER_BLOCK(-780, 120, -110, 0) EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, 510, 0, -90, 17, GF_FLO08_Item_StarPiece) EVT_RETURN EVT_END diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c index c61d217f94..373c1317ee 100644 --- a/src/world/area_flo/flo_16/CD1F10.c +++ b/src/world/area_flo/flo_16/CD1F10.c @@ -288,8 +288,7 @@ EvtScript N(80243E80) = { EvtScript N(makeEntities) = { EVT_SET(AreaFlag(39), 0) EVT_BIND_TRIGGER(N(80243E80), TRIGGER_FLOOR_TOUCH, 20, 1, 0) - EVT_CALL(MakeEntity, EVT_PTR(Entity_SuperBlock), 350, 240, -100, 0, MAKE_ENTITY_END) - EVT_SETUP_SUPER_BLOCK(SUPER_BLOCK_MAPVAR, SUPER_BLOCK_GAMEFLAG) + EVT_MAKE_SUPER_BLOCK(350, 240, -100, 0) EVT_CALL(MakeEntity, EVT_PTR(Entity_ScriptSpring), 472, 100, -100, 0, MAKE_ENTITY_END) EVT_CALL(AssignScript, EVT_PTR(N(80243DB0))) EVT_RETURN diff --git a/src/world/area_gv/gv_01/gv_01.c b/src/world/area_gv/gv_01/gv_01.c index f047a3c8a4..5be266a7c9 100644 --- a/src/world/area_gv/gv_01/gv_01.c +++ b/src/world/area_gv/gv_01/gv_01.c @@ -62,8 +62,7 @@ EvtScript N(EVS_DropLastLetter) = { EvtScript N(EVS_Main) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_20000) - EVT_SETUP_CAMERA_DEFAULT() - EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SETUP_CAMERA_NO_LEAD() EVT_THREAD EVT_CALL(GetCurrentPartnerID, LVar0) EVT_IF_NE(LVar0, PARTNER_NONE) diff --git a/src/world/area_jan/jan.h b/src/world/area_jan/jan.h index 0e6145d34b..b2fb0af1e2 100644 --- a/src/world/area_jan/jan.h +++ b/src/world/area_jan/jan.h @@ -20,6 +20,10 @@ enum { AB_JAN_F = AreaByte(15), }; +enum { + AF_JAN_0D = AreaFlag(0xD), +}; + #define AF_JAN(index) AreaFlag(index) #endif diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c deleted file mode 100644 index 26a6f6f151..0000000000 --- a/src/world/area_jan/jan_00/B20540.c +++ /dev/null @@ -1,34 +0,0 @@ -#include "jan_00.h" -#include "npc.h" -#include "effects.h" - -#include "world/common/atomic/TexturePan.inc.c" - -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024030C_B2084C); - -#include "world/common/HeartPlant_SpawnHeart.inc.c" - -#include "world/common/StashVars.inc.c" - -#include "world/common/GetItemName.inc.c" - -#include "world/common/GetNpcCollisionHeight.inc.c" - -#include "world/common/AddPlayerHandsOffset.inc.c" - -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240738_B20C78); - -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024078C_B20CCC); - -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_802407C4_B20D04); - -extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" - -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240B4C_B2108C); - -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240CF8_B21238); - -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240F14_B21454); - -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80241134_B21674); diff --git a/src/world/area_jan/jan_00/B216E0.c b/src/world/area_jan/jan_00/B216E0.c deleted file mode 100644 index ae029cbd70..0000000000 --- a/src/world/area_jan/jan_00/B216E0.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "jan_00.h" - -static char* N(exit_str_0) = "jan_01"; -static char* N(exit_str_1) = "jan_08"; -static char* N(exit_str_2) = "mac_06"; - -extern u32 N(unkAngle1); -extern s32 N(unkAngle2); -extern s32 N(unkAngle3); - -#include "world/common/atomic/WhaleAnim.inc.c" - -ApiStatus jan_00_UnkPlayerPosFunc(Evt* script, s32 isInitialCall) { - Npc* player = get_npc_safe(ACTOR_PLAYER); - f32 yaw = -player->yaw; - f32 x = player->pos.x + 30.0f + (sin_deg(yaw) * 170.0f); - f32 z = player->pos.z + (cos_deg(yaw) * 170.0f); - f32 y = player->pos.y + 50.0f; - - evt_set_float_variable(script, LVar0, x); - evt_set_float_variable(script, LVar1, y); - evt_set_float_variable(script, LVar2, z); - return ApiStatus_DONE2; -} diff --git a/src/world/area_jan/jan_00/B21EA0.c b/src/world/area_jan/jan_00/B21EA0.c deleted file mode 100644 index 6e51604cb8..0000000000 --- a/src/world/area_jan/jan_00/B21EA0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "jan_00.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_jan/jan_00/jan_00.h b/src/world/area_jan/jan_00/jan_00.h index 933bf23e04..809d4414cc 100644 --- a/src/world/area_jan/jan_00/jan_00.h +++ b/src/world/area_jan/jan_00/jan_00.h @@ -2,8 +2,27 @@ /// @brief Jade Jungle - Whale Cove #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_00_shape.h" +#include "mapfs/jan_00_hit.h" + +#include "sprite/npc/HeartPlant.h" +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/Kolorado.h" +#include "sprite/npc/JrTroopa.h" + +enum { + NPC_Kolorado_01 = 0, + NPC_Kolorado_02 = 1, + NPC_JrTroopa = 2, + NPC_HeartPlant_01 = 3, + NPC_HeartPlant_02 = 4, + NPC_HeartPlant_03 = 5, + NPC_HeartPlant_04 = 6, + NPC_HeartPlant_05 = 7, +}; + #define NAMESPACE jan_00 diff --git a/src/world/area_jan/jan_00/jan_00_0_header.c b/src/world/area_jan/jan_00/jan_00_0_header.c new file mode 100644 index 0000000000..fb5cb603a9 --- /dev/null +++ b/src/world/area_jan/jan_00/jan_00_0_header.c @@ -0,0 +1,25 @@ + +#include "jan_00.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [jan_00_ENTRY_0] { 150.0, 0.0, 200.0, 0.0 }, + [jan_00_ENTRY_1] { 340.0, 0.0, 340.0, 315.0 }, + [jan_00_ENTRY_2] { 340.0, 0.0, -340.0, 225.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_jan_00 }, +}; + +EvtScript N(EVS_80241C10) = { + EVT_CALL(SetMusicTrack, 0, SONG_YOSHIS_VILLAGE, 0, 8) + EVT_CALL(ClearAmbientSounds, 250) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_00/jan_00_1_main.c b/src/world/area_jan/jan_00/jan_00_1_main.c new file mode 100644 index 0000000000..b8c80cf6e5 --- /dev/null +++ b/src/world/area_jan/jan_00/jan_00_1_main.c @@ -0,0 +1,73 @@ +#include "jan_00.h" +#include "npc.h" +#include "effects.h" +#include "entity.h" + +extern EvtScript N(EVS_80241C10); +extern NpcGroupList N(DefaultNPCs); +extern EvtScript N(EVS_MakeEntities); + +extern EvtScript N(EVS_802467AC); +extern EvtScript N(EVS_80247A2C); +API_CALLABLE(func_8024030C_B2084C); + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024030C_B2084C); +MAP_DATA_SECTION_START + +EvtScript N(EVS_ExitWalk_jan_01_0) = EVT_EXIT_WALK(60, jan_00_ENTRY_1, "jan_01", jan_01_ENTRY_0); +EvtScript N(EVS_ExitWalk_jan_08_0) = EVT_EXIT_WALK(60, jan_00_ENTRY_2, "jan_08", jan_08_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_01_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilise, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_08_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiline, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_CALL(SetCamPerspective, CAM_DEFAULT, 3, 25, 16, 4096) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SET(GF_MAP_JadeJungle, TRUE) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(EnableTexPanning, MODEL_o135, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o142, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o52, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 0, 400, 0, 0) + TEX_PAN_PARAMS_FREQ( 0, 1, 0, 0) + 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( -100, 200, 0, 0) + TEX_PAN_PARAMS_FREQ( 1, 1, 0, 0) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_EXEC(N(EVS_802467AC)) + EVT_EXEC(N(EVS_80247A2C)) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilitne, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_deilitse, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, jan_00_ENTRY_0) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_ELSE + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_IF + EVT_CALL(func_8024030C_B2084C) + EVT_EXEC_WAIT(N(EVS_80241C10)) + EVT_CALL(PlaySound, SOUND_80000017) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_00/jan_00_2_npc.c b/src/world/area_jan/jan_00/jan_00_2_npc.c new file mode 100644 index 0000000000..f2bdf83779 --- /dev/null +++ b/src/world/area_jan/jan_00/jan_00_2_npc.c @@ -0,0 +1,795 @@ +#include "jan_00.h" +#include "effects.h" +#include "npc.h" + +extern EvtScript N(D_80245860_B25DA0); +extern EvtScript N(EVS_NpcInteract_HeartPlant_01); + +#include "world/common/HeartPlant_SpawnHeart.inc.c" + +NpcSettings N(NpcSettings_Kolorado_01) = { + .height = 24, + .radius = 48, + .level = 99, +}; + +NpcSettings N(NpcSettings_Kolorado_02) = { + .height = 40, + .radius = 24, + .level = 99, +}; + +NpcSettings N(NpcSettings_JrTroopa) = { + .height = 32, + .radius = 24, + .level = 99, +}; + +EvtScript N(EVS_NpcAuxAI_HeartPlant_01) = { + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetSelfVar, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80242260_B227A0) = { + EVT_WAIT(45) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_HeartPlant_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_HeartPlant_01) = { + EVT_CALL(GetSelfVar, 1, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SetSelfVar, 1, 1) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2099, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HeartPlant_Anim00) + EVT_WAIT(1) + EVT_CALL(N(HeartPlant_SpawnHeart)) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HeartPlant_Anim01) + EVT_THREAD + EVT_CALL(BindNpcInteract, NPC_SELF, 0) + EVT_EXEC(N(D_80242260_B227A0)) + EVT_WAIT(45) + EVT_CALL(SetSelfVar, 1, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HeartPlant_Anim00) + EVT_END_THREAD + EVT_END_IF + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_HeartPlant_01) = { + .height = 20, + .radius = 28, + .level = 99, + .otherAI = &N(EVS_NpcAuxAI_HeartPlant_01), + .onInteract = &N(EVS_NpcInteract_HeartPlant_01), +}; + +#include "world/common/atomic/LetterChoice.inc.c" + +s32 N(LetterList)[] = { + ITEM_LETTER25, + ITEM_NONE +}; + +EvtScript N(EVS_Kolorado_LetterDelivery) = { + EVT_CALL(N(LetterDelivery_Init), + NPC_Kolorado_02, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, + ITEM_LETTER25, 0, + MSG_CH5_001D, MSG_CH5_001E, MSG_CH5_001F, MSG_CH5_0020, + EVT_PTR(N(LetterList))) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Kolorado_LetterReward) = { + EVT_IF_EQ(LVarC, 2) + EVT_SET(LVar0, ITEM_STAR_PIECE) + EVT_SET(LVar1, 3) + EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) + EVT_CALL(AddStarPieces, 1) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +API_CALLABLE(func_80240B4C_B2108C); +INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240B4C_B2108C); + +API_CALLABLE(func_80240CF8_B21238); +INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240CF8_B21238); + +API_CALLABLE(func_80240F14_B21454); +INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240F14_B21454); + +API_CALLABLE(func_80241134_B21674); +INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80241134_B21674); + +MAP_DATA_SECTION_START + +EvtScript N(D_80242D90_B232D0) = { + EVT_CALL(func_80240CF8_B21238, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80242DB0_B232F0) = { + EVT_CALL(GetNpcPos, NPC_Kolorado_01, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_ELSE + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 1) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 1) + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, -300) + EVT_CALL(GetNpcPos, NPC_Kolorado_01, LVar0, LVar1, LVar2) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_ELSE + EVT_SET(LVar3, LVar0) + EVT_SUB(LVar3, -300) + EVT_CALL(GetNpcPos, NPC_Kolorado_01, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, LVar3) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_END_IF + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80242FA8_B234E8) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 310) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, 310) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-7.5)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(5.0), EVT_FLOAT(0.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(60) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 180, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-7.5)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(0.0), EVT_FLOAT(0.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.4)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_SET(LVar0, 0) + EVT_EXEC_GET_TID(N(D_80242D90_B232D0), LVar3) + EVT_SET(LVar0, 1) + EVT_EXEC_GET_TID(N(D_80242D90_B232D0), LVar4) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_LAVA_LAVA_ISLAND) + EVT_SET(LVar0, 2) + EVT_EXEC_GET_TID(N(D_80242D90_B232D0), LVar5) + EVT_END_IF + EVT_CALL(func_80240F14_B21454, 1) + EVT_KILL_THREAD(LVar3) + EVT_KILL_THREAD(LVar4) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_LAVA_LAVA_ISLAND) + EVT_KILL_THREAD(LVar5) + EVT_END_IF + EVT_WAIT(1) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_LAVA_LAVA_ISLAND) + EVT_CALL(func_80240B4C_B2108C, 3, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcFlagBits, NPC_Kolorado_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Walk) + EVT_CALL(NpcMoveTo, NPC_Kolorado_02, LVar0, LVar2, 10) + EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Thrown) + EVT_CALL(SetNpcJumpscale, NPC_Kolorado_02, EVT_FLOAT(1.0)) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_Kolorado_02, 224, 0, 20, 20) + EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Walk) + EVT_CALL(NpcMoveTo, NPC_Kolorado_02, 290, 20, 20) + EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Idle) + EVT_CALL(SetNpcFlagBits, NPC_Kolorado_02, NPC_FLAG_100, FALSE) + EVT_CALL(InterpNpcYaw, NPC_Kolorado_02, 270, 0) + EVT_END_IF + EVT_CALL(func_80240B4C_B2108C, 3, LVar0, LVar1, LVar2) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 15) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump, 224, 0, 20, 20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(PlayerMoveTo, 260, 20, 15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(func_80240B4C_B2108C, 3, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, 0x00000102) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 20) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_PARTNER, 224, 0, 20, 20) + EVT_CALL(PartnerIsFlying, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_WAIT(10) + EVT_CALL(DisablePartnerAI, 0) + EVT_END_IF + EVT_CALL(NpcMoveTo, NPC_PARTNER, 230, 20, 10) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, 0x00000106) + EVT_CALL(SetNpcAnimation, NPC_Kolorado_01, ANIM_Kolorado_TalkSad) + EVT_CALL(SetNpcJumpscale, NPC_Kolorado_01, 0) + EVT_CALL(NpcJump0, NPC_Kolorado_01, 158, -10, -38, 20) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(SpeakToPlayer, NPC_Kolorado_01, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_CH5_0000) + EVT_CALL(SetMusicTrack, 0, SONG_YOSHIS_VILLAGE, 0, 8) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_LAVA_LAVA_ISLAND) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 0, 300, 15, EVT_FLOAT(-6.0)) + EVT_CALL(InterpNpcYaw, NPC_Kolorado_02, 90, 0) + EVT_WAIT(20) + EVT_CALL(SpeakToPlayer, NPC_Kolorado_02, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 1, MSG_CH5_0001) + EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_Kolorado_02, 270, 4) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Kolorado_02, 90, 4) + EVT_WAIT(15) + EVT_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_32C, 0) + EVT_CALL(GetNpcPos, NPC_Kolorado_02, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Kolorado_02, LVar0, LVar1, LVar2, 15) + EVT_WAIT(25) + EVT_CALL(NpcFacePlayer, NPC_Kolorado_02, 4) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Kolorado_02, ANIM_Kolorado_Panic, ANIM_Kolorado_Yell, 5, MSG_CH5_0002) + EVT_CALL(SetNpcAnimation, NPC_Kolorado_01, ANIM_Kolorado_Idle) + EVT_CALL(SetNpcSpeed, NPC_Kolorado_02, EVT_FLOAT(6.0)) + EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Walk) + EVT_CALL(NpcMoveTo, NPC_Kolorado_02, 330, 190, 0) + EVT_CALL(SetNpcPos, NPC_Kolorado_02, 0, -1000, 0) + EVT_SET(GB_StoryProgress, STORY_CH5_REACHED_LAVA_LAVA_ISLAND) + EVT_SETF(LVar9, EVT_FLOAT(4.0)) + EVT_ELSE + EVT_SETF(LVar9, EVT_FLOAT(1.0)) + EVT_END_IF + EVT_EXEC(N(D_80245860_B25DA0)) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(ResetCam, CAM_DEFAULT, LVar9) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802437C4_B23D04) = { + EVT_LABEL(0) + EVT_CALL(GetNpcYaw, NPC_Kolorado_01, LVar0) + EVT_CALL(InterpPlayerYaw, LVar0, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVar0, 0) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Kolorado_01) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 250, 0, 200) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 250, 0, 200) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(0.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_EXEC(N(D_80242FA8_B234E8)) + EVT_RETURN + EVT_END +}; + +Vec3f N(D_802438E4_B23E24)[] = { + { 290.0, 0.0, 20.0 }, + { 245.0, 6.0, -35.0 }, + { 190.0, 10.0, -50.0 }, +}; + +EvtScript N(EVS_NpcInteract_Kolorado_01) = { + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(SpeakToPlayer, NPC_Kolorado_01, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_CH5_0003) + EVT_CALL(ShowChoice, MSG_Choice_0010) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(ContinueSpeech, NPC_Kolorado_01, ANIM_Kolorado_Walk, ANIM_Kolorado_Still, 5, MSG_CH5_0005) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(EndSpeech, NPC_SELF, 0xFFFFFFFF, 0xFFFFFFFF, 5) + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_TRADED_VASE_FOR_SEED) + EVT_CALL(NpcFacePlayer, NPC_Kolorado_02, 0) + EVT_END_IF + EVT_CALL(SetNpcJumpscale, NPC_SELF, 0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_SELF, 158, -50, -38, 20) + EVT_SET(LVar0, 0) + EVT_EXEC(N(D_80242DB0_B232F0)) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, 0x00000106) + EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) + EVT_CALL(func_80240B4C_B2108C, 3, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.5)) + EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 20) + EVT_CALL(func_80240B4C_B2108C, 0, LVar0, LVar1, LVar2) + EVT_CALL(PlayerMoveTo, LVar0, LVar2, 10) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_THREAD + EVT_CALL(func_80240CF8_B21238, 0) + EVT_END_THREAD + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar3, LVar5, 20) + EVT_CALL(func_80240B4C_B2108C, 3, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, 0x00000102) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.5)) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar0, LVar1, LVar2, 18) + EVT_CALL(func_80240B4C_B2108C, 1, LVar0, LVar1, LVar2) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 18) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, 0x00000106) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_THREAD + EVT_CALL(func_80240CF8_B21238, 1) + EVT_END_THREAD + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_TRADED_VASE_FOR_SEED) + EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Walk) + EVT_CALL(LoadPath, 20, EVT_PTR(N(D_802438E4_B23E24)), 3, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_Kolorado_02, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(func_80240B4C_B2108C, 2, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Thrown) + EVT_CALL(SetNpcJumpscale, NPC_Kolorado_02, EVT_FLOAT(0.5)) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_02, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_Kolorado_02, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_Idle) + EVT_CALL(InterpNpcYaw, NPC_Kolorado_02, 90, 0) + EVT_THREAD + EVT_CALL(func_80240CF8_B21238, 2) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_Kolorado_02, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_0007) + EVT_END_IF + EVT_IF_GE(GB_StoryProgress, STORY_CH5_SUSHIE_JOINED_PARTY) + EVT_IF_EQ(GF_MAC01_Defeated_JrTroopa4, TRUE) + EVT_GOTO(90) + EVT_END_IF + EVT_CALL(SetNpcVar, NPC_JrTroopa, 0, 1) + EVT_LOOP(0) + EVT_CALL(GetNpcVar, NPC_JrTroopa, 0, LVar0) + EVT_WAIT(1) + EVT_IF_NE(LVar0, 1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_EXEC(N(D_802437C4_B23D04)) + EVT_CALL(func_80240F14_B21454, 0) + EVT_CALL(EnableGroup, MODEL_kujira, FALSE) + EVT_ELSE + EVT_LABEL(90) + EVT_EXEC(N(D_802437C4_B23D04)) + EVT_CALL(func_80240F14_B21454, 0) + EVT_CALL(EnableGroup, MODEL_kujira, FALSE) + EVT_CALL(GotoMap, EVT_PTR("mac_06"), mac_06_ENTRY_1) + EVT_WAIT(100) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Kolorado_01) = { + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_1000000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_HAS_SHADOW, FALSE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Still) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, jan_00_ENTRY_0) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_40 | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, 0x00000106) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Kolorado_01))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Kolorado_01))) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, 158, -10, -38) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Kolorado_01))) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Kolorado_02) = { + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_0006) + EVT_EXEC_WAIT(N(EVS_Kolorado_LetterDelivery)) + EVT_EXEC_WAIT(N(EVS_Kolorado_LetterReward)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Kolorado_02) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_TRADED_VASE_FOR_SEED) + EVT_CALL(SetNpcPos, NPC_SELF, 290, 0, 20) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 1) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Kolorado_02))) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802441C8_B24708) = { + EVT_LOOP(0) + EVT_CALL(PlayerFaceNpc, NPC_JrTroopa, FALSE) + EVT_CALL(NpcFaceNpc, NPC_Kolorado_02, NPC_JrTroopa, 0) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_JrTroopa, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_JrTroopa) = { + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, 0xFFFFFFFF, 0xFFFFFFFF, 5, MSG_CH5_0008) + EVT_EXEC_GET_TID(N(D_802441C8_B24708), LVar9) + EVT_CALL(SetMusicTrack, 0, SONG_JR_TROOPA_THEME, 0, 8) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_80000055, 0) + EVT_THREAD + EVT_CALL(func_80241134_B21674) + EVT_END_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 85, 0, 320) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 85, 0, 320) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(22.5), EVT_FLOAT(-12.5)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(23.0), EVT_FLOAT(0.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_ChargeTripped) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 80, 90, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 250, 0, 90) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(14.5), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.7)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Charge) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(StopSound, SOUND_80000055) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_JR_TROOPA_SPLASH, 0) + EVT_CALL(NpcJump0, NPC_SELF, 250, 0, 90, 20) + EVT_KILL_THREAD(LVar9) + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(SetSelfVar, 0, 2) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_OutOfBreath) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_TiredTalk, ANIM_JrTroopa_OutOfBreath, 5, MSG_CH5_0009) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_TiredTalk, ANIM_JrTroopa_OutOfBreath, 0, MSG_CH5_000A) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Panic) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_WAIT(20) + EVT_CALL(NpcJump0, NPC_SELF, 250, 0, 90, 10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_Panic, ANIM_JrTroopa_Panic, 0, MSG_CH5_000B) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Charge) + EVT_WAIT(10) + EVT_THREAD + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_JrTroopa_ChargeArmsUp, ANIM_JrTroopa_Charge, 0, MSG_CH5_000C) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_ChargeTripped) + EVT_END_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 85, 0, 320) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 85, 0, 320) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(-10.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(24.0), EVT_FLOAT(0.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.5)) + EVT_CALL(NpcJump0, NPC_SELF, 80, -50, 90, 20) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_JR_TROOPA_SPLASH, 0) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, -20, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_80000055, 0) + EVT_THREAD + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(2.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, -555, -32, 0) + EVT_END_THREAD + EVT_WAIT(100) + EVT_CALL(GotoMap, EVT_PTR("mac_06"), mac_06_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_JrTroopa) = { + EVT_IF_EQ(GF_MAC01_Defeated_JrTroopa4, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, -530, -50, 20) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_JrTroopa))) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(D_8024488C_B24DCC)[] = { + { + .id = NPC_Kolorado_01, + .settings = &N(NpcSettings_Kolorado_01), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_400000, + .init = &N(EVS_NpcInit_Kolorado_01), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Kolorado_Idle, + .walk = ANIM_Kolorado_Walk, + .run = ANIM_Kolorado_Run, + .chase = ANIM_Kolorado_Run, + .anim_4 = ANIM_Kolorado_Idle, + .anim_5 = ANIM_Kolorado_Idle, + .death = ANIM_Kolorado_Idle, + .hit = ANIM_Kolorado_Idle, + .anim_8 = ANIM_Kolorado_Idle, + .anim_9 = ANIM_Kolorado_Idle, + .anim_A = ANIM_Kolorado_Idle, + .anim_B = ANIM_Kolorado_Idle, + .anim_C = ANIM_Kolorado_Idle, + .anim_D = ANIM_Kolorado_Idle, + .anim_E = ANIM_Kolorado_Idle, + .anim_F = ANIM_Kolorado_Idle, + }, + .tattle = MSG_NpcTattle_Whale, + }, + { + .id = NPC_Kolorado_02, + .settings = &N(NpcSettings_Kolorado_02), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_JUMPING | NPC_FLAG_400000, + .init = &N(EVS_NpcInit_Kolorado_02), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Kolorado_Idle, + .walk = ANIM_Kolorado_Walk, + .run = ANIM_Kolorado_Run, + .chase = ANIM_Kolorado_Run, + .anim_4 = ANIM_Kolorado_Idle, + .anim_5 = ANIM_Kolorado_Idle, + .death = ANIM_Kolorado_Idle, + .hit = ANIM_Kolorado_Idle, + .anim_8 = ANIM_Kolorado_Idle, + .anim_9 = ANIM_Kolorado_Idle, + .anim_A = ANIM_Kolorado_Idle, + .anim_B = ANIM_Kolorado_Idle, + .anim_C = ANIM_Kolorado_Idle, + .anim_D = ANIM_Kolorado_Idle, + .anim_E = ANIM_Kolorado_Idle, + .anim_F = ANIM_Kolorado_Idle, + }, + .tattle = MSG_NpcTattle_Kolorado, + }, + { + .id = NPC_JrTroopa, + .settings = &N(NpcSettings_JrTroopa), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_JUMPING | NPC_FLAG_400000, + .init = &N(EVS_NpcInit_JrTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_JrTroopa_Idle, + .walk = ANIM_JrTroopa_Walk, + .run = ANIM_JrTroopa_Walk, + .chase = ANIM_JrTroopa_Walk, + .anim_4 = ANIM_JrTroopa_Idle, + .anim_5 = ANIM_JrTroopa_Idle, + .death = ANIM_JrTroopa_Idle, + .hit = ANIM_JrTroopa_Idle, + .anim_8 = ANIM_JrTroopa_Idle, + .anim_9 = ANIM_JrTroopa_Idle, + .anim_A = ANIM_JrTroopa_Idle, + .anim_B = ANIM_JrTroopa_Idle, + .anim_C = ANIM_JrTroopa_Idle, + .anim_D = ANIM_JrTroopa_Idle, + .anim_E = ANIM_JrTroopa_Idle, + .anim_F = ANIM_JrTroopa_Idle, + }, + }, +}; + +StaticNpc N(D_80244E5C_B2539C) = { + .id = NPC_HeartPlant_01, + .settings = &N(NpcSettings_HeartPlant_01), + .pos = { 455.0f, 0.0f, 115.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_JUMPING | NPC_FLAG_8000 | NPC_FLAG_400000, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_HeartPlant_Anim00, + .walk = ANIM_HeartPlant_Anim00, + .run = ANIM_HeartPlant_Anim00, + .chase = ANIM_HeartPlant_Anim00, + .anim_4 = ANIM_HeartPlant_Anim00, + .anim_5 = ANIM_HeartPlant_Anim00, + .death = ANIM_HeartPlant_Anim00, + .hit = ANIM_HeartPlant_Anim00, + .anim_8 = ANIM_HeartPlant_Anim00, + .anim_9 = ANIM_HeartPlant_Anim00, + .anim_A = ANIM_HeartPlant_Anim00, + .anim_B = ANIM_HeartPlant_Anim00, + .anim_C = ANIM_HeartPlant_Anim00, + .anim_D = ANIM_HeartPlant_Anim00, + .anim_E = ANIM_HeartPlant_Anim00, + .anim_F = ANIM_HeartPlant_Anim00, + }, + .tattle = MSG_NpcTattle_HeartPlant, +}; + +StaticNpc N(D_8024504C_B2558C) = { + .id = NPC_HeartPlant_02, + .settings = &N(NpcSettings_HeartPlant_01), + .pos = { 167.0f, 0.0f, 404.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_JUMPING | NPC_FLAG_8000 | NPC_FLAG_400000, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_HeartPlant_Anim00, + .walk = ANIM_HeartPlant_Anim00, + .run = ANIM_HeartPlant_Anim00, + .chase = ANIM_HeartPlant_Anim00, + .anim_4 = ANIM_HeartPlant_Anim00, + .anim_5 = ANIM_HeartPlant_Anim00, + .death = ANIM_HeartPlant_Anim00, + .hit = ANIM_HeartPlant_Anim00, + .anim_8 = ANIM_HeartPlant_Anim00, + .anim_9 = ANIM_HeartPlant_Anim00, + .anim_A = ANIM_HeartPlant_Anim00, + .anim_B = ANIM_HeartPlant_Anim00, + .anim_C = ANIM_HeartPlant_Anim00, + .anim_D = ANIM_HeartPlant_Anim00, + .anim_E = ANIM_HeartPlant_Anim00, + .anim_F = ANIM_HeartPlant_Anim00, + }, + .tattle = MSG_NpcTattle_HeartPlant, +}; + +StaticNpc N(D_8024523C_B2577C) = { + .id = NPC_HeartPlant_03, + .settings = &N(NpcSettings_HeartPlant_01), + .pos = { 90.0f, 0.0f, 316.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_JUMPING | NPC_FLAG_8000 | NPC_FLAG_400000, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_HeartPlant_Anim00, + .walk = ANIM_HeartPlant_Anim00, + .run = ANIM_HeartPlant_Anim00, + .chase = ANIM_HeartPlant_Anim00, + .anim_4 = ANIM_HeartPlant_Anim00, + .anim_5 = ANIM_HeartPlant_Anim00, + .death = ANIM_HeartPlant_Anim00, + .hit = ANIM_HeartPlant_Anim00, + .anim_8 = ANIM_HeartPlant_Anim00, + .anim_9 = ANIM_HeartPlant_Anim00, + .anim_A = ANIM_HeartPlant_Anim00, + .anim_B = ANIM_HeartPlant_Anim00, + .anim_C = ANIM_HeartPlant_Anim00, + .anim_D = ANIM_HeartPlant_Anim00, + .anim_E = ANIM_HeartPlant_Anim00, + .anim_F = ANIM_HeartPlant_Anim00, + }, + .tattle = MSG_NpcTattle_HeartPlant, +}; + +StaticNpc N(D_8024542C_B2596C) = { + .id = NPC_HeartPlant_04, + .settings = &N(NpcSettings_HeartPlant_01), + .pos = { 424.0f, 0.0f, 182.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_JUMPING | NPC_FLAG_8000 | NPC_FLAG_400000, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_HeartPlant_Anim00, + .walk = ANIM_HeartPlant_Anim00, + .run = ANIM_HeartPlant_Anim00, + .chase = ANIM_HeartPlant_Anim00, + .anim_4 = ANIM_HeartPlant_Anim00, + .anim_5 = ANIM_HeartPlant_Anim00, + .death = ANIM_HeartPlant_Anim00, + .hit = ANIM_HeartPlant_Anim00, + .anim_8 = ANIM_HeartPlant_Anim00, + .anim_9 = ANIM_HeartPlant_Anim00, + .anim_A = ANIM_HeartPlant_Anim00, + .anim_B = ANIM_HeartPlant_Anim00, + .anim_C = ANIM_HeartPlant_Anim00, + .anim_D = ANIM_HeartPlant_Anim00, + .anim_E = ANIM_HeartPlant_Anim00, + .anim_F = ANIM_HeartPlant_Anim00, + }, + .tattle = MSG_NpcTattle_HeartPlant, +}; + +StaticNpc N(D_8024561C_B25B5C) = { + .id = NPC_HeartPlant_05, + .settings = &N(NpcSettings_HeartPlant_01), + .pos = { 143.0f, 0.0f, 260.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_4 | NPC_FLAG_100 | NPC_FLAG_JUMPING | NPC_FLAG_8000 | NPC_FLAG_400000, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_HeartPlant_Anim00, + .walk = ANIM_HeartPlant_Anim00, + .run = ANIM_HeartPlant_Anim00, + .chase = ANIM_HeartPlant_Anim00, + .anim_4 = ANIM_HeartPlant_Anim00, + .anim_5 = ANIM_HeartPlant_Anim00, + .death = ANIM_HeartPlant_Anim00, + .hit = ANIM_HeartPlant_Anim00, + .anim_8 = ANIM_HeartPlant_Anim00, + .anim_9 = ANIM_HeartPlant_Anim00, + .anim_A = ANIM_HeartPlant_Anim00, + .anim_B = ANIM_HeartPlant_Anim00, + .anim_C = ANIM_HeartPlant_Anim00, + .anim_D = ANIM_HeartPlant_Anim00, + .anim_E = ANIM_HeartPlant_Anim00, + .anim_F = ANIM_HeartPlant_Anim00, + }, + .tattle = MSG_NpcTattle_HeartPlant, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(D_8024488C_B24DCC)), + NPC_GROUP(N(D_80244E5C_B2539C)), + NPC_GROUP(N(D_8024504C_B2558C)), + NPC_GROUP(N(D_8024523C_B2577C)), + NPC_GROUP(N(D_8024542C_B2596C)), + NPC_GROUP(N(D_8024561C_B25B5C)), + {} +}; diff --git a/src/world/area_jan/jan_00/jan_00_3_entity.c b/src/world/area_jan/jan_00/jan_00_3_entity.c new file mode 100644 index 0000000000..92d9e9f638 --- /dev/null +++ b/src/world/area_jan/jan_00/jan_00_3_entity.c @@ -0,0 +1,20 @@ +#include "jan_00.h" +#include "entity.h" + +EvtScript N(D_80245860_B25DA0) = { + EVT_CALL(MakeItemEntity, ITEM_COIN, 15, 100, 415, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_JAN00_Item_CoinA) + EVT_CALL(MakeItemEntity, ITEM_COIN, 15, 125, 415, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_JAN00_Item_CoinB) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_STOP_WATCH, 370, 0, -210, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_JAN00_Item_StopWatch) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, jan_00_ENTRY_0) + EVT_EXEC(N(D_80245860_B25DA0)) + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_SpinningFlower), 15, 0, 415, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_00/jan_00_4_whale.c b/src/world/area_jan/jan_00/jan_00_4_whale.c new file mode 100644 index 0000000000..546e26ed8e --- /dev/null +++ b/src/world/area_jan/jan_00/jan_00_4_whale.c @@ -0,0 +1,333 @@ +#include "jan_00.h" +#include "effects.h" + +u32 N(unkAngle1) = 0; +s32 N(unkAngle2) = -1; +s32 N(unkAngle3) = -1; + +#include "world/common/atomic/WhaleAnim.inc.c" + +ApiStatus jan_00_UnkPlayerPosFunc(Evt* script, s32 isInitialCall) { + Npc* player = get_npc_safe(ACTOR_PLAYER); + f32 yaw = -player->yaw; + f32 x = player->pos.x + 30.0f + (sin_deg(yaw) * 170.0f); + f32 z = player->pos.z + (cos_deg(yaw) * 170.0f); + f32 y = player->pos.y + 50.0f; + + evt_set_float_variable(script, LVar0, x); + evt_set_float_variable(script, LVar1, y); + evt_set_float_variable(script, LVar2, z); + return ApiStatus_DONE2; +} + + +EvtScript N(D_8024595C_B25E9C) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 30, 60, 30, 0, 0) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o168, LVar0, -1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802459D4_B25F14) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, 30, 30, 1, 0) + EVT_SETF(LVar1, LVar0) + EVT_DIVF(LVar1, EVT_FLOAT(3.0)) + EVT_CALL(RotateModel, MODEL_o173, LVar0, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_dou, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o183, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o167, 60, 29, -51) + EVT_CALL(TranslateModel, MODEL_o168, 60, 29, 51) + EVT_CALL(RotateModel, MODEL_o170, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o183, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o167, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o168, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o183, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o167, -60, -29, 51) + EVT_CALL(TranslateModel, MODEL_o168, -60, -29, -51) + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, -40, 30, 1, 0) + EVT_CALL(TranslateModel, MODEL_bero, LVar0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80245C10_B26150) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, -30, 8, 1, 0) + EVT_ADDF(LVar0, EVT_FLOAT(30.0)) + EVT_SETF(LVar1, LVar0) + EVT_DIVF(LVar1, EVT_FLOAT(3.0)) + EVT_CALL(RotateModel, MODEL_o173, LVar0, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_dou, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o183, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o167, 60, 29, -51) + EVT_CALL(TranslateModel, MODEL_o168, 60, 29, 51) + EVT_CALL(RotateModel, MODEL_o170, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o183, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o167, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o168, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o183, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o167, -60, -29, 51) + EVT_CALL(TranslateModel, MODEL_o168, -60, -29, -51) + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, -40, 120, 1, 0) + EVT_CALL(TranslateModel, MODEL_bero, LVar0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80245E5C_B2639C) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80245E6C_B263AC) = { + EVT_SET(LVar1, LVarC) + EVT_MOD(LVar1, 4) + EVT_IF_EQ(LVar1, 0) + EVT_CALL(N(UnkPlayerPosFunc)) + EVT_CALL(PlayEffect, EFFECT_DAMAGE_STARS, 2, LVar0, LVar1, LVar2, 0, -1, 0, 5, 0, 0, 0, 0, 0) + EVT_END_IF + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 30, 60, 30, 0, 0) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o168, LVar0, -1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80245F6C_B264AC) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80245F7C_B264BC) = { + EVT_IF_GE(LVarC, 0) + EVT_IF_LE(LVarC, 2) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, TRUE) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(LVarC, 15) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, TRUE) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVarC, 22) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, TRUE) + EVT_RETURN + EVT_END_IF + EVT_CALL(EnableModel, MODEL_o170, TRUE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802460A4_B265E4) = { + EVT_SET(LVar0, LVarC) + EVT_DIV(LVar0, 20) + EVT_MOD(LVar0, 2) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, EVT_FLOAT(-1.0), EVT_FLOAT(1.0), 3, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, LVar0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_dou, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o170, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o183, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024620C_B2674C) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, EVT_FLOAT(-6.0), EVT_FLOAT(6.0), 3, 0, 0) + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar1, EVT_FLOAT(6.0), EVT_FLOAT(-6.0), 2, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, LVar0, LVar1, 0) + EVT_CALL(TranslateGroup, MODEL_dou, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o170, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o183, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, LVar1, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, LVar1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024634C_B2688C) = { + EVT_SET(LVar0, LVarC) + EVT_DIV(LVar0, 20) + EVT_MOD(LVar0, 2) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, EVT_FLOAT(-1.0), EVT_FLOAT(1.0), 3, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, LVar0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_dou, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o170, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o183, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802464B4_B269F4) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 30, 60, 30, 0, 0) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o168, LVar0, -1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024652C_B26A6C) = { + EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, 8, 3, 0, 0) + EVT_SET(LVar1, LVar0) + EVT_DIV(LVar1, 3) + EVT_CALL(RotateModel, MODEL_o173, LVar0, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_dou, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o183, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o167, 60, 29, -51) + EVT_CALL(TranslateModel, MODEL_o168, 60, 29, 51) + EVT_CALL(RotateModel, MODEL_o170, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o183, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o167, LVar1, 0, 0, -1) + EVT_CALL(RotateModel, MODEL_o168, LVar1, 0, 0, -1) + EVT_CALL(TranslateModel, MODEL_o170, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o183, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o167, -60, -29, 51) + EVT_CALL(TranslateModel, MODEL_o168, -60, -29, -51) + EVT_SET(LVar0, LVarC) + EVT_MUL(LVar0, 2) + EVT_CALL(N(UnkFloatFunc001), LVar0, LVar0, 30, 60, 3, 0, 0) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o168, LVar0, -1, 0, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802467AC) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(MakeLocalVertexCopy, 1, MODEL_karada, TRUE) + EVT_CALL(SetCustomGfxBuilders, 1, EVT_PTR(N(unkAngleFunc002)), 0) + EVT_CALL(SetModelCustomGfx, MODEL_karada, 1, -1) + EVT_CALL(MakeLocalVertexCopy, 2, MODEL_onaka, TRUE) + EVT_CALL(SetCustomGfxBuilders, 2, EVT_PTR(N(unkAngleFunc003)), 0) + EVT_CALL(SetModelCustomGfx, MODEL_onaka, 2, -1) + EVT_THREAD + EVT_LABEL(0) + EVT_CALL(N(UnkAngleFunc001), 0, LVar0, LVar1, LVar2) + EVT_SUBF(LVar0, -80) + EVT_SUBF(LVar1, -18) + EVT_SUBF(LVar2, 420) + EVT_ADDF(LVar0, 55) + EVT_ADDF(LVar1, -20) + EVT_ADDF(LVar2, 0) + EVT_CALL(TranslateModel, MODEL_bero, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_o170, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_o183, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_o173, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_o167, LVar0, LVar1, LVar2) + EVT_CALL(TranslateModel, MODEL_o168, LVar0, LVar1, LVar2) + EVT_CALL(TranslateGroup, MODEL_dou, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcYaw, NPC_Kolorado_01, LVar0) + EVT_MULF(LVar0, -1) + EVT_ADDF(LVar0, -90) + EVT_CALL(TranslateModel, MODEL_bero, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o170, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o183, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, -100, 0, 0) + EVT_CALL(TranslateGroup, MODEL_dou, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_bero, 100, -1, 0) + EVT_CALL(TranslateModel, MODEL_o170, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o183, -5, -68, 0) + EVT_CALL(TranslateModel, MODEL_o173, 102, 4, 0) + EVT_CALL(TranslateModel, MODEL_o167, 60, 29, -51) + EVT_CALL(TranslateModel, MODEL_o168, 60, 29, 51) + EVT_CALL(RotateModel, MODEL_bero, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o170, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o183, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o173, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o167, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o168, LVar0, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_dou, LVar0, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_bero, -100, 1, 0) + EVT_CALL(TranslateModel, MODEL_o170, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o183, 5, 68, 0) + EVT_CALL(TranslateModel, MODEL_o173, -102, -4, 0) + EVT_CALL(TranslateModel, MODEL_o167, -60, -29, 51) + EVT_CALL(TranslateModel, MODEL_o168, -60, -29, -51) + EVT_CALL(TranslateModel, MODEL_bero, 100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o170, 100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o183, 100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, 100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o167, 100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o168, 100, 0, 0) + EVT_CALL(TranslateGroup, MODEL_dou, 100, 0, 0) + EVT_CALL(GetNpcAnimation, NPC_Kolorado_01, LVar0) + EVT_IF_NE(LVar0, LVarB) + EVT_SET(LVarB, LVar0) + EVT_SET(LVarC, 0) + EVT_CALL(EnableModel, MODEL_o170, TRUE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_SWITCH(LVarB) + EVT_CASE_EQ(0x00B60003) + EVT_SET(LVarD, EVT_PTR(N(D_80245C10_B26150))) + EVT_CASE_EQ(0x00B60000) + EVT_SET(LVarD, EVT_PTR(N(D_8024595C_B25E9C))) + EVT_CASE_EQ(0x00B60002) + EVT_SET(LVarD, EVT_PTR(N(D_802459D4_B25F14))) + EVT_CASE_EQ(0x00B60001) + EVT_SET(LVarD, EVT_PTR(N(D_802464B4_B269F4))) + EVT_CASE_EQ(0x00B60004) + EVT_SET(LVarD, EVT_PTR(N(D_8024652C_B26A6C))) + EVT_CASE_EQ(0x00B60005) + EVT_SET(LVarD, EVT_PTR(N(D_80245E5C_B2639C))) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_CASE_EQ(0x00B60006) + EVT_SET(LVarD, EVT_PTR(N(D_802460A4_B265E4))) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_CASE_EQ(0x00B60007) + EVT_SET(LVarD, EVT_PTR(N(D_8024620C_B2674C))) + EVT_CALL(EnableModel, MODEL_o170, FALSE) + EVT_CALL(EnableModel, MODEL_o183, FALSE) + EVT_CASE_EQ(0x00B60008) + EVT_SET(LVarD, EVT_PTR(N(D_8024634C_B2688C))) + EVT_CASE_EQ(0x00B60009) + EVT_SET(LVarD, EVT_PTR(N(D_80245E6C_B263AC))) + EVT_CASE_EQ(0x00B6000A) + EVT_SET(LVarD, EVT_PTR(N(D_80245F6C_B264AC))) + EVT_CASE_EQ(0x00B6000C) + EVT_SET(LVarD, EVT_PTR(N(D_80245F7C_B264BC))) + EVT_END_SWITCH + EVT_END_IF + EVT_EXEC_WAIT(LVarD) + EVT_ADD(LVarC, 1) + EVT_IF_GT(LVarC, 1000) + EVT_SET(LVarC, 0) + EVT_END_IF + EVT_GOTO(0) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_80247040) = { + EVT_CALL(SetNpcAnimation, NPC_Kolorado_01, ANIM_Kolorado_IdleSad) + 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 new file mode 100644 index 0000000000..1024d54870 --- /dev/null +++ b/src/world/area_jan/jan_00/jan_00_5_foliage.c @@ -0,0 +1,51 @@ +#include "jan_00.h" +#include "effects.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = { + .count = 2, + .models = { + MODEL_o241, + MODEL_o242, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_o240, + } +}; + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COCONUT, + .pos = { 485, 95, -145 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .spawnFlag = AF_JAN_0D, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .drops = &N(Tree1_Drops), +}; + +BombTrigger N(D_80247A1C_B27F5C) = { + .pos = { 481.0f, 0.0f, -165.0f }, + .radius = 0.0f +}; + +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_RETURN + EVT_END +}; diff --git a/src/world/area_kgr/kgr_01/kgr_01_1_main.c b/src/world/area_kgr/kgr_01/kgr_01_1_main.c index ef9e8cfb36..058473869a 100644 --- a/src/world/area_kgr/kgr_01/kgr_01_1_main.c +++ b/src/world/area_kgr/kgr_01/kgr_01_1_main.c @@ -32,8 +32,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_SETUP_CAMERA_DEFAULT() - EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SETUP_CAMERA_NO_LEAD() EVT_CALL(HidePlayerShadow, TRUE) EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) EVT_EXEC(N(EVS_StartTongueWiggle)) diff --git a/src/world/area_kgr/kgr_02/kgr_02_1_main.c b/src/world/area_kgr/kgr_02/kgr_02_1_main.c index afedbc6996..6c47707ffd 100644 --- a/src/world/area_kgr/kgr_02/kgr_02_1_main.c +++ b/src/world/area_kgr/kgr_02/kgr_02_1_main.c @@ -31,8 +31,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_TOAD_TOWN) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_SETUP_CAMERA_DEFAULT() - EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SETUP_CAMERA_NO_LEAD() EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) EVT_SET(LVar0, N(EVS_BindExitTriggers)) EVT_EXEC(EnterWalk) diff --git a/src/world/area_kpa/kpa_117/kpa_117_1_main.c b/src/world/area_kpa/kpa_117/kpa_117_1_main.c index d2f4c57e5a..7192cf0996 100644 --- a/src/world/area_kpa/kpa_117/kpa_117_1_main.c +++ b/src/world/area_kpa/kpa_117/kpa_117_1_main.c @@ -16,7 +16,7 @@ EvtScript N(EVS_BindExitTriggers) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_BOWSERS_CASTLE) EVT_CALL(SetSpriteShading, SHADING_NONE) - EVT_SETUP_CAMERA_NO_LEAD() + EVT_SETUP_CAMERA_ALT_NO_LEAD() EVT_EXEC_WAIT(N(EVS_Empty)) EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) EVT_EXEC(EnterWalk) diff --git a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c index 75434bcc19..6e59a0f8ea 100644 --- a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c +++ b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c @@ -6,44 +6,7 @@ extern EvtScript N(EVS_KoloradoSinkingPlatform); API_CALLABLE(N(AwaitLetterChoiceResult)); API_CALLABLE(N(SetLetterChoiceResult)); -f32 N(FlyingAI_JumpVels)[] = { - 4.5, 3.5, 2.6, 2.0, 1.5, 20.0, -}; - -#include "world/common/enemy/FlyingAI.inc.c" - -#include "world/common/enemy/FlyingNoAttackAI.inc.c" - -MobileAISettings N(AISettings_LavaBubble) = { - .moveSpeed = 0.8f, - .moveTime = 100, - .alertRadius = 90.0f, - .playerSearchInterval = 4, - .chaseSpeed = 3.2f, - .chaseTurnRate = 10, - .chaseUpdateInterval = 1, - .chaseRadius = 100.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(EVS_NpcAI_LavaBubble) = { - EVT_CALL(SetSelfVar, 0, 1) - EVT_CALL(SetSelfVar, 5, 0) - EVT_CALL(SetSelfVar, 6, 0) - EVT_CALL(SetSelfVar, 1, 150) - EVT_CALL(N(FlyingNoAttackAI_Main), EVT_PTR(N(AISettings_LavaBubble))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_LavaBubble) = { - .height = 20, - .radius = 22, - .level = 17, - .ai = &N(EVS_NpcAI_LavaBubble), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; +#include "world/common/enemy/complete/LavaBubble.inc.c" NpcSettings N(NpSettings_Kolorado) = { .height = 40, @@ -64,7 +27,7 @@ EvtScript N(EVS_Kolorado_LetterDelivery) = { ITEM_LETTER25, 0, MSG_CH5_00E4, MSG_CH5_00E5, MSG_CH5_00E6, MSG_CH5_00E7, EVT_PTR(N(LetterList))) - EVT_EXEC_WAIT(N(DoLetterDelivery)) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) EVT_RETURN EVT_END }; diff --git a/src/world/area_kzn/kzn_03/kzn_03_2_npc.c b/src/world/area_kzn/kzn_03/kzn_03_2_npc.c index 2572e6b3d1..13179ec0e8 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_2_npc.c +++ b/src/world/area_kzn/kzn_03/kzn_03_2_npc.c @@ -1,222 +1,8 @@ #include "kzn_03.h" -extern EvtScript D_800936DC; +#include "world/common/enemy/complete/SpikeTop.inc.c" -// spike top -#include "world/common/enemy/TackleAI.inc.c" - -#include "world/common/AwaitPlayerNearNpc.inc.c" - -// spike top data - -MobileAISettings N(D_80243AA0_C647B0) = { - .moveSpeed = 1.0f, - .moveTime = 60, - .waitTime = 60, - .alertRadius = 90.0f, - .alertOffsetDist = 40.0f, - .playerSearchInterval = 1, - .chaseSpeed = 4.5f, - .chaseRadius = 100.0f, - .chaseOffsetDist = 40.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(D_80243AD0_C647E0) = { - EVT_CALL(SetSelfVar, 2, 5) - EVT_CALL(SetSelfVar, 3, 2) - EVT_CALL(SetSelfVar, 5, 5) - EVT_CALL(SetSelfVar, 7, 2) - EVT_CALL(N(TackleAI_Main), EVT_PTR(N(D_80243AA0_C647B0))) - EVT_RETURN - EVT_END -}; - -MobileAISettings N(AISettings_SpikeTop) = { - .moveSpeed = 1.0f, - .moveTime = 60, - .waitTime = 60, - .alertRadius = 90.0f, - .alertOffsetDist = 40.0f, - .playerSearchInterval = 1, - .chaseSpeed = 7.0f, - .chaseRadius = 100.0f, - .chaseOffsetDist = 40.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(EVS_NpcAI_SpikeTop) = { - EVT_CALL(SetSelfVar, 2, 4) - EVT_CALL(SetSelfVar, 3, 10) - EVT_CALL(SetSelfVar, 5, 4) - EVT_CALL(SetSelfVar, 7, 3) - EVT_CALL(N(TackleAI_Main), EVT_PTR(N(AISettings_SpikeTop))) - EVT_RETURN - EVT_END -}; - -MobileAISettings N(D_80243BE0_C648F0) = { - .moveSpeed = 1.0f, - .moveTime = 20, - .waitTime = 5, - .alertRadius = 120.0f, - .playerSearchInterval = 3, - .chaseSpeed = 6.0f, - .chaseRadius = 150.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(D_80243C10_C64920) = { - 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_RETURN - EVT_END -}; - -EvtScript N(D_80243C80_C64990) = { - EVT_CALL(N(func_80240814_97BE44)) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BuzzyBeetle_Anim0F) - EVT_CALL(N(AwaitPlayerNearNpc)) - EVT_CALL(SelfEnemyOverrideSyncPos, 1) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BuzzyBeetle_Anim00) - EVT_CALL(N(func_802408B4_97BEE4)) - EVT_CALL(SelfEnemyOverrideSyncPos, 0) - EVT_CALL(SetSelfVar, 2, 5) - EVT_CALL(SetSelfVar, 3, 2) - EVT_CALL(SetSelfVar, 5, 5) - EVT_CALL(SetSelfVar, 7, 2) - EVT_CALL(N(TackleAI_Main), EVT_PTR(N(D_80243AA0_C647B0))) - EVT_RETURN - EVT_END -}; - -// different spike top prefabs - -NpcSettings N(NpcSettings_Unused1) = { - .height = 20, - .radius = 22, - .level = 10, - .ai = &N(D_80243AD0_C647E0), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -NpcSettings N(NpcSettings_Unused2) = { - .height = 20, - .radius = 22, - .level = 10, - .ai = &N(D_80243C80_C64990), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -NpcSettings N(NpcSettings_SpikeTop) = { - .height = 20, - .radius = 22, - .level = 17, - .ai = &N(EVS_NpcAI_SpikeTop), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -NpcSettings N(NpcSettings_Unused3) = { - .height = 24, - .radius = 24, - .level = 25, - .ai = &N(D_80243C10_C64920), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - - -#include "world/common/enemy/PiranhaPlantAI.inc.c" - -// piranha plant data - -EvtScript N(EVS_NpcDefeat_PiranhaHitbox) = { - 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(func_80045900, 1) - EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_10, 1) - EVT_CALL(RemoveNpc, NPC_SELF) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -MobileAISettings N(AISettings_Piranha) = { - .moveTime = 30, - .waitTime = 30, - .alertRadius = 150.0f, - .playerSearchInterval = 1, -}; - -EvtScript N(EVS_NpcAI_Piranha) = { - EVT_CALL(SetSelfVar, 7, 1) - EVT_CALL(SetSelfVar, 8, 10) - EVT_CALL(SetSelfVar, 9, 9) - EVT_CALL(SetSelfVar, 10, 12) - EVT_CALL(SetSelfVar, 11, 7) - EVT_CALL(SetSelfVar, 12, 30) - EVT_CALL(SetSelfVar, 13, 15) - EVT_CALL(SetSelfVar, 14, 18) - EVT_CALL(SetSelfVar, 15, 15) - EVT_CALL(N(PiranhaPlantAI_Main), EVT_PTR(N(AISettings_Piranha))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_Piranha) = { - .height = 50, - .radius = 36, - .level = 17, - .ai = &N(EVS_NpcAI_Piranha), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -EvtScript N(EVS_NpcAI_PiranhaHitbox) = { - EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) - EVT_CALL(SetSelfVar, 0, 14) - EVT_CALL(SetSelfVar, 1, 28) - EVT_CALL(SetSelfVar, 4, 3) - EVT_CALL(SetSelfVar, 15, SOUND_20DE) - EVT_CALL(N(MeleeHitbox_Main)) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_80244090) = { - 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(D_800936DC) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_PiranhaHitbox) = { - .height = 20, - .radius = 28, - .level = 17, - .ai = &N(EVS_NpcAI_PiranhaHitbox), - .onDefeat = &N(EVS_NpcDefeat_PiranhaHitbox), -}; +#include "world/common/enemy/complete/PutridPiranha.inc.c" NpcSettings N(NpcSettings_ZiplineDummy) = { .height = 24, @@ -243,7 +29,7 @@ EvtScript N(EVS_Kolorado_LetterDelivery) = { ITEM_LETTER25, 0, MSG_CH5_00E4, MSG_CH5_00E5, MSG_CH5_00E6, MSG_CH5_00E7, EVT_PTR(N(LetterList))) - EVT_EXEC_WAIT(N(DoLetterDelivery)) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) EVT_RETURN EVT_END }; @@ -648,10 +434,10 @@ StaticNpc N(NpcData_SpikeTop_03) = { .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Piranha)[] = { +StaticNpc N(NpcData_PutridPiranha)[] = { { .id = NPC_Piranha, - .settings = &N(NpcSettings_Piranha), + .settings = &N(NpcSettings_PutridPiranha), .pos = { 260.0f, 20.0f, 255.0f }, .yaw = 270, .flags = NPC_FLAG_LOCK_ANIMS, @@ -700,7 +486,7 @@ StaticNpc N(NpcData_Piranha)[] = { }, { .id = NPC_Piranha_Hitbox, - .settings = &N(NpcSettings_PiranhaHitbox), + .settings = &N(NpcSettings_PutridPiranha_Hitbox), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, @@ -735,6 +521,6 @@ NpcGroupList N(DefaultNPCs) = { NPC_GROUP(N(NpcData_SpikeTop_01), BTL_KZN_FORMATION_08, BTL_KZN_STAGE_01), NPC_GROUP(N(NpcData_SpikeTop_02), BTL_KZN_FORMATION_09, BTL_KZN_STAGE_01), NPC_GROUP(N(NpcData_SpikeTop_03), BTL_KZN_FORMATION_0A, BTL_KZN_STAGE_01), - NPC_GROUP(N(NpcData_Piranha), BTL_KZN_FORMATION_13, BTL_KZN_STAGE_01), + NPC_GROUP(N(NpcData_PutridPiranha), BTL_KZN_FORMATION_13, BTL_KZN_STAGE_01), {} }; diff --git a/src/world/area_kzn/kzn_04/kzn_04_2_entity.c b/src/world/area_kzn/kzn_04/kzn_04_2_entity.c index 015fd8568d..6ecbd8a13c 100644 --- a/src/world/area_kzn/kzn_04/kzn_04_2_entity.c +++ b/src/world/area_kzn/kzn_04/kzn_04_2_entity.c @@ -7,8 +7,7 @@ #include "world/common/atomic/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(Entity_SuperBlock), 530, 560, 25, 0, MAKE_ENTITY_END) - EVT_SETUP_SUPER_BLOCK(SUPER_BLOCK_MAPVAR, SUPER_BLOCK_GAMEFLAG) + EVT_MAKE_SUPER_BLOCK(530, 560, 25, 0) EVT_RETURN EVT_END }; diff --git a/src/world/area_kzn/kzn_07/kzn_07.h b/src/world/area_kzn/kzn_07/kzn_07.h index 19e7e9cb6a..0f9c8c2be6 100644 --- a/src/world/area_kzn/kzn_07/kzn_07.h +++ b/src/world/area_kzn/kzn_07/kzn_07.h @@ -9,6 +9,8 @@ #include "mapfs/kzn_07_shape.h" #include "mapfs/kzn_07_hit.h" +#include "sprite/npc/LavaBubble.h" + enum { NPC_Bubble_01 = 0, NPC_Bubble_02 = 1, diff --git a/src/world/area_kzn/kzn_07/kzn_07_1_main.c b/src/world/area_kzn/kzn_07/kzn_07_1_main.c index b1f6a9477a..0712cf4264 100644 --- a/src/world/area_kzn/kzn_07/kzn_07_1_main.c +++ b/src/world/area_kzn/kzn_07/kzn_07_1_main.c @@ -58,7 +58,7 @@ LavaReset N(SafeFloorColliders)[] = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_MT_LAVALAVA) EVT_CALL(SetSpriteShading, SHADING_KZN_07) - EVT_SETUP_CAMERA_NO_LEAD() + EVT_SETUP_CAMERA_ALT_NO_LEAD() EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) EVT_EXEC(N(EVS_SetupMusic)) diff --git a/src/world/area_kzn/kzn_07/kzn_07_3_enemy.c b/src/world/area_kzn/kzn_07/kzn_07_3_enemy.c index fa88a57bfc..a81ef70802 100644 --- a/src/world/area_kzn/kzn_07/kzn_07_3_enemy.c +++ b/src/world/area_kzn/kzn_07/kzn_07_3_enemy.c @@ -1,49 +1,11 @@ #include "kzn_07.h" #include "effects.h" -#include "sprite/npc/LavaBubble.h" -#include "world/common/enemy/FlyingAI.inc.c" +#include "world/common/enemy/complete/LavaBubble.inc.c" -#include "world/common/enemy/FlyingNoAttackAI.inc.c" - -f32 N(FlyingAI_JumpVels)[] = { - 4.5, 3.5, 2.6, 2.0, 1.5, 20.0, -}; - -MobileAISettings N(D_80242BA8_C70ED8) = { - .moveSpeed = 0.8f, - .moveTime = 100, - .alertRadius = 90.0f, - .playerSearchInterval = 4, - .chaseSpeed = 3.2f, - .chaseTurnRate = 10, - .chaseUpdateInterval = 1, - .chaseRadius = 100.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(D_80242BD8_C70F08) = { - EVT_CALL(SetSelfVar, 0, 1) - EVT_CALL(SetSelfVar, 5, 0) - EVT_CALL(SetSelfVar, 6, 0) - EVT_CALL(SetSelfVar, 1, 150) - EVT_CALL(N(FlyingNoAttackAI_Main), EVT_PTR(N(D_80242BA8_C70ED8))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(D_80242C48_C70F78) = { - .height = 20, - .radius = 22, - .level = 17, - .ai = &N(D_80242BD8_C70F08), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -StaticNpc N(D_80242C74_C70FA4) = { +StaticNpc N(NpcData_LavaBubble_01) = { .id = NPC_Bubble_01, - .settings = &N(D_80242C48_C70F78), + .settings = &N(NpcSettings_LavaBubble), .pos = { -200.0f, 50.0f, 150.0f }, .yaw = 90, .flags = NPC_FLAG_LOCK_ANIMS, @@ -91,9 +53,9 @@ StaticNpc N(D_80242C74_C70FA4) = { .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(D_80242E64_C71194) = { +StaticNpc N(NpcData_LavaBubble_02) = { .id = NPC_Bubble_02, - .settings = &N(D_80242C48_C70F78), + .settings = &N(NpcSettings_LavaBubble), .pos = { -250.0f, 80.0f, 50.0f }, .yaw = 90, .flags = NPC_FLAG_LOCK_ANIMS, @@ -142,7 +104,7 @@ StaticNpc N(D_80242E64_C71194) = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(D_80242C74_C70FA4), BTL_KZN_FORMATION_05, BTL_KZN_STAGE_01), - NPC_GROUP(N(D_80242E64_C71194), BTL_KZN_FORMATION_06, BTL_KZN_STAGE_01), + NPC_GROUP(N(NpcData_LavaBubble_01), BTL_KZN_FORMATION_05, BTL_KZN_STAGE_01), + NPC_GROUP(N(NpcData_LavaBubble_02), BTL_KZN_FORMATION_06, BTL_KZN_STAGE_01), {} }; diff --git a/src/world/area_kzn/kzn_08/kzn_08.h b/src/world/area_kzn/kzn_08/kzn_08.h index 632dfa2197..9aba79116f 100644 --- a/src/world/area_kzn/kzn_08/kzn_08.h +++ b/src/world/area_kzn/kzn_08/kzn_08.h @@ -9,6 +9,8 @@ #include "mapfs/kzn_08_shape.h" #include "mapfs/kzn_08_hit.h" +#include "sprite/npc/LargePiranha.h" + enum { NPC_PutridPiranha_01 = 0, NPC_PutridPiranha_02 = 1 diff --git a/src/world/area_kzn/kzn_08/kzn_08_3_enemy.c b/src/world/area_kzn/kzn_08/kzn_08_3_enemy.c index a870a1c94d..b605a6757a 100644 --- a/src/world/area_kzn/kzn_08/kzn_08_3_enemy.c +++ b/src/world/area_kzn/kzn_08/kzn_08_3_enemy.c @@ -1,135 +1,12 @@ #include "kzn_08.h" -extern EvtScript D_800936DC; +#include "world/common/enemy/complete/LavaBubble.inc.c" +#include "world/common/enemy/complete/PutridPiranha.inc.c" -#include "sprite/npc/LargePiranha.h" - -f32 N(FlyingAI_JumpVels)[] = { - 4.5, 3.5, 2.6, 2.0, 1.5, 20.0, -}; - -#include "world/common/enemy/FlyingAI.inc.c" - -#include "world/common/enemy/FlyingNoAttackAI.inc.c" - -#include "world/common/enemy/PiranhaPlantAI.inc.c" - -MobileAISettings N(D_80244DB8_C76238) = { - .moveSpeed = 0.8f, - .moveTime = 100, - .alertRadius = 90.0f, - .playerSearchInterval = 4, - .chaseSpeed = 3.2f, - .chaseTurnRate = 10, - .chaseUpdateInterval = 1, - .chaseRadius = 100.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(D_80244DE8_C76268) = { - EVT_CALL(SetSelfVar, 0, 1) - EVT_CALL(SetSelfVar, 5, 0) - EVT_CALL(SetSelfVar, 6, 0) - EVT_CALL(SetSelfVar, 1, 150) - EVT_CALL(N(FlyingNoAttackAI_Main), EVT_PTR(N(D_80244DB8_C76238))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(80244E58) = { - .height = 20, - .radius = 22, - .level = 17, - .ai = &N(D_80244DE8_C76268), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -EvtScript N(D_80244E84_C76304) = { - 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(func_80045900, 1) - EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_10, 1) - EVT_CALL(RemoveNpc, NPC_SELF) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -MobileAISettings N(D_80244F40_C763C0) = { - .moveTime = 30, - .waitTime = 30, - .alertRadius = 150.0f, - .playerSearchInterval = 1, -}; - -EvtScript N(D_80244F70_C763F0) = { - EVT_CALL(SetSelfVar, 7, 1) - EVT_CALL(SetSelfVar, 8, 10) - EVT_CALL(SetSelfVar, 9, 9) - EVT_CALL(SetSelfVar, 10, 12) - EVT_CALL(SetSelfVar, 11, 7) - EVT_CALL(SetSelfVar, 12, 30) - EVT_CALL(SetSelfVar, 13, 15) - EVT_CALL(SetSelfVar, 14, 18) - EVT_CALL(SetSelfVar, 15, 15) - EVT_CALL(N(PiranhaPlantAI_Main), EVT_PTR(N(D_80244F40_C763C0))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(D_80245044_C764C4) = { - .height = 50, - .radius = 36, - .level = 17, - .ai = &N(D_80244F70_C763F0), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -EvtScript N(D_80245070_C764F0) = { - EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) - EVT_CALL(SetSelfVar, 0, 14) - EVT_CALL(SetSelfVar, 1, 28) - EVT_CALL(SetSelfVar, 4, 3) - EVT_CALL(SetSelfVar, 15, SOUND_20DE) - EVT_CALL(EVT_PTR(N(MeleeHitbox_Main))) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_802450F0) = { - 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(D_800936DC) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_MeleeHitbox) = { - .height = 20, - .radius = 28, - .level = 17, - .ai = &N(D_80245070_C764F0), - .onDefeat = &N(D_80244E84_C76304), -}; - -StaticNpc N(D_802451A8_C76628)[] = { +StaticNpc N(NpcData_PutridPiranha)[] = { { .id = NPC_PutridPiranha_01, - .settings = &N(D_80245044_C764C4), + .settings = &N(NpcSettings_PutridPiranha), .pos = { 80.0f, 0.0f, 135.0f }, .yaw = 270, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS, @@ -178,7 +55,7 @@ StaticNpc N(D_802451A8_C76628)[] = { }, { .id = NPC_PutridPiranha_02, - .settings = &N(NpcSettings_MeleeHitbox), + .settings = &N(NpcSettings_PutridPiranha_Hitbox), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, @@ -209,6 +86,6 @@ StaticNpc N(D_802451A8_C76628)[] = { }; NpcGroupList N(DefaultNPCs) = { - NPC_GROUP(N(D_802451A8_C76628), BTL_KZN_FORMATION_11, BTL_KZN_STAGE_04), + NPC_GROUP(N(NpcData_PutridPiranha), BTL_KZN_FORMATION_11, BTL_KZN_STAGE_04), {} }; diff --git a/src/world/area_kzn/kzn_09/kzn_09_2_entity.c b/src/world/area_kzn/kzn_09/kzn_09_2_entity.c index bb13b79416..e641f3cc20 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_2_entity.c +++ b/src/world/area_kzn/kzn_09/kzn_09_2_entity.c @@ -7,8 +7,7 @@ #include "world/common/atomic/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(Entity_SuperBlock), 130, 480, -75, 0, MAKE_ENTITY_END) - EVT_SETUP_SUPER_BLOCK(SUPER_BLOCK_MAPVAR, SUPER_BLOCK_GAMEFLAG) + EVT_MAKE_SUPER_BLOCK(130, 480, -75, 0) EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 350, 350, 55, 0, MODEL_o149, MAKE_ENTITY_END) EVT_CALL(AssignPanelFlag, GF_KZN09_HiddenPanel) EVT_RETURN diff --git a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c index 6eff820450..158232fb78 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c +++ b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c @@ -1,222 +1,15 @@ #include "kzn_09.h" -extern EvtScript D_800936DC; - -#include "world/common/enemy/PiranhaPlantAI.inc.c" - -#include "world/common/enemy/TackleAI.inc.c" - -#include "world/common/AwaitPlayerNearNpc.inc.c" - NpcSettings N(NpcSettings_Kolorado) = { .height = 40, .radius = 24, .level = 99, }; -EvtScript N(EVS_NpcDefeat_PiranhaHitbox) = { - 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(func_80045900, 1) - EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_10, 1) - EVT_CALL(RemoveNpc, NPC_SELF) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; +#include "world/common/enemy/complete/PutridPiranha.inc.c" +#include "world/common/enemy/complete/SpikeTop.inc.c" -MobileAISettings N(D_80244C38_C7B918) = { - .moveTime = 30, - .waitTime = 30, - .alertRadius = 150.0f, - .playerSearchInterval = 1, -}; - -EvtScript N(EVS_NpcAI_Piranha) = { - EVT_CALL(SetSelfVar, 7, 1) - EVT_CALL(SetSelfVar, 8, 10) - EVT_CALL(SetSelfVar, 9, 9) - EVT_CALL(SetSelfVar, 10, 12) - EVT_CALL(SetSelfVar, 11, 7) - EVT_CALL(SetSelfVar, 12, 30) - EVT_CALL(SetSelfVar, 13, 15) - EVT_CALL(SetSelfVar, 14, 18) - EVT_CALL(SetSelfVar, 15, 15) - EVT_CALL(N(PiranhaPlantAI_Main), EVT_PTR(N(D_80244C38_C7B918))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_Piranha) = { - .height = 50, - .radius = 36, - .level = 17, - .ai = &N(EVS_NpcAI_Piranha), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -EvtScript N(EVS_NpcAI_PiranhaHitbox) = { - EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) - EVT_CALL(SetSelfVar, 0, 14) - EVT_CALL(SetSelfVar, 1, 28) - EVT_CALL(SetSelfVar, 4, 3) - EVT_CALL(SetSelfVar, 15, SOUND_20DE) - EVT_CALL(N(MeleeHitbox_Main)) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_80244DE8) = { - 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(D_800936DC) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_PiranhaHitbox) = { - .height = 20, - .radius = 28, - .level = 17, - .ai = &N(EVS_NpcAI_PiranhaHitbox), - .onDefeat = &N(EVS_NpcDefeat_PiranhaHitbox), -}; - -MobileAISettings N(D_80244EA0_C7BB80) = { - .moveSpeed = 1.0f, - .moveTime = 60, - .waitTime = 60, - .alertRadius = 90.0f, - .alertOffsetDist = 40.0f, - .playerSearchInterval = 1, - .chaseSpeed = 4.5f, - .chaseRadius = 100.0f, - .chaseOffsetDist = 40.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(D_80244ED0_C7BBB0) = { - EVT_CALL(SetSelfVar, 2, 5) - EVT_CALL(SetSelfVar, 3, 2) - EVT_CALL(SetSelfVar, 5, 5) - EVT_CALL(SetSelfVar, 7, 2) - EVT_CALL(N(TackleAI_Main), EVT_PTR(N(D_80244EA0_C7BB80))) - EVT_RETURN - EVT_END -}; - -MobileAISettings N(D_80244F40_C7BC20) = { - .moveSpeed = 1.0f, - .moveTime = 60, - .waitTime = 60, - .alertRadius = 90.0f, - .alertOffsetDist = 40.0f, - .playerSearchInterval = 1, - .chaseSpeed = 7.0f, - .chaseRadius = 100.0f, - .chaseOffsetDist = 40.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(D_80244F70_C7BC50) = { - EVT_CALL(SetSelfVar, 2, 4) - EVT_CALL(SetSelfVar, 3, 10) - EVT_CALL(SetSelfVar, 5, 4) - EVT_CALL(SetSelfVar, 7, 3) - EVT_CALL(N(TackleAI_Main), EVT_PTR(N(D_80244F40_C7BC20))) - EVT_RETURN - EVT_END -}; - -MobileAISettings N(D_80244FE0_C7BCC0) = { - .moveSpeed = 1.0f, - .moveTime = 20, - .waitTime = 5, - .alertRadius = 120.0f, - .playerSearchInterval = 3, - .chaseSpeed = 6.0f, - .chaseRadius = 150.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(D_80245010_C7BCF0) = { - 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_80244FE0_C7BCC0))) - EVT_RETURN - EVT_END -}; - -EvtScript N(D_80245080_C7BD60) = { - EVT_CALL(N(func_80240814_97BE44)) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BuzzyBeetle_Anim0F) - EVT_CALL(N(AwaitPlayerNearNpc)) - EVT_CALL(SelfEnemyOverrideSyncPos, 1) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BuzzyBeetle_Anim00) - EVT_CALL(N(func_802408B4_97BEE4)) - EVT_CALL(SelfEnemyOverrideSyncPos, 0) - EVT_CALL(SetSelfVar, 2, 5) - EVT_CALL(SetSelfVar, 3, 2) - EVT_CALL(SetSelfVar, 5, 5) - EVT_CALL(SetSelfVar, 7, 2) - EVT_CALL(N(TackleAI_Main), EVT_PTR(N(D_80244EA0_C7BB80))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(80245174) = { - .height = 20, - .radius = 22, - .level = 10, - .ai = &N(D_80244ED0_C7BBB0), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -NpcSettings N(802451A0) = { - .height = 20, - .radius = 22, - .level = 10, - .ai = &N(D_80245080_C7BD60), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -NpcSettings N(D_802451CC_C7BEAC) = { - .height = 20, - .radius = 22, - .level = 17, - .ai = &N(D_80244F70_C7BC50), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -NpcSettings N(802451F8) = { - .height = 24, - .radius = 24, - .level = 25, - .ai = &N(D_80245010_C7BCF0), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -NpcSettings N(NpcSettings_Dummy) = { +NpcSettings N(NpcSettings_Zipline) = { .height = 24, .radius = 24, .level = 99, @@ -235,7 +28,7 @@ EvtScript N(D_80245B64_C7C844) = { ITEM_LETTER25, 0, MSG_CH5_00E8, MSG_CH5_00E9, MSG_CH5_00EA, MSG_CH5_00EB, EVT_PTR(N(LetterList))) - EVT_EXEC_WAIT(N(DoLetterDelivery)) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) EVT_RETURN EVT_END }; @@ -490,7 +283,7 @@ StaticNpc N(NpcData_PassiveNPCs)[] = { }, { .id = NPC_ZiplineDummy, - .settings = &N(NpcSettings_Dummy), + .settings = &N(NpcSettings_Zipline), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_200000, @@ -524,7 +317,7 @@ StaticNpc N(NpcData_PassiveNPCs)[] = { StaticNpc N(NpcData_SpikeTop) = { .id = NPC_SpikeTop, - .settings = &N(D_802451CC_C7BEAC), + .settings = &N(NpcSettings_SpikeTop), .pos = { -100.0f, 350.0f, 50.0f }, .yaw = 270, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, @@ -572,10 +365,10 @@ StaticNpc N(NpcData_SpikeTop) = { .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Piranha)[] = { +StaticNpc N(NpcData_PutridPiranha)[] = { { .id = NPC_Piranha, - .settings = &N(NpcSettings_Piranha), + .settings = &N(NpcSettings_PutridPiranha), .pos = { 200.0f, 350.0f, 100.0f }, .yaw = 270, .flags = NPC_FLAG_LOCK_ANIMS, @@ -624,7 +417,7 @@ StaticNpc N(NpcData_Piranha)[] = { }, { .id = NPC_Piranha_Hitbox, - .settings = &N(NpcSettings_PiranhaHitbox), + .settings = &N(NpcSettings_PutridPiranha_Hitbox), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, @@ -657,6 +450,6 @@ StaticNpc N(NpcData_Piranha)[] = { NpcGroupList N(DefaultNPCs) = { NPC_GROUP(N(NpcData_PassiveNPCs)), NPC_GROUP(N(NpcData_SpikeTop), BTL_KZN_FORMATION_0B, BTL_KZN_STAGE_01), - NPC_GROUP(N(NpcData_Piranha), BTL_KZN_FORMATION_0F, BTL_KZN_STAGE_01), + NPC_GROUP(N(NpcData_PutridPiranha), BTL_KZN_FORMATION_0F, BTL_KZN_STAGE_01), {} }; diff --git a/src/world/area_kzn/kzn_11/kzn_11_3_npc.c b/src/world/area_kzn/kzn_11/kzn_11_3_npc.c index 87edcb2478..73cca58c4e 100644 --- a/src/world/area_kzn/kzn_11/kzn_11_3_npc.c +++ b/src/world/area_kzn/kzn_11/kzn_11_3_npc.c @@ -1,46 +1,9 @@ #include "kzn_11.h" -f32 N(FlyingAI_JumpVels)[] = { - 4.5, 3.5, 2.6, 2.0, 1.5, 20.0, -}; - -#include "world/common/enemy/FlyingAI.inc.c" - -#include "world/common/enemy/FlyingNoAttackAI.inc.c" +#include "world/common/enemy/complete/LavaBubble.inc.c" #include "world/common/enemy/FireBarAI.inc.c" -MobileAISettings N(AISettings_Bubble) = { - .moveSpeed = 0.8f, - .moveTime = 100, - .alertRadius = 90.0f, - .playerSearchInterval = 4, - .chaseSpeed = 3.2f, - .chaseTurnRate = 10, - .chaseUpdateInterval = 1, - .chaseRadius = 100.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(EVS_NpcAI_Bubble) = { - EVT_CALL(SetSelfVar, 0, 1) - EVT_CALL(SetSelfVar, 5, 0) - EVT_CALL(SetSelfVar, 6, 0) - EVT_CALL(SetSelfVar, 1, 150) - EVT_CALL(N(FlyingNoAttackAI_Main), EVT_PTR(N(AISettings_Bubble))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_Bubble) = { - .height = 20, - .radius = 22, - .level = 17, - .ai = &N(EVS_NpcAI_Bubble), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - s32 N(FireBar_Sounds)[] = { SOUND_FIRE_BAR_0, SOUND_FIRE_BAR_1, SOUND_FIRE_BAR_2, SOUND_FIRE_BAR_3, SOUND_FIRE_BAR_4, SOUND_FIRE_BAR_5, SOUND_FIRE_BAR_6, SOUND_FIRE_BAR_7, @@ -310,7 +273,7 @@ StaticNpc N(NpcData_FireBar_03)[] = { StaticNpc N(NpcData_Bubble_01) = { .id = NPC_Bubble_01, - .settings = &N(NpcSettings_Bubble), + .settings = &N(NpcSettings_LavaBubble), .pos = { -150.0f, 50.0f, 10.0f }, .yaw = 90, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, @@ -360,7 +323,7 @@ StaticNpc N(NpcData_Bubble_01) = { StaticNpc N(NpcData_Bubble_02) = { .id = NPC_Bubble_02, - .settings = &N(NpcSettings_Bubble), + .settings = &N(NpcSettings_LavaBubble), .pos = { 150.0f, 50.0f, 10.0f }, .yaw = 270, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, diff --git a/src/world/area_kzn/kzn_17/kzn_17_3_npc.c b/src/world/area_kzn/kzn_17/kzn_17_3_npc.c index 4477f4803b..03171373b5 100644 --- a/src/world/area_kzn/kzn_17/kzn_17_3_npc.c +++ b/src/world/area_kzn/kzn_17/kzn_17_3_npc.c @@ -1,219 +1,13 @@ #include "kzn_17.h" -#include "world/common/enemy/PiranhaPlantAI.inc.c" -#include "world/common/enemy/TackleAI.inc.c" - -#include "world/common/AwaitPlayerNearNpc.inc.c" - -extern EvtScript D_800936DC; - NpcSettings N(NpcSettings_Kolorado) = { .height = 40, .radius = 24, .level = 99, }; -EvtScript N(EVS_NpcDefeat_PiranhaHitbox) = { - 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(func_80045900, 1) - EVT_CASE_EQ(OUTCOME_ENEMY_FLED) - EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_10, 1) - EVT_CALL(RemoveNpc, NPC_SELF) - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -MobileAISettings N(AISettings_Piranha) = { - .moveTime = 30, - .waitTime = 30, - .alertRadius = 150.0f, - .playerSearchInterval = 1, -}; - -EvtScript N(EVS_NpcAI_Piranha) = { - EVT_CALL(SetSelfVar, 7, 1) - EVT_CALL(SetSelfVar, 8, 10) - EVT_CALL(SetSelfVar, 9, 9) - EVT_CALL(SetSelfVar, 10, 12) - EVT_CALL(SetSelfVar, 11, 7) - EVT_CALL(SetSelfVar, 12, 30) - EVT_CALL(SetSelfVar, 13, 15) - EVT_CALL(SetSelfVar, 14, 18) - EVT_CALL(SetSelfVar, 15, 15) - EVT_CALL(N(PiranhaPlantAI_Main), EVT_PTR(N(AISettings_Piranha))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_Piranha) = { - .height = 50, - .radius = 36, - .level = 17, - .ai = &N(EVS_NpcAI_Piranha), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -EvtScript N(EVS_NpcAI_PiranhaHitbox) = { - EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) - EVT_CALL(SetSelfVar, 0, 14) - EVT_CALL(SetSelfVar, 1, 28) - EVT_CALL(SetSelfVar, 4, 3) - EVT_CALL(SetSelfVar, 15, SOUND_20DE) - EVT_CALL(N(MeleeHitbox_Main)) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_80243C38) = { - 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(D_800936DC) - EVT_END_CASE_GROUP - EVT_END_SWITCH - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_PiranhaHitbox) = { - .height = 20, - .radius = 28, - .level = 17, - .ai = &N(EVS_NpcAI_PiranhaHitbox), - .onDefeat = &N(EVS_NpcDefeat_PiranhaHitbox), -}; - -MobileAISettings N(AISettings_Unused1) = { - .moveSpeed = 1.0f, - .moveTime = 60, - .waitTime = 60, - .alertRadius = 90.0f, - .alertOffsetDist = 40.0f, - .playerSearchInterval = 1, - .chaseSpeed = 4.5f, - .chaseRadius = 100.0f, - .chaseOffsetDist = 40.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(EVS_NpcAI_Unused1) = { - EVT_CALL(SetSelfVar, 2, 5) - EVT_CALL(SetSelfVar, 3, 2) - EVT_CALL(SetSelfVar, 5, 5) - EVT_CALL(SetSelfVar, 7, 2) - EVT_CALL(N(TackleAI_Main), EVT_PTR(N(AISettings_Unused1))) - EVT_RETURN - EVT_END -}; - -MobileAISettings N(AISettings_SpikeTop) = { - .moveSpeed = 1.0f, - .moveTime = 60, - .waitTime = 60, - .alertRadius = 90.0f, - .alertOffsetDist = 40.0f, - .playerSearchInterval = 1, - .chaseSpeed = 7.0f, - .chaseRadius = 100.0f, - .chaseOffsetDist = 40.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(EVS_NpcAI_SpikeTop) = { - EVT_CALL(SetSelfVar, 2, 4) - EVT_CALL(SetSelfVar, 3, 10) - EVT_CALL(SetSelfVar, 5, 4) - EVT_CALL(SetSelfVar, 7, 3) - EVT_CALL(N(TackleAI_Main), EVT_PTR(N(AISettings_SpikeTop))) - EVT_RETURN - EVT_END -}; - -MobileAISettings N(AISettings_Unused3) = { - .moveSpeed = 1.0f, - .moveTime = 20, - .waitTime = 5, - .alertRadius = 120.0f, - .playerSearchInterval = 3, - .chaseSpeed = 6.0f, - .chaseRadius = 150.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(EVS_NpcAI_Unused3) = { - 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(AISettings_Unused3))) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_NpcAI_Unused2) = { - EVT_CALL(N(func_80240814_97BE44)) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BuzzyBeetle_Anim0F) - EVT_CALL(N(AwaitPlayerNearNpc)) - EVT_CALL(SelfEnemyOverrideSyncPos, 1) - EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BuzzyBeetle_Anim00) - EVT_CALL(N(func_802408B4_97BEE4)) - EVT_CALL(SelfEnemyOverrideSyncPos, 0) - EVT_CALL(SetSelfVar, 2, 5) - EVT_CALL(SetSelfVar, 3, 2) - EVT_CALL(SetSelfVar, 5, 5) - EVT_CALL(SetSelfVar, 7, 2) - EVT_CALL(N(TackleAI_Main), EVT_PTR(N(AISettings_Unused1))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(NpcSettings_Unused1) = { - .height = 20, - .radius = 22, - .level = 10, - .ai = &N(EVS_NpcAI_Unused1), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -NpcSettings N(NpcSettings_Unused2) = { - .height = 20, - .radius = 22, - .level = 10, - .ai = &N(EVS_NpcAI_Unused2), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -NpcSettings N(NpcSettings_SpikeTop) = { - .height = 20, - .radius = 22, - .level = 17, - .ai = &N(EVS_NpcAI_SpikeTop), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; - -NpcSettings N(NpcSettings_Unused3) = { - .height = 24, - .radius = 24, - .level = 25, - .ai = &N(EVS_NpcAI_Unused3), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, -}; +#include "world/common/enemy/complete/PutridPiranha.inc.c" +#include "world/common/enemy/complete/SpikeTop.inc.c" #include "world/common/atomic/LetterChoice.inc.c" @@ -228,7 +22,7 @@ EvtScript N(EVS_Kolorado_LetterDelivery1) = { ITEM_LETTER25, 0, MSG_CH5_00E4, MSG_CH5_00E5, MSG_CH5_00E6, MSG_CH5_00E7, EVT_PTR(N(LetterList))) - EVT_EXEC_WAIT(N(DoLetterDelivery)) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) EVT_RETURN EVT_END }; @@ -239,7 +33,7 @@ EvtScript N(EVS_Kolorado_LetterDelivery2) = { ITEM_LETTER25, 0, MSG_CH5_00E8, MSG_CH5_00E9, MSG_CH5_00EA, MSG_CH5_00EB, EVT_PTR(N(LetterList))) - EVT_EXEC_WAIT(N(DoLetterDelivery)) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) EVT_RETURN EVT_END }; @@ -400,7 +194,7 @@ StaticNpc N(NpcData_Kolorado) = { StaticNpc N(NpcData_Piranha)[] = { { .id = NPC_Piranha, - .settings = &N(NpcSettings_Piranha), + .settings = &N(NpcSettings_PutridPiranha), .pos = { -325.0f, 0.0f, 150.0f }, .yaw = 270, .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, @@ -449,7 +243,7 @@ StaticNpc N(NpcData_Piranha)[] = { }, { .id = NPC_Piranha_Hitbox, - .settings = &N(NpcSettings_PiranhaHitbox), + .settings = &N(NpcSettings_PutridPiranha_Hitbox), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, .flags = NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_DROPS, diff --git a/src/world/area_kzn/kzn_19/kzn_19_3_npc.c b/src/world/area_kzn/kzn_19/kzn_19_3_npc.c index d6c3e23660..84de6fd203 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_3_npc.c +++ b/src/world/area_kzn/kzn_19/kzn_19_3_npc.c @@ -354,7 +354,7 @@ EvtScript N(EVS_Kolorado_LetterDelivery) = { ITEM_LETTER25, 0, MSG_CH5_00E4, MSG_CH5_00E5, MSG_CH5_00E6, MSG_CH5_00E7, EVT_PTR(N(LetterList))) - EVT_EXEC_WAIT(N(DoLetterDelivery)) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) EVT_RETURN EVT_END }; diff --git a/src/world/area_kzn/kzn_20/kzn_20_1_main.c b/src/world/area_kzn/kzn_20/kzn_20_1_main.c index 6104b8dacf..2a4782fe22 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_1_main.c +++ b/src/world/area_kzn/kzn_20/kzn_20_1_main.c @@ -200,8 +200,7 @@ EvtScript N(EVS_OnBreakWall) = { EvtScript N(EVS_Main) = { EVT_SET(GB_WorldLocation, LOCATION_MT_LAVALAVA) EVT_CALL(SetSpriteShading, SHADING_KZN_20) - EVT_SETUP_CAMERA_DEFAULT() - EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SETUP_CAMERA_NO_LEAD() EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_SET(LVar0, N(EVS_BindExitTriggers)) EVT_EXEC(EnterWalk) diff --git a/src/world/area_kzn/kzn_20/kzn_20_2_npc.c b/src/world/area_kzn/kzn_20/kzn_20_2_npc.c index 64db7bf3e6..1b434d236a 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_2_npc.c +++ b/src/world/area_kzn/kzn_20/kzn_20_2_npc.c @@ -53,7 +53,7 @@ EvtScript N(EVS_Kolorado_LetterDelivery) = { ITEM_LETTER25, 0, MSG_CH5_00E4, MSG_CH5_00E5, MSG_CH5_00E6, MSG_CH5_00E7, EVT_PTR(N(LetterList))) - EVT_EXEC_WAIT(N(DoLetterDelivery)) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) EVT_RETURN EVT_END }; diff --git a/src/world/area_mac/mac_06/mac_06_1_main.c b/src/world/area_mac/mac_06/mac_06_1_main.c index 422e902d9c..df00ebb8a2 100644 --- a/src/world/area_mac/mac_06/mac_06_1_main.c +++ b/src/world/area_mac/mac_06/mac_06_1_main.c @@ -2,7 +2,7 @@ extern EvtScript N(EVS_Main); extern EvtScript N(EVS_FlyingGull); -extern EvtScript N(EVS_80242A14); +extern EvtScript N(EVS_WhaleMain); extern NpcGroupList N(DefaultNPCs); @@ -69,7 +69,7 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_DEFAULT() EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC(N(EVS_FlyingGull)) - EVT_EXEC(N(EVS_80242A14)) + EVT_EXEC(N(EVS_WhaleMain)) EVT_CALL(SetMusicTrack, 0, SONG_RIDING_THE_WHALE, 0, 8) EVT_CALL(PlayAmbientSounds, AMBIENT_BEACH) EVT_EXEC(N(EVS_AnimateWaves)) diff --git a/src/world/area_mac/mac_06/mac_06_2.c b/src/world/area_mac/mac_06/mac_06_2.c index aaac6bac18..728ebedaf6 100644 --- a/src/world/area_mac/mac_06/mac_06_2.c +++ b/src/world/area_mac/mac_06/mac_06_2.c @@ -23,7 +23,7 @@ ApiStatus N(UnkPlayerPosFunc)(Evt* script, s32 isInitialCall) { MAP_RODATA_PAD(2, unk); -EvtScript N(D_80241B6C_8666AC) = { +EvtScript N(EVS_WhaleState_Still) = { EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 30, 60, 30, 0, 0) EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) EVT_CALL(RotateModel, MODEL_o168, LVar0, -1, 0, 0) @@ -31,7 +31,7 @@ EvtScript N(D_80241B6C_8666AC) = { EVT_END }; -EvtScript N(D_80241BE4_866724) = { +EvtScript N(EVS_WhaleState_2) = { EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, 30, 30, 1, 0) EVT_SETF(LVar1, LVar0) EVT_DIVF(LVar1, EVT_FLOAT(3.0)) @@ -55,7 +55,7 @@ EvtScript N(D_80241BE4_866724) = { EVT_END }; -EvtScript N(D_80241E20_866960) = { +EvtScript N(EVS_WhaleState_IdleSad) = { EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, -30, 8, 1, 0) EVT_ADDF(LVar0, EVT_FLOAT(30.0)) EVT_SETF(LVar1, LVar0) @@ -80,12 +80,12 @@ EvtScript N(D_80241E20_866960) = { EVT_END }; -EvtScript N(D_8024206C_866BAC) = { +EvtScript N(EVS_WhaleState_WalkSad) = { EVT_RETURN EVT_END }; -EvtScript N(D_8024207C_866BBC) = { +EvtScript N(EVS_WhaleState_Shout) = { EVT_CALL(GetNpcVar, NPC_Whale, 0, LVar3) EVT_IF_EQ(LVar3, 0) EVT_CALL(N(UnkPlayerPosFunc)) @@ -103,12 +103,12 @@ EvtScript N(D_8024207C_866BBC) = { EVT_END }; -EvtScript N(D_802421D4_866D14) = { +EvtScript N(EVS_WhaleState_TalkSad) = { EVT_RETURN EVT_END }; -EvtScript N(D_802421E4_866D24) = { +EvtScript N(EVS_WhaleState_HurtStill) = { EVT_IF_GE(LVarC, 0) EVT_IF_LE(LVarC, 2) EVT_CALL(EnableModel, MODEL_o170, FALSE) @@ -132,7 +132,7 @@ EvtScript N(D_802421E4_866D24) = { EVT_END }; -EvtScript N(D_8024230C_866E4C) = { +EvtScript N(EVS_WhaleState_Run) = { EVT_SET(LVar0, LVarC) EVT_DIV(LVar0, 20) EVT_MOD(LVar0, 2) @@ -167,7 +167,7 @@ EvtScript N(D_80242474_866FB4) = { EVT_END }; -EvtScript N(D_802425B4_8670F4) = { +EvtScript N(EVS_WhaleState_Talk) = { EVT_SET(LVar0, LVarC) EVT_DIV(LVar0, 20) EVT_MOD(LVar0, 2) @@ -187,7 +187,7 @@ EvtScript N(D_802425B4_8670F4) = { EVT_END }; -EvtScript N(D_8024271C_86725C) = { +EvtScript N(EVS_WhaleState_Idle) = { EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 30, 60, 30, 0, 0) EVT_CALL(RotateModel, MODEL_o167, LVar0, 1, 0, 0) EVT_CALL(RotateModel, MODEL_o168, LVar0, -1, 0, 0) @@ -195,7 +195,7 @@ EvtScript N(D_8024271C_86725C) = { EVT_END }; -EvtScript N(D_80242794_8672D4) = { +EvtScript N(EVS_WhaleState_Walk) = { EVT_CALL(N(UnkFloatFunc001), LVarC, LVar0, 0, 30, 3, 0, 0) EVT_SET(LVar1, LVar0) EVT_DIV(LVar1, 3) @@ -222,7 +222,7 @@ EvtScript N(D_80242794_8672D4) = { EVT_END }; -EvtScript N(EVS_80242A14) = { +EvtScript N(EVS_WhaleMain) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(MakeLocalVertexCopy, 1, MODEL_karada, TRUE) EVT_CALL(SetCustomGfxBuilders, 1, EVT_PTR(N(unkAngleFunc002)), 0) @@ -301,22 +301,22 @@ EvtScript N(EVS_80242A14) = { EVT_SWITCH(LVarB) EVT_CASE_EQ(ANIM_Kolorado_IdleSad) EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2037, 0) - EVT_SET(LVarD, EVT_PTR(N(D_80241E20_866960))) + EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_IdleSad))) EVT_CASE_EQ(ANIM_Kolorado_Still) - EVT_SET(LVarD, EVT_PTR(N(D_80241B6C_8666AC))) + EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_Still))) EVT_CASE_EQ(ANIM_Kolorado_Yell) EVT_CALL(PlaySoundAtNpc, NPC_Whale, SOUND_2036, 0) - EVT_SET(LVarD, EVT_PTR(N(D_80241BE4_866724))) + EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_2))) EVT_CASE_EQ(ANIM_Kolorado_Idle) - EVT_SET(LVarD, EVT_PTR(N(D_8024271C_86725C))) + EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_Idle))) EVT_CASE_EQ(ANIM_Kolorado_Walk) - EVT_SET(LVarD, EVT_PTR(N(D_80242794_8672D4))) + EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_Walk))) EVT_CASE_EQ(ANIM_Kolorado_WalkSad) - EVT_SET(LVarD, EVT_PTR(N(D_8024206C_866BAC))) + EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_WalkSad))) EVT_CALL(EnableModel, MODEL_o170, FALSE) EVT_CALL(EnableModel, MODEL_o183, FALSE) EVT_CASE_EQ(ANIM_Kolorado_Run) - EVT_SET(LVarD, EVT_PTR(N(D_8024230C_866E4C))) + EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_Run))) EVT_CALL(EnableModel, MODEL_o170, FALSE) EVT_CALL(EnableModel, MODEL_o183, FALSE) EVT_CASE_EQ(ANIM_Kolorado_Panic) @@ -324,13 +324,13 @@ EvtScript N(EVS_80242A14) = { EVT_CALL(EnableModel, MODEL_o170, FALSE) EVT_CALL(EnableModel, MODEL_o183, FALSE) EVT_CASE_EQ(ANIM_Kolorado_Talk) - EVT_SET(LVarD, EVT_PTR(N(D_802425B4_8670F4))) + EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_Talk))) EVT_CASE_EQ(ANIM_Kolorado_Shout) - EVT_SET(LVarD, EVT_PTR(N(D_8024207C_866BBC))) + EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_Shout))) EVT_CASE_EQ(ANIM_Kolorado_TalkSad) - EVT_SET(LVarD, EVT_PTR(N(D_802421D4_866D14))) + EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_TalkSad))) EVT_CASE_EQ(ANIM_Kolorado_HurtStill) - EVT_SET(LVarD, EVT_PTR(N(D_802421E4_866D24))) + EVT_SET(LVarD, EVT_PTR(N(EVS_WhaleState_HurtStill))) EVT_END_SWITCH EVT_END_IF EVT_EXEC_WAIT(LVarD) diff --git a/src/world/area_mac/mac_06/mac_06_3.c b/src/world/area_mac/mac_06/mac_06_3.c index 3177f2cc1f..3dbbb21195 100644 --- a/src/world/area_mac/mac_06/mac_06_3.c +++ b/src/world/area_mac/mac_06/mac_06_3.c @@ -1,15 +1,11 @@ #include "mac_06.h" +#include "model.h" +#include "effects.h" -#define CLONED_MODEL_GULL 11000 +#define CLONED_MODEL_GULL 11000 +#define CLONED_MODEL_UNUSED 10000 -API_CALLABLE(func_80241098_865BD8); -API_CALLABLE(func_80240E80_8659C0); -API_CALLABLE(func_80241290_865DD0); -API_CALLABLE(func_802412AC_865DEC); -API_CALLABLE(func_80241388_865EC8); -API_CALLABLE(func_802415FC_86613C); - -NpcSettings N(NpcSettings_Kolorado_01) = { +NpcSettings N(NpcSettings_Whale) = { .height = 24, .radius = 48, .level = 99, @@ -28,14 +24,11 @@ NpcSettings N(NpcSettings_JrTroopa) = { }; f32 D_80243434_867F74 = 0.0f; - -s32 D_80243438_867F78 = 0; - +f32 D_80243438_867F78 = 0.0f; s32 D_8024343C_867F7C = 0; - s32 D_80243440_867F80 = 0; -s32 func_80240E80_8659C0(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(func_80240E80_8659C0)) { Bytecode* args = script->ptrReadPos; Npc* whale = get_npc_safe(NPC_Whale); Npc* kolorado; @@ -102,11 +95,91 @@ s32 func_80240E80_8659C0(Evt* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -INCLUDE_ASM(s32, "world/area_mac/mac_06/mac_06_3", func_80241098_865BD8); +API_CALLABLE(N(func_80241098_865BD8)) { + u32 buttons = gGameStatusPtr->pressedButtons[0]; + Npc* npc = get_npc_safe(NPC_Whale); + + switch (D_8024343C_867F7C) { + case 0: + if (buttons & BUTTON_A) { + D_8024343C_867F7C = 10; + break; + } + if (D_80243440_867F80 >= 150) { + return ApiStatus_DONE2; + } + D_80243440_867F80++; + break; -INCLUDE_ASM(s32, "world/area_mac/mac_06/mac_06_3", func_80241290_865DD0); + case 10: + npc->currentAnim = ANIM_Kolorado_Shout; + D_80243434_867F74 = 0.0f; + D_80243438_867F78 = 5.0f; + D_8024343C_867F7C = 11; + break; -INCLUDE_ASM(s32, "world/area_mac/mac_06/mac_06_3", func_802412AC_865DEC); + case 11: + D_80243434_867F74 += D_80243438_867F78; + if (D_80243434_867F74 < 70.0f) { + if (D_80243438_867F78 < 4.0f) { + D_80243438_867F78 = 4.0f; + } + D_80243438_867F78 += 1.0f; + } else { + D_80243438_867F78 -= 2.0f; + } + if (npc->currentAnim == ANIM_Kolorado_Idle) { + D_80243438_867F78 = 4.0f; + D_8024343C_867F7C++; + } + break; + + case 12: + D_80243434_867F74 -= D_80243438_867F78; + if (D_80243434_867F74 < 0.0f) { + D_80243434_867F74 = 0.0f; + return ApiStatus_DONE2; + } + D_80243438_867F78 += 1.0f; + break; + } + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(func_80241290_865DD0)) { + if(gGameStatusPtr->pressedButtons[0] & BUTTON_B) { + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} + +API_CALLABLE(N(func_802412AC_865DEC)) { + Bytecode* args = script->ptrReadPos; + s32 modelID = evt_get_variable(script, *args++); + s32 outVarX = *args++; + s32 outVarY = *args++; + s32 outVarZ = *args++; + s32 modelIndex = get_model_list_index_from_tree_index(modelID); + Model* model = get_model_from_list_index(modelIndex); + f32 x, y, z; + + if (model->flags & MODEL_FLAGS_HAS_TRANSFORM_APPLIED) { + // get model translation from transform matrix + x = model->transformMatrix[3][0]; + y = model->transformMatrix[3][1]; + z = model->transformMatrix[3][2]; + } else { + z = 0.0f; + y = 0.0f; + x = 0.0f; + } + + evt_set_float_variable(script, outVarX, x); + evt_set_float_variable(script, outVarY, y); + evt_set_float_variable(script, outVarZ, z); + return ApiStatus_DONE2; +} EvtScript N(EVS_NpcIdle_Whale) = { EVT_CALL(GetEntryID, LVar0) @@ -114,7 +187,7 @@ EvtScript N(EVS_NpcIdle_Whale) = { EVT_CALL(GetNpcPos, NPC_Whale, LVar0, LVar1, LVar2) EVT_CALL(NpcFlyTo, NPC_Whale, 50, LVar1, 500, 120, 0, EASING_SIN_OUT) EVT_THREAD - EVT_CALL(func_80241098_865BD8) + EVT_CALL(N(func_80241098_865BD8)) EVT_END_THREAD EVT_WAIT(150) EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Idle) @@ -137,7 +210,7 @@ EvtScript N(EVS_NpcIdle_Whale) = { EVT_END_IF EVT_CALL(NpcFlyTo, NPC_Whale, -70, LVar1, 500, 120, 0, EASING_SIN_OUT) EVT_THREAD - EVT_CALL(func_80241098_865BD8) + EVT_CALL(N(func_80241098_865BD8)) EVT_END_THREAD EVT_WAIT(150) EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Idle) @@ -148,9 +221,61 @@ EvtScript N(EVS_NpcIdle_Whale) = { EVT_END }; -INCLUDE_ASM(s32, "world/area_mac/mac_06/mac_06_3", func_80241388_865EC8); +API_CALLABLE(N(SeagullYawInterp)) { + f32 x1 = evt_get_float_variable(script, LVar1); + f32 y1 = evt_get_float_variable(script, LVar3); + f32 x2 = evt_get_float_variable(script, LVar4); + f32 y2 = evt_get_float_variable(script, LVar5); + f32 lastYaw = evt_get_float_variable(script, LVar7); + f32 newYaw, deltaYaw; + + if (evt_get_variable(script, LocalFlag(0))) { + evt_set_float_variable(script, LVar6, 0.0f); + evt_set_float_variable(script, LVar7, 0.0f); + evt_set_variable(script, LocalFlag(0), 0); + evt_set_variable(script, LocalFlag(1), 1); + return ApiStatus_DONE2; + } + + if (x1 == x2 && y1 == y2) { + return ApiStatus_DONE2; + } + + if (evt_get_variable(script, LocalFlag(1))) { + newYaw = atan2(-x1, y1, -x2, y2); + evt_set_float_variable(script, LVar6, newYaw); + evt_set_float_variable(script, LVar7, newYaw); + evt_set_variable(script, LocalFlag(1), 0); + return ApiStatus_DONE2; + } -INCLUDE_ASM(s32, "world/area_mac/mac_06/mac_06_3", func_802415FC_86613C); + newYaw = atan2(-x1, y1, -x2, y2); + newYaw = clamp_angle(newYaw); + evt_set_float_variable(script, LVar6, newYaw); + + deltaYaw = lastYaw - newYaw; + if (deltaYaw >= 180.0f) { + lastYaw -= 360.0f; + } else if (deltaYaw <= -180.0f) { + lastYaw += 360.0f; + } + + evt_set_float_variable(script, LVar7, lastYaw + (f32)((newYaw - lastYaw) * 0.1)); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(MakeJrTroopaBubbles)) { + Npc* jrTroopa = get_npc_safe(NPC_JrTroopa); + f32 x = jrTroopa->pos.x + 10.0f; + f32 y = jrTroopa->pos.y; + f32 z = jrTroopa->pos.z; + + if (y < 0.0f) { + fx_rising_bubble(0, x, y, z, 0.0f); + sfx_adjust_env_sound_pos(0x46, 0, x, y, z); + } + return ApiStatus_DONE2; +} EvtScript N(EVS_NpcInit_Whale) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_1000000, TRUE) @@ -178,17 +303,17 @@ EvtScript N(EVS_NpcInit_Whale) = { EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) EVT_THREAD - EVT_CALL(func_80240E80_8659C0, 0) + EVT_CALL(N(func_80240E80_8659C0), 0) EVT_END_THREAD EVT_THREAD - EVT_CALL(func_80240E80_8659C0, 1) + EVT_CALL(N(func_80240E80_8659C0), 1) EVT_END_THREAD EVT_THREAD EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH5_REACHED_LAVA_LAVA_ISLAND) - EVT_CALL(func_80240E80_8659C0, 2) + EVT_CALL(N(func_80240E80_8659C0), 2) EVT_CASE_EQ(STORY_CH5_TRADED_VASE_FOR_SEED) - EVT_CALL(func_80240E80_8659C0, 2) + EVT_CALL(N(func_80240E80_8659C0), 2) EVT_END_SWITCH EVT_END_THREAD EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_LAVA_LAVA_ISLAND) @@ -200,7 +325,7 @@ EvtScript N(EVS_NpcInit_Whale) = { EVT_END_IF EVT_END_IF EVT_THREAD - EVT_CALL(func_80241290_865DD0) + EVT_CALL(N(func_80241290_865DD0)) EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, mac_06_ENTRY_0) EVT_CALL(GotoMap, EVT_PTR("jan_00"), jan_00_ENTRY_0) @@ -248,7 +373,7 @@ EvtScript N(EVS_FlyingGull) = { EVT_SETF(LVar8, LVar2) EVT_MULF(LVar8, -1) EVT_CALL(TranslateModel, CLONED_MODEL_GULL, LVar1, LVar8, LVar3) - EVT_CALL(func_80241388_865EC8) + EVT_CALL(N(SeagullYawInterp)) EVT_CALL(RotateModel, MODEL_hontai, LVar7, 0, 1, 0) EVT_CALL(RotateModel, CLONED_MODEL_GULL, LVar7, 0, 1, 0) EVT_CALL(RotateModel, CLONED_MODEL_GULL, 180, 0, 0, 1) @@ -263,8 +388,7 @@ EvtScript N(EVS_FlyingGull) = { EVT_END }; -// unused -EvtScript N(EVS_80243CAC) = { +EvtScript N(EVS_UnusedGull) = { EVT_CALL(CloneModel, MODEL_hontai, LVar0) EVT_SET(LVarF, LVar0) EVT_SET(LocalFlag(0), TRUE) @@ -282,12 +406,12 @@ EvtScript N(EVS_80243CAC) = { EVT_LABEL(10) EVT_LABEL(0) EVT_SET(LVarE, LVarF) - EVT_IF_EQ(LVarE, 0x00002710) + EVT_IF_EQ(LVarE, CLONED_MODEL_UNUSED) EVT_SET(LVarE, 22) EVT_ELSE EVT_ADD(LVarE, -1) EVT_END_IF - EVT_CALL(func_802412AC_865DEC, LVarE, MV_Unk_00, MV_Unk_01, MV_Unk_02) + EVT_CALL(N(func_802412AC_865DEC), LVarE, MV_Unk_00, MV_Unk_01, MV_Unk_02) EVT_SETF(LVar0, MV_Unk_00) EVT_SUBF(LVar0, LVar1) EVT_IF_LT(LVar0, 0) @@ -331,7 +455,7 @@ EvtScript N(EVS_80243CAC) = { EVT_END_IF EVT_ADDF(LVar3, LVarA) EVT_CALL(TranslateModel, LVarF, LVar1, LVar2, LVar3) - EVT_CALL(func_80241388_865EC8) + EVT_CALL(N(SeagullYawInterp)) EVT_CALL(RotateModel, LVarF, LVar7, 0, 1, 0) EVT_SET(LVar4, LVar1) EVT_SET(LVar5, LVar3) @@ -361,7 +485,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { EVT_WAIT(5) EVT_CHILD_THREAD EVT_LOOP(0) - EVT_CALL(func_802415FC_86613C) + EVT_CALL(N(MakeJrTroopaBubbles)) EVT_WAIT(5) EVT_END_LOOP EVT_END_CHILD_THREAD @@ -387,7 +511,7 @@ EvtScript N(EVS_NpcInit_JrTroopa) = { StaticNpc N(NpcData_Whale) = { .id = NPC_Whale, - .settings = &N(NpcSettings_Kolorado_01), + .settings = &N(NpcSettings_Whale), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_GRAVITY | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, diff --git a/src/world/area_mgm/mgm_00/mgm_00_1_main.c b/src/world/area_mgm/mgm_00/mgm_00_1_main.c index eecdb263ff..72b210cc07 100644 --- a/src/world/area_mgm/mgm_00/mgm_00_1_main.c +++ b/src/world/area_mgm/mgm_00/mgm_00_1_main.c @@ -122,8 +122,7 @@ EvtScript N(EVS_EnterMap) = { }; EvtScript N(EVS_Main) = { - EVT_SETUP_CAMERA_DEFAULT() - EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SETUP_CAMERA_NO_LEAD() EVT_EXEC_WAIT(N(D_80243C40_E123E0)) EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(D_80241850_E0FFF0)) diff --git a/src/world/area_mgm/mgm_01/mgm_01_1_main.c b/src/world/area_mgm/mgm_01/mgm_01_1_main.c index 865140bc64..d14c2e9035 100644 --- a/src/world/area_mgm/mgm_01/mgm_01_1_main.c +++ b/src/world/area_mgm/mgm_01/mgm_01_1_main.c @@ -82,8 +82,7 @@ EvtScript N(D_8024189C_E13FFC) = { EvtScript N(EVS_Main) = { EVT_CALL(SetSpriteShading, SHADING_ARN_09) - EVT_SETUP_CAMERA_DEFAULT() - EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SETUP_CAMERA_NO_LEAD() EVT_CALL(SetRenderMode, MODEL_o36, RENDER_MODE_SURFXLU_ZB_ZUPD) EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) diff --git a/src/world/area_mgm/mgm_02/mgm_02_1_main.c b/src/world/area_mgm/mgm_02/mgm_02_1_main.c index 8a17647a13..9ad41945bb 100644 --- a/src/world/area_mgm/mgm_02/mgm_02_1_main.c +++ b/src/world/area_mgm/mgm_02/mgm_02_1_main.c @@ -38,8 +38,7 @@ EvtScript N(EVS_SetupCamera) = { }; EvtScript N(EVS_Main) = { - EVT_SETUP_CAMERA_DEFAULT() - EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SETUP_CAMERA_NO_LEAD() EVT_EXEC(N(EVS_SetupCamera)) EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_Dummy)) diff --git a/src/world/area_mgm/mgm_03/mgm_03_1_main.c b/src/world/area_mgm/mgm_03/mgm_03_1_main.c index b543b84ae8..fdbc46033d 100644 --- a/src/world/area_mgm/mgm_03/mgm_03_1_main.c +++ b/src/world/area_mgm/mgm_03/mgm_03_1_main.c @@ -15,8 +15,7 @@ MapSettings N(settings) = { EvtScript N(EVS_Main) = { EVT_CALL(SetSpriteShading, SHADING_ARN_09) - EVT_SETUP_CAMERA_DEFAULT() - EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_SETUP_CAMERA_NO_LEAD() EVT_RETURN EVT_END }; diff --git a/src/world/area_sbk/sbk.h b/src/world/area_sbk/sbk.h index 54c9343ff0..363ef711b5 100644 --- a/src/world/area_sbk/sbk.h +++ b/src/world/area_sbk/sbk.h @@ -2,24 +2,82 @@ #define _WORLD_AREA_SBK_SBK_H_ enum { - AB_SBK_0 = AreaByte(0), - AB_SBK_1 = AreaByte(1), - AB_SBK_2 = AreaByte(2), - AB_SBK_3 = AreaByte(3), - AB_SBK_4 = AreaByte(4), - AB_SBK_5 = AreaByte(5), - AB_SBK_6 = AreaByte(6), - AB_SBK_7 = AreaByte(7), - AB_SBK_8 = AreaByte(8), - AB_SBK_9 = AreaByte(9), - AB_SBK_A = AreaByte(10), - AB_SBK_B = AreaByte(11), - AB_SBK_C = AreaByte(12), - AB_SBK_D = AreaByte(13), - AB_SBK_E = AreaByte(14), - AB_SBK_F = AreaByte(15), + AB_SBK_0 = AreaByte(0), + AB_SBK_1 = AreaByte(1), + AB_SBK_2 = AreaByte(2), + AB_SBK_3 = AreaByte(3), + AB_SBK_4 = AreaByte(4), + AB_SBK_5 = AreaByte(5), + AB_SBK_6 = AreaByte(6), + AB_SBK_7 = AreaByte(7), + AB_SBK_8 = AreaByte(8), + AB_SBK_9 = AreaByte(9), + AB_SBK_A = AreaByte(10), + AB_SBK_B = AreaByte(11), + AB_SBK_C = AreaByte(12), + AB_SBK_D = AreaByte(13), + AB_SBK_E = AreaByte(14), + AB_SBK_F = AreaByte(15), }; -#define AF_SBK(index) AreaFlag(index) +enum { + AF_SBK_01 = AreaFlag(1), + AF_SBK_02 = AreaFlag(2), + AF_SBK_03 = AreaFlag(3), + AF_SBK_04 = AreaFlag(4), + AF_SBK_05 = AreaFlag(5), + AF_SBK_06 = AreaFlag(6), +}; + +extern MapSettings sbk_00_settings; +extern MapSettings sbk_01_settings; +//extern MapSettings sbk_02_settings; +extern MapSettings sbk_03_settings; +extern MapSettings sbk_04_settings; +extern MapSettings sbk_05_settings; +extern MapSettings sbk_06_settings; +extern MapSettings sbk_10_settings; +extern MapSettings sbk_11_settings; +extern MapSettings sbk_12_settings; +extern MapSettings sbk_13_settings; +extern MapSettings sbk_14_settings; +extern MapSettings sbk_15_settings; +extern MapSettings sbk_16_settings; +extern MapSettings sbk_20_settings; +extern MapSettings sbk_21_settings; +extern MapSettings sbk_22_settings; +extern MapSettings sbk_23_settings; +extern MapSettings sbk_24_settings; +extern MapSettings sbk_25_settings; +extern MapSettings sbk_26_settings; +//extern MapSettings sbk_30_settings; +extern MapSettings sbk_31_settings; +extern MapSettings sbk_32_settings; +extern MapSettings sbk_33_settings; +extern MapSettings sbk_34_settings; +extern MapSettings sbk_35_settings; +extern MapSettings sbk_36_settings; +extern MapSettings sbk_40_settings; +extern MapSettings sbk_41_settings; +extern MapSettings sbk_42_settings; +extern MapSettings sbk_43_settings; +extern MapSettings sbk_44_settings; +extern MapSettings sbk_45_settings; +extern MapSettings sbk_46_settings; +extern MapSettings sbk_50_settings; +extern MapSettings sbk_51_settings; +extern MapSettings sbk_52_settings; +extern MapSettings sbk_53_settings; +extern MapSettings sbk_54_settings; +extern MapSettings sbk_55_settings; +extern MapSettings sbk_56_settings; +extern MapSettings sbk_60_settings; +extern MapSettings sbk_61_settings; +extern MapSettings sbk_62_settings; +extern MapSettings sbk_63_settings; +extern MapSettings sbk_64_settings; +extern MapSettings sbk_65_settings; +extern MapSettings sbk_66_settings; +extern MapSettings sbk_99_settings; #endif diff --git a/src/world/area_sbk/sbk_00/929270.c b/src/world/area_sbk/sbk_00/929270.c deleted file mode 100644 index e1241f4937..0000000000 --- a/src/world/area_sbk/sbk_00/929270.c +++ /dev/null @@ -1,50 +0,0 @@ -#include "sbk_00.h" -#include "message_ids.h" - -#include "world/common/SpawnSunEffect.inc.c" - -EntryList N(entryList) = { - { -475.0f, 0.0f, 0.0f, 90.0f }, - { 475.0f, 0.0f, 0.0f, 270.0f }, - { 0.0f, 0.0f, -475.0f, 180.0f }, - { 0.0f, 0.0f, 475.0f, 0.0f }, -}; - -MapSettings N(settings) = { - .main = &N(main), - .entryList = &N(entryList), - .entryCount = ENTRY_COUNT(N(entryList)), - .background = &gBackgroundImage, - .tattle = { MSG_MapTattle_sbk_00 }, -}; - -EvtScript N(exitWalk_802400E0) = EVT_EXIT_WALK(60, 1, "sbk_01", 0); - -EvtScript N(exitWalk_8024013C) = EVT_EXIT_WALK(60, 3, "sbk_10", 2); - -EvtScript N(80240198) = { - EVT_BIND_TRIGGER(N(exitWalk_802400E0), TRIGGER_FLOOR_ABOVE, 3, 1, 0) - EVT_BIND_TRIGGER(N(exitWalk_8024013C), TRIGGER_FLOOR_ABOVE, 6, 1, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(main) = { - EVT_SET(GB_WorldLocation, 10) - EVT_CALL(SetSpriteShading, -1) - EVT_IF_EQ(GB_StoryProgress, -63) - EVT_CALL(DisablePulseStone, 0) - EVT_END_IF - EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) - EVT_CALL(SetCamBGColor, 0, 0, 0, 0) - EVT_CALL(SetCamEnabled, 0, 1) - EVT_CALL(SetCamLeadPlayer, 0, 0) - EVT_CALL(MakeNpcs, 0, EVT_PTR(N(npcGroupList_80240768))) - EVT_EXEC_WAIT(N(makeEntities)) - EVT_CALL(N(SpawnSunEffect)) - EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) - EVT_SET(LVar0, EVT_PTR(N(80240198))) - EVT_EXEC(EnterWalk) - EVT_RETURN - EVT_END -}; diff --git a/src/world/area_sbk/sbk_00/9292B0.c b/src/world/area_sbk/sbk_00/9292B0.c deleted file mode 100644 index 15cd686031..0000000000 --- a/src/world/area_sbk/sbk_00/9292B0.c +++ /dev/null @@ -1,131 +0,0 @@ -#include "sbk_00.h" -#include "sprite/npc/Pokey.h" -#include "entity.h" - -#include "world/common/SetNpcB5_3.inc.c" - -MobileAISettings N(npcAISettings_80240300) = { - .moveSpeed = 1.8f, - .moveTime = 50, - .waitTime = 10, - .alertRadius = 250.0f, - .playerSearchInterval = 2, - .chaseSpeed = 3.5f, - .chaseTurnRate= 45, - .chaseUpdateInterval = 6, - .chaseRadius = 300.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(npcAI_80240330) = { - EVT_CALL(N(SetNpcB5_3)) - EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_80240300))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(npcSettings_8024035C) = { - .height = 72, - .radius = 15, - .ai = &N(npcAI_80240330), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, - .level = 9, -}; - -StaticNpc N(npcGroup_80240388) = { - .id = 0, - .settings = &N(npcSettings_8024035C), - .pos = { -40.0f, 0.0f, 160.0f }, - .flags = NPC_FLAG_JUMPING, - .yaw = 90, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .itemDropChance = 15, - .itemDrops = { - { ITEM_DRIED_FRUIT, 9, 0 }, - { ITEM_TASTY_TONIC, 1, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - .maxCoinBonus = 1, - }, - .territory = { .temp = { -40, 0, 160, 100, 0, -32767, 0, 0, 0, 0, 1000, 0, 0, 1 }}, - .animations = { - ANIM_Pokey_Anim04, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim04, - ANIM_Pokey_Anim04, - ANIM_Pokey_Anim0C, - ANIM_Pokey_Anim0C, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - }, - .aiDetectFlags = AI_DETECT_SIGHT, -}; - -StaticNpc N(npcGroup_80240578) = { - .id = 1, - .settings = &N(npcSettings_8024035C), - .pos = { 245.0f, 0.0f, 75.0f }, - .flags = NPC_FLAG_JUMPING, - .yaw = 270, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .itemDropChance = 15, - .itemDrops = { - { ITEM_DRIED_FRUIT, 9, 0 }, - { ITEM_TASTY_TONIC, 1, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - .maxCoinBonus = 1, - }, - .territory = { .temp = { 245, 0, 75, 100, 0, -32767, 0, 0, 0, 0, 1000, 0, 0, 1 }}, - .animations = { - ANIM_Pokey_Anim04, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim04, - ANIM_Pokey_Anim04, - ANIM_Pokey_Anim0C, - ANIM_Pokey_Anim0C, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - }, - .aiDetectFlags = AI_DETECT_SIGHT, -}; - -NpcGroupList N(npcGroupList_80240768) = { - NPC_GROUP(N(npcGroup_80240388), 0x0A00, 0x00), - NPC_GROUP(N(npcGroup_80240578), 0x0A01, 0x00), - {}, -}; - -static s32 N(pad_78C) = { - 0x00000000, -}; - -EvtScript N(makeEntities) = { - EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -230, 0, 155, 0, 152, MAKE_ENTITY_END) - EVT_CALL(AssignBlockFlag, GF_SBK00_ItemBlock_FrightJar) - EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 160, 0, 205, 0, 343, MAKE_ENTITY_END) - EVT_CALL(AssignBlockFlag, GF_SBK00_ItemBlock_Coin) - EVT_RETURN - EVT_END -}; diff --git a/src/world/area_sbk/sbk_00/sbk_00.h b/src/world/area_sbk/sbk_00/sbk_00.h index f7fed6fc7f..21863c398b 100644 --- a/src/world/area_sbk/sbk_00/sbk_00.h +++ b/src/world/area_sbk/sbk_00/sbk_00.h @@ -2,12 +2,18 @@ /// @brief Dry Dry Desert - N3W3 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" -#define NAMESPACE sbk_00 +#include "../sbk.h" +#include "mapfs/sbk_00_shape.h" +#include "mapfs/sbk_00_hit.h" -extern EvtScript N(main); -extern NpcGroupList N(npcGroupList_80240768); -extern EvtScript N(makeEntities); +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, +}; + +#define NAMESPACE sbk_00 diff --git a/src/world/area_sbk/sbk_00/sbk_00_1_main.c b/src/world/area_sbk/sbk_00/sbk_00_1_main.c new file mode 100644 index 0000000000..e8e39167f6 --- /dev/null +++ b/src/world/area_sbk/sbk_00/sbk_00_1_main.c @@ -0,0 +1,49 @@ +#include "sbk_00.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_00_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_00_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_00_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_00_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_00 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_01_0) = EVT_EXIT_WALK(60, sbk_00_ENTRY_1, "sbk_01", sbk_01_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_10_2) = EVT_EXIT_WALK(60, sbk_00_ENTRY_3, "sbk_10", sbk_10_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_01_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_10_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_00/sbk_00_2_npc.c b/src/world/area_sbk/sbk_00/sbk_00_2_npc.c new file mode 100644 index 0000000000..3062b7774a --- /dev/null +++ b/src/world/area_sbk/sbk_00/sbk_00_2_npc.c @@ -0,0 +1,111 @@ +#include "sbk_00.h" + +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_Pokey), + .pos = { -40.0f, 0.0f, 160.0f }, + .yaw = 90, + .flags = NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -40, 0, 160 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_Pokey), + .pos = { 245.0f, 0.0f, 75.0f }, + .yaw = 270, + .flags = NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 245, 0, 75 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_SBK_FORMATION_00, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_02), BTL_SBK_FORMATION_01, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_00/sbk_00_3_entity.c b/src/world/area_sbk/sbk_00/sbk_00_3_entity.c new file mode 100644 index 0000000000..02325a58f5 --- /dev/null +++ b/src/world/area_sbk/sbk_00/sbk_00_3_entity.c @@ -0,0 +1,11 @@ +#include "sbk_00.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -230, 0, 155, 0, ITEM_FRIGHT_JAR, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK00_ItemBlock_FrightJar) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 160, 0, 205, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK00_ItemBlock_Coin) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_01/929A90.c b/src/world/area_sbk/sbk_01/929A90.c deleted file mode 100644 index 70a6f3ff83..0000000000 --- a/src/world/area_sbk/sbk_01/929A90.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "sbk_01.h" -#include "message_ids.h" - -#include "world/common/SpawnSunEffect.inc.c" - -extern EvtScript N(main); -extern NpcGroupList N(npcGroupList_802407D8); - -EntryList N(entryList) = { - { -475.0f, 0.0f, 0.0f, 90.0f }, - { 475.0f, 0.0f, 0.0f, 270.0f }, - { 0.0f, 0.0f, -475.0f, 180.0f }, - { 0.0f, 0.0f, 475.0f, 0.0f }, -}; - -MapSettings N(settings) = { - .main = &N(main), - .entryList = &N(entryList), - .entryCount = ENTRY_COUNT(N(entryList)), - .background = &gBackgroundImage, - .tattle = { MSG_MapTattle_sbk_01 }, -}; - -EvtScript N(exitWalk_802400E0) = EVT_EXIT_WALK(60, 0, "sbk_00", 1); - -EvtScript N(exitWalk_8024013C) = EVT_EXIT_WALK(60, 1, "sbk_02", 0); - -EvtScript N(exitWalk_80240198) = EVT_EXIT_WALK(60, 3, "sbk_11", 2); - -EvtScript N(802401F4) = { - EVT_BIND_TRIGGER(N(exitWalk_802400E0), TRIGGER_FLOOR_ABOVE, 7, 1, 0) - EVT_BIND_TRIGGER(N(exitWalk_8024013C), TRIGGER_FLOOR_ABOVE, 3, 1, 0) - EVT_BIND_TRIGGER(N(exitWalk_80240198), TRIGGER_FLOOR_ABOVE, 5, 1, 0) - EVT_RETURN - EVT_END -}; - -EvtScript N(main) = { - EVT_SET(GB_WorldLocation, 10) - EVT_CALL(SetSpriteShading, -1) - EVT_IF_EQ(GB_StoryProgress, -63) - EVT_CALL(DisablePulseStone, 0) - EVT_END_IF - EVT_CALL(SetCamPerspective, 0, 3, 25, 16, 4096) - EVT_CALL(SetCamBGColor, 0, 0, 0, 0) - EVT_CALL(SetCamEnabled, 0, 1) - EVT_CALL(SetCamLeadPlayer, 0, 0) - EVT_CALL(MakeNpcs, 0, EVT_PTR(N(npcGroupList_802407D8))) - EVT_CALL(N(SpawnSunEffect)) - EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) - EVT_SET(LVar0, EVT_PTR(N(802401F4))) - EVT_EXEC(EnterWalk) - EVT_RETURN - EVT_END -}; diff --git a/src/world/area_sbk/sbk_01/929AD0.c b/src/world/area_sbk/sbk_01/929AD0.c deleted file mode 100644 index 77aa775412..0000000000 --- a/src/world/area_sbk/sbk_01/929AD0.c +++ /dev/null @@ -1,117 +0,0 @@ -#include "sbk_01.h" -#include "sprite/npc/Pokey.h" - -#include "world/common/SetNpcB5_3.inc.c" - -MobileAISettings N(npcAISettings_80240370) = { - .moveSpeed = 1.8f, - .moveTime = 50, - .waitTime = 10, - .alertRadius = 250.0f, - .playerSearchInterval = 2, - .chaseSpeed = 3.5f, - .chaseTurnRate= 45, - .chaseUpdateInterval = 6, - .chaseRadius = 300.0f, - .unk_AI_2C = 1, -}; - -EvtScript N(npcAI_802403A0) = { - EVT_CALL(N(SetNpcB5_3)) - EVT_CALL(BasicAI_Main, EVT_PTR(N(npcAISettings_80240370))) - EVT_RETURN - EVT_END -}; - -NpcSettings N(npcSettings_802403CC) = { - .height = 72, - .radius = 15, - .ai = &N(npcAI_802403A0), - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, - .level = 9, -}; - -StaticNpc N(npcGroup_802403F8) = { - .id = 0, - .settings = &N(npcSettings_802403CC), - .pos = { 205.0f, 0.0f, -60.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .yaw = 90, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .itemDropChance = 15, - .itemDrops = { - { ITEM_DRIED_FRUIT, 9, 0 }, - { ITEM_TASTY_TONIC, 1, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - .maxCoinBonus = 1, - }, - .territory = { .temp = { 205, 0, -60, 100, 0, -32767, 0, 0, 0, 0, 1000, 0, 0, 1 }}, - .animations = { - ANIM_Pokey_Anim04, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim04, - ANIM_Pokey_Anim04, - ANIM_Pokey_Anim0C, - ANIM_Pokey_Anim0C, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - }, - .aiDetectFlags = AI_DETECT_SIGHT, -}; - -StaticNpc N(npcGroup_802405E8) = { - .id = 1, - .settings = &N(npcSettings_802403CC), - .pos = { -200.0f, 0.0f, 180.0f }, - .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, - .yaw = 270, - .drops = { - .dropFlags = NPC_DROP_FLAGS_80, - .itemDropChance = 15, - .itemDrops = { - { ITEM_DRIED_FRUIT, 9, 0 }, - { ITEM_TASTY_TONIC, 1, 0 }, - }, - .heartDrops = STANDARD_HEART_DROPS(2), - .flowerDrops = STANDARD_FLOWER_DROPS(2), - .maxCoinBonus = 1, - }, - .territory = { .temp = { -200, 0, 180, 100, 0, -32767, 0, 0, 0, 0, 1000, 0, 0, 1 }}, - .animations = { - ANIM_Pokey_Anim04, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim04, - ANIM_Pokey_Anim04, - ANIM_Pokey_Anim0C, - ANIM_Pokey_Anim0C, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - ANIM_Pokey_Anim08, - }, - .aiDetectFlags = AI_DETECT_SIGHT, -}; - -NpcGroupList N(npcGroupList_802407D8) = { - NPC_GROUP(N(npcGroup_802403F8), 0x0A03, 0x00), - NPC_GROUP(N(npcGroup_802405E8), 0x0A01, 0x00), - {}, -}; diff --git a/src/world/area_sbk/sbk_01/sbk_01.h b/src/world/area_sbk/sbk_01/sbk_01.h index 6447509833..037aae5cc9 100644 --- a/src/world/area_sbk/sbk_01/sbk_01.h +++ b/src/world/area_sbk/sbk_01/sbk_01.h @@ -2,11 +2,18 @@ /// @brief Dry Dry Desert - N3W2 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" -#define NAMESPACE sbk_01 +#include "../sbk.h" +#include "mapfs/sbk_01_shape.h" +#include "mapfs/sbk_01_hit.h" -extern EvtScript N(main); -extern NpcGroupList N(npcGroupList_802407D8); +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, +}; + +#define NAMESPACE sbk_01 diff --git a/src/world/area_sbk/sbk_01/sbk_01_1_main.c b/src/world/area_sbk/sbk_01/sbk_01_1_main.c new file mode 100644 index 0000000000..ea490f2172 --- /dev/null +++ b/src/world/area_sbk/sbk_01/sbk_01_1_main.c @@ -0,0 +1,49 @@ +#include "sbk_01.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_01_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_01_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_01_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_01_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_01 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_00_1) = EVT_EXIT_WALK(60, sbk_01_ENTRY_0, "sbk_00", sbk_00_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_02_0) = EVT_EXIT_WALK(60, sbk_01_ENTRY_1, "sbk_02", sbk_02_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_11_2) = EVT_EXIT_WALK(60, sbk_01_ENTRY_3, "sbk_11", sbk_11_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_00_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_02_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_11_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_01/sbk_01_2_npc.c b/src/world/area_sbk/sbk_01/sbk_01_2_npc.c new file mode 100644 index 0000000000..b168c18416 --- /dev/null +++ b/src/world/area_sbk/sbk_01/sbk_01_2_npc.c @@ -0,0 +1,112 @@ +#include "sbk_01.h" +#include "sprite/npc/Pokey.h" + +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_Pokey), + .pos = { 205.0f, 0.0f, -60.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 205, 0, -60 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_Pokey), + .pos = { -200.0f, 0.0f, 180.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -200, 0, 180 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_SBK_FORMATION_03, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_02), BTL_SBK_FORMATION_01, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_02/92A2B0.c b/src/world/area_sbk/sbk_02/92A2B0.c index bf449613d9..ad88af8cda 100644 --- a/src/world/area_sbk/sbk_02/92A2B0.c +++ b/src/world/area_sbk/sbk_02/92A2B0.c @@ -22,14 +22,14 @@ s32 N(get_tattle)(void) { #include "world/common/atomic/UnkFunc27.inc.c" -ApiStatus func_80240338_92A5E8(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80240338_92A5E8) { EffectInstance* effect = (EffectInstance*)evt_get_variable(script, MapVar(0)); effect->data.sun->targetAlpha = 0; return ApiStatus_DONE2; } -ApiStatus func_80240364_92A614(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80240364_92A614) { static u8 savedPrimR, savedPrimG, savedPrimB; static u8 savedEnvR, savedEnvG, savedEnvB; static s32 targetPrimR, targetPrimG, targetPrimB; diff --git a/src/world/area_sbk/sbk_02/92A9A0.c b/src/world/area_sbk/sbk_02/92A9A0.c index e045e76ad0..912f0be96a 100644 --- a/src/world/area_sbk/sbk_02/92A9A0.c +++ b/src/world/area_sbk/sbk_02/92A9A0.c @@ -6,7 +6,7 @@ // needs data #ifdef NON_MATCHING -ApiStatus func_8024091C_92ABCC(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_8024091C_92ABCC) { Bytecode* args = script->ptrReadPos; if (isInitialCall) { D_8024404C_92E2FC = FALSE; @@ -27,7 +27,7 @@ static s32 D_80245630[91]; extern s32 D_8024404C_92E2FC; extern s32 D_80244050_92E300; -ApiStatus func_80240970_92AC20(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_80240970_92AC20) { Bytecode* args = script->ptrReadPos; D_80244050_92E300 = evt_get_variable(script, *args++); @@ -35,7 +35,7 @@ ApiStatus func_80240970_92AC20(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802409A8_92AC58(Evt* script, s32 isInitialCall) { +API_CALLABLE(func_802409A8_92AC58) { Bytecode* args = script->ptrReadPos; s32* buf = (s32*) evt_get_variable(script, *args++); s32 i; @@ -58,7 +58,7 @@ ApiStatus func_802409A8_92AC58(Evt* script, s32 isInitialCall) { #include "world/common/GetItemName.inc.c" -ApiStatus PostChapter2StatUpdate(Evt* script, s32 isInitialCall) { +API_CALLABLE(PostChapter2StatUpdate) { PlayerData* playerData = &gPlayerData; set_max_SP(2); @@ -68,13 +68,12 @@ ApiStatus PostChapter2StatUpdate(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus N(CheckTradeEventTime)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(CheckTradeEventTime)) { script->varTable[0] = (s32)((gPlayerData.frameCounter - gPlayerData.tradeEventStartTime) / 3600) < script->varTable[0]; return ApiStatus_DONE2; } - -ApiStatus GetItemCount(Evt* script, s32 isInitialCall) { +API_CALLABLE(GetItemCount) { script->varTable[0] = get_item_count(); return ApiStatus_DONE2; } diff --git a/src/world/area_sbk/sbk_02/sbk_02.h b/src/world/area_sbk/sbk_02/sbk_02.h index 119bd71c4e..e3b96ce502 100644 --- a/src/world/area_sbk/sbk_02/sbk_02.h +++ b/src/world/area_sbk/sbk_02/sbk_02.h @@ -2,8 +2,23 @@ /// @brief Dry Dry Desert - N3W1 Ruins Entrance #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_02_shape.h" +#include "mapfs/sbk_02_hit.h" + +#include "sprite/npc/WorldMamar.h" +#include "sprite/npc/Toad.h" + +enum { + NPC_Mamar = 1, + NPC_Toad = 2, +}; + +enum { + MV_Unk_00 = MapVar(0), +}; + #define NAMESPACE sbk_02 diff --git a/src/world/area_sbk/sbk_02/sbk_02_0_header.c b/src/world/area_sbk/sbk_02/sbk_02_0_header.c new file mode 100644 index 0000000000..fd67af6b91 --- /dev/null +++ b/src/world/area_sbk/sbk_02/sbk_02_0_header.c @@ -0,0 +1,45 @@ +#include "sbk_02.h" + +extern EvtScript N(EVS_Main); + +s32 N(get_tattle)(void) { + s32 tattle; + if (evt_get_variable(NULL, GB_StoryProgress) > STORY_CH2_GOT_PULSE_STONE) { + tattle = MSG_MapTattle_sbk_02_after; + } else { + tattle = MSG_MapTattle_sbk_02_before; + } + return tattle; +} + +EntryList N(Entrances) = { + [sbk_02_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_02_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_02_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_02_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, + [sbk_02_ENTRY_4] { 0.0, 80.0, -195.0, 180.0 }, + [sbk_02_ENTRY_5] { 20.0, 0.0, 110.0, 270.0 }, + [sbk_02_ENTRY_6] { -80.0, 0.0, 80.0, 180.0 }, + [sbk_02_ENTRY_7] { 80.0, 0.0, 80.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { &N(get_tattle) }, +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(sbk_02_ENTRY_6) + EVT_CASE_OR_EQ(sbk_02_ENTRY_7) + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_02/sbk_02_1_main.c b/src/world/area_sbk/sbk_02/sbk_02_1_main.c new file mode 100644 index 0000000000..0ef15152ce --- /dev/null +++ b/src/world/area_sbk/sbk_02/sbk_02_1_main.c @@ -0,0 +1,84 @@ +#include "sbk_02.h" +#include "effects.h" +#include "entity.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_80243A00); +extern EvtScript N(EVS_80243B38); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); + +EvtScript N(EVS_ExitWalk_sbk_01_1) = EVT_EXIT_WALK(60, sbk_02_ENTRY_0, "sbk_01", sbk_01_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_03_0) = EVT_EXIT_WALK(60, sbk_02_ENTRY_1, "sbk_03", sbk_03_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_12_2) = EVT_EXIT_WALK(60, sbk_02_ENTRY_3, "sbk_12", sbk_12_ENTRY_2); +EvtScript N(EVS_ExitWalk_isk_01_0) = EVT_EXIT_WALK(60, sbk_02_ENTRY_4, "isk_01", isk_01_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_01_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_03_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_12_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_isk_01_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deili1, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240F30_92B1E0) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(sbk_02_ENTRY_5) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_OR_EQ(sbk_02_ENTRY_6) + EVT_CASE_OR_EQ(sbk_02_ENTRY_7) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_IF_LT(GB_StoryProgress, STORY_CH2_UNCOVERED_DRY_DRY_RUINS) + EVT_CALL(PlayEffect, EFFECT_SUN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_SET(MV_Unk_00, LVarF) + EVT_END_IF + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_BEGAN_PEACH_MISSION) + EVT_CALL(SetMusicTrack, 0, SONG_STAR_SPIRIT_THEME, 1, 8) + EVT_ELSE + EVT_EXEC(N(EVS_SetupMusic)) + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(sbk_02_ENTRY_6) + EVT_CASE_OR_EQ(sbk_02_ENTRY_7) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_EXEC_WAIT(N(EVS_80243A00)) + EVT_END_SWITCH + EVT_EXEC(N(D_80240F30_92B1E0)) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(sbk_02_ENTRY_5) + EVT_WAIT(65) + EVT_CASE_OR_EQ(sbk_02_ENTRY_6) + EVT_CASE_OR_EQ(sbk_02_ENTRY_7) + EVT_EXEC(N(EVS_80243B38)) + EVT_WAIT(3) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_WAIT(1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_02/sbk_02_2_ruins.c b/src/world/area_sbk/sbk_02/sbk_02_2_ruins.c new file mode 100644 index 0000000000..892d0e3104 --- /dev/null +++ b/src/world/area_sbk/sbk_02/sbk_02_2_ruins.c @@ -0,0 +1,734 @@ +#include "sbk_02.h" +#include "effects.h" + +#include "world/common/atomic/UnkFunc27.inc.c" + +API_CALLABLE(N(func_80240338_92A5E8)) { + EffectInstance* effect = (EffectInstance*)evt_get_variable(script, MapVar(0)); + + effect->data.sun->targetAlpha = 0; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(func_80240364_92A614)) { + static u8 savedPrimR, savedPrimG, savedPrimB; + static u8 savedEnvR, savedEnvG, savedEnvB; + static s32 targetPrimR, targetPrimG, targetPrimB; + static s32 targetEnvR, targetEnvG, targetEnvB; + static s32 duration, elapsed; + + Bytecode* args = script->ptrReadPos; + s32 blendPrimR, blendPrimG, blendPrimB; + s32 blendEnvR, blendEnvG, blendEnvB; + + if (isInitialCall) { + get_model_env_color_parameters(&savedPrimR, &savedPrimG, &savedPrimB, &savedEnvR, &savedEnvG, &savedEnvB); + targetPrimR = evt_get_variable(script, *args++); + targetPrimG = evt_get_variable(script, *args++); + targetPrimB = evt_get_variable(script, *args++); + targetEnvR = evt_get_variable(script, *args++); + targetEnvG = evt_get_variable(script, *args++); + targetEnvB = evt_get_variable(script, *args++); + duration = evt_get_variable(script, *args++); + elapsed = 0; + } + + if (duration > 0) { + elapsed++; + blendPrimR = savedPrimR + ((targetPrimR - savedPrimR) * elapsed) / duration; + blendPrimG = savedPrimG + ((targetPrimG - savedPrimG) * elapsed) / duration; + blendPrimB = savedPrimB + ((targetPrimB - savedPrimB) * elapsed) / duration; + blendEnvR = savedEnvR + ((targetEnvR - savedEnvR) * elapsed) / duration; + blendEnvG = savedEnvG + ((targetEnvG - savedEnvG) * elapsed) / duration; + blendEnvB = savedEnvB + ((targetEnvB - savedEnvB) * elapsed) / duration; + + set_model_env_color_parameters(blendPrimR, blendPrimG, blendPrimB, blendEnvR, blendEnvG, blendEnvB); + if (elapsed >= duration) { + return ApiStatus_DONE2; + } + } else { + set_model_env_color_parameters(targetPrimR, targetPrimG, targetPrimB, targetEnvR, targetEnvG, targetEnvB); + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} + +s32 N(D_80241250_92B500)[] = { + ITEM_PULSE_STONE, + ITEM_NONE +}; + +EvtScript N(D_80241258_92B508) = { + EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, 0, 0, 0, 20, 10, 0, 60, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_DUST, 2, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(PlaySoundAtCollider, COLLIDER_iwa, SOUND_5F, 0) + EVT_SET(LVar2, 0) + EVT_CALL(MakeLerp, 0, -50, 50, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_point_iwa, LVar2, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_point_iwa, 0, LVar0, 0) + EVT_SUB(LVar2, 10) + EVT_ADDF(LVar3, EVT_FLOAT(0.2)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_iwa, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_point_iwa, FALSE) + EVT_CALL(PlaySound, SOUND_8000005F) + EVT_RETURN + EVT_END +}; + +s32 N(D_80241418_92B6C8)[] = { + MODEL_ruins, MODEL_step, 0x0000FFFF +}; + +s32 N(D_80241424_92B6D4)[] = { + MODEL_upper_light, MODEL_o225, 0x0000FFFF +}; + +EvtScript N(D_80241430_92B6E0) = { + EVT_CALL(N(UnkFunc27), 2, 0, 3) + EVT_CALL(N(UnkFunc27), 1, -1, 3) + EVT_CALL(N(UnkFunc27), 1, EVT_PTR(N(D_80241418_92B6C8)), 0) + EVT_CALL(N(UnkFunc27), 0, EVT_PTR(N(D_80241424_92B6D4)), 0) + EVT_CALL(N(func_80240364_92A614), 255, 255, 255, 0, 0, 0, 0) + EVT_WAIT(1) + EVT_CALL(N(func_80240364_92A614), 44, 32, 177, 0, 0, 0, 60) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802414FC_92B7AC) = { + EVT_CALL(SetRenderMode, MODEL_o225, RENDER_MODE_SURFACE_XLU_LAYER2) + EVT_CALL(EnableTexPanning, MODEL_o225, TRUE) + EVT_CALL(EnableTexPanning, 0x00002710, TRUE) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 0) + EVT_LOOP(0) + EVT_CALL(SetTexPanOffset, 3, 0, LVar0, 0) + EVT_CALL(SetTexPanOffset, 3, 1, LVar1, LVar2) + EVT_ADD(LVar0, 0x00001770) + EVT_ADD(LVar1, 0x00001388) + EVT_ADD(LVar2, 0x00000FA0) + EVT_IF_GT(LVar0, 0x00020000) + EVT_SUB(LVar0, 0x00020000) + EVT_END_IF + EVT_IF_GT(LVar1, 0x00020000) + EVT_SUB(LVar1, 0x00020000) + EVT_END_IF + EVT_IF_GT(LVar2, 0x00020000) + EVT_SUB(LVar2, 0x00020000) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80241678_92B928) = { + EVT_CALL(EnableModel, MODEL_o225, TRUE) + EVT_SET(LVar2, 0) + EVT_SET(LVar0, -100) + EVT_LOOP(100) + EVT_SET(LVar3, LVar2) + EVT_DIVF(LVar3, 80) + EVT_CALL(ScaleModel, MODEL_o225, LVar3, EVT_FLOAT(1.0), LVar3) + EVT_CALL(TranslateModel, MODEL_o225, 0, LVar0, 0) + EVT_ADD(LVar0, 1) + EVT_ADD(LVar2, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(0) + EVT_CALL(ScaleModel, MODEL_o225, LVar3, EVT_FLOAT(1.0), LVar3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80241790_92BA40) = { + EVT_WAIT(10) + EVT_CALL(EnableModel, 0x00002710, TRUE) + EVT_SET(LVar2, 0) + EVT_SET(LVar0, -100) + EVT_LOOP(100) + EVT_SET(LVar3, LVar2) + EVT_DIVF(LVar3, 110) + EVT_CALL(ScaleModel, 0x00002710, LVar3, EVT_FLOAT(1.0), LVar3) + EVT_CALL(TranslateModel, 0x00002710, 0, LVar0, 0) + EVT_ADD(LVar0, 1) + EVT_ADD(LVar2, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(0) + EVT_CALL(ScaleModel, 0x00002710, LVar3, EVT_FLOAT(1.0), LVar3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802418B4_92BB64) = { + EVT_CALL(EnableModel, MODEL_o225, TRUE) + EVT_SET(LVar0, 0) + EVT_SET(LVar2, 100) + EVT_SETF(LVar3, EVT_FLOAT(1.25)) + EVT_LOOP(20) + EVT_CALL(ScaleModel, MODEL_o225, LVar3, EVT_FLOAT(1.0), LVar3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(70) + EVT_SET(LVar3, LVar2) + EVT_DIVF(LVar3, 80) + EVT_CALL(ScaleModel, MODEL_o225, LVar3, LVar3, LVar3) + EVT_CALL(TranslateModel, MODEL_o225, 0, LVar0, 0) + EVT_SUB(LVar0, 2) + EVT_ADD(LVar2, 5) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(EnableModel, MODEL_o225, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802419F0_92BCA0) = { + EVT_WAIT(10) + EVT_CALL(EnableModel, 0x00002710, TRUE) + EVT_SET(LVar0, 0) + EVT_SET(LVar2, 100) + EVT_SETF(LVar3, EVT_FLOAT(0.91)) + EVT_LOOP(20) + EVT_CALL(ScaleModel, 0x00002710, LVar3, EVT_FLOAT(1.0), LVar3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(70) + EVT_SET(LVar3, LVar2) + EVT_DIVF(LVar3, 110) + EVT_CALL(ScaleModel, 0x00002710, LVar3, LVar3, LVar3) + EVT_CALL(TranslateModel, 0x00002710, 0, LVar0, 0) + EVT_SUB(LVar0, 2) + EVT_ADD(LVar2, 5) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(EnableModel, 0x00002710, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80241B38_92BDE8) = { + EVT_CHILD_THREAD + EVT_CALL(EnableTexPanning, MODEL_upper_light, TRUE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_CALL(SetTexPanOffset, 1, 0, LVar0, 0) + EVT_ADD(LVar0, 0x000009C4) + EVT_IF_GT(LVar0, 0x00008000) + EVT_SUB(LVar0, 0x00008000) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CALL(EnableModel, MODEL_upper_light, TRUE) + EVT_SET(LVar0, -200) + EVT_SET(LVar1, 0) + EVT_LOOP(200) + EVT_CALL(TranslateModel, MODEL_upper_light, 0, LVar0, 0) + EVT_ADD(LVar0, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80241C90_92BF40) = { + EVT_CHILD_THREAD + EVT_CALL(EnableTexPanning, MODEL_upper_light, TRUE) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_CALL(SetTexPanOffset, 1, 0, LVar0, 0) + EVT_ADD(LVar0, 0x000009C4) + EVT_IF_GT(LVar0, 0x00008000) + EVT_SUB(LVar0, 0x00008000) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CALL(EnableModel, MODEL_upper_light, TRUE) + EVT_SET(LVar0, 0) + EVT_CALL(TranslateModel, MODEL_upper_light, 0, LVar0, 0) + EVT_WAIT(10) + EVT_LOOP(100) + EVT_CALL(TranslateModel, MODEL_upper_light, 0, LVar0, 0) + EVT_SUB(LVar0, 2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80241DE0_92C090) = { + EVT_CALL(MakeTransformGroup, MODEL_ruins) + EVT_CALL(EnableGroup, MODEL_ruins, TRUE) + EVT_THREAD + EVT_CALL(EnableTexPanning, MODEL_o232, TRUE) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 0) + EVT_LOOP(600) + EVT_CALL(SetTexPanOffset, 2, 0, 0, LVar0) + EVT_CALL(SetTexPanOffset, 2, 1, LVar1, LVar2) + EVT_ADD(LVar0, 200) + EVT_ADD(LVar1, -200) + EVT_ADD(LVar2, 700) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(EnableModel, MODEL_o232, FALSE) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_LOOP(30) + EVT_CALL(RandInt, 290, LVar0) + EVT_ADD(LVar0, -110) + EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -35, 20, 10, 0, 60, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_DUST, 2, LVar0, 0, -35, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(10) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_LOOP(15) + EVT_CALL(RandInt, 180, LVar0) + EVT_ADD(LVar0, 170) + EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -300, 20, 10, 0, 60, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_DUST, 2, LVar0, 0, -300, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(20) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(100) + EVT_LOOP(5) + EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, -180, 0, 260, 20, 10, 0, 60, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_DUST, 2, -180, 0, 260, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(40) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(110) + EVT_LOOP(4) + EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, 180, 0, 260, 20, 10, 0, 60, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_DUST, 2, 180, 0, 260, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(50) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(PlaySound, SOUND_8000005E) + EVT_CALL(MakeLerp, -310, 0, 310, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_ruins, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802422F0_92C5A0) = { + EVT_CALL(MakeTransformGroup, MODEL_ruins) + EVT_CALL(EnableGroup, MODEL_ruins, TRUE) + EVT_THREAD + EVT_CALL(EnableTexPanning, MODEL_o232, TRUE) + EVT_SET(LVar0, 0x0000EA60) + EVT_SET(LVar1, 0xFFFF15A0) + EVT_SET(LVar2, 0x00033450) + EVT_LOOP(300) + EVT_CALL(SetTexPanOffset, 2, 0, 0, LVar0) + EVT_CALL(SetTexPanOffset, 2, 1, LVar1, LVar2) + EVT_ADD(LVar0, 200) + EVT_ADD(LVar1, -200) + EVT_ADD(LVar2, 700) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(EnableModel, MODEL_o232, FALSE) + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(10) + EVT_CALL(RandInt, 290, LVar0) + EVT_ADD(LVar0, -110) + EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -35, 20, 10, 0, 60, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_DUST, 2, LVar0, 0, -35, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(10) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_LOOP(5) + EVT_CALL(RandInt, 180, LVar0) + EVT_ADD(LVar0, 170) + EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, LVar0, 0, -300, 20, 10, 0, 60, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_DUST, 2, LVar0, 0, -300, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(20) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(3) + EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, -180, 0, 260, 20, 10, 0, 60, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_DUST, 2, -180, 0, 260, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(40) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(10) + EVT_LOOP(2) + EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, 180, 0, 260, 20, 10, 0, 60, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_DUST, 2, 180, 0, 260, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(50) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(MakeLerp, -20, 0, 20, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_ruins, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802427F4_92CAA4) = { + EVT_CALL(RotateGroup, MODEL_c_wang, LVar0, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_d_wang, LVar0, 0, 1, 0) + EVT_SET(LVar2, 0) + EVT_SUB(LVar2, LVar0) + EVT_CALL(RotateGroup, MODEL_a_wang, LVar2, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_b_wang, LVar2, 0, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802428A4_92CB54) = { + EVT_CALL(MakeLerp, 180, 0, 60, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_EXEC_WAIT(N(D_802427F4_92CAA4)) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80242928_92CBD8) = { + EVT_CALL(MakeLerp, 0, 60, 180, EASING_QUADRATIC_IN) + EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o168, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o177, LVar0, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o169, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o178, -20, 0, 0) + EVT_CALL(RotateModel, MODEL_o169, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o178, LVar0, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o169, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o178, 20, 0, 0) + EVT_CALL(RotateModel, MODEL_o130, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o176, LVar0, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o175, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o129, -20, 0, 0) + EVT_CALL(RotateModel, MODEL_o175, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o129, LVar0, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o175, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o129, 20, 0, 0) + EVT_SET(LVar2, 0) + EVT_SUB(LVar2, LVar0) + EVT_CALL(RotateModel, MODEL_o141, LVar2, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o174, LVar2, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o140, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, 20, 0, 0) + EVT_CALL(RotateModel, MODEL_o140, LVar2, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o173, LVar2, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o140, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, -20, 0, 0) + EVT_CALL(RotateModel, MODEL_o157, LVar2, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o171, LVar2, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o158, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o172, 20, 0, 0) + EVT_CALL(RotateModel, MODEL_o158, LVar2, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o172, LVar2, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o158, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o172, -20, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(MakeLerp, 0, 60, 180, EASING_QUADRATIC_OUT) + EVT_LABEL(20) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_o169, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o178, -20, 0, 0) + EVT_CALL(RotateModel, MODEL_o169, 60, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o178, 60, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o169, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o178, 20, 0, 0) + EVT_CALL(RotateModel, MODEL_o169, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o178, LVar0, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o175, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o129, -20, 0, 0) + EVT_CALL(RotateModel, MODEL_o175, 60, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o129, 60, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o175, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o129, 20, 0, 0) + EVT_CALL(RotateModel, MODEL_o175, LVar0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o129, LVar0, 0, 1, 0) + EVT_SET(LVar2, 0) + EVT_SUB(LVar2, LVar0) + EVT_CALL(TranslateModel, MODEL_o140, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, 20, 0, 0) + EVT_CALL(RotateModel, MODEL_o140, -60, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o173, -60, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o140, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o173, -20, 0, 0) + EVT_CALL(RotateModel, MODEL_o140, LVar2, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o173, LVar2, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o158, 20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o172, 20, 0, 0) + EVT_CALL(RotateModel, MODEL_o158, -60, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o172, -60, 0, 1, 0) + EVT_CALL(TranslateModel, MODEL_o158, -20, 0, 0) + EVT_CALL(TranslateModel, MODEL_o172, -20, 0, 0) + EVT_CALL(RotateModel, MODEL_o158, LVar2, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o172, LVar2, 0, 1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(20) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802431C0_92D470) = { + EVT_CALL(EnableGroup, MODEL_step, TRUE) + EVT_CALL(MakeLerp, -310, 0, 310, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_step, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80243268_92D518) = { + EVT_CALL(EnableGroup, MODEL_step, TRUE) + EVT_CALL(MakeLerp, -20, 0, 20, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_step, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80243310_92D5C0) = { + EVT_CALL(PlaySoundAt, SOUND_5E, 0, 0, 39, -80) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(0.2)) + EVT_END_THREAD + EVT_CALL(MakeLerp, 0, -180, 180, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(RotateModel, MODEL_o106, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o107, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o100, LVar0, 1, 0, 0) + EVT_CALL(RotateModel, MODEL_o105, LVar0, 1, 0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, 61, 2, -83, 20, 10, 0, 60, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_DUST, 2, 61, 2, -83, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(3) + EVT_CALL(PlayEffect, EFFECT_SMOKE_IMPACT, 0, -61, 2, -83, 20, 10, 0, 60, 0, 0, 0, 0, 0) + EVT_CALL(PlayEffect, EFFECT_DUST, 2, -61, 2, -83, 60, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024358C_92D83C) = { + EVT_CALL(DisablePulseStone, TRUE) + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_LE(LVar0, 0) + EVT_CALL(CloseChoicePopup) + EVT_CALL(DisablePulseStone, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(func_802CF56C, 1) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_CALL(CloseChoicePopup) + EVT_SET(GB_StoryProgress, STORY_CH2_UNCOVERED_DRY_DRY_RUINS) + EVT_CALL(N(func_80240338_92A5E8)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_RUINS_APPEAR, 1, 8) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 210, 0, 137) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(150.0), EVT_FLOAT(500.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(-450.0), EVT_FLOAT(-500.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(10) + EVT_SET(LVar0, 180) + EVT_EXEC_WAIT(N(D_802427F4_92CAA4)) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 120, EVT_FLOAT(0.2)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 300, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 300, EVT_FLOAT(0.2)) + EVT_END_THREAD + EVT_EXEC(N(D_80241258_92B508)) + EVT_WAIT(30) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 0) + EVT_SET(LVar0, -80) + EVT_SET(LocalFlag(0), FALSE) + EVT_ELSE + EVT_SET(LVar0, 80) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, LVar0, 80, 0) + EVT_CALL(func_802D2884, 0, 0, 0) + EVT_END_THREAD + EVT_EXEC(N(D_80241430_92B6E0)) + EVT_WAIT(30) + EVT_CALL(CloneModel, MODEL_o225, 0x00002710) + EVT_EXEC(N(D_802414FC_92B7AC)) + EVT_EXEC(N(D_80241678_92B928)) + EVT_EXEC(N(D_80241790_92BA40)) + EVT_WAIT(100) + EVT_EXEC(N(D_80241B38_92BDE8)) + EVT_WAIT(150) + EVT_EXEC(N(D_80241DE0_92C090)) + EVT_EXEC(N(D_802431C0_92D470)) + EVT_WAIT(100) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(8.0), EVT_FLOAT(-9.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(80) + EVT_EXEC(N(D_802428A4_92CB54)) + EVT_WAIT(60) + EVT_WAIT(50) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(GotoMap, EVT_PTR("sbk_30"), sbk_30_ENTRY_4) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("sbk_30"), sbk_30_ENTRY_5) + EVT_END_IF + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_80243A00) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(EnableGroup, MODEL_day_version, FALSE) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_ruin, COLLIDER_FLAGS_UPPER_MASK) + EVT_CASE_LT(STORY_CH2_UNCOVERED_DRY_DRY_RUINS) + EVT_CALL(EnableGroup, MODEL_day_version, FALSE) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_ruin, COLLIDER_FLAGS_UPPER_MASK) + EVT_BIND_PADLOCK(EVT_PTR(N(D_8024358C_92D83C)), TRIGGER_WALL_PRESS_A, COLLIDER_iwa, EVT_PTR(N(D_80241250_92B500)), 0, 1) + EVT_CASE_DEFAULT + EVT_CALL(EnableModel, MODEL_point_iwa, FALSE) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_pikapika, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_SWITCH + EVT_CALL(EnableGroup, MODEL_ruins, FALSE) + EVT_CALL(EnableGroup, MODEL_step, FALSE) + EVT_CALL(EnableModel, MODEL_upper_light, FALSE) + EVT_CALL(EnableModel, MODEL_o225, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_80243B38) = { + EVT_CALL(PlaySound, SOUND_5C) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(func_802CF56C, 1) + EVT_CALL(func_802D2884, 0, 0, 0) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_iwa, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_point_iwa, FALSE) + EVT_CALL(EnableGroup, MODEL_day_version, FALSE) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 400, EVT_FLOAT(0.2)) + EVT_END_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 210, 0, 137) + EVT_CALL(SetCamPosA, CAM_DEFAULT, EVT_FLOAT(150.0), EVT_FLOAT(500.0)) + EVT_CALL(SetCamPosB, CAM_DEFAULT, EVT_FLOAT(-450.0), EVT_FLOAT(-500.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(8.0), EVT_FLOAT(-9.0)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(500.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(N(UnkFunc27), 2, 0, 3) + EVT_CALL(N(UnkFunc27), 1, -1, 3) + EVT_CALL(N(UnkFunc27), 1, EVT_PTR(N(D_80241418_92B6C8)), 0) + EVT_CALL(N(UnkFunc27), 0, EVT_PTR(N(D_80241424_92B6D4)), 0) + EVT_CALL(N(func_80240364_92A614), 44, 32, 177, 0, 0, 0, 0) + EVT_EXEC(N(D_802422F0_92C5A0)) + EVT_EXEC(N(D_80243268_92D518)) + EVT_CALL(CloneModel, MODEL_o225, 0x00002710) + EVT_EXEC(N(D_802414FC_92B7AC)) + EVT_EXEC(N(D_802418B4_92BB64)) + EVT_EXEC(N(D_802419F0_92BCA0)) + EVT_WAIT(20) + EVT_EXEC(N(D_80241C90_92BF40)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(4.0), EVT_FLOAT(-6.5)) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(790.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.2)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(100) + EVT_EXEC(N(D_80242928_92CBD8)) + EVT_WAIT(100) + EVT_EXEC_WAIT(N(D_80243310_92D5C0)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_ruin, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(60) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(func_802CF56C, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_02/sbk_02_3_npc.c b/src/world/area_sbk/sbk_02/sbk_02_3_npc.c new file mode 100644 index 0000000000..d61a9ac5ef --- /dev/null +++ b/src/world/area_sbk/sbk_02/sbk_02_3_npc.c @@ -0,0 +1,458 @@ +#include "sbk_02.h" +#include "effects.h" + + +#include "world/common/GetNpcCollisionHeight.inc.c" + +#include "world/common/AddPlayerHandsOffset.inc.c" + +// needs data +#ifdef NON_MATCHING +API_CALLABLE(func_8024091C_92ABCC) { + Bytecode* args = script->ptrReadPos; + if (isInitialCall) { + D_8024404C_92E2FC = FALSE; + } + if (D_8024404C_92E2FC) { + D_8024404C_92E2FC = FALSE; + evt_set_variable(script, *args++, D_80244050_92E300); + return ApiStatus_DONE2; + } else { + return ApiStatus_BLOCK; + } +} +#else +INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_8024091C_92ABCC); +#endif + +static s32 D_80245630[91]; +extern s32 D_8024404C_92E2FC; +extern s32 D_80244050_92E300; + +API_CALLABLE(func_80240970_92AC20) { + Bytecode* args = script->ptrReadPos; + + D_80244050_92E300 = evt_get_variable(script, *args++); + D_8024404C_92E2FC = TRUE; + return ApiStatus_DONE2; +} + +API_CALLABLE(func_802409A8_92AC58) { + Bytecode* args = script->ptrReadPos; + s32* buf = (s32*) evt_get_variable(script, *args++); + s32 i; + + if (buf != NULL) { + for (i = 0; *buf != NULL; i++) { + D_80245630[i] = *buf++; + } + D_80245630[i] = 0; + } else { + for (i = 0; i <= 90; i++) { + D_80245630[i] = i + 0x80; + D_80245630[91] = 0; + } + } + return ApiStatus_DONE2; +} + +#include "world/common/StashVars.inc.c" + +#include "world/common/GetItemName.inc.c" + +API_CALLABLE(PostChapter2StatUpdate) { + PlayerData* playerData = &gPlayerData; + + set_max_SP(2); + playerData->curHP = playerData->curMaxHP; + playerData->curFP = playerData->curMaxFP; + sync_status_menu(); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(CheckTradeEventTime)) { + script->varTable[0] = (s32)((gPlayerData.frameCounter - gPlayerData.tradeEventStartTime) / 3600) < script->varTable[0]; + return ApiStatus_DONE2; +} + +API_CALLABLE(GetItemCount) { + script->varTable[0] = get_item_count(); + return ApiStatus_DONE2; +} + + +NpcSettings N(NpcSettings_Mamar) = { + .height = 26, + .radius = 24, + .level = 99, +}; + +s32 N(missing_80243F9C_3F9C)[] = { + 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00630000, + 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00630000, +}; + +NpcSettings N(NpcSettings_Toad) = { + .height = 30, + .radius = 24, + .level = 99, +}; + +s32 N(missing_80244020_4020)[] = { + 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00630000, +}; + +s32 N(D_8024404C_92E2FC) = 0; + +s32 N(D_80244050_92E300) = 0; + +EvtScript N(D_80244054_92E304) = { + EVT_SET(LVar9, LVar1) + EVT_CALL(ShowConsumableChoicePopup) + EVT_SET(LVarA, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CASE_EQ(-1) + EVT_CASE_DEFAULT + EVT_CALL(RemoveItemAt, LVar1) + EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) + EVT_CALL(N(AddPlayerHandsOffset), LVar3, LVar4, LVar5) + EVT_CALL(MakeItemEntity, LVar0, 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_END_SWITCH + EVT_CALL(N(func_80240970_92AC20), LVarA) + EVT_CALL(CloseChoicePopup) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80244188_92E438) = { + EVT_CALL(N(func_802409A8_92AC58), LVar0) + EVT_BIND_PADLOCK(EVT_PTR(N(D_80244054_92E304)), TRIGGER_FORCE_ACTIVATE, 0, 80245630_BSS[30], 0, 1) + EVT_CALL(N(func_8024091C_92ABCC), LVar0) + EVT_RETURN + EVT_END +}; + +s32** N(varStash) = NULL; + +EvtScript N(D_802441DC_92E48C) = { + EVT_CALL(ShowGotItem, LVar0, TRUE, 0) + EVT_RETURN + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_8024420C) = { + EVT_CALL(ShowGotItem, LVar0, TRUE, 16) + EVT_RETURN + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Mamar) = { + EVT_LOOP(0) + EVT_LOOP(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_SUB(LVar1, 1) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 1) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80244330_92E5E0) = { + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(func_802CF56C, 2) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SET(LVar3, LVar0) + EVT_ADD(LVar3, -50) + EVT_SET(LVar4, LVar1) + EVT_ADD(LVar4, 26) + EVT_CALL(SetNpcPos, NPC_Mamar, LVar3, LVar4, LVar2) + EVT_CALL(PlayerFaceNpc, NPC_Mamar, FALSE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 600) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(18.0), EVT_FLOAT(-9.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(1) + EVT_CALL(WaitForPlayerInputEnabled) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, 512, MSG_CH2_00EB) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 18, -9) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_Mamar, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(EnableNpcAI, NPC_Mamar, FALSE) + EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Leap) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(PlaySoundAtPlayer, SOUND_139, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SET(LVar3, LVar1) + EVT_ADD(LVar1, 50) + EVT_ADD(LVar2, 10) + EVT_ADD(LVar3, 30) + EVT_LOOP(5) + EVT_CALL(PlayEffect, EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(6) + EVT_CALL(PlayEffect, EFFECT_SPARKLES, 1, LVar0, LVar3, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(6) + EVT_END_LOOP + EVT_WAIT(20) + EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 20) + EVT_CALL(PlayEffect, EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Idle) + EVT_CALL(EnableNpcAI, NPC_Mamar, TRUE) + EVT_CALL(N(PostChapter2StatUpdate)) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0192, 160, 40) + EVT_WAIT(10) + EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(250.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, 512, MSG_CH2_00EC) + EVT_WAIT(10) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(GetNpcPos, NPC_Mamar, LVar3, LVar4, LVar5) + EVT_ADD(LVar0, LVar3) + EVT_DIV(LVar0, 2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Mamar, ANIM_WorldMamar_TalkHappy, ANIM_WorldMamar_Idle, 512, MSG_CH2_00ED) + EVT_CALL(SetNpcFlagBits, NPC_Mamar, NPC_FLAG_40000, TRUE) + EVT_THREAD + EVT_LOOP(25) + EVT_CALL(GetNpcPos, NPC_Mamar, LVar0, LVar1, LVar2) + EVT_CALL(PlayEffect, EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 20, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_WAIT(4) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_SET(LVar2, 0) + EVT_SET(LVar3, 0x00000708) + EVT_CALL(MakeLerp, LVar2, LVar3, 100, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_Mamar, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_Mamar, LVar2, LVar3, LVar4) + EVT_SET(LVar5, LVar3) + EVT_ADD(LVar5, 180) + EVT_CALL(MakeLerp, LVar3, LVar5, 100, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcPos, NPC_Mamar, LVar2, LVar0, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcPos, NPC_Mamar, NPC_DISPOSE_LOCATION) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(PlaySoundAtNpc, NPC_Mamar, SOUND_2045, 0) + EVT_END_THREAD + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_WAIT(90) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_SET(GB_StoryProgress, STORY_CH2_STAR_SPRIT_DEPARTED) + EVT_EXEC(N(EVS_80240CC0)) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Mamar) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, sbk_02_ENTRY_5) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Mamar))) + EVT_EXEC(N(D_80244330_92E5E0)) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Toad) = { + EVT_SET(LVar0, 5) + EVT_CALL(N(CheckTradeEventTime)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_CH2_00EE) + EVT_WAIT(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0) + EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_SET(GF_TradingEvent2_Active, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(GetItemCount)) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_CH2_00EF) + EVT_RETURN + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_CH2_00F0) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 2) + EVT_EXEC_WAIT(N(D_80244188_92E438)) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(-1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_CH2_00F4) + EVT_RETURN + EVT_CASE_EQ(214) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_CH2_00F1) + EVT_SET(LVar0, ITEM_MAPLE_SUPER) + EVT_SET(LVar1, ITEM_TYPE_CONSUMABLE) + EVT_EXEC_WAIT(N(D_802441DC_92E48C)) + EVT_CALL(AddItem, LVar0, LVar1) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_CH2_00F2) + EVT_WAIT(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SMOKE_BURST, 0) + EVT_CALL(PlayEffect, EFFECT_BIG_SMOKE_PUFF, LVar0, LVar1, LVar2, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_SET(GF_TradingEvent2_Active, FALSE) + EVT_ADD(GB_TradingEvent_Count, 1) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Toad_Pink_Talk, ANIM_Toad_Pink_Idle, 0, MSG_CH2_00F3) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Toad) = { + EVT_IF_NE(GF_TradingEvent2_Active, FALSE) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Toad))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Mamar) = { + .id = NPC_Mamar, + .settings = &N(NpcSettings_Mamar), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .init = &N(EVS_NpcInit_Mamar), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_WorldMamar_Idle, + .walk = ANIM_WorldMamar_Idle, + .run = ANIM_WorldMamar_Idle, + .chase = ANIM_WorldMamar_Idle, + .anim_4 = ANIM_WorldMamar_Idle, + .anim_5 = ANIM_WorldMamar_Idle, + .death = ANIM_WorldMamar_Idle, + .hit = ANIM_WorldMamar_Idle, + .anim_8 = ANIM_WorldMamar_Still, + .anim_9 = ANIM_WorldMamar_Idle, + .anim_A = ANIM_WorldMamar_Idle, + .anim_B = ANIM_WorldMamar_Idle, + .anim_C = ANIM_WorldMamar_Idle, + .anim_D = ANIM_WorldMamar_Idle, + .anim_E = ANIM_WorldMamar_Idle, + .anim_F = ANIM_WorldMamar_Idle, + }, +}; + +StaticNpc N(NpcData_Toad) = { + .id = NPC_Toad, + .settings = &N(NpcSettings_Toad), + .pos = { 0.0f, 2.0f, 150.0f }, + .yaw = 90, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_ENABLE_HIT_SCRIPT | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_DIRTY_SHADOW | NPC_FLAG_MOTION_BLUR, + .init = &N(EVS_NpcInit_Toad), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Toad_Pink_Idle, + .walk = ANIM_Toad_Pink_Walk, + .run = ANIM_Toad_Pink_Run, + .chase = ANIM_Toad_Pink_Run, + .anim_4 = ANIM_Toad_Pink_Idle, + .anim_5 = ANIM_Toad_Pink_Idle, + .death = ANIM_Toad_Pink_Idle, + .hit = ANIM_Toad_Pink_Disappointed, + .anim_8 = ANIM_Toad_Pink_Run, + .anim_9 = ANIM_Toad_Pink_Run, + .anim_A = ANIM_Toad_Pink_Run, + .anim_B = ANIM_Toad_Pink_Run, + .anim_C = ANIM_Toad_Pink_Run, + .anim_D = ANIM_Toad_Pink_Run, + .anim_E = ANIM_Toad_Pink_Run, + .anim_F = ANIM_Toad_Pink_Run, + }, + .tattle = MSG_NpcTattle_PrizeToad, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Mamar)), + NPC_GROUP(N(NpcData_Toad)), + {} +}; diff --git a/src/world/area_sbk/sbk_02/sbk_02_4_entity.c b/src/world/area_sbk/sbk_02/sbk_02_4_entity.c new file mode 100644 index 0000000000..2a9f34afa7 --- /dev/null +++ b/src/world/area_sbk/sbk_02/sbk_02_4_entity.c @@ -0,0 +1,10 @@ +#include "sbk_02.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH2_UNCOVERED_DRY_DRY_RUINS) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), -240, 60, -200, 0, 6, MAKE_ENTITY_END) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_03/92F8B0.c b/src/world/area_sbk/sbk_03/92F8B0.c deleted file mode 100644 index 222d3345cc..0000000000 --- a/src/world/area_sbk/sbk_03/92F8B0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_03.h" - -static char* N(exit_str_0) = "sbk_02"; -static char* N(exit_str_1) = "sbk_04"; -static char* N(exit_str_2) = "sbk_13"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_03/92F8F0.c b/src/world/area_sbk/sbk_03/92F8F0.c deleted file mode 100644 index ac14304699..0000000000 --- a/src/world/area_sbk/sbk_03/92F8F0.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "sbk_03.h" -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_03/sbk_03.h b/src/world/area_sbk/sbk_03/sbk_03.h index a3e5f88261..e12137efb4 100644 --- a/src/world/area_sbk/sbk_03/sbk_03.h +++ b/src/world/area_sbk/sbk_03/sbk_03.h @@ -2,8 +2,20 @@ /// @brief Dry Dry Desert - N3 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_03_shape.h" +#include "mapfs/sbk_03_hit.h" + +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, + NPC_Pokey_03 = 2, + NPC_Pokey_04 = 3, +}; + #define NAMESPACE sbk_03 diff --git a/src/world/area_sbk/sbk_03/sbk_03_1_main.c b/src/world/area_sbk/sbk_03/sbk_03_1_main.c new file mode 100644 index 0000000000..36cb6f3a5c --- /dev/null +++ b/src/world/area_sbk/sbk_03/sbk_03_1_main.c @@ -0,0 +1,49 @@ +#include "sbk_03.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_03_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_03_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_03_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_03_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_03 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_02_1) = EVT_EXIT_WALK(60, sbk_03_ENTRY_0, "sbk_02", sbk_02_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_04_0) = EVT_EXIT_WALK(60, sbk_03_ENTRY_1, "sbk_04", sbk_04_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_13_2) = EVT_EXIT_WALK(60, sbk_03_ENTRY_3, "sbk_13", sbk_13_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_02_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_04_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_13_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_03/sbk_03_2_npc.c b/src/world/area_sbk/sbk_03/sbk_03_2_npc.c new file mode 100644 index 0000000000..f542edeab3 --- /dev/null +++ b/src/world/area_sbk/sbk_03/sbk_03_2_npc.c @@ -0,0 +1,215 @@ +#include "sbk_03.h" + +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_Pokey), + .pos = { -340.0f, 0.0f, -125.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -340, 0, -125 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_Pokey), + .pos = { 10.0f, 0.0f, 100.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 10, 0, 100 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_03) = { + .id = NPC_Pokey_03, + .settings = &N(NpcSettings_Pokey), + .pos = { -90.0f, 0.0f, 260.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -90, 0, 260 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_04) = { + .id = NPC_Pokey_04, + .settings = &N(NpcSettings_Pokey), + .pos = { 165.0f, 0.0f, 300.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 165, 0, 300 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_SBK_FORMATION_00, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_02), BTL_SBK_FORMATION_03, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_03), BTL_SBK_FORMATION_02, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_04), BTL_SBK_FORMATION_01, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_04/9304D0.c b/src/world/area_sbk/sbk_04/9304D0.c deleted file mode 100644 index 1c9c4f67e1..0000000000 --- a/src/world/area_sbk/sbk_04/9304D0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_04.h" - -static char* N(exit_str_0) = "sbk_03"; -static char* N(exit_str_1) = "sbk_05"; -static char* N(exit_str_2) = "sbk_14"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_04/930510.c b/src/world/area_sbk/sbk_04/930510.c deleted file mode 100644 index be0e06a784..0000000000 --- a/src/world/area_sbk/sbk_04/930510.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "sbk_04.h" -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_04/sbk_04.h b/src/world/area_sbk/sbk_04/sbk_04.h index d7894826b5..08372dc47a 100644 --- a/src/world/area_sbk/sbk_04/sbk_04.h +++ b/src/world/area_sbk/sbk_04/sbk_04.h @@ -2,8 +2,18 @@ /// @brief Dry Dry Desert - N3E1 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_04_shape.h" +#include "mapfs/sbk_04_hit.h" + +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, +}; + #define NAMESPACE sbk_04 diff --git a/src/world/area_sbk/sbk_04/sbk_04_1_main.c b/src/world/area_sbk/sbk_04/sbk_04_1_main.c new file mode 100644 index 0000000000..ad8caf837f --- /dev/null +++ b/src/world/area_sbk/sbk_04/sbk_04_1_main.c @@ -0,0 +1,49 @@ +#include "sbk_04.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_04_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_04_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_04_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_04_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_04 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_03_1) = EVT_EXIT_WALK(60, sbk_04_ENTRY_0, "sbk_03", sbk_03_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_05_0) = EVT_EXIT_WALK(60, sbk_04_ENTRY_1, "sbk_05", sbk_05_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_14_2) = EVT_EXIT_WALK(60, sbk_04_ENTRY_3, "sbk_14", sbk_14_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_03_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_05_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_14_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_04/sbk_04_2_npc.c b/src/world/area_sbk/sbk_04/sbk_04_2_npc.c new file mode 100644 index 0000000000..e5e6f3b313 --- /dev/null +++ b/src/world/area_sbk/sbk_04/sbk_04_2_npc.c @@ -0,0 +1,111 @@ +#include "sbk_04.h" + +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_Pokey), + .pos = { -295.0f, 0.0f, -110.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -295, 0, -110 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_Pokey), + .pos = { -140.0f, 0.0f, -30.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -140, 0, -30 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_SBK_FORMATION_01, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_02), BTL_SBK_FORMATION_01, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_05/930CF0.c b/src/world/area_sbk/sbk_05/930CF0.c deleted file mode 100644 index 3229d15243..0000000000 --- a/src/world/area_sbk/sbk_05/930CF0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_05.h" - -static char* N(exit_str_0) = "sbk_04"; -static char* N(exit_str_1) = "sbk_06"; -static char* N(exit_str_2) = "sbk_15"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_05/930D30.c b/src/world/area_sbk/sbk_05/930D30.c deleted file mode 100644 index d5a51ae11f..0000000000 --- a/src/world/area_sbk/sbk_05/930D30.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "sbk_05.h" -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_05/sbk_05.h b/src/world/area_sbk/sbk_05/sbk_05.h index eab2ace453..e5ffe3e533 100644 --- a/src/world/area_sbk/sbk_05/sbk_05.h +++ b/src/world/area_sbk/sbk_05/sbk_05.h @@ -2,8 +2,26 @@ /// @brief Dry Dry Desert - N3E2 Pokey Army #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_05_shape.h" +#include "mapfs/sbk_05_hit.h" + +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, + NPC_Pokey_03 = 2, + NPC_Pokey_04 = 3, + NPC_Pokey_05 = 4, + NPC_Pokey_06 = 5, + NPC_Pokey_07 = 6, + NPC_Pokey_08 = 7, + NPC_Pokey_09 = 8, + NPC_Pokey_10 = 9, +}; + #define NAMESPACE sbk_05 diff --git a/src/world/area_sbk/sbk_05/sbk_05_1_main.c b/src/world/area_sbk/sbk_05/sbk_05_1_main.c new file mode 100644 index 0000000000..32d7a3f87b --- /dev/null +++ b/src/world/area_sbk/sbk_05/sbk_05_1_main.c @@ -0,0 +1,65 @@ +#include "sbk_05.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_05_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_05_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_05_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_05_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, + [sbk_05_ENTRY_4] { 157.0, 200.0, -338.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_05 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_04_1) = EVT_EXIT_WALK(60, sbk_05_ENTRY_0, "sbk_04", sbk_04_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_06_0) = EVT_EXIT_WALK(60, sbk_05_ENTRY_1, "sbk_06", sbk_06_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_15_2) = EVT_EXIT_WALK(60, sbk_05_ENTRY_3, "sbk_15", sbk_15_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_04_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_06_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_15_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240268_930F58) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(sbk_05_ENTRY_4) + 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_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_EXEC(N(D_80240268_930F58)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_05/sbk_05_2_entity.c b/src/world/area_sbk/sbk_05/sbk_05_2_entity.c new file mode 100644 index 0000000000..b8cc3262be --- /dev/null +++ b/src/world/area_sbk/sbk_05/sbk_05_2_entity.c @@ -0,0 +1,7 @@ +#include "sbk_05.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_FIRE_FLOWER, -100, 0, -445, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_SBK05_Item_FireFlower) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_05/sbk_05_3_npc.c b/src/world/area_sbk/sbk_05/sbk_05_3_npc.c new file mode 100644 index 0000000000..7b33a2236b --- /dev/null +++ b/src/world/area_sbk/sbk_05/sbk_05_3_npc.c @@ -0,0 +1,527 @@ +#include "sbk_05.h" + +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_Pokey), + .pos = { -280.0f, 0.0f, -110.0f }, + .yaw = 180, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -280, 0, -110 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_Pokey), + .pos = { -200.0f, 0.0f, -80.0f }, + .yaw = 120, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -200, 0, -80 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_03) = { + .id = NPC_Pokey_03, + .settings = &N(NpcSettings_Pokey), + .pos = { -160.0f, 0.0f, -225.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -160, 0, -225 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_04) = { + .id = NPC_Pokey_04, + .settings = &N(NpcSettings_Pokey), + .pos = { -100.0f, 0.0f, 70.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -100, 0, 70 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_05) = { + .id = NPC_Pokey_05, + .settings = &N(NpcSettings_Pokey), + .pos = { -10.0f, 0.0f, 30.0f }, + .yaw = 80, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -10, 0, 30 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_06) = { + .id = NPC_Pokey_06, + .settings = &N(NpcSettings_Pokey), + .pos = { 20.0f, 0.0f, -110.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 20, 0, -110 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_07) = { + .id = NPC_Pokey_07, + .settings = &N(NpcSettings_Pokey), + .pos = { 170.0f, 0.0f, -50.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 170, 0, -50 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_08) = { + .id = NPC_Pokey_08, + .settings = &N(NpcSettings_Pokey), + .pos = { 250.0f, 0.0f, 130.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 250, 0, 130 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_09) = { + .id = NPC_Pokey_09, + .settings = &N(NpcSettings_Pokey), + .pos = { 340.0f, 0.0f, 200.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 340, 0, 200 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_10) = { + .id = NPC_Pokey_10, + .settings = &N(NpcSettings_Pokey), + .pos = { -150.0f, 0.0f, 360.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -150, 0, 360 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_SBK_FORMATION_00, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_02), BTL_SBK_FORMATION_00, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_03), BTL_SBK_FORMATION_00, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_04), BTL_SBK_FORMATION_02, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_05), BTL_SBK_FORMATION_02, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_06), BTL_SBK_FORMATION_03, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_07), BTL_SBK_FORMATION_01, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_08), BTL_SBK_FORMATION_01, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_09), BTL_SBK_FORMATION_01, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_10), BTL_SBK_FORMATION_01, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_06/9325C0.c b/src/world/area_sbk/sbk_06/9325C0.c deleted file mode 100644 index de7d2e8e46..0000000000 --- a/src/world/area_sbk/sbk_06/9325C0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "sbk_06.h" - -static char* N(exit_str_0) = "sbk_05"; -static char* N(exit_str_1) = "sbk_16"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_06/932600.c b/src/world/area_sbk/sbk_06/932600.c deleted file mode 100644 index 8324250ec3..0000000000 --- a/src/world/area_sbk/sbk_06/932600.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_06.h" -#include "world/common/Bandit_DropCoin.inc.c" - -#include "common/foliage.inc.c" diff --git a/src/world/area_sbk/sbk_06/sbk_06.h b/src/world/area_sbk/sbk_06/sbk_06.h index 8d553eb06b..74fa4816a4 100644 --- a/src/world/area_sbk/sbk_06/sbk_06.h +++ b/src/world/area_sbk/sbk_06/sbk_06.h @@ -2,8 +2,17 @@ /// @brief Dry Dry Desert - N3E3 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_06_shape.h" +#include "mapfs/sbk_06_hit.h" + +#include "sprite/npc/Bandit.h" + +enum { + NPC_Bandit = 0, +}; + #define NAMESPACE sbk_06 diff --git a/src/world/area_sbk/sbk_06/sbk_06_1_main.c b/src/world/area_sbk/sbk_06/sbk_06_1_main.c new file mode 100644 index 0000000000..144fe39bed --- /dev/null +++ b/src/world/area_sbk/sbk_06/sbk_06_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_06.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); +extern EvtScript N(EVS_SetupFoliage); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_06_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_06_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_06_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_06_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_06 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_05_1) = EVT_EXIT_WALK(60, sbk_06_ENTRY_0, "sbk_05", sbk_05_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_16_2) = EVT_EXIT_WALK(60, sbk_06_ENTRY_3, "sbk_16", sbk_16_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_05_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_16_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_06/sbk_06_2_npc.c b/src/world/area_sbk/sbk_06/sbk_06_2_npc.c new file mode 100644 index 0000000000..94e5b7727a --- /dev/null +++ b/src/world/area_sbk/sbk_06/sbk_06_2_npc.c @@ -0,0 +1,58 @@ +#include "sbk_06.h" + +#include "world/common/enemy/complete/Bandit.inc.c" + +StaticNpc N(NpcData_Bandit) = { + .id = NPC_Bandit, + .settings = &N(NpcSettings_Bandit), + .pos = { -200.0f, 0.0f, 230.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -200, 0, 230 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Bandit), BTL_SBK_FORMATION_0C, BTL_SBK_STAGE_00), + {} +}; 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 new file mode 100644 index 0000000000..d519f069c1 --- /dev/null +++ b/src/world/area_sbk/sbk_06/sbk_06_3_foliage.c @@ -0,0 +1,48 @@ +#include "sbk_06.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = { + .count = 1, + .models = { + MODEL_o58, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_o57, + } +}; + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 205, 100, -310 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_SBK06_Tree1_Coin, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .drops = &N(Tree1_Drops), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { 228.0f, 0.0f, -306.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_06/sbk_06_4_entity.c b/src/world/area_sbk/sbk_06/sbk_06_4_entity.c new file mode 100644 index 0000000000..d45131d675 --- /dev/null +++ b/src/world/area_sbk/sbk_06/sbk_06_4_entity.c @@ -0,0 +1,14 @@ +#include "sbk_06.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 135, 60, -205, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK06_MultiCoinBrick) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -20, 60, -250, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 220, 60, 65, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 90, 60, 220, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -70, 60, 100, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -370, 60, 150, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_10/933C80.c b/src/world/area_sbk/sbk_10/933C80.c deleted file mode 100644 index d5b976acb8..0000000000 --- a/src/world/area_sbk/sbk_10/933C80.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_10.h" - -static char* N(exit_str_0) = "sbk_11"; -static char* N(exit_str_1) = "sbk_00"; -static char* N(exit_str_2) = "sbk_20"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_10/sbk_10.h b/src/world/area_sbk/sbk_10/sbk_10.h index 63d53ecef5..3046df5adf 100644 --- a/src/world/area_sbk/sbk_10/sbk_10.h +++ b/src/world/area_sbk/sbk_10/sbk_10.h @@ -2,8 +2,11 @@ /// @brief Dry Dry Desert - N2W3 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_10_shape.h" +#include "mapfs/sbk_10_hit.h" + #define NAMESPACE sbk_10 diff --git a/src/world/area_sbk/sbk_10/sbk_10_1_main.c b/src/world/area_sbk/sbk_10/sbk_10_1_main.c new file mode 100644 index 0000000000..3d10717eb3 --- /dev/null +++ b/src/world/area_sbk/sbk_10/sbk_10_1_main.c @@ -0,0 +1,49 @@ +#include "sbk_10.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_10_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_10_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_10_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_10_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_10 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_11_0) = EVT_EXIT_WALK(60, sbk_10_ENTRY_1, "sbk_11", sbk_11_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_00_3) = EVT_EXIT_WALK(60, sbk_10_ENTRY_2, "sbk_00", sbk_00_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_20_2) = EVT_EXIT_WALK(60, sbk_10_ENTRY_3, "sbk_20", sbk_20_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_11_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_00_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_20_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_10/sbk_10_2_entity.c b/src/world/area_sbk/sbk_10/sbk_10_2_entity.c new file mode 100644 index 0000000000..67c8dad39b --- /dev/null +++ b/src/world/area_sbk/sbk_10/sbk_10_2_entity.c @@ -0,0 +1,9 @@ +#include "sbk_10.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 315, 93, 60, 0, ITEM_THUNDER_RAGE, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK10_HiddenItem_ThunderRage) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_11/934040.c b/src/world/area_sbk/sbk_11/934040.c deleted file mode 100644 index 7e80e1dc22..0000000000 --- a/src/world/area_sbk/sbk_11/934040.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_11.h" - -static char* N(exit_str_0) = "sbk_10"; -static char* N(exit_str_1) = "sbk_12"; -static char* N(exit_str_2) = "sbk_01"; -static char* N(exit_str_3) = "sbk_21"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_11/934080.c b/src/world/area_sbk/sbk_11/934080.c deleted file mode 100644 index 49ae91466f..0000000000 --- a/src/world/area_sbk/sbk_11/934080.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_11.h" -#include "world/common/Bandit_DropCoin.inc.c" - -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_11/sbk_11.h b/src/world/area_sbk/sbk_11/sbk_11.h index c3c4d7fc86..394f452449 100644 --- a/src/world/area_sbk/sbk_11/sbk_11.h +++ b/src/world/area_sbk/sbk_11/sbk_11.h @@ -2,8 +2,19 @@ /// @brief Dry Dry Desert - N2W2 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_11_shape.h" +#include "mapfs/sbk_11_hit.h" + +#include "sprite/npc/Bandit.h" +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey = 0, + NPC_Bandit = 1, +}; + #define NAMESPACE sbk_11 diff --git a/src/world/area_sbk/sbk_11/sbk_11_1_main.c b/src/world/area_sbk/sbk_11/sbk_11_1_main.c new file mode 100644 index 0000000000..16c7f1b483 --- /dev/null +++ b/src/world/area_sbk/sbk_11/sbk_11_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_11.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_11_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_11_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_11_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_11_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_11 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_10_1) = EVT_EXIT_WALK(60, sbk_11_ENTRY_0, "sbk_10", sbk_10_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_12_0) = EVT_EXIT_WALK(60, sbk_11_ENTRY_1, "sbk_12", sbk_12_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_01_3) = EVT_EXIT_WALK(60, sbk_11_ENTRY_2, "sbk_01", sbk_01_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_21_2) = EVT_EXIT_WALK(60, sbk_11_ENTRY_3, "sbk_21", sbk_21_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_10_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_12_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_01_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_21_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_11/sbk_11_2_npc.c b/src/world/area_sbk/sbk_11/sbk_11_2_npc.c new file mode 100644 index 0000000000..2d4f310771 --- /dev/null +++ b/src/world/area_sbk/sbk_11/sbk_11_2_npc.c @@ -0,0 +1,111 @@ +#include "sbk_11.h" + +#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey) = { + .id = NPC_Pokey, + .settings = &N(NpcSettings_Pokey), + .pos = { -120.0f, 0.0f, 90.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -120, 0, 90 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit) = { + .id = NPC_Bandit, + .settings = &N(NpcSettings_Bandit), + .pos = { -200.0f, 0.0f, 230.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -200, 0, 230 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey), BTL_SBK_FORMATION_04, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit), BTL_SBK_FORMATION_0D, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_12/934D40.c b/src/world/area_sbk/sbk_12/934D40.c deleted file mode 100644 index 6522224094..0000000000 --- a/src/world/area_sbk/sbk_12/934D40.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_12.h" - -static char* N(exit_str_0) = "sbk_11"; -static char* N(exit_str_1) = "sbk_13"; -static char* N(exit_str_2) = "sbk_02"; -static char* N(exit_str_3) = "sbk_22"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_12/934D80.c b/src/world/area_sbk/sbk_12/934D80.c deleted file mode 100644 index ef5ef2b65c..0000000000 --- a/src/world/area_sbk/sbk_12/934D80.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "sbk_12.h" -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_12/sbk_12.h b/src/world/area_sbk/sbk_12/sbk_12.h index 21a2704b50..decf854d61 100644 --- a/src/world/area_sbk/sbk_12/sbk_12.h +++ b/src/world/area_sbk/sbk_12/sbk_12.h @@ -2,8 +2,20 @@ /// @brief Dry Dry Desert - N2W1 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_12_shape.h" +#include "mapfs/sbk_12_hit.h" + +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, + NPC_Pokey_03 = 2, +}; + + #define NAMESPACE sbk_12 diff --git a/src/world/area_sbk/sbk_12/sbk_12_1_main.c b/src/world/area_sbk/sbk_12/sbk_12_1_main.c new file mode 100644 index 0000000000..1571e76193 --- /dev/null +++ b/src/world/area_sbk/sbk_12/sbk_12_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_12.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_12_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_12_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_12_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_12_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_12 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_11_1) = EVT_EXIT_WALK(60, sbk_12_ENTRY_0, "sbk_11", sbk_11_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_13_0) = EVT_EXIT_WALK(60, sbk_12_ENTRY_1, "sbk_13", sbk_13_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_02_3) = EVT_EXIT_WALK(60, sbk_12_ENTRY_2, "sbk_02", sbk_02_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_22_2) = EVT_EXIT_WALK(60, sbk_12_ENTRY_3, "sbk_22", sbk_22_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_11_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_13_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_02_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_22_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_12/sbk_12_2_npc.c b/src/world/area_sbk/sbk_12/sbk_12_2_npc.c new file mode 100644 index 0000000000..d138a1bec4 --- /dev/null +++ b/src/world/area_sbk/sbk_12/sbk_12_2_npc.c @@ -0,0 +1,163 @@ +#include "sbk_12.h" + +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_Pokey), + .pos = { -190.0f, 0.0f, -130.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -190, 0, -130 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_Pokey), + .pos = { -40.0f, 0.0f, -200.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -40, 0, -200 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_03) = { + .id = NPC_Pokey_03, + .settings = &N(NpcSettings_Pokey), + .pos = { 195.0f, 0.0f, -255.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 195, 0, -255 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_SBK_FORMATION_02, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_02), BTL_SBK_FORMATION_00, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_03), BTL_SBK_FORMATION_01, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_13/9357E0.c b/src/world/area_sbk/sbk_13/9357E0.c deleted file mode 100644 index 01829f8801..0000000000 --- a/src/world/area_sbk/sbk_13/9357E0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_13.h" - -static char* N(exit_str_0) = "sbk_12"; -static char* N(exit_str_1) = "sbk_14"; -static char* N(exit_str_2) = "sbk_03"; -static char* N(exit_str_3) = "sbk_23"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_13/935820.c b/src/world/area_sbk/sbk_13/935820.c deleted file mode 100644 index 63ddeef757..0000000000 --- a/src/world/area_sbk/sbk_13/935820.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_13.h" -#include "world/common/Bandit_DropCoin.inc.c" - -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_13/sbk_13.h b/src/world/area_sbk/sbk_13/sbk_13.h index c496192739..f99f0ffc90 100644 --- a/src/world/area_sbk/sbk_13/sbk_13.h +++ b/src/world/area_sbk/sbk_13/sbk_13.h @@ -2,8 +2,20 @@ /// @brief Dry Dry Desert - N2 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_13_shape.h" +#include "mapfs/sbk_13_hit.h" + +#include "sprite/npc/Bandit.h" +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, + NPC_Bandit = 2, +}; + #define NAMESPACE sbk_13 diff --git a/src/world/area_sbk/sbk_13/sbk_13_1_main.c b/src/world/area_sbk/sbk_13/sbk_13_1_main.c new file mode 100644 index 0000000000..79eed4e6f3 --- /dev/null +++ b/src/world/area_sbk/sbk_13/sbk_13_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_13.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_13_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_13_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_13_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_13_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_13 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_12_1) = EVT_EXIT_WALK(60, sbk_13_ENTRY_0, "sbk_12", sbk_12_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_14_0) = EVT_EXIT_WALK(60, sbk_13_ENTRY_1, "sbk_14", sbk_14_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_03_3) = EVT_EXIT_WALK(60, sbk_13_ENTRY_2, "sbk_03", sbk_03_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_23_2) = EVT_EXIT_WALK(60, sbk_13_ENTRY_3, "sbk_23", sbk_23_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_12_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_14_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_03_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_23_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_13/sbk_13_2_npc.c b/src/world/area_sbk/sbk_13/sbk_13_2_npc.c new file mode 100644 index 0000000000..faeab850f8 --- /dev/null +++ b/src/world/area_sbk/sbk_13/sbk_13_2_npc.c @@ -0,0 +1,163 @@ +#include "sbk_13.h" + +#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_Pokey), + .pos = { -70.0f, 0.0f, -60.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -70, 0, -60 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_Pokey), + .pos = { 120.0f, 0.0f, -50.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 120, 0, -50 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit) = { + .id = NPC_Bandit, + .settings = &N(NpcSettings_Bandit), + .pos = { -200.0f, 0.0f, 230.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -200, 0, 230 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_SBK_FORMATION_04, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_02), BTL_SBK_FORMATION_05, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit), BTL_SBK_FORMATION_0E, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_14/9366E0.c b/src/world/area_sbk/sbk_14/9366E0.c deleted file mode 100644 index d875f36b82..0000000000 --- a/src/world/area_sbk/sbk_14/9366E0.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "sbk_14.h" - -static char* N(exit_str_0) = "sbk_13"; -static char* N(exit_str_1) = "sbk_15"; -static char* N(exit_str_2) = "sbk_04"; -static char* N(exit_str_3) = "sbk_24"; -static char* N(exit_str_4) = "sbk_05"; -static char* N(exit_str_5) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_14/sbk_14.h b/src/world/area_sbk/sbk_14/sbk_14.h index c24742b4fb..ec5d9e6bd3 100644 --- a/src/world/area_sbk/sbk_14/sbk_14.h +++ b/src/world/area_sbk/sbk_14/sbk_14.h @@ -2,8 +2,11 @@ /// @brief Dry Dry Desert - N2E1 (Tweester A) #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_14_shape.h" +#include "mapfs/sbk_14_hit.h" + #define NAMESPACE sbk_14 diff --git a/src/world/area_sbk/sbk_14/sbk_14_1_main.c b/src/world/area_sbk/sbk_14/sbk_14_1_main.c new file mode 100644 index 0000000000..87d4a36ce2 --- /dev/null +++ b/src/world/area_sbk/sbk_14/sbk_14_1_main.c @@ -0,0 +1,66 @@ +#include "sbk_14.h" +#include "entity.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_14_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_14_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_14_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_14_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, + [sbk_14_ENTRY_4] { 157.0, 200.0, -338.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_14 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_13_1) = EVT_EXIT_WALK(60, sbk_14_ENTRY_0, "sbk_13", sbk_13_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_15_0) = EVT_EXIT_WALK(60, sbk_14_ENTRY_1, "sbk_15", sbk_15_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_04_3) = EVT_EXIT_WALK(60, sbk_14_ENTRY_2, "sbk_04", sbk_04_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_24_2) = EVT_EXIT_WALK(60, sbk_14_ENTRY_3, "sbk_24", sbk_24_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_13_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_15_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_04_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_24_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_802402C0_9369A0) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(sbk_14_ENTRY_4) + 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_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_EXEC(N(D_802402C0_9369A0)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_14/sbk_14_2_entity.c b/src/world/area_sbk/sbk_14/sbk_14_2_entity.c new file mode 100644 index 0000000000..048ff69ccd --- /dev/null +++ b/src/world/area_sbk/sbk_14/sbk_14_2_entity.c @@ -0,0 +1,37 @@ +#include "sbk_14.h" +#include "entity.h" + +TweesterPath N(D_80240440_936B20)[] = { + { -65, 0, 217 }, + { -262, 0, -64 }, + { 57, 0, -286 }, + { 327, 0, 8 }, + { TWEETSER_PATH_LOOP } +}; + +TweesterPath* N(D_80240474_936B54)[] = { + N(D_80240440_936B20), + PTR_LIST_END +}; + +EvtScript N(D_8024047C_936B5C) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(GotoMap, EVT_PTR("sbk_05"), sbk_05_ENTRY_4) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_Tweester), 327, 0, 8, 0, EVT_PTR(N(D_80240474_936B54)), MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(D_8024047C_936B5C))) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 0, 60, -100, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK14_MultiCoinBrick) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -240, 0, 215, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK14_ItemBlock_Coin) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 220, 0, 150, 0, ITEM_HONEY_SYRUP, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK14_ItemBlock_HoneySyrup) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_15/936CD0.c b/src/world/area_sbk/sbk_15/936CD0.c deleted file mode 100644 index 8fa91e2604..0000000000 --- a/src/world/area_sbk/sbk_15/936CD0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_15.h" - -static char* N(exit_str_0) = "sbk_14"; -static char* N(exit_str_1) = "sbk_16"; -static char* N(exit_str_2) = "sbk_05"; -static char* N(exit_str_3) = "sbk_25"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_15/936D10.c b/src/world/area_sbk/sbk_15/936D10.c deleted file mode 100644 index fe45bee0b0..0000000000 --- a/src/world/area_sbk/sbk_15/936D10.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "sbk_15.h" -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_15/sbk_15.h b/src/world/area_sbk/sbk_15/sbk_15.h index 3a62bda219..c8d1e0a23c 100644 --- a/src/world/area_sbk/sbk_15/sbk_15.h +++ b/src/world/area_sbk/sbk_15/sbk_15.h @@ -2,8 +2,18 @@ /// @brief Dry Dry Desert - N2E2 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_15_shape.h" +#include "mapfs/sbk_15_hit.h" + +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, +}; + #define NAMESPACE sbk_15 diff --git a/src/world/area_sbk/sbk_15/sbk_15_1_main.c b/src/world/area_sbk/sbk_15/sbk_15_1_main.c new file mode 100644 index 0000000000..14c994dbd3 --- /dev/null +++ b/src/world/area_sbk/sbk_15/sbk_15_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_15.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_15_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_15_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_15_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_15_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_15 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_14_1) = EVT_EXIT_WALK(60, sbk_15_ENTRY_0, "sbk_14", sbk_14_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_16_0) = EVT_EXIT_WALK(60, sbk_15_ENTRY_1, "sbk_16", sbk_16_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_05_3) = EVT_EXIT_WALK(60, sbk_15_ENTRY_2, "sbk_05", sbk_05_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_25_2) = EVT_EXIT_WALK(60, sbk_15_ENTRY_3, "sbk_25", sbk_25_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_14_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_16_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_05_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_25_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_15/sbk_15_2_npc.c b/src/world/area_sbk/sbk_15/sbk_15_2_npc.c new file mode 100644 index 0000000000..55cf1bade0 --- /dev/null +++ b/src/world/area_sbk/sbk_15/sbk_15_2_npc.c @@ -0,0 +1,111 @@ +#include "sbk_15.h" + +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_Pokey), + .pos = { -230.0f, 0.0f, 100.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -230, 0, 100 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_Pokey), + .pos = { 20.0f, 0.0f, 260.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 20, 0, 260 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_SBK_FORMATION_05, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_02), BTL_SBK_FORMATION_07, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_16/937570.c b/src/world/area_sbk/sbk_16/937570.c deleted file mode 100644 index dc7d4016bd..0000000000 --- a/src/world/area_sbk/sbk_16/937570.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_16.h" - -static char* N(exit_str_0) = "sbk_15"; -static char* N(exit_str_1) = "sbk_06"; -static char* N(exit_str_2) = "sbk_26"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_16/9375B0.c b/src/world/area_sbk/sbk_16/9375B0.c deleted file mode 100644 index 7275a46a29..0000000000 --- a/src/world/area_sbk/sbk_16/9375B0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_16.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_sbk/sbk_16/sbk_16.h b/src/world/area_sbk/sbk_16/sbk_16.h index 46ff5a59ab..38aee2b2bd 100644 --- a/src/world/area_sbk/sbk_16/sbk_16.h +++ b/src/world/area_sbk/sbk_16/sbk_16.h @@ -2,8 +2,11 @@ /// @brief Dry Dry Desert - N2E3 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_16_shape.h" +#include "mapfs/sbk_16_hit.h" + #define NAMESPACE sbk_16 diff --git a/src/world/area_sbk/sbk_16/sbk_16_1_main.c b/src/world/area_sbk/sbk_16/sbk_16_1_main.c new file mode 100644 index 0000000000..70df86dd8d --- /dev/null +++ b/src/world/area_sbk/sbk_16/sbk_16_1_main.c @@ -0,0 +1,49 @@ +#include "sbk_16.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupFoliage); + +EntryList N(Entrances) = { + [sbk_16_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_16_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_16_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_16_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_16 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_15_1) = EVT_EXIT_WALK(60, sbk_16_ENTRY_0, "sbk_15", sbk_15_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_06_3) = EVT_EXIT_WALK(60, sbk_16_ENTRY_2, "sbk_06", sbk_06_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_26_2) = EVT_EXIT_WALK(60, sbk_16_ENTRY_3, "sbk_26", sbk_26_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_15_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_06_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_26_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupFoliage)) + 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 new file mode 100644 index 0000000000..bd6415ffd8 --- /dev/null +++ b/src/world/area_sbk/sbk_16/sbk_16_2_foliage.c @@ -0,0 +1,62 @@ +#include "sbk_16.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = { + .count = 1, + .models = { + MODEL_o56, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_o55, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -351.0f, 0.0f, -101.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = { + .count = 1, + .models = { + MODEL_o58, + } +}; + +FoliageModelList N(Tree2_TrunkModels) = { + .count = 1, + .models = { + MODEL_o57, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { 228.0f, 0.0f, -306.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o193, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_20/938590.c b/src/world/area_sbk/sbk_20/938590.c deleted file mode 100644 index 1ea03ce8d1..0000000000 --- a/src/world/area_sbk/sbk_20/938590.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_20.h" - -static char* N(exit_str_0) = "sbk_21"; -static char* N(exit_str_1) = "sbk_10"; -static char* N(exit_str_2) = "sbk_30"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_20/9385D0.c b/src/world/area_sbk/sbk_20/9385D0.c deleted file mode 100644 index dee83bb07e..0000000000 --- a/src/world/area_sbk/sbk_20/9385D0.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "sbk_20.h" -#include "world/common/Bandit_DropCoin.inc.c" diff --git a/src/world/area_sbk/sbk_20/sbk_20.h b/src/world/area_sbk/sbk_20/sbk_20.h index a67068475d..e5aa5b35a4 100644 --- a/src/world/area_sbk/sbk_20/sbk_20.h +++ b/src/world/area_sbk/sbk_20/sbk_20.h @@ -2,8 +2,22 @@ /// @brief Dry Dry Desert - N1W3 Special Block #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_20_shape.h" +#include "mapfs/sbk_20_hit.h" + +#include "sprite/npc/Bandit.h" + +enum { + NPC_Bandit_01 = 0, + NPC_Bandit_02 = 1, +}; + +enum { + MV_BlockHitCounter = MapVar(0), +}; + #define NAMESPACE sbk_20 diff --git a/src/world/area_sbk/sbk_20/sbk_20_1_main.c b/src/world/area_sbk/sbk_20/sbk_20_1_main.c new file mode 100644 index 0000000000..59b32a308b --- /dev/null +++ b/src/world/area_sbk/sbk_20/sbk_20_1_main.c @@ -0,0 +1,52 @@ +#include "sbk_20.h" +#include "entity.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_20_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_20_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_20_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_20_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_20 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_21_0) = EVT_EXIT_WALK(60, sbk_20_ENTRY_1, "sbk_21", sbk_21_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_10_3) = EVT_EXIT_WALK(60, sbk_20_ENTRY_2, "sbk_10", sbk_10_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_30_2) = EVT_EXIT_WALK(60, sbk_20_ENTRY_3, "sbk_30", sbk_30_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_21_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_10_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_30_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_20/sbk_20_2_entity.c b/src/world/area_sbk/sbk_20/sbk_20_2_entity.c new file mode 100644 index 0000000000..6b27030d2b --- /dev/null +++ b/src/world/area_sbk/sbk_20/sbk_20_2_entity.c @@ -0,0 +1,54 @@ +#include "sbk_20.h" +#include "effects.h" +#include "entity.h" + +EvtScript N(EVS_OnHitInertBlock) = { + EVT_ADD(MV_BlockHitCounter, 1) + EVT_SWITCH(MV_BlockHitCounter) + EVT_CASE_EQ(1) + EVT_IF_EQ(GF_SBK20_ItemBlock_Mushroom, FALSE) + EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySoundAt, SOUND_2108, 0, -80, 60, -200) + EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, -80, 73, -200, 10, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -80, 60, -200, 0, ITEM_MUSHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_Mushroom) + EVT_END_IF + EVT_CASE_EQ(10) + EVT_IF_EQ(GF_SBK20_ItemBlock_SuperShroom, FALSE) + EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySoundAt, SOUND_2108, 0, -180, 60, -200) + EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, -180, 73, -200, 10, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -180, 60, -200, 0, ITEM_SUPER_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_SuperShroom) + EVT_END_IF + EVT_CASE_EQ(100) + EVT_IF_EQ(GF_SBK20_ItemBlock_UltraShroom, FALSE) + EVT_CALL(PlaySound, SOUND_B) + EVT_CALL(PlaySoundAt, SOUND_2108, 0, -130, 60, -150) + EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, -130, 73, -150, 10, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -130, 60, -150, 0, ITEM_ULTRA_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_UltraShroom) + EVT_END_IF + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_InertYellowBlock), -130, 0, -200, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OnHitInertBlock))) + EVT_IF_EQ(GF_SBK20_ItemBlock_Mushroom, TRUE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -80, 60, -200, 0, ITEM_MUSHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_Mushroom) + EVT_END_IF + EVT_IF_EQ(GF_SBK20_ItemBlock_SuperShroom, TRUE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -180, 60, -200, 0, ITEM_SUPER_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_SuperShroom) + EVT_END_IF + EVT_IF_EQ(GF_SBK20_ItemBlock_UltraShroom, TRUE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -130, 60, -150, 0, ITEM_ULTRA_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK20_ItemBlock_UltraShroom) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_20/sbk_20_2_npc.c b/src/world/area_sbk/sbk_20/sbk_20_2_npc.c new file mode 100644 index 0000000000..8592a46d69 --- /dev/null +++ b/src/world/area_sbk/sbk_20/sbk_20_2_npc.c @@ -0,0 +1,109 @@ +#include "sbk_20.h" + +#include "world/common/enemy/complete/Bandit.inc.c" + +StaticNpc N(NpcData_Bandit_01) = { + .id = NPC_Bandit_01, + .settings = &N(NpcSettings_Bandit), + .pos = { -100.0f, 0.0f, 80.0f }, + .yaw = 90, + .flags = NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -100, 0, 80 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit_02) = { + .id = NPC_Bandit_02, + .settings = &N(NpcSettings_Bandit), + .pos = { 120.0f, 0.0f, 30.0f }, + .yaw = 270, + .flags = NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 120, 0, 30 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Bandit_01), BTL_SBK_FORMATION_0C, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit_02), BTL_SBK_FORMATION_0A, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_21/939560.c b/src/world/area_sbk/sbk_21/939560.c deleted file mode 100644 index 2de2fdd9f6..0000000000 --- a/src/world/area_sbk/sbk_21/939560.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_21.h" - -static char* N(exit_str_0) = "sbk_20"; -static char* N(exit_str_1) = "sbk_22"; -static char* N(exit_str_2) = "sbk_11"; -static char* N(exit_str_3) = "sbk_31"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_21/sbk_21.h b/src/world/area_sbk/sbk_21/sbk_21.h index c03e5f54d9..80fe9e0a4b 100644 --- a/src/world/area_sbk/sbk_21/sbk_21.h +++ b/src/world/area_sbk/sbk_21/sbk_21.h @@ -2,8 +2,11 @@ /// @brief Dry Dry Desert - N1W2 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_21_shape.h" +#include "mapfs/sbk_21_hit.h" + #define NAMESPACE sbk_21 diff --git a/src/world/area_sbk/sbk_21/sbk_21_1_main.c b/src/world/area_sbk/sbk_21/sbk_21_1_main.c new file mode 100644 index 0000000000..b1dd21758d --- /dev/null +++ b/src/world/area_sbk/sbk_21/sbk_21_1_main.c @@ -0,0 +1,49 @@ +#include "sbk_21.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [sbk_21_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_21_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_21_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_21_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_21 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_20_1) = EVT_EXIT_WALK(60, sbk_21_ENTRY_0, "sbk_20", sbk_20_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_22_0) = EVT_EXIT_WALK(60, sbk_21_ENTRY_1, "sbk_22", sbk_22_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_11_3) = EVT_EXIT_WALK(60, sbk_21_ENTRY_2, "sbk_11", sbk_11_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_31_2) = EVT_EXIT_WALK(60, sbk_21_ENTRY_3, "sbk_31", sbk_31_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_20_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_22_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_11_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_31_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_22/939930.c b/src/world/area_sbk/sbk_22/939930.c deleted file mode 100644 index 570231b411..0000000000 --- a/src/world/area_sbk/sbk_22/939930.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_22.h" - -static char* N(exit_str_0) = "sbk_21"; -static char* N(exit_str_1) = "sbk_23"; -static char* N(exit_str_2) = "sbk_12"; -static char* N(exit_str_3) = "sbk_32"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_22/939970.c b/src/world/area_sbk/sbk_22/939970.c deleted file mode 100644 index 93bf618c49..0000000000 --- a/src/world/area_sbk/sbk_22/939970.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_22.h" -#include "world/common/Bandit_DropCoin.inc.c" - -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_22/sbk_22.h b/src/world/area_sbk/sbk_22/sbk_22.h index 6df40adf70..d9d077b350 100644 --- a/src/world/area_sbk/sbk_22/sbk_22.h +++ b/src/world/area_sbk/sbk_22/sbk_22.h @@ -2,8 +2,19 @@ /// @brief Dry Dry Desert - N1W1 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_22_shape.h" +#include "mapfs/sbk_22_hit.h" + +#include "sprite/npc/Bandit.h" +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey = 0, + NPC_Bandit = 1, +}; + #define NAMESPACE sbk_22 diff --git a/src/world/area_sbk/sbk_22/sbk_22_1_main.c b/src/world/area_sbk/sbk_22/sbk_22_1_main.c new file mode 100644 index 0000000000..ee391353b2 --- /dev/null +++ b/src/world/area_sbk/sbk_22/sbk_22_1_main.c @@ -0,0 +1,53 @@ +#include "sbk_22.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_22_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_22_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_22_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_22_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_22 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_21_1) = EVT_EXIT_WALK(60, sbk_22_ENTRY_0, "sbk_21", sbk_21_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_23_0) = EVT_EXIT_WALK(60, sbk_22_ENTRY_1, "sbk_23", sbk_23_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_12_3) = EVT_EXIT_WALK(60, sbk_22_ENTRY_2, "sbk_12", sbk_12_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_32_2) = EVT_EXIT_WALK(60, sbk_22_ENTRY_3, "sbk_32", sbk_32_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_21_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_23_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_12_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_32_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_22/sbk_22_2_npc.c b/src/world/area_sbk/sbk_22/sbk_22_2_npc.c new file mode 100644 index 0000000000..e084f175b2 --- /dev/null +++ b/src/world/area_sbk/sbk_22/sbk_22_2_npc.c @@ -0,0 +1,111 @@ +#include "sbk_22.h" + +#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey) = { + .id = NPC_Pokey, + .settings = &N(NpcSettings_Pokey), + .pos = { -140.0f, 0.0f, -230.0f }, + .yaw = 90, + .flags = NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -140, 0, -230 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit) = { + .id = NPC_Bandit, + .settings = &N(NpcSettings_Bandit), + .pos = { 40.0f, 0.0f, 90.0f }, + .yaw = 270, + .flags = NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 40, 0, 90 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey), BTL_SBK_FORMATION_08, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit), BTL_SBK_FORMATION_0E, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_22/sbk_22_3_entity.c b/src/world/area_sbk/sbk_22/sbk_22_3_entity.c new file mode 100644 index 0000000000..030e94a8ae --- /dev/null +++ b/src/world/area_sbk/sbk_22/sbk_22_3_entity.c @@ -0,0 +1,17 @@ +#include "sbk_22.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -225, 0, -225, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK22_ItemBlock_CoinA) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), -225, 0, 225, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK22_ItemBlock_CoinB) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 225, 0, -225, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK22_ItemBlock_CoinC) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 225, 0, 225, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK22_ItemBlock_CoinD) + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 0, 0, 0, 0, ITEM_FIRE_FLOWER, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK22_ItemBlock_FireFlower) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_23/93A760.c b/src/world/area_sbk/sbk_23/93A760.c deleted file mode 100644 index b41f91f631..0000000000 --- a/src/world/area_sbk/sbk_23/93A760.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "sbk_23.h" - -static char* N(exit_str_0) = "sbk_22"; -static char* N(exit_str_1) = "sbk_24"; -static char* N(exit_str_2) = "sbk_13"; -static char* N(exit_str_3) = "sbk_33"; -static char* N(exit_str_4) = "sbk_14"; -static char* N(exit_str_5) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_23/sbk_23.h b/src/world/area_sbk/sbk_23/sbk_23.h index ac239beec2..7b86ceec12 100644 --- a/src/world/area_sbk/sbk_23/sbk_23.h +++ b/src/world/area_sbk/sbk_23/sbk_23.h @@ -2,8 +2,11 @@ /// @brief Dry Dry Desert - N1 (Tweester B) #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_23_shape.h" +#include "mapfs/sbk_23_hit.h" + #define NAMESPACE sbk_23 diff --git a/src/world/area_sbk/sbk_23/sbk_23_1_main.c b/src/world/area_sbk/sbk_23/sbk_23_1_main.c new file mode 100644 index 0000000000..b2a21b64c5 --- /dev/null +++ b/src/world/area_sbk/sbk_23/sbk_23_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_23.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_23_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_23_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_23_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_23_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_23 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_22_1) = EVT_EXIT_WALK(60, sbk_23_ENTRY_0, "sbk_22", sbk_22_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_24_0) = EVT_EXIT_WALK(60, sbk_23_ENTRY_1, "sbk_24", sbk_24_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_13_3) = EVT_EXIT_WALK(60, sbk_23_ENTRY_2, "sbk_13", sbk_13_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_33_2) = EVT_EXIT_WALK(60, sbk_23_ENTRY_3, "sbk_33", sbk_33_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_22_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_24_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_13_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_33_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_23/sbk_23_2_entity.c b/src/world/area_sbk/sbk_23/sbk_23_2_entity.c new file mode 100644 index 0000000000..a355471845 --- /dev/null +++ b/src/world/area_sbk/sbk_23/sbk_23_2_entity.c @@ -0,0 +1,31 @@ +#include "sbk_23.h" +#include "entity.h" + +TweesterPath N(D_802403C0_93AB20)[] = { + { -65, 0, 217 }, + { -262, 0, -64 }, + { 57, 0, -286 }, + { 327, 0, 8 }, + { TWEETSER_PATH_LOOP } +}; + +TweesterPath* N(D_802403F4_93AB54)[] = { + N(D_802403C0_93AB20), + PTR_LIST_END +}; + +EvtScript N(D_802403FC_93AB5C) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(GotoMap, EVT_PTR("sbk_14"), sbk_14_ENTRY_4) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_Tweester), 327, 0, 8, 0, EVT_PTR(N(D_802403F4_93AB54)), MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(D_802403FC_93AB5C))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_24/93AC30.c b/src/world/area_sbk/sbk_24/93AC30.c deleted file mode 100644 index dd7af7a2cf..0000000000 --- a/src/world/area_sbk/sbk_24/93AC30.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_24.h" - -static char* N(exit_str_0) = "sbk_23"; -static char* N(exit_str_1) = "sbk_25"; -static char* N(exit_str_2) = "sbk_14"; -static char* N(exit_str_3) = "sbk_34"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_24/93AC70.c b/src/world/area_sbk/sbk_24/93AC70.c deleted file mode 100644 index a7dfc84097..0000000000 --- a/src/world/area_sbk/sbk_24/93AC70.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_24.h" -#include "world/common/Bandit_DropCoin.inc.c" - -#include "common/foliage.inc.c" diff --git a/src/world/area_sbk/sbk_24/sbk_24.h b/src/world/area_sbk/sbk_24/sbk_24.h index cca7600cce..c5a4f55c00 100644 --- a/src/world/area_sbk/sbk_24/sbk_24.h +++ b/src/world/area_sbk/sbk_24/sbk_24.h @@ -2,8 +2,13 @@ /// @brief Dry Dry Desert - N1E1 Palm Trio #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_24_shape.h" +#include "mapfs/sbk_24_hit.h" + +#include "sprite/npc/Bandit.h" + #define NAMESPACE sbk_24 diff --git a/src/world/area_sbk/sbk_24/sbk_24_1_main.c b/src/world/area_sbk/sbk_24/sbk_24_1_main.c new file mode 100644 index 0000000000..3da35daa65 --- /dev/null +++ b/src/world/area_sbk/sbk_24/sbk_24_1_main.c @@ -0,0 +1,68 @@ +#include "sbk_24.h" +#include "entity.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupFoliage); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_24_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_24_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_24_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_24_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, + [sbk_24_ENTRY_4] { 157.0, 200.0, -338.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_24 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_23_1) = EVT_EXIT_WALK(60, sbk_24_ENTRY_0, "sbk_23", sbk_23_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_25_0) = EVT_EXIT_WALK(60, sbk_24_ENTRY_1, "sbk_25", sbk_25_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_14_3) = EVT_EXIT_WALK(60, sbk_24_ENTRY_2, "sbk_14", sbk_14_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_34_2) = EVT_EXIT_WALK(60, sbk_24_ENTRY_3, "sbk_34", sbk_34_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_23_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_25_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_14_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_34_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80240600_93B230) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(sbk_24_ENTRY_4) + 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_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_EXEC(N(D_80240600_93B230)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_24/sbk_24_2_npc.c b/src/world/area_sbk/sbk_24/sbk_24_2_npc.c new file mode 100644 index 0000000000..a3e21f3896 --- /dev/null +++ b/src/world/area_sbk/sbk_24/sbk_24_2_npc.c @@ -0,0 +1,3 @@ +#include "sbk_24.h" + +#include "world/common/enemy/complete/Bandit.inc.c" diff --git a/src/world/area_sbk/sbk_24/sbk_24_3_entity.c b/src/world/area_sbk/sbk_24/sbk_24_3_entity.c new file mode 100644 index 0000000000..676b94b65e --- /dev/null +++ b/src/world/area_sbk/sbk_24/sbk_24_3_entity.c @@ -0,0 +1,9 @@ +#include "sbk_24.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenRedBlock), 340, 60, -170, 0, ITEM_RUNAWAY_PAY, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK24_HiddenBadge_RunawayPay) + 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 new file mode 100644 index 0000000000..d5b22a4e93 --- /dev/null +++ b/src/world/area_sbk/sbk_24/sbk_24_4_foliage.c @@ -0,0 +1,89 @@ +#include "sbk_24.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = { + .count = 1, + .models = { + MODEL_o50, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_o49, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { 265.0f, 0.0f, -146.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = { + .count = 1, + .models = { + MODEL_o56, + } +}; + +FoliageModelList N(Tree2_TrunkModels) = { + .count = 1, + .models = { + MODEL_o55, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { 401.0f, 0.0f, -119.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree3_LeafModels) = { + .count = 1, + .models = { + MODEL_o58, + } +}; + +FoliageModelList N(Tree3_TrunkModels) = { + .count = 1, + .models = { + MODEL_o57, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree3) = { + .leaves = &N(Tree3_LeafModels), + .trunk = &N(Tree3_TrunkModels), +}; + +BombTrigger N(BombPos_Tree3) = { + .pos = { 362.0f, 0.0f, -234.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o49, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o81, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o82, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_25/93C280.c b/src/world/area_sbk/sbk_25/93C280.c deleted file mode 100644 index d2f6793f4e..0000000000 --- a/src/world/area_sbk/sbk_25/93C280.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_25.h" - -static char* N(exit_str_0) = "sbk_24"; -static char* N(exit_str_1) = "sbk_26"; -static char* N(exit_str_2) = "sbk_15"; -static char* N(exit_str_3) = "sbk_35"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_25/93C2C0.c b/src/world/area_sbk/sbk_25/93C2C0.c deleted file mode 100644 index 836998bc6f..0000000000 --- a/src/world/area_sbk/sbk_25/93C2C0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "sbk_25.h" - -#include "world/common/Bandit_DropCoin.inc.c" - -#include "common/foliage.inc.c" diff --git a/src/world/area_sbk/sbk_25/sbk_25.h b/src/world/area_sbk/sbk_25/sbk_25.h index e844d823d6..e629a9f927 100644 --- a/src/world/area_sbk/sbk_25/sbk_25.h +++ b/src/world/area_sbk/sbk_25/sbk_25.h @@ -2,8 +2,18 @@ /// @brief Dry Dry Desert - N1E2 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_25_shape.h" +#include "mapfs/sbk_25_hit.h" + +#include "sprite/npc/Bandit.h" + +enum { + NPC_Bandit_01 = 0, + NPC_Bandit_02 = 1, +}; + #define NAMESPACE sbk_25 diff --git a/src/world/area_sbk/sbk_25/sbk_25_1_main.c b/src/world/area_sbk/sbk_25/sbk_25_1_main.c new file mode 100644 index 0000000000..7e3a1b8888 --- /dev/null +++ b/src/world/area_sbk/sbk_25/sbk_25_1_main.c @@ -0,0 +1,55 @@ +#include "sbk_25.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); +extern EvtScript N(EVS_SetupFoliage); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_25_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_25_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_25_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_25_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_25 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_24_1) = EVT_EXIT_WALK(60, sbk_25_ENTRY_0, "sbk_24", sbk_24_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_26_0) = EVT_EXIT_WALK(60, sbk_25_ENTRY_1, "sbk_26", sbk_26_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_15_3) = EVT_EXIT_WALK(60, sbk_25_ENTRY_2, "sbk_15", sbk_15_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_35_2) = EVT_EXIT_WALK(60, sbk_25_ENTRY_3, "sbk_35", sbk_35_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_24_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_26_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_15_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_35_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_25/sbk_25_2_npc.c b/src/world/area_sbk/sbk_25/sbk_25_2_npc.c new file mode 100644 index 0000000000..e6a1ed048d --- /dev/null +++ b/src/world/area_sbk/sbk_25/sbk_25_2_npc.c @@ -0,0 +1,109 @@ +#include "sbk_25.h" + +#include "world/common/enemy/complete/Bandit.inc.c" + +StaticNpc N(NpcData_Bandit_01) = { + .id = NPC_Bandit_01, + .settings = &N(NpcSettings_Bandit), + .pos = { -80.0f, 0.0f, -20.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -80, 0, -20 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit_02) = { + .id = NPC_Bandit_02, + .settings = &N(NpcSettings_Bandit), + .pos = { 120.0f, 0.0f, 20.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 120, 0, 20 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Bandit_01), BTL_SBK_FORMATION_0A, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit_02), BTL_SBK_FORMATION_0A, BTL_SBK_STAGE_00), + {} +}; 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 new file mode 100644 index 0000000000..88ba05c6fb --- /dev/null +++ b/src/world/area_sbk/sbk_25/sbk_25_3_foliage.c @@ -0,0 +1,62 @@ +#include "sbk_25.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = { + .count = 1, + .models = { + MODEL_o58, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_o57, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -398.0f, 0.0f, -104.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = { + .count = 1, + .models = { + MODEL_o60, + } +}; + +FoliageModelList N(Tree2_TrunkModels) = { + .count = 1, + .models = { + MODEL_o59, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { -238.0f, 0.0f, -179.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o197, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o199, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_25/sbk_25_4_entity.c b/src/world/area_sbk/sbk_25/sbk_25_4_entity.c new file mode 100644 index 0000000000..d59742e4d2 --- /dev/null +++ b/src/world/area_sbk/sbk_25/sbk_25_4_entity.c @@ -0,0 +1,16 @@ +#include "sbk_25.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 0, 60, -100, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK25_MultiCoinBrickA) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 120, 60, 185, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK25_MultiCoinBrickB) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -300, 60, -80, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -240, 60, 230, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -75, 60, 295, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -75, 60, -360, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 270, 60, -150, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_26/93DCD0.c b/src/world/area_sbk/sbk_26/93DCD0.c deleted file mode 100644 index cfe193e9c7..0000000000 --- a/src/world/area_sbk/sbk_26/93DCD0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_26.h" - -static char* N(exit_str_0) = "sbk_25"; -static char* N(exit_str_1) = "sbk_16"; -static char* N(exit_str_2) = "sbk_36"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_26/93DD10.c b/src/world/area_sbk/sbk_26/93DD10.c deleted file mode 100644 index 7ae71e05f8..0000000000 --- a/src/world/area_sbk/sbk_26/93DD10.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_26.h" -#include "world/common/Bandit_DropCoin.inc.c" - -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_26/93DE30.c b/src/world/area_sbk/sbk_26/93DE30.c deleted file mode 100644 index 9977736967..0000000000 --- a/src/world/area_sbk/sbk_26/93DE30.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_26.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_sbk/sbk_26/sbk_26.h b/src/world/area_sbk/sbk_26/sbk_26.h index e89a82bb6f..0855e453b3 100644 --- a/src/world/area_sbk/sbk_26/sbk_26.h +++ b/src/world/area_sbk/sbk_26/sbk_26.h @@ -2,8 +2,19 @@ /// @brief Dry Dry Desert - N1E3 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_26_shape.h" +#include "mapfs/sbk_26_hit.h" + +#include "sprite/npc/Bandit.h" +#include "sprite/npc/Pokey.h" + +enum { + NPC_Bandit = 0, + NPC_Pokey = 1, +}; + #define NAMESPACE sbk_26 diff --git a/src/world/area_sbk/sbk_26/sbk_26_1_main.c b/src/world/area_sbk/sbk_26/sbk_26_1_main.c new file mode 100644 index 0000000000..cab075d9d4 --- /dev/null +++ b/src/world/area_sbk/sbk_26/sbk_26_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_26.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupFoliage); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_26_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_26_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_26_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_26_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_26 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_25_1) = EVT_EXIT_WALK(60, sbk_26_ENTRY_0, "sbk_25", sbk_25_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_16_3) = EVT_EXIT_WALK(60, sbk_26_ENTRY_2, "sbk_16", sbk_16_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_36_2) = EVT_EXIT_WALK(60, sbk_26_ENTRY_3, "sbk_36", sbk_36_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_25_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_16_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_36_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_26/sbk_26_2_npc.c b/src/world/area_sbk/sbk_26/sbk_26_2_npc.c new file mode 100644 index 0000000000..4fb67b404b --- /dev/null +++ b/src/world/area_sbk/sbk_26/sbk_26_2_npc.c @@ -0,0 +1,111 @@ +#include "sbk_26.h" + +#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Bandit) = { + .id = NPC_Bandit, + .settings = &N(NpcSettings_Bandit), + .pos = { -223.0f, 0.0f, 101.0f }, + .yaw = 180, + .flags = NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -223, 0, 101 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey) = { + .id = NPC_Pokey, + .settings = &N(NpcSettings_Pokey), + .pos = { -140.0f, 0.0f, -230.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -140, 0, -230 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Bandit), BTL_SBK_FORMATION_0C, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey), BTL_SBK_FORMATION_06, BTL_SBK_STAGE_00), + {} +}; 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 new file mode 100644 index 0000000000..4cb8c255f2 --- /dev/null +++ b/src/world/area_sbk/sbk_26/sbk_26_3_foliage.c @@ -0,0 +1,48 @@ +#include "sbk_26.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = { + .count = 1, + .models = { + MODEL_o60, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_o59, + } +}; + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -155, 92, 160 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_SBK26_Tree1_Coin, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .drops = &N(Tree1_Drops), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -178.0f, 0.0f, 164.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index 9f6f9d2f58..9cfa199277 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -31,8 +31,10 @@ s32 N(get_tattle)(void) { #include "world/common/AddPlayerHandsOffset.inc.c" +// AwaitLetterChoiceResult INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241120_9406D0); +// SetLetterChoiceResult INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241174_940724); INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802411AC_94075C); diff --git a/src/world/area_sbk/sbk_30/sbk_30.h b/src/world/area_sbk/sbk_30/sbk_30.h index 64e7f58171..88861f1739 100644 --- a/src/world/area_sbk/sbk_30/sbk_30.h +++ b/src/world/area_sbk/sbk_30/sbk_30.h @@ -2,8 +2,26 @@ /// @brief Dry Dry Desert - W3 Kolorado's Camp #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_30_shape.h" +#include "mapfs/sbk_30_hit.h" + +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/Kolorado.h" +#include "sprite/npc/WorldKooper.h" +#include "sprite/npc/Archeologist.h" + +enum { + NPC_Kolorado = 0, + NPC_Archeologist_01 = 1, + NPC_Archeologist_02 = 2, +}; + +enum { + MF_TreeDrop_Letter = MapFlag(10), +}; + #define NAMESPACE sbk_30 diff --git a/src/world/area_sbk/sbk_30/sbk_30_1_main.c b/src/world/area_sbk/sbk_30/sbk_30_1_main.c new file mode 100644 index 0000000000..2c05c955ec --- /dev/null +++ b/src/world/area_sbk/sbk_30/sbk_30_1_main.c @@ -0,0 +1,143 @@ +#include "sbk_30.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupFoliage); +extern NpcGroupList N(DefaultNPCs); + +s32 N(get_tattle)(void) { + s32 tattle; + if (evt_get_variable(NULL, GB_StoryProgress) > STORY_CH2_STAR_SPRIT_DEPARTED) { + tattle = MSG_MapTattle_sbk_30_after; + } else { + tattle = MSG_MapTattle_sbk_30_before; + } + return tattle; +} + +EntryList N(Entrances) = { + [sbk_30_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_30_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_30_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_30_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, + [sbk_30_ENTRY_4] { 0.0, 0.0, 0.0, 0.0 }, + [sbk_30_ENTRY_5] { 0.0, 0.0, 0.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { &N(get_tattle) }, +}; + +EvtScript N(D_802418B0_940E60) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(sbk_30_ENTRY_4) + EVT_CASE_OR_EQ(sbk_30_ENTRY_5) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +#include "world/common/atomic/UnkFunc27.inc.c" + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_99_1) = EVT_EXIT_WALK(60, sbk_30_ENTRY_0, "sbk_99", sbk_99_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_31_0) = EVT_EXIT_WALK(60, sbk_30_ENTRY_1, "sbk_31", sbk_31_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_20_3) = EVT_EXIT_WALK(60, sbk_30_ENTRY_2, "sbk_20", sbk_20_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_40_2) = EVT_EXIT_WALK(60, sbk_30_ENTRY_3, "sbk_40", sbk_40_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_99_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_31_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_20_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_40_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80241B20_9410D0) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(sbk_30_ENTRY_0) + EVT_IF_EQ(GF_SBK30_Visited, FALSE) + EVT_SET(GF_SBK30_Visited, TRUE) + EVT_SET(GB_StoryProgress, STORY_CH2_ARRIVED_AT_DRY_DRY_DESERT) + EVT_END_IF + EVT_CASE_EQ(sbk_30_ENTRY_1) + EVT_CASE_EQ(sbk_30_ENTRY_2) + EVT_CASE_EQ(sbk_30_ENTRY_3) + EVT_CASE_EQ(sbk_30_ENTRY_4) + EVT_RETURN + EVT_END_SWITCH + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80241BEC_94119C) = { + EVT_CALL(PlaySound, SOUND_80000060) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 193, 0, -237) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 193, 0, -237) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(N(UnkFunc27), 2, 0, 3) + EVT_CALL(N(UnkFunc27), 1, -1, 3) + EVT_CALL(N(UnkFunc26), 3, 44, 32, 177, 0, 0, 0, 0, 0, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 300, EVT_FLOAT(0.25)) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(60) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, sbk_30_ENTRY_4) + EVT_CALL(GotoMap, EVT_PTR("dro_01"), dro_01_ENTRY_3) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("dro_01"), dro_01_ENTRY_4) + EVT_END_IF + EVT_WAIT(100) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_IF_LT(GB_StoryProgress, STORY_UNUSED_FFFFFFCC) + EVT_CALL(EnableGroup, MODEL_g28, FALSE) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_ELSE + EVT_CALL(EnableGroup, MODEL_g23, FALSE) + EVT_CALL(EnableGroup, MODEL_sakji_tent, FALSE) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_Default, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetZoneEnabled, ZONE_o25, FALSE) + EVT_END_IF + EVT_EXEC(N(D_802418B0_940E60)) + EVT_EXEC(N(D_80241B20_9410D0)) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(sbk_30_ENTRY_4) + EVT_CASE_OR_EQ(sbk_30_ENTRY_5) + EVT_EXEC_WAIT(N(D_80241BEC_94119C)) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_CALL(N(SpawnSunEffect)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_30/sbk_30_2_npc.c b/src/world/area_sbk/sbk_30/sbk_30_2_npc.c new file mode 100644 index 0000000000..5748b772a7 --- /dev/null +++ b/src/world/area_sbk/sbk_30/sbk_30_2_npc.c @@ -0,0 +1,429 @@ + +#include "sbk_30.h" + +NpcSettings N(NpcSettings_Kolorado) = { + .height = 40, + .radius = 24, + .level = 99, +}; + +NpcSettings N(NpcSettings_Unused) = { + .height = 35, + .radius = 24, + .level = 99, +}; + +NpcSettings N(NpcSettings_Archeologist_01) = { + .height = 42, + .radius = 24, + .level = 99, +}; + +#include "world/common/atomic/LetterChoice.inc.c" + +s32 N(LetterList)[] = { + ITEM_LETTER25, + ITEM_NONE +}; + +EvtScript N(D_80242A8C_94203C) = { + EVT_CALL(N(LetterDelivery_Init), + NPC_Kolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, + ITEM_LETTER25, 0, + MSG_CH2_004A, MSG_CH2_004B, MSG_CH2_004C, MSG_CH2_004D, + EVT_PTR(N(LetterList))) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80242ADC_94208C) = { + EVT_IF_EQ(LVarC, 2) + EVT_SET(LVar0, 348) + EVT_SET(LVar1, 3) + EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) + EVT_CALL(AddStarPieces, 1) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +s32 N(ArtifactList)[] = { + ITEM_ARTIFACT, + ITEM_NONE +}; + +EvtScript N(D_80242B48_9420F8) = { + EVT_SET(GF_SBK_GaveArtifactToKolorado, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0044) + EVT_SET(LVar0, 348) + EVT_SET(LVar1, 3) + EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) + EVT_CALL(AddStarPieces, 1) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0045) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Kolorado) = { + EVT_CALL(GetNpcAnimation, NPC_SELF, LVar9) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) + EVT_IF_EQ(GF_SBK30_Met_Kolorado, FALSE) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 0, EVT_FLOAT(300.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.5)) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0037) + EVT_CALL(ResetCam, CAM_DEFAULT, 4) + EVT_SET(GF_SBK30_Met_Kolorado, TRUE) + EVT_GOTO(50) + EVT_END_IF + EVT_IF_EQ(GF_SBK_GaveArtifactToKolorado, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0046) + EVT_GOTO(50) + EVT_END_IF + EVT_CALL(HasKeyItem, ITEM_ARTIFACT, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_IF_EQ(GF_SBK_KeptArtifactFromKolorado, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0043) + EVT_ELSE + EVT_SET(GF_SBK_KeptArtifactFromKolorado, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0040) + EVT_END_IF + EVT_SET(LVar0, EVT_PTR(N(ArtifactList))) + EVT_SET(LVar1, 0) + EVT_EXEC_WAIT(N(EVS_ShowChoiceWindow)) + EVT_SWITCH(LVar0) + EVT_CASE_GE(1) + EVT_EXEC_WAIT(N(D_80242B48_9420F8)) + EVT_GOTO(50) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0041) + EVT_SET(LVar0, EVT_PTR(N(ArtifactList))) + EVT_SET(LVar1, 0) + EVT_EXEC_WAIT(N(EVS_ShowChoiceWindow)) + EVT_SWITCH(LVar0) + EVT_CASE_GE(1) + EVT_EXEC_WAIT(N(D_80242B48_9420F8)) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0042) + EVT_GOTO(50) + EVT_END_SWITCH + EVT_END_SWITCH + EVT_END_IF + EVT_IF_GE(GB_StoryProgress, STORY_CH2_ARRIVED_AT_DRY_DRY_OUTPOST) + EVT_IF_EQ(GF_DRO02_Sheek_SpokeTo, FALSE) + EVT_IF_EQ(AF_SBK_04, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0039) + EVT_SET(AF_SBK_04, TRUE) + EVT_GOTO(50) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_003A) + EVT_GOTO(50) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(GF_DRO02_Sheek_AskedAboutRuins, FALSE) + EVT_IF_EQ(AF_SBK_05, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_003B) + EVT_SET(GF_SBK30_Kolorado_SharedRumorAboutMoustafa, TRUE) + EVT_SET(AF_SBK_05, TRUE) + EVT_GOTO(50) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_003C) + EVT_GOTO(50) + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(GF_SBK30_Kolorado_SharedRumorAboutMoustafa, TRUE) + EVT_IF_EQ(GF_DRO02_Sheek_AskedAboutMoustafa, FALSE) + EVT_IF_EQ(AF_SBK_06, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_003D) + EVT_SET(AF_SBK_06, TRUE) + EVT_GOTO(50) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_003E) + EVT_GOTO(50) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_003F) + EVT_GOTO(50) + EVT_END_IF + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH2_0038) + EVT_LABEL(50) + EVT_LABEL(90) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_EQ(LVar0, PARTNER_KOOPER) + EVT_IF_EQ(GF_SBK30_KooperMetKolorado, FALSE) + EVT_SET(GF_SBK30_KooperMetKolorado, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_WorldKooper_CelebrateLoop, ANIM_WorldKooper_Idle, 0, NPC_SELF, MSG_CH2_0047) + EVT_CALL(SpeakToNpc, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, NPC_PARTNER, MSG_CH2_0048) + EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_WorldKooper_CelebrateLoop, ANIM_WorldKooper_Idle, 0, NPC_SELF, MSG_CH2_0049) + EVT_CALL(EnablePartnerAI) + EVT_END_IF + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, LVar9) + EVT_EXEC_WAIT(N(D_80242A8C_94203C)) + EVT_EXEC_WAIT(N(D_80242ADC_94208C)) + EVT_IF_NE(LVarC, 0) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Kolorado) = { + EVT_LOOP(0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Walk) + EVT_CALL(NpcMoveTo, NPC_SELF, 97, -179, 120) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Walk) + EVT_CALL(NpcMoveTo, NPC_SELF, 200, -100, 120) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_KoloradoPanic) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 145, -145, 0) + EVT_LABEL(0) + EVT_CALL(RandInt, 30, LVar0) + EVT_ADD(LVar0, 1) + EVT_WAIT(LVar0) + EVT_CALL(GetNpcYaw, NPC_SELF, LVar0) + EVT_ADD(LVar0, 180) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 5) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Kolorado) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(sbk_30_ENTRY_4) + EVT_CASE_OR_EQ(sbk_30_ENTRY_5) + EVT_CALL(SetNpcPos, NPC_SELF, 210, 0, -210) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_KoloradoPanic))) + EVT_END_CASE_GROUP + EVT_CASE_DEFAULT + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Kolorado))) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Kolorado))) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Archeologist_01) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Archeologist_Talk) + EVT_LABEL(0) + EVT_CALL(RandInt, 50, LVar0) + EVT_ADD(LVar0, 1) + EVT_WAIT(LVar0) + EVT_CALL(GetNpcYaw, NPC_SELF, LVar0) + EVT_ADD(LVar0, 180) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 5) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Archeologist_01) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_GOT_PULSE_STONE) + EVT_IF_EQ(AF_SBK_02, FALSE) + EVT_SET(LVar0, 0x000D004E) + EVT_SET(AF_SBK_02, TRUE) + EVT_ELSE + EVT_SET(LVar0, 0x000D004F) + EVT_SET(AF_SBK_02, FALSE) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_IF_EQ(GF_SBK_GaveArtifactToKolorado, FALSE) + EVT_SET(LVar0, 0x000D0050) + EVT_ELSE + EVT_SET(LVar0, 0x000D0051) + EVT_END_IF + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Archeologist_Talk, ANIM_Archeologist_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Archeologist_01) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Archeologist_01))) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(sbk_30_ENTRY_4) + EVT_CASE_OR_EQ(sbk_30_ENTRY_5) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Archeologist_01))) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Archeologist_02) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_GOT_PULSE_STONE) + EVT_IF_EQ(AF_SBK_03, FALSE) + EVT_SET(LVar0, 0x000D0052) + EVT_SET(AF_SBK_03, TRUE) + EVT_ELSE + EVT_SET(LVar0, 0x000D0053) + EVT_SET(AF_SBK_03, FALSE) + EVT_END_IF + EVT_CASE_DEFAULT + EVT_IF_EQ(GF_SBK_GaveArtifactToKolorado, FALSE) + EVT_SET(LVar0, 0x000D0054) + EVT_ELSE + EVT_SET(LVar0, 0x000D0055) + EVT_END_IF + EVT_END_SWITCH + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Archeologist_Talk, ANIM_Archeologist_Idle, 0, LVar0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Archeologist_02) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Archeologist_02))) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_OR_EQ(sbk_30_ENTRY_4) + EVT_CASE_OR_EQ(sbk_30_ENTRY_5) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Archeologist_01))) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Archeologist_02)[] = { + { + .id = NPC_Kolorado, + .settings = &N(NpcSettings_Kolorado), + .pos = { 200.0f, 0.0f, -100.0f }, + .yaw = 90, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Kolorado), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Kolorado_Idle, + .walk = ANIM_Kolorado_Walk, + .run = ANIM_Kolorado_Run, + .chase = ANIM_Kolorado_Run, + .anim_4 = ANIM_Kolorado_Idle, + .anim_5 = ANIM_Kolorado_Idle, + .death = ANIM_Kolorado_Idle, + .hit = ANIM_Kolorado_Idle, + .anim_8 = ANIM_Kolorado_Idle, + .anim_9 = ANIM_Kolorado_Idle, + .anim_A = ANIM_Kolorado_Idle, + .anim_B = ANIM_Kolorado_Idle, + .anim_C = ANIM_Kolorado_Idle, + .anim_D = ANIM_Kolorado_Idle, + .anim_E = ANIM_Kolorado_Idle, + .anim_F = ANIM_Kolorado_Idle, + }, + .tattle = MSG_NpcTattle_SBK_Kolorado, + }, + { + .id = NPC_Archeologist_01, + .settings = &N(NpcSettings_Archeologist_01), + .pos = { 238.0f, 0.0f, -112.0f }, + .yaw = 270, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Archeologist_01), + .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 = { 0 }, + } + }, + .animations = { + .idle = ANIM_Archeologist_Idle, + .walk = ANIM_Archeologist_Walk, + .run = ANIM_Archeologist_Run, + .chase = ANIM_Archeologist_Run, + .anim_4 = ANIM_Archeologist_Idle, + .anim_5 = ANIM_Archeologist_Idle, + .death = ANIM_Archeologist_Idle, + .hit = ANIM_Archeologist_Idle, + .anim_8 = ANIM_Archeologist_Idle, + .anim_9 = ANIM_Archeologist_Idle, + .anim_A = ANIM_Archeologist_Idle, + .anim_B = ANIM_Archeologist_Idle, + .anim_C = ANIM_Archeologist_Idle, + .anim_D = ANIM_Archeologist_Idle, + .anim_E = ANIM_Archeologist_Idle, + .anim_F = ANIM_Archeologist_Idle, + }, + .tattle = MSG_NpcTattle_SBK_ExcavatorA, + }, + { + .id = NPC_Archeologist_02, + .settings = &N(NpcSettings_Archeologist_01), + .pos = { 170.0f, 0.0f, -190.0f }, + .yaw = 90, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .init = &N(EVS_NpcInit_Archeologist_02), + .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 = { 0 }, + } + }, + .animations = { + .idle = ANIM_Archeologist_Idle, + .walk = ANIM_Archeologist_Walk, + .run = ANIM_Archeologist_Run, + .chase = ANIM_Archeologist_Run, + .anim_4 = ANIM_Archeologist_Idle, + .anim_5 = ANIM_Archeologist_Idle, + .death = ANIM_Archeologist_Idle, + .hit = ANIM_Archeologist_Idle, + .anim_8 = ANIM_Archeologist_Idle, + .anim_9 = ANIM_Archeologist_Idle, + .anim_A = ANIM_Archeologist_Idle, + .anim_B = ANIM_Archeologist_Idle, + .anim_C = ANIM_Archeologist_Idle, + .anim_D = ANIM_Archeologist_Idle, + .anim_E = ANIM_Archeologist_Idle, + .anim_F = ANIM_Archeologist_Idle, + }, + .tattle = MSG_NpcTattle_SBK_ExcavatorB, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Archeologist_02)), + {} +}; diff --git a/src/world/area_sbk/sbk_30/sbk_30_3_foliage.c b/src/world/area_sbk/sbk_30/sbk_30_3_foliage.c new file mode 100644 index 0000000000..22b47ecd21 --- /dev/null +++ b/src/world/area_sbk/sbk_30/sbk_30_3_foliage.c @@ -0,0 +1,58 @@ +#include "sbk_30.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree2_LeafModels) = { + .count = 1, + .models = { + MODEL_ki_ha, + } +}; + +FoliageModelList N(Tree2_TrunkModels) = { + .count = 1, + .models = { + MODEL_ki_miki, + } +}; + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_LETTER02, + .pos = { 204, 92, -220 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_NEVER_VANISH, + .pickupFlag = GF_SBK30_Tree2_Letter02, + .spawnFlag = MF_TreeDrop_Letter, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .drops = &N(Tree1_Drops), +}; + +BombTrigger N(BombPos_Tree) = { + .pos = { 266.0f, 0.0f, -209.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_IF_LT(GB_StoryProgress, STORY_UNUSED_FFFFFFCC) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + 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_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_31/944000.c b/src/world/area_sbk/sbk_31/944000.c deleted file mode 100644 index f24b9135f1..0000000000 --- a/src/world/area_sbk/sbk_31/944000.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_31.h" - -static char* N(exit_str_0) = "sbk_30"; -static char* N(exit_str_1) = "sbk_32"; -static char* N(exit_str_2) = "sbk_21"; -static char* N(exit_str_3) = "sbk_41"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_31/944040.c b/src/world/area_sbk/sbk_31/944040.c deleted file mode 100644 index 79caaa1e69..0000000000 --- a/src/world/area_sbk/sbk_31/944040.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "sbk_31.h" -#include "world/common/Bandit_DropCoin.inc.c" diff --git a/src/world/area_sbk/sbk_31/sbk_31.h b/src/world/area_sbk/sbk_31/sbk_31.h index f5209cc1ce..49728ae9af 100644 --- a/src/world/area_sbk/sbk_31/sbk_31.h +++ b/src/world/area_sbk/sbk_31/sbk_31.h @@ -2,8 +2,17 @@ /// @brief Dry Dry Desert - W2 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_31_shape.h" +#include "mapfs/sbk_31_hit.h" + +#include "sprite/npc/Bandit.h" + +enum { + NPC_Bandit = 0, +}; + #define NAMESPACE sbk_31 diff --git a/src/world/area_sbk/sbk_31/sbk_31_1_main.c b/src/world/area_sbk/sbk_31/sbk_31_1_main.c new file mode 100644 index 0000000000..abac474d24 --- /dev/null +++ b/src/world/area_sbk/sbk_31/sbk_31_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_31.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_31_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_31_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_31_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_31_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_31 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_30_1) = EVT_EXIT_WALK(60, sbk_31_ENTRY_0, "sbk_30", sbk_30_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_32_0) = EVT_EXIT_WALK(60, sbk_31_ENTRY_1, "sbk_32", sbk_32_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_21_3) = EVT_EXIT_WALK(60, sbk_31_ENTRY_2, "sbk_21", sbk_21_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_41_2) = EVT_EXIT_WALK(60, sbk_31_ENTRY_3, "sbk_41", sbk_41_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_30_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_32_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_21_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_41_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_31/sbk_31_2_npc.c b/src/world/area_sbk/sbk_31/sbk_31_2_npc.c new file mode 100644 index 0000000000..fd9c534404 --- /dev/null +++ b/src/world/area_sbk/sbk_31/sbk_31_2_npc.c @@ -0,0 +1,58 @@ +#include "sbk_31.h" + +#include "world/common/enemy/complete/Bandit.inc.c" + +StaticNpc N(NpcData_Bandit) = { + .id = NPC_Bandit, + .settings = &N(NpcSettings_Bandit), + .pos = { 23.0f, 0.0f, -260.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 23, 0, -260 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Bandit), BTL_SBK_FORMATION_0C, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_32/944A60.c b/src/world/area_sbk/sbk_32/944A60.c deleted file mode 100644 index fd3badad0d..0000000000 --- a/src/world/area_sbk/sbk_32/944A60.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_32.h" - -static char* N(exit_str_0) = "sbk_31"; -static char* N(exit_str_1) = "sbk_33"; -static char* N(exit_str_2) = "sbk_22"; -static char* N(exit_str_3) = "sbk_42"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_32/944AA0.c b/src/world/area_sbk/sbk_32/944AA0.c deleted file mode 100644 index 44e27c9dbf..0000000000 --- a/src/world/area_sbk/sbk_32/944AA0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_32.h" -#include "world/common/Bandit_DropCoin.inc.c" - -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_32/sbk_32.h b/src/world/area_sbk/sbk_32/sbk_32.h index c1864689f8..a4998cb9ae 100644 --- a/src/world/area_sbk/sbk_32/sbk_32.h +++ b/src/world/area_sbk/sbk_32/sbk_32.h @@ -2,8 +2,20 @@ /// @brief Dry Dry Desert - W1 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_32_shape.h" +#include "mapfs/sbk_32_hit.h" + +#include "sprite/npc/Bandit.h" +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, + NPC_Bandit = 2, +}; + #define NAMESPACE sbk_32 diff --git a/src/world/area_sbk/sbk_32/sbk_32_1_main.c b/src/world/area_sbk/sbk_32/sbk_32_1_main.c new file mode 100644 index 0000000000..e6da1dc461 --- /dev/null +++ b/src/world/area_sbk/sbk_32/sbk_32_1_main.c @@ -0,0 +1,65 @@ +#include "sbk_32.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_32_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_32_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_32_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_32_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, + [sbk_32_ENTRY_4] { 157.0, 200.0, -338.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_32 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_31_1) = EVT_EXIT_WALK(60, sbk_32_ENTRY_0, "sbk_31", sbk_31_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_33_0) = EVT_EXIT_WALK(60, sbk_32_ENTRY_1, "sbk_33", sbk_33_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_22_3) = EVT_EXIT_WALK(60, sbk_32_ENTRY_2, "sbk_22", sbk_22_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_42_2) = EVT_EXIT_WALK(60, sbk_32_ENTRY_3, "sbk_42", sbk_42_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_31_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_33_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_22_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_42_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(sbk_32_ENTRY_4) + 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_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_32/sbk_32_2_npc.c b/src/world/area_sbk/sbk_32/sbk_32_2_npc.c new file mode 100644 index 0000000000..48b608a5b5 --- /dev/null +++ b/src/world/area_sbk/sbk_32/sbk_32_2_npc.c @@ -0,0 +1,163 @@ +#include "sbk_32.h" + +#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_Pokey), + .pos = { -140.0f, 0.0f, -270.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -140, 0, -270 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_Pokey), + .pos = { -120.0f, 0.0f, 110.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -120, 0, 110 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit) = { + .id = NPC_Bandit, + .settings = &N(NpcSettings_Bandit), + .pos = { 23.0f, 0.0f, -260.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 23, 0, -260 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_SBK_FORMATION_01, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_02), BTL_SBK_FORMATION_02, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit), BTL_SBK_FORMATION_0B, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_33/9459D0.c b/src/world/area_sbk/sbk_33/9459D0.c deleted file mode 100644 index c7b1cf69f1..0000000000 --- a/src/world/area_sbk/sbk_33/9459D0.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "sbk_33.h" - -static char* N(exit_str_0) = "sbk_24"; -static char* N(exit_str_1) = "sbk_32"; -static char* N(exit_str_2) = "sbk_34"; -static char* N(exit_str_3) = "sbk_23"; -static char* N(exit_str_4) = "sbk_43"; -static char* N(exit_str_5) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_33/sbk_33.h b/src/world/area_sbk/sbk_33/sbk_33.h index 85650bac88..72ddb0b90d 100644 --- a/src/world/area_sbk/sbk_33/sbk_33.h +++ b/src/world/area_sbk/sbk_33/sbk_33.h @@ -2,8 +2,11 @@ /// @brief Dry Dry Desert - Center (Tweester C) #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_33_shape.h" +#include "mapfs/sbk_33_hit.h" + #define NAMESPACE sbk_33 diff --git a/src/world/area_sbk/sbk_33/sbk_33_0_header.c b/src/world/area_sbk/sbk_33/sbk_33_0_header.c new file mode 100644 index 0000000000..6e77f6ab32 --- /dev/null +++ b/src/world/area_sbk/sbk_33/sbk_33_0_header.c @@ -0,0 +1,19 @@ +#include "sbk_33.h" +#include "entity.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [sbk_33_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_33_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_33_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_33_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_33 }, +}; diff --git a/src/world/area_sbk/sbk_33/sbk_33_1_entity.c b/src/world/area_sbk/sbk_33/sbk_33_1_entity.c new file mode 100644 index 0000000000..ec065bef7e --- /dev/null +++ b/src/world/area_sbk/sbk_33/sbk_33_1_entity.c @@ -0,0 +1,33 @@ +#include "sbk_33.h" +#include "entity.h" + +TweesterPath N(DefaultTweesterPath)[] = { + { -65, 0, 217 }, + { -262, 0, -64 }, + { 57, 0, -286 }, + { 327, 0, 8 }, + { TWEETSER_PATH_LOOP } +}; + +TweesterPath* N(TweesterPaths)[] = { + N(DefaultTweesterPath), + PTR_LIST_END +}; + +EvtScript N(D_802400FC_945ACC) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(GotoMap, EVT_PTR("sbk_24"), sbk_24_ENTRY_4) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 0, 0, 225, 0, MODEL_stage, MAKE_ENTITY_END) + EVT_CALL(AssignPanelFlag, GF_SBK33_HiddenPanel) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Tweester), 327, 0, 8, 0, EVT_PTR(N(TweesterPaths)), MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(D_802400FC_945ACC))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_33/sbk_33_2_main.c b/src/world/area_sbk/sbk_33/sbk_33_2_main.c new file mode 100644 index 0000000000..324171df0c --- /dev/null +++ b/src/world/area_sbk/sbk_33/sbk_33_2_main.c @@ -0,0 +1,35 @@ +#include "sbk_33.h" + +extern EvtScript N(EVS_MakeEntities); + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_32_1) = EVT_EXIT_WALK(60, sbk_33_ENTRY_0, "sbk_32", sbk_32_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_34_0) = EVT_EXIT_WALK(60, sbk_33_ENTRY_1, "sbk_34", sbk_34_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_23_3) = EVT_EXIT_WALK(60, sbk_33_ENTRY_2, "sbk_23", sbk_23_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_43_2) = EVT_EXIT_WALK(60, sbk_33_ENTRY_3, "sbk_43", sbk_43_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_32_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_34_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_23_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_43_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_34/945ED0.c b/src/world/area_sbk/sbk_34/945ED0.c deleted file mode 100644 index 5db3f5626e..0000000000 --- a/src/world/area_sbk/sbk_34/945ED0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_34.h" - -static char* N(exit_str_0) = "sbk_33"; -static char* N(exit_str_1) = "sbk_35"; -static char* N(exit_str_2) = "sbk_24"; -static char* N(exit_str_3) = "sbk_44"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_34/945F10.c b/src/world/area_sbk/sbk_34/945F10.c deleted file mode 100644 index ba9a02869f..0000000000 --- a/src/world/area_sbk/sbk_34/945F10.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "sbk_34.h" - -#include "world/common/StashVars.inc.c" - -#include "world/common/GetItemName.inc.c" - -#include "world/common/GetNpcCollisionHeight.inc.c" - -#include "world/common/AddPlayerHandsOffset.inc.c" - -INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240384_946254); - -INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_802403D8_9462A8); - -INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240410_9462E0); - -extern s32 N(LetterDelivery_SavedNpcAnim); -#include "world/common/LetterDelivery.inc.c" diff --git a/src/world/area_sbk/sbk_34/946670.c b/src/world/area_sbk/sbk_34/946670.c deleted file mode 100644 index 9aeb310fdb..0000000000 --- a/src/world/area_sbk/sbk_34/946670.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_34.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_sbk/sbk_34/sbk_34.h b/src/world/area_sbk/sbk_34/sbk_34.h index e7eb64b2f1..fc2cc1af67 100644 --- a/src/world/area_sbk/sbk_34/sbk_34.h +++ b/src/world/area_sbk/sbk_34/sbk_34.h @@ -2,8 +2,19 @@ /// @brief Dry Dry Desert - E1 Nomadimouse #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_34_shape.h" +#include "mapfs/sbk_34_hit.h" + +#include "sprite/npc/WorldParakarry.h" +#include "sprite/npc/Nomadimouse.h" + +enum { + NPC_Nomadimouse = 0, + NPC_Sack = 1, +}; + #define NAMESPACE sbk_34 diff --git a/src/world/area_sbk/sbk_34/sbk_34_1_main.c b/src/world/area_sbk/sbk_34/sbk_34_1_main.c new file mode 100644 index 0000000000..8cb0a03956 --- /dev/null +++ b/src/world/area_sbk/sbk_34/sbk_34_1_main.c @@ -0,0 +1,53 @@ +#include "sbk_34.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupFoliage); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_34_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_34_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_34_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_34_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_34 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_33_1) = EVT_EXIT_WALK(60, sbk_34_ENTRY_0, "sbk_33", sbk_33_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_35_0) = EVT_EXIT_WALK(60, sbk_34_ENTRY_1, "sbk_35", sbk_35_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_24_3) = EVT_EXIT_WALK(60, sbk_34_ENTRY_2, "sbk_24", sbk_24_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_44_2) = EVT_EXIT_WALK(60, sbk_34_ENTRY_3, "sbk_44", sbk_44_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_33_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_35_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_24_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_44_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_34/sbk_34_2_npc.c b/src/world/area_sbk/sbk_34/sbk_34_2_npc.c new file mode 100644 index 0000000000..aae8b5818e --- /dev/null +++ b/src/world/area_sbk/sbk_34/sbk_34_2_npc.c @@ -0,0 +1,152 @@ +#include "sbk_34.h" + +NpcSettings N(NpcSettings_Nomadimouse) = { + .height = 22, + .radius = 25, + .level = 99, +}; + +#include "world/common/atomic/LetterChoice.inc.c" + +s32 N(D_802416A8_947578)[] = { + ITEM_LETTER08, + ITEM_NONE +}; + +EvtScript N(EVS_Nomadimouse_LetterDelivery) = { + EVT_CALL(N(LetterDelivery_Init), + NPC_Nomadimouse, ANIM_Nomadimouse_Talk, ANIM_Nomadimouse_Idle, + ITEM_LETTER08, ITEM_NONE, + MSG_CH2_005B, MSG_CH2_005C, MSG_CH2_005D, MSG_CH2_005E, + EVT_PTR(N(D_802416A8_947578))) + EVT_EXEC_WAIT(N(EVS_DoLetterDelivery)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Nomadimouse_LetterReward) = { + EVT_IF_EQ(LVarC, 2) + EVT_SET(LVar0, ITEM_STAR_PIECE) + EVT_SET(LVar1, 3) + EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) + EVT_CALL(AddStarPieces, 1) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Nomadimouse) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH2_ARRIVED_AT_DRY_DRY_OUTPOST) + EVT_IF_EQ(GF_SBK34_Met_Nomadimouse, FALSE) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 0, EVT_FLOAT(250.0), EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Nomadimouse_Talk, ANIM_Nomadimouse_Idle, 0, MSG_CH2_0056) + EVT_SET(GF_SBK34_Met_Nomadimouse, TRUE) + EVT_CALL(ResetCam, CAM_DEFAULT, 4) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Nomadimouse_Talk, ANIM_Nomadimouse_Idle, 0, MSG_CH2_0057) + EVT_END_IF + EVT_CASE_LT(STORY_CH2_UNCOVERED_DRY_DRY_RUINS) + EVT_IF_EQ(GF_SBK34_Met_Nomadimouse, FALSE) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 0, EVT_FLOAT(250.0), EVT_FLOAT(15.0), EVT_FLOAT(-6.0)) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Nomadimouse_Talk, ANIM_Nomadimouse_Idle, 0, MSG_CH2_0058) + EVT_SET(GF_SBK34_Met_Nomadimouse, TRUE) + EVT_CALL(ResetCam, CAM_DEFAULT, 4) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Nomadimouse_Talk, ANIM_Nomadimouse_Idle, 0, MSG_CH2_0059) + EVT_END_IF + EVT_CASE_GE(STORY_CH2_UNCOVERED_DRY_DRY_RUINS) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Nomadimouse_Talk, ANIM_Nomadimouse_Idle, 0, MSG_CH2_005A) + EVT_END_SWITCH + EVT_EXEC_WAIT(N(EVS_Nomadimouse_LetterDelivery)) + EVT_EXEC_WAIT(N(EVS_Nomadimouse_LetterReward)) + EVT_IF_NE(LVarC, 0) + EVT_RETURN + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Nomadimouse) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Nomadimouse))) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Nomadimouse_Idle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Sack) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Nomadimouse_Sack) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Nomadimouse)[] = { + { + .id = NPC_Nomadimouse, + .settings = &N(NpcSettings_Nomadimouse), + .pos = { 114.0f, 0.0f, -50.0f }, + .yaw = 90, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, + .init = &N(EVS_NpcInit_Nomadimouse), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Nomadimouse_Idle, + .walk = ANIM_Nomadimouse_Idle, + .run = ANIM_Nomadimouse_Idle, + .chase = ANIM_Nomadimouse_Idle, + .anim_4 = ANIM_Nomadimouse_Idle, + .anim_5 = ANIM_Nomadimouse_Idle, + .death = ANIM_Nomadimouse_Idle, + .hit = ANIM_Nomadimouse_Idle, + .anim_8 = ANIM_Nomadimouse_Idle, + .anim_9 = ANIM_Nomadimouse_Idle, + .anim_A = ANIM_Nomadimouse_Idle, + .anim_B = ANIM_Nomadimouse_Idle, + .anim_C = ANIM_Nomadimouse_Idle, + .anim_D = ANIM_Nomadimouse_Idle, + .anim_E = ANIM_Nomadimouse_Idle, + .anim_F = ANIM_Nomadimouse_Idle, + }, + .tattle = MSG_NpcTattle_SBK_Nomadimouse, + }, + { + .id = NPC_Sack, + .settings = &N(NpcSettings_Nomadimouse), + .pos = { 134.0f, 0.0f, -50.0f }, + .yaw = 90, + .flags = NPC_FLAG_PASSIVE | NPC_FLAG_100 | NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_400000, + .init = &N(EVS_NpcInit_Sack), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Nomadimouse_Idle, + .walk = ANIM_Nomadimouse_Idle, + .run = ANIM_Nomadimouse_Idle, + .chase = ANIM_Nomadimouse_Idle, + .anim_4 = ANIM_Nomadimouse_Idle, + .anim_5 = ANIM_Nomadimouse_Idle, + .death = ANIM_Nomadimouse_Idle, + .hit = ANIM_Nomadimouse_Idle, + .anim_8 = ANIM_Nomadimouse_Idle, + .anim_9 = ANIM_Nomadimouse_Idle, + .anim_A = ANIM_Nomadimouse_Idle, + .anim_B = ANIM_Nomadimouse_Idle, + .anim_C = ANIM_Nomadimouse_Idle, + .anim_D = ANIM_Nomadimouse_Idle, + .anim_E = ANIM_Nomadimouse_Idle, + .anim_F = ANIM_Nomadimouse_Idle, + }, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Nomadimouse)), + {} +}; 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 new file mode 100644 index 0000000000..ff062d4783 --- /dev/null +++ b/src/world/area_sbk/sbk_34/sbk_34_3_foliage.c @@ -0,0 +1,48 @@ +#include "sbk_34.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = { + .count = 1, + .models = { + MODEL_o63, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_o62, + } +}; + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 105, 100, -89 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_SBK34_Tree1_Coin, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .drops = &N(Tree1_Drops), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { 131.0f, 0.0f, -89.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o201, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_35/9486B0.c b/src/world/area_sbk/sbk_35/9486B0.c deleted file mode 100644 index 945f7cce9b..0000000000 --- a/src/world/area_sbk/sbk_35/9486B0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_35.h" - -static char* N(exit_str_0) = "sbk_34"; -static char* N(exit_str_1) = "sbk_36"; -static char* N(exit_str_2) = "sbk_25"; -static char* N(exit_str_3) = "sbk_45"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_35/9486F0.c b/src/world/area_sbk/sbk_35/9486F0.c deleted file mode 100644 index 5a9f452e62..0000000000 --- a/src/world/area_sbk/sbk_35/9486F0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "sbk_35.h" -#include "world/common/Bandit_DropCoin.inc.c" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_sbk/sbk_35/sbk_35.h b/src/world/area_sbk/sbk_35/sbk_35.h index 3e158b33cd..8ddbde7384 100644 --- a/src/world/area_sbk/sbk_35/sbk_35.h +++ b/src/world/area_sbk/sbk_35/sbk_35.h @@ -2,8 +2,17 @@ /// @brief Dry Dry Desert - E2 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_35_shape.h" +#include "mapfs/sbk_35_hit.h" + +#include "sprite/npc/Bandit.h" + +enum { + NPC_Bandit = 0, +}; + #define NAMESPACE sbk_35 diff --git a/src/world/area_sbk/sbk_35/sbk_35_1_main.c b/src/world/area_sbk/sbk_35/sbk_35_1_main.c new file mode 100644 index 0000000000..10254d743d --- /dev/null +++ b/src/world/area_sbk/sbk_35/sbk_35_1_main.c @@ -0,0 +1,53 @@ +#include "sbk_35.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupFoliage); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_35_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_35_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_35_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_35_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_35 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_34_1) = EVT_EXIT_WALK(60, sbk_35_ENTRY_0, "sbk_34", sbk_34_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_36_0) = EVT_EXIT_WALK(60, sbk_35_ENTRY_1, "sbk_36", sbk_36_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_25_3) = EVT_EXIT_WALK(60, sbk_35_ENTRY_2, "sbk_25", sbk_25_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_45_2) = EVT_EXIT_WALK(60, sbk_35_ENTRY_3, "sbk_45", sbk_45_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_34_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_36_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_25_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_45_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_35/sbk_35_2_npc.c b/src/world/area_sbk/sbk_35/sbk_35_2_npc.c new file mode 100644 index 0000000000..c7deeb60da --- /dev/null +++ b/src/world/area_sbk/sbk_35/sbk_35_2_npc.c @@ -0,0 +1,58 @@ +#include "sbk_35.h" + +#include "world/common/enemy/complete/Bandit.inc.c" + +StaticNpc N(NpcData_Bandit) = { + .id = NPC_Bandit, + .settings = &N(NpcSettings_Bandit), + .pos = { -40.0f, 0.0f, 155.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -40, 0, 155 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Bandit), BTL_SBK_FORMATION_0C, BTL_SBK_STAGE_00), + {} +}; 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 new file mode 100644 index 0000000000..6c46f63832 --- /dev/null +++ b/src/world/area_sbk/sbk_35/sbk_35_3_foliage.c @@ -0,0 +1,102 @@ +#include "sbk_35.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = { + .count = 1, + .models = { + MODEL_o57, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_o56, + } +}; + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -398, 100, 129 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_SBK35_Tree1_Coin, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .drops = &N(Tree1_Drops), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -398.0f, 0.0f, 104.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = { + .count = 1, + .models = { + MODEL_o59, + } +}; + +FoliageModelList N(Tree2_TrunkModels) = { + .count = 1, + .models = { + MODEL_o58, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { -108.0f, 0.0f, -406.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree3_LeafModels) = { + .count = 1, + .models = { + MODEL_o61, + } +}; + +FoliageModelList N(Tree3_TrunkModels) = { + .count = 1, + .models = { + MODEL_o60, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree3) = { + .leaves = &N(Tree3_LeafModels), + .trunk = &N(Tree3_TrunkModels), +}; + +BombTrigger N(BombPos_Tree3) = { + .pos = { 211.0f, 0.0f, -111.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o193, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o195, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_36/949E60.c b/src/world/area_sbk/sbk_36/949E60.c deleted file mode 100644 index 6227799592..0000000000 --- a/src/world/area_sbk/sbk_36/949E60.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_36.h" - -static char* N(exit_str_0) = "sbk_35"; -static char* N(exit_str_1) = "dro_01"; -static char* N(exit_str_2) = "sbk_26"; -static char* N(exit_str_3) = "sbk_46"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_36/949EA0.c b/src/world/area_sbk/sbk_36/949EA0.c deleted file mode 100644 index 876cf65c86..0000000000 --- a/src/world/area_sbk/sbk_36/949EA0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_36.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_sbk/sbk_36/sbk_36.h b/src/world/area_sbk/sbk_36/sbk_36.h index 61210877cd..6791593119 100644 --- a/src/world/area_sbk/sbk_36/sbk_36.h +++ b/src/world/area_sbk/sbk_36/sbk_36.h @@ -2,8 +2,15 @@ /// @brief Dry Dry Desert - E3 Outside Outpost #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_36_shape.h" +#include "mapfs/sbk_36_hit.h" + +enum { + MF_TreeDrop_Letter = MapFlag(10), +}; + #define NAMESPACE sbk_36 diff --git a/src/world/area_sbk/sbk_36/sbk_36_1_main.c b/src/world/area_sbk/sbk_36/sbk_36_1_main.c new file mode 100644 index 0000000000..7e2435a067 --- /dev/null +++ b/src/world/area_sbk/sbk_36/sbk_36_1_main.c @@ -0,0 +1,53 @@ +#include "sbk_36.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupFoliage); + +EntryList N(Entrances) = { + [sbk_36_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_36_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_36_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_36_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_36 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_35_1) = EVT_EXIT_WALK(60, sbk_36_ENTRY_0, "sbk_35", sbk_35_ENTRY_1); +EvtScript N(EVS_ExitWalk_dro_01_0) = EVT_EXIT_WALK(60, sbk_36_ENTRY_1, "dro_01", dro_01_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_26_3) = EVT_EXIT_WALK(60, sbk_36_ENTRY_2, "sbk_26", sbk_26_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_46_2) = EVT_EXIT_WALK(60, sbk_36_ENTRY_3, "sbk_46", sbk_46_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_35_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_dro_01_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_26_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_46_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupFoliage)) + 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 new file mode 100644 index 0000000000..f4df2b546b --- /dev/null +++ b/src/world/area_sbk/sbk_36/sbk_36_2_foliage.c @@ -0,0 +1,304 @@ +#include "sbk_36.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = { + .count = 1, + .models = { + MODEL_o73, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_o72, + } +}; + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -422, 100, 116 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_SBK36_Tree1_Coin, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .drops = &N(Tree1_Drops), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -422.0f, 0.0f, 91.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = { + .count = 1, + .models = { + MODEL_o71, + } +}; + +FoliageModelList N(Tree2_TrunkModels) = { + .count = 1, + .models = { + MODEL_o70, + } +}; + +FoliageDropList N(Tree2_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -322, 100, -86 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_SBK36_Tree2_Coin, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .drops = &N(Tree2_Drops), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { -322.0f, 0.0f, -111.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree3_LeafModels) = { + .count = 1, + .models = { + MODEL_o75, + } +}; + +FoliageModelList N(Tree3_TrunkModels) = { + .count = 1, + .models = { + MODEL_o74, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree3) = { + .leaves = &N(Tree3_LeafModels), + .trunk = &N(Tree3_TrunkModels), +}; + +BombTrigger N(BombPos_Tree3) = { + .pos = { -244.0f, 0.0f, 77.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree4_LeafModels) = { + .count = 1, + .models = { + MODEL_o69, + } +}; + +FoliageModelList N(Tree4_TrunkModels) = { + .count = 1, + .models = { + MODEL_o68, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree4) = { + .leaves = &N(Tree4_LeafModels), + .trunk = &N(Tree4_TrunkModels), +}; + +BombTrigger N(BombPos_Tree4) = { + .pos = { -128.0f, 0.0f, -111.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree5_LeafModels) = { + .count = 1, + .models = { + MODEL_o57, + } +}; + +FoliageModelList N(Tree5_TrunkModels) = { + .count = 1, + .models = { + MODEL_o56, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree5) = { + .leaves = &N(Tree5_LeafModels), + .trunk = &N(Tree5_TrunkModels), +}; + +BombTrigger N(BombPos_Tree5) = { + .pos = { 58.0f, 0.0f, 101.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree6_LeafModels) = { + .count = 1, + .models = { + MODEL_o59, + } +}; + +FoliageModelList N(Tree6_TrunkModels) = { + .count = 1, + .models = { + MODEL_o58, + } +}; + +FoliageDropList N(Tree6_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 158, 100, -76 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_SBK36_Tree6_Coin, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree6) = { + .leaves = &N(Tree6_LeafModels), + .trunk = &N(Tree6_TrunkModels), + .drops = &N(Tree6_Drops), +}; + +BombTrigger N(BombPos_Tree6) = { + .pos = { 158.0f, 0.0f, -101.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree7_LeafModels) = { + .count = 1, + .models = { + MODEL_o67, + } +}; + +FoliageModelList N(Tree7_TrunkModels) = { + .count = 1, + .models = { + MODEL_o66, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree7) = { + .leaves = &N(Tree7_LeafModels), + .trunk = &N(Tree7_TrunkModels), +}; + +BombTrigger N(BombPos_Tree7) = { + .pos = { 236.0f, 0.0f, 87.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree8_LeafModels) = { + .count = 1, + .models = { + MODEL_o63, + } +}; + +FoliageModelList N(Tree8_TrunkModels) = { + .count = 1, + .models = { + MODEL_o62, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree8) = { + .leaves = &N(Tree8_LeafModels), + .trunk = &N(Tree8_TrunkModels), +}; + +BombTrigger N(BombPos_Tree8) = { + .pos = { 351.0f, 0.0f, -101.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree9_LeafModels) = { + .count = 1, + .models = { + MODEL_o65, + } +}; + +FoliageModelList N(Tree9_TrunkModels) = { + .count = 1, + .models = { + MODEL_o64, + } +}; + +FoliageDropList N(Tree9_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_LETTER03, + .pos = { 366, 92, 101 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_NEVER_VANISH, + .pickupFlag = GF_SBK36_Tree9_Letter03, + .spawnFlag = MF_TreeDrop_Letter, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree9) = { + .leaves = &N(Tree9_LeafModels), + .trunk = &N(Tree9_TrunkModels), + .drops = &N(Tree9_Drops), +}; + +BombTrigger N(BombPos_Tree9) = { + .pos = { 438.0f, 0.0f, 101.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o205, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o203, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o207, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(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_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_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_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_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_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_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_36/sbk_36_3_entity.c b/src/world/area_sbk/sbk_36/sbk_36_3_entity.c new file mode 100644 index 0000000000..e4149a6acd --- /dev/null +++ b/src/world/area_sbk/sbk_36/sbk_36_3_entity.c @@ -0,0 +1,20 @@ +#include "sbk_36.h" +#include "entity.h" + +EvtScript N(ReadSign) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_017A, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_Signpost), 410, 0, -75, 0, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(ReadSign))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_40/94B3A0.c b/src/world/area_sbk/sbk_40/94B3A0.c deleted file mode 100644 index 34f2352544..0000000000 --- a/src/world/area_sbk/sbk_40/94B3A0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_40.h" - -static char* N(exit_str_0) = "sbk_41"; -static char* N(exit_str_1) = "sbk_30"; -static char* N(exit_str_2) = "sbk_50"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_40/94B3E0.c b/src/world/area_sbk/sbk_40/94B3E0.c deleted file mode 100644 index af2c194292..0000000000 --- a/src/world/area_sbk/sbk_40/94B3E0.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "sbk_40.h" -#include "world/common/Bandit_DropCoin.inc.c" diff --git a/src/world/area_sbk/sbk_40/sbk_40.h b/src/world/area_sbk/sbk_40/sbk_40.h index d5ce6145fe..0e305d3f80 100644 --- a/src/world/area_sbk/sbk_40/sbk_40.h +++ b/src/world/area_sbk/sbk_40/sbk_40.h @@ -2,8 +2,18 @@ /// @brief Dry Dry Desert - S1W3 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_40_shape.h" +#include "mapfs/sbk_40_hit.h" + +#include "sprite/npc/Bandit.h" + +enum { + NPC_Bandit_01 = 0, + NPC_Bandit_02 = 1, +}; + #define NAMESPACE sbk_40 diff --git a/src/world/area_sbk/sbk_40/sbk_40_1_main.c b/src/world/area_sbk/sbk_40/sbk_40_1_main.c new file mode 100644 index 0000000000..9c2ad862b7 --- /dev/null +++ b/src/world/area_sbk/sbk_40/sbk_40_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_40.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_40_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_40_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_40_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_40_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_40 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_41_0) = EVT_EXIT_WALK(60, sbk_40_ENTRY_1, "sbk_41", sbk_41_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_30_3) = EVT_EXIT_WALK(60, sbk_40_ENTRY_2, "sbk_30", sbk_30_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_50_2) = EVT_EXIT_WALK(60, sbk_40_ENTRY_3, "sbk_50", sbk_50_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_41_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_30_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_50_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_40/sbk_40_2_npc.c b/src/world/area_sbk/sbk_40/sbk_40_2_npc.c new file mode 100644 index 0000000000..3f1eb8c9b5 --- /dev/null +++ b/src/world/area_sbk/sbk_40/sbk_40_2_npc.c @@ -0,0 +1,109 @@ +#include "sbk_40.h" + +#include "world/common/enemy/complete/Bandit.inc.c" + +StaticNpc N(NpcData_Bandit_01) = { + .id = NPC_Bandit_01, + .settings = &N(NpcSettings_Bandit), + .pos = { -300.0f, 0.0f, 85.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -300, 0, 85 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit_02) = { + .id = NPC_Bandit_02, + .settings = &N(NpcSettings_Bandit), + .pos = { -80.0f, 0.0f, 190.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -80, 0, 190 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Bandit_01), BTL_SBK_FORMATION_0B, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit_02), BTL_SBK_FORMATION_0B, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_40/sbk_40_3_entity.c b/src/world/area_sbk/sbk_40/sbk_40_3_entity.c new file mode 100644 index 0000000000..3653635d54 --- /dev/null +++ b/src/world/area_sbk/sbk_40/sbk_40_3_entity.c @@ -0,0 +1,12 @@ +#include "sbk_40.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 0, 60, -100, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK40_MultiCoinBrick) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 165, 60, -300, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 110, 60, 130, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -110, 60, 200, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_41/94C040.c b/src/world/area_sbk/sbk_41/94C040.c deleted file mode 100644 index b323d025fe..0000000000 --- a/src/world/area_sbk/sbk_41/94C040.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "sbk_41.h" - -static char* N(exit_str_0) = "sbk_40"; -static char* N(exit_str_1) = "sbk_42"; -static char* N(exit_str_2) = "sbk_31"; -static char* N(exit_str_3) = "sbk_51"; -static char* N(exit_str_4) = "sbk_32"; -static char* N(exit_str_5) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_41/sbk_41.h b/src/world/area_sbk/sbk_41/sbk_41.h index a43303d9cc..6c032ebcb8 100644 --- a/src/world/area_sbk/sbk_41/sbk_41.h +++ b/src/world/area_sbk/sbk_41/sbk_41.h @@ -2,8 +2,11 @@ /// @brief Dry Dry Desert - S1W2 (Tweester D) #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_41_shape.h" +#include "mapfs/sbk_41_hit.h" + #define NAMESPACE sbk_41 diff --git a/src/world/area_sbk/sbk_41/sbk_41_1_main.c b/src/world/area_sbk/sbk_41/sbk_41_1_main.c new file mode 100644 index 0000000000..9bc2d218f2 --- /dev/null +++ b/src/world/area_sbk/sbk_41/sbk_41_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_41.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_41_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_41_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_41_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_41_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_41 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_40_1) = EVT_EXIT_WALK(60, sbk_41_ENTRY_0, "sbk_40", sbk_40_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_42_0) = EVT_EXIT_WALK(60, sbk_41_ENTRY_1, "sbk_42", sbk_42_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_31_3) = EVT_EXIT_WALK(60, sbk_41_ENTRY_2, "sbk_31", sbk_31_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_51_2) = EVT_EXIT_WALK(60, sbk_41_ENTRY_3, "sbk_51", sbk_51_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_40_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_42_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_31_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_51_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_41/sbk_41_2_entity.c b/src/world/area_sbk/sbk_41/sbk_41_2_entity.c new file mode 100644 index 0000000000..cf963080d8 --- /dev/null +++ b/src/world/area_sbk/sbk_41/sbk_41_2_entity.c @@ -0,0 +1,31 @@ +#include "sbk_41.h" +#include "entity.h" + +TweesterPath N(DefaultTweesterPath)[] = { + { -65, 0, 217 }, + { -262, 0, -64 }, + { 57, 0, -286 }, + { 327, 0, 8 }, + { TWEETSER_PATH_LOOP } +}; + +TweesterPath* N(TweesterPaths)[] = { + N(DefaultTweesterPath), + PTR_LIST_END +}; + +EvtScript N(EVS_RideTweester) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(GotoMap, EVT_PTR("sbk_32"), sbk_32_ENTRY_4) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_Tweester), 327, 0, 8, 0, EVT_PTR(N(TweesterPaths)), MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_RideTweester))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_42/94C510.c b/src/world/area_sbk/sbk_42/94C510.c deleted file mode 100644 index edc8a695d8..0000000000 --- a/src/world/area_sbk/sbk_42/94C510.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_42.h" - -static char* N(exit_str_0) = "sbk_41"; -static char* N(exit_str_1) = "sbk_43"; -static char* N(exit_str_2) = "sbk_32"; -static char* N(exit_str_3) = "sbk_52"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_42/94C550.c b/src/world/area_sbk/sbk_42/94C550.c deleted file mode 100644 index e623ef3161..0000000000 --- a/src/world/area_sbk/sbk_42/94C550.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "sbk_42.h" -#include "world/common/Bandit_DropCoin.inc.c" diff --git a/src/world/area_sbk/sbk_42/sbk_42.h b/src/world/area_sbk/sbk_42/sbk_42.h index fa494b185a..87affe4fba 100644 --- a/src/world/area_sbk/sbk_42/sbk_42.h +++ b/src/world/area_sbk/sbk_42/sbk_42.h @@ -2,8 +2,18 @@ /// @brief Dry Dry Desert - S1W1 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_42_shape.h" +#include "mapfs/sbk_42_hit.h" + +#include "sprite/npc/Bandit.h" + +enum { + NPC_Bandit_01 = 0, + NPC_Bandit_02 = 1, +}; + #define NAMESPACE sbk_42 diff --git a/src/world/area_sbk/sbk_42/sbk_42_1_main.c b/src/world/area_sbk/sbk_42/sbk_42_1_main.c new file mode 100644 index 0000000000..bb3e5894f8 --- /dev/null +++ b/src/world/area_sbk/sbk_42/sbk_42_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_42.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_42_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_42_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_42_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_42_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_42 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_41_1) = EVT_EXIT_WALK(60, sbk_42_ENTRY_0, "sbk_41", sbk_41_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_43_0) = EVT_EXIT_WALK(60, sbk_42_ENTRY_1, "sbk_43", sbk_43_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_32_3) = EVT_EXIT_WALK(60, sbk_42_ENTRY_2, "sbk_32", sbk_32_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_52_2) = EVT_EXIT_WALK(60, sbk_42_ENTRY_3, "sbk_52", sbk_52_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_41_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_43_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_32_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_52_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_42/sbk_42_2_npc.c b/src/world/area_sbk/sbk_42/sbk_42_2_npc.c new file mode 100644 index 0000000000..e8e854faa1 --- /dev/null +++ b/src/world/area_sbk/sbk_42/sbk_42_2_npc.c @@ -0,0 +1,109 @@ +#include "sbk_42.h" + +#include "world/common/enemy/complete/Bandit.inc.c" + +StaticNpc N(NpcData_Bandit_01) = { + .id = NPC_Bandit_01, + .settings = &N(NpcSettings_Bandit), + .pos = { -40.0f, 0.0f, 0.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -40, 0, 0 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit_02) = { + .id = NPC_Bandit_02, + .settings = &N(NpcSettings_Bandit), + .pos = { 60.0f, 0.0f, 30.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 60, 0, 30 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Bandit_01), BTL_SBK_FORMATION_0A, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit_02), BTL_SBK_FORMATION_0B, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_43/94D170.c b/src/world/area_sbk/sbk_43/94D170.c deleted file mode 100644 index 73a22e407d..0000000000 --- a/src/world/area_sbk/sbk_43/94D170.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_43.h" - -static char* N(exit_str_0) = "sbk_42"; -static char* N(exit_str_1) = "sbk_44"; -static char* N(exit_str_2) = "sbk_33"; -static char* N(exit_str_3) = "sbk_53"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_43/sbk_43.h b/src/world/area_sbk/sbk_43/sbk_43.h index e7eb67a997..5801cbd1f1 100644 --- a/src/world/area_sbk/sbk_43/sbk_43.h +++ b/src/world/area_sbk/sbk_43/sbk_43.h @@ -2,8 +2,11 @@ /// @brief Dry Dry Desert - S1 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_43_shape.h" +#include "mapfs/sbk_43_hit.h" + #define NAMESPACE sbk_43 diff --git a/src/world/area_sbk/sbk_43/sbk_43_1_main.c b/src/world/area_sbk/sbk_43/sbk_43_1_main.c new file mode 100644 index 0000000000..57e4c5319c --- /dev/null +++ b/src/world/area_sbk/sbk_43/sbk_43_1_main.c @@ -0,0 +1,52 @@ +#include "sbk_43.h" +#include "entity.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_43_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_43_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_43_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_43_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_43 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_42_1) = EVT_EXIT_WALK(60, sbk_43_ENTRY_0, "sbk_42", sbk_42_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_44_0) = EVT_EXIT_WALK(60, sbk_43_ENTRY_1, "sbk_44", sbk_44_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_33_3) = EVT_EXIT_WALK(60, sbk_43_ENTRY_2, "sbk_33", sbk_33_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_53_2) = EVT_EXIT_WALK(60, sbk_43_ENTRY_3, "sbk_53", sbk_53_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_42_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_44_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_33_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_53_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_43/sbk_43_2_entity.c b/src/world/area_sbk/sbk_43/sbk_43_2_entity.c new file mode 100644 index 0000000000..7cfa6ebf87 --- /dev/null +++ b/src/world/area_sbk/sbk_43/sbk_43_2_entity.c @@ -0,0 +1,9 @@ +#include "sbk_43.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 0, 0, 0, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK43_ItemBlock_Coin) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_44/94D5A0.c b/src/world/area_sbk/sbk_44/94D5A0.c deleted file mode 100644 index c56c09224e..0000000000 --- a/src/world/area_sbk/sbk_44/94D5A0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_44.h" - -static char* N(exit_str_0) = "sbk_43"; -static char* N(exit_str_1) = "sbk_45"; -static char* N(exit_str_2) = "sbk_34"; -static char* N(exit_str_3) = "sbk_54"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_44/94D5E0.c b/src/world/area_sbk/sbk_44/94D5E0.c deleted file mode 100644 index 0b7d1ea198..0000000000 --- a/src/world/area_sbk/sbk_44/94D5E0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_44.h" -#include "world/common/Bandit_DropCoin.inc.c" - -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_44/sbk_44.h b/src/world/area_sbk/sbk_44/sbk_44.h index 560363f7ef..ea0dd5a006 100644 --- a/src/world/area_sbk/sbk_44/sbk_44.h +++ b/src/world/area_sbk/sbk_44/sbk_44.h @@ -2,8 +2,20 @@ /// @brief Dry Dry Desert - S1E1 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_44_shape.h" +#include "mapfs/sbk_44_hit.h" + +#include "sprite/npc/Bandit.h" +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, + NPC_Bandit = 2, +}; + #define NAMESPACE sbk_44 diff --git a/src/world/area_sbk/sbk_44/sbk_44_1_main.c b/src/world/area_sbk/sbk_44/sbk_44_1_main.c new file mode 100644 index 0000000000..506db0bff6 --- /dev/null +++ b/src/world/area_sbk/sbk_44/sbk_44_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_44.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_44_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_44_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_44_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_44_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_44 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_43_1) = EVT_EXIT_WALK(60, sbk_44_ENTRY_0, "sbk_43", sbk_43_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_45_0) = EVT_EXIT_WALK(60, sbk_44_ENTRY_1, "sbk_45", sbk_45_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_34_3) = EVT_EXIT_WALK(60, sbk_44_ENTRY_2, "sbk_34", sbk_34_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_54_2) = EVT_EXIT_WALK(60, sbk_44_ENTRY_3, "sbk_54", sbk_54_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_43_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_45_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_34_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_54_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_44/sbk_44_2_npc.c b/src/world/area_sbk/sbk_44/sbk_44_2_npc.c new file mode 100644 index 0000000000..55c6451a4e --- /dev/null +++ b/src/world/area_sbk/sbk_44/sbk_44_2_npc.c @@ -0,0 +1,163 @@ +#include "sbk_44.h" + +#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_Pokey), + .pos = { -100.0f, 0.0f, -55.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -100, 0, -55 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_Pokey), + .pos = { -22.0f, 0.0f, -5.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -22, 0, -5 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit) = { + .id = NPC_Bandit, + .settings = &N(NpcSettings_Bandit), + .pos = { 150.0f, 0.0f, 80.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 150, 0, 80 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_SBK_FORMATION_05, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_02), BTL_SBK_FORMATION_04, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit), BTL_SBK_FORMATION_0E, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_45/94E4A0.c b/src/world/area_sbk/sbk_45/94E4A0.c deleted file mode 100644 index ec1606f4c7..0000000000 --- a/src/world/area_sbk/sbk_45/94E4A0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_45.h" - -static char* N(exit_str_0) = "sbk_44"; -static char* N(exit_str_1) = "sbk_46"; -static char* N(exit_str_2) = "sbk_35"; -static char* N(exit_str_3) = "sbk_55"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_45/sbk_45.h b/src/world/area_sbk/sbk_45/sbk_45.h index d22dcb251a..8dcfe6a2be 100644 --- a/src/world/area_sbk/sbk_45/sbk_45.h +++ b/src/world/area_sbk/sbk_45/sbk_45.h @@ -2,8 +2,11 @@ /// @brief Dry Dry Desert - S1E2 Small Bluffs #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_45_shape.h" +#include "mapfs/sbk_45_hit.h" + #define NAMESPACE sbk_45 diff --git a/src/world/area_sbk/sbk_45/sbk_45_1_main.c b/src/world/area_sbk/sbk_45/sbk_45_1_main.c new file mode 100644 index 0000000000..90a1a4b8f9 --- /dev/null +++ b/src/world/area_sbk/sbk_45/sbk_45_1_main.c @@ -0,0 +1,65 @@ +#include "sbk_45.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_45_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_45_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_45_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_45_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, + [sbk_45_ENTRY_4] { 157.0, 200.0, -338.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_45 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_44_1) = EVT_EXIT_WALK(60, sbk_45_ENTRY_0, "sbk_44", sbk_44_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_46_0) = EVT_EXIT_WALK(60, sbk_45_ENTRY_1, "sbk_46", sbk_46_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_35_3) = EVT_EXIT_WALK(60, sbk_45_ENTRY_2, "sbk_35", sbk_35_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_55_2) = EVT_EXIT_WALK(60, sbk_45_ENTRY_3, "sbk_55", sbk_55_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_44_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_46_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_35_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_55_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(sbk_45_ENTRY_4) + 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_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_45/sbk_45_2_entity.c b/src/world/area_sbk/sbk_45/sbk_45_2_entity.c new file mode 100644 index 0000000000..0ee943781f --- /dev/null +++ b/src/world/area_sbk/sbk_45/sbk_45_2_entity.c @@ -0,0 +1,12 @@ + +#include "sbk_45.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -255, 55, -145, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -375, 80, -145, 0, MAKE_ENTITY_END) + EVT_CALL(MakeItemEntity, ITEM_STOP_WATCH, -375, 105, -145, ITEM_SPAWN_MODE_FALL_NEVER_VANISH, GF_SBK45_Item_StopWatch) + EVT_CALL(MakeItemEntity, ITEM_SPIN_ATTACK, 193, 79, -345, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_SBK45_Item_SpinAttack) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_46/94E9A0.c b/src/world/area_sbk/sbk_46/94E9A0.c deleted file mode 100644 index 3d5470570b..0000000000 --- a/src/world/area_sbk/sbk_46/94E9A0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_46.h" - -static char* N(exit_str_0) = "sbk_45"; -static char* N(exit_str_1) = "sbk_36"; -static char* N(exit_str_2) = "sbk_56"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_46/94E9E0.c b/src/world/area_sbk/sbk_46/94E9E0.c deleted file mode 100644 index 377433e65c..0000000000 --- a/src/world/area_sbk/sbk_46/94E9E0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_46.h" -#include "world/common/Bandit_DropCoin.inc.c" - -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_46/94EB00.c b/src/world/area_sbk/sbk_46/94EB00.c deleted file mode 100644 index 4817a8dbe6..0000000000 --- a/src/world/area_sbk/sbk_46/94EB00.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_46.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_sbk/sbk_46/sbk_46.h b/src/world/area_sbk/sbk_46/sbk_46.h index 08ad34de3a..db4ad3dcf5 100644 --- a/src/world/area_sbk/sbk_46/sbk_46.h +++ b/src/world/area_sbk/sbk_46/sbk_46.h @@ -2,8 +2,20 @@ /// @brief Dry Dry Desert - S1E3 North of Oasis #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_46_shape.h" +#include "mapfs/sbk_46_hit.h" + +#include "sprite/npc/Bandit.h" +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey = 0, + NPC_Bandit_01 = 1, + NPC_Bandit_02 = 2, +}; + #define NAMESPACE sbk_46 diff --git a/src/world/area_sbk/sbk_46/sbk_46_1_main.c b/src/world/area_sbk/sbk_46/sbk_46_1_main.c new file mode 100644 index 0000000000..1c12a76821 --- /dev/null +++ b/src/world/area_sbk/sbk_46/sbk_46_1_main.c @@ -0,0 +1,53 @@ +#include "sbk_46.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); +extern EvtScript N(EVS_SetupFoliage); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_46_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_46_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_46_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_46_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_46 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_45_1) = EVT_EXIT_WALK(60, sbk_46_ENTRY_0, "sbk_45", sbk_45_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_36_3) = EVT_EXIT_WALK(60, sbk_46_ENTRY_2, "sbk_36", sbk_36_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_56_2) = EVT_EXIT_WALK(60, sbk_46_ENTRY_3, "sbk_56", sbk_56_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_45_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_36_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_56_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_46/sbk_46_2_npc.c b/src/world/area_sbk/sbk_46/sbk_46_2_npc.c new file mode 100644 index 0000000000..1c715aa208 --- /dev/null +++ b/src/world/area_sbk/sbk_46/sbk_46_2_npc.c @@ -0,0 +1,162 @@ +#include "sbk_46.h" + +#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey) = { + .id = NPC_Pokey, + .settings = &N(NpcSettings_Pokey), + .pos = { 310.0f, 0.0f, -100.0f }, + .yaw = 270, + .flags = NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 310, 0, -100 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit_01) = { + .id = NPC_Bandit_01, + .settings = &N(NpcSettings_Bandit), + .pos = { -190.0f, 0.0f, -318.0f }, + .yaw = 90, + .flags = NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -190, 0, -318 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit_02) = { + .id = NPC_Bandit_02, + .settings = &N(NpcSettings_Bandit), + .pos = { -200.0f, 0.0f, 115.0f }, + .yaw = 300, + .flags = NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -200, 0, 115 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey), BTL_SBK_FORMATION_06, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit_01), BTL_SBK_FORMATION_0D, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit_02), BTL_SBK_FORMATION_0C, BTL_SBK_STAGE_00), + {} +}; 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 new file mode 100644 index 0000000000..288b8dd3fe --- /dev/null +++ b/src/world/area_sbk/sbk_46/sbk_46_3_foliage.c @@ -0,0 +1,102 @@ +#include "sbk_46.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = { + .count = 1, + .models = { + MODEL_o62, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_o61, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -228.0f, 0.0f, -306.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = { + .count = 1, + .models = { + MODEL_o64, + } +}; + +FoliageModelList N(Tree2_TrunkModels) = { + .count = 1, + .models = { + MODEL_o63, + } +}; + +FoliageDropList N(Tree2_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -178, 100, 189 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_SBK46_Tree2_Coin, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .drops = &N(Tree2_Drops), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { -178.0f, 0.0f, 164.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree3_LeafModels) = { + .count = 1, + .models = { + MODEL_o60, + } +}; + +FoliageModelList N(Tree3_TrunkModels) = { + .count = 1, + .models = { + MODEL_o59, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree3) = { + .leaves = &N(Tree3_LeafModels), + .trunk = &N(Tree3_TrunkModels), +}; + +BombTrigger N(BombPos_Tree3) = { + .pos = { 351.0f, 0.0f, -101.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o193, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o195, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_46/sbk_46_4_entity.c b/src/world/area_sbk/sbk_46/sbk_46_4_entity.c new file mode 100644 index 0000000000..cb7d21194f --- /dev/null +++ b/src/world/area_sbk/sbk_46/sbk_46_4_entity.c @@ -0,0 +1,12 @@ + +#include "sbk_46.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 0, 0, 0, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK46_ItemBlock_Coin) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 0, 85, 0, 0, ITEM_LIFE_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK46_HiddenItem_LifeShroom) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_50/950610.c b/src/world/area_sbk/sbk_50/950610.c deleted file mode 100644 index 07bcb1d0d5..0000000000 --- a/src/world/area_sbk/sbk_50/950610.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_50.h" - -static char* N(exit_str_0) = "sbk_51"; -static char* N(exit_str_1) = "sbk_40"; -static char* N(exit_str_2) = "sbk_60"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_50/sbk_50.h b/src/world/area_sbk/sbk_50/sbk_50.h index b92b72afc3..6e8f6c140d 100644 --- a/src/world/area_sbk/sbk_50/sbk_50.h +++ b/src/world/area_sbk/sbk_50/sbk_50.h @@ -2,8 +2,11 @@ /// @brief Dry Dry Desert - S2W3 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_50_shape.h" +#include "mapfs/sbk_50_hit.h" + #define NAMESPACE sbk_50 diff --git a/src/world/area_sbk/sbk_50/sbk_50_1_main.c b/src/world/area_sbk/sbk_50/sbk_50_1_main.c new file mode 100644 index 0000000000..361adaedcb --- /dev/null +++ b/src/world/area_sbk/sbk_50/sbk_50_1_main.c @@ -0,0 +1,47 @@ +#include "sbk_50.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [sbk_50_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_50_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_50_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_50_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_50 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_51_0) = EVT_EXIT_WALK(60, sbk_50_ENTRY_1, "sbk_51", sbk_51_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_40_3) = EVT_EXIT_WALK(60, sbk_50_ENTRY_2, "sbk_40", sbk_40_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_60_2) = EVT_EXIT_WALK(60, sbk_50_ENTRY_3, "sbk_60", sbk_60_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_51_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_40_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_60_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_51/950970.c b/src/world/area_sbk/sbk_51/950970.c deleted file mode 100644 index e061b30ee0..0000000000 --- a/src/world/area_sbk/sbk_51/950970.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_51.h" - -static char* N(exit_str_0) = "sbk_50"; -static char* N(exit_str_1) = "sbk_52"; -static char* N(exit_str_2) = "sbk_41"; -static char* N(exit_str_3) = "sbk_61"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_51/9509B0.c b/src/world/area_sbk/sbk_51/9509B0.c deleted file mode 100644 index d1e27e774b..0000000000 --- a/src/world/area_sbk/sbk_51/9509B0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_51.h" -#include "world/common/Bandit_DropCoin.inc.c" - -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_51/sbk_51.h b/src/world/area_sbk/sbk_51/sbk_51.h index 8feeb08152..c91153b783 100644 --- a/src/world/area_sbk/sbk_51/sbk_51.h +++ b/src/world/area_sbk/sbk_51/sbk_51.h @@ -2,8 +2,19 @@ /// @brief Dry Dry Desert - S2W2 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_51_shape.h" +#include "mapfs/sbk_51_hit.h" + +#include "sprite/npc/Bandit.h" +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey = 0, + NPC_Bandit = 1, +}; + #define NAMESPACE sbk_51 diff --git a/src/world/area_sbk/sbk_51/sbk_51_1_main.c b/src/world/area_sbk/sbk_51/sbk_51_1_main.c new file mode 100644 index 0000000000..612c03c746 --- /dev/null +++ b/src/world/area_sbk/sbk_51/sbk_51_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_51.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_51_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_51_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_51_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_51_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_51 }, +}; + +EvtScript N(EVS_ExitWalk_sbk_50_1) = EVT_EXIT_WALK(60, sbk_51_ENTRY_0, "sbk_50", sbk_50_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_52_0) = EVT_EXIT_WALK(60, sbk_51_ENTRY_1, "sbk_52", sbk_52_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_41_3) = EVT_EXIT_WALK(60, sbk_51_ENTRY_2, "sbk_41", sbk_41_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_61_2) = EVT_EXIT_WALK(60, sbk_51_ENTRY_3, "sbk_61", sbk_61_ENTRY_2); + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_50_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_52_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_41_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_61_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_51/sbk_51_2_npc.c b/src/world/area_sbk/sbk_51/sbk_51_2_npc.c new file mode 100644 index 0000000000..ef67441e09 --- /dev/null +++ b/src/world/area_sbk/sbk_51/sbk_51_2_npc.c @@ -0,0 +1,111 @@ +#include "sbk_51.h" + +#include "world/common/enemy/complete/Bandit.inc.c" +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey) = { + .id = NPC_Pokey, + .settings = &N(NpcSettings_Pokey), + .pos = { 180.0f, 0.0f, 120.0f }, + .yaw = 0, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 180, 0, 120 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit) = { + .id = NPC_Bandit, + .settings = &N(NpcSettings_Bandit), + .pos = { -60.0f, 0.0f, -88.0f }, + .yaw = 0, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -60, 0, -88 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey), BTL_SBK_FORMATION_05, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit), BTL_SBK_FORMATION_0E, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_52/951670.c b/src/world/area_sbk/sbk_52/951670.c deleted file mode 100644 index 34fe456143..0000000000 --- a/src/world/area_sbk/sbk_52/951670.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_52.h" - -static char* N(exit_str_0) = "sbk_51"; -static char* N(exit_str_1) = "sbk_53"; -static char* N(exit_str_2) = "sbk_42"; -static char* N(exit_str_3) = "sbk_62"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_52/sbk_52.h b/src/world/area_sbk/sbk_52/sbk_52.h index e6071e1d4b..07a19a5a52 100644 --- a/src/world/area_sbk/sbk_52/sbk_52.h +++ b/src/world/area_sbk/sbk_52/sbk_52.h @@ -2,8 +2,11 @@ /// @brief Dry Dry Desert - S2W1 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_52_shape.h" +#include "mapfs/sbk_52_hit.h" + #define NAMESPACE sbk_52 diff --git a/src/world/area_sbk/sbk_52/sbk_52_1_main.c b/src/world/area_sbk/sbk_52/sbk_52_1_main.c new file mode 100644 index 0000000000..6656cff97d --- /dev/null +++ b/src/world/area_sbk/sbk_52/sbk_52_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_52.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_52_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_52_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_52_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_52_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_52 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_51_1) = EVT_EXIT_WALK(60, sbk_52_ENTRY_0, "sbk_51", sbk_51_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_53_0) = EVT_EXIT_WALK(60, sbk_52_ENTRY_1, "sbk_53", sbk_53_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_42_3) = EVT_EXIT_WALK(60, sbk_52_ENTRY_2, "sbk_42", sbk_42_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_62_2) = EVT_EXIT_WALK(60, sbk_52_ENTRY_3, "sbk_62", sbk_62_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_51_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_53_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_42_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_62_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_52/sbk_52_2_entity.c b/src/world/area_sbk/sbk_52/sbk_52_2_entity.c new file mode 100644 index 0000000000..77cafb8ef6 --- /dev/null +++ b/src/world/area_sbk/sbk_52/sbk_52_2_entity.c @@ -0,0 +1,11 @@ +#include "sbk_52.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 0, 60, -100, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK52_MultiCoinBrick) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), 80, 60, 270, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BrickBlock), -210, 60, 165, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_53/951AE0.c b/src/world/area_sbk/sbk_53/951AE0.c deleted file mode 100644 index f9e8a9f44b..0000000000 --- a/src/world/area_sbk/sbk_53/951AE0.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_53.h" - -static char* N(exit_str_0) = "sbk_52"; -static char* N(exit_str_1) = "sbk_54"; -static char* N(exit_str_2) = "sbk_43"; -static char* N(exit_str_3) = "sbk_63"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_53/951B20.c b/src/world/area_sbk/sbk_53/951B20.c deleted file mode 100644 index e4741af634..0000000000 --- a/src/world/area_sbk/sbk_53/951B20.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "sbk_53.h" -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_53/sbk_53.h b/src/world/area_sbk/sbk_53/sbk_53.h index bb315d6f51..6f8cba8863 100644 --- a/src/world/area_sbk/sbk_53/sbk_53.h +++ b/src/world/area_sbk/sbk_53/sbk_53.h @@ -2,8 +2,19 @@ /// @brief Dry Dry Desert - S2 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_53_shape.h" +#include "mapfs/sbk_53_hit.h" + +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, + NPC_Pokey_03 = 2, +}; + #define NAMESPACE sbk_53 diff --git a/src/world/area_sbk/sbk_53/sbk_53_1_main.c b/src/world/area_sbk/sbk_53/sbk_53_1_main.c new file mode 100644 index 0000000000..712ae685ef --- /dev/null +++ b/src/world/area_sbk/sbk_53/sbk_53_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_53.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_53_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_53_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_53_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_53_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_53 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_52_1) = EVT_EXIT_WALK(60, sbk_53_ENTRY_0, "sbk_52", sbk_52_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_54_0) = EVT_EXIT_WALK(60, sbk_53_ENTRY_1, "sbk_54", sbk_54_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_43_3) = EVT_EXIT_WALK(60, sbk_53_ENTRY_2, "sbk_43", sbk_43_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_63_2) = EVT_EXIT_WALK(60, sbk_53_ENTRY_3, "sbk_63", sbk_63_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_52_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_54_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_43_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_63_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_53/sbk_53_2_npc.c b/src/world/area_sbk/sbk_53/sbk_53_2_npc.c new file mode 100644 index 0000000000..9228c420a5 --- /dev/null +++ b/src/world/area_sbk/sbk_53/sbk_53_2_npc.c @@ -0,0 +1,163 @@ +#include "sbk_53.h" + +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_Pokey), + .pos = { -176.0f, 0.0f, -196.0f }, + .yaw = 0, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -176, 0, -196 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_Pokey), + .pos = { -110.0f, 0.0f, -270.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -110, 0, -270 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_03) = { + .id = NPC_Pokey_03, + .settings = &N(NpcSettings_Pokey), + .pos = { 252.0f, 0.0f, -233.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 252, 0, -233 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_SBK_FORMATION_00, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_02), BTL_SBK_FORMATION_02, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_03), BTL_SBK_FORMATION_01, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_54/952580.c b/src/world/area_sbk/sbk_54/952580.c deleted file mode 100644 index 348cf4950f..0000000000 --- a/src/world/area_sbk/sbk_54/952580.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "sbk_54.h" - -static char* N(exit_str_0) = "sbk_53"; -static char* N(exit_str_1) = "sbk_55"; -static char* N(exit_str_2) = "sbk_44"; -static char* N(exit_str_3) = "sbk_64"; -static char* N(exit_str_4) = "sbk_45"; -static char* N(exit_str_5) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_54/sbk_54.h b/src/world/area_sbk/sbk_54/sbk_54.h index d52b820ccb..4b654ae91b 100644 --- a/src/world/area_sbk/sbk_54/sbk_54.h +++ b/src/world/area_sbk/sbk_54/sbk_54.h @@ -2,8 +2,12 @@ /// @brief Dry Dry Desert - S2E1 Blue Cactus #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_54_shape.h" +#include "mapfs/sbk_54_hit.h" + + #define NAMESPACE sbk_54 diff --git a/src/world/area_sbk/sbk_54/sbk_54_1_main.c b/src/world/area_sbk/sbk_54/sbk_54_1_main.c new file mode 100644 index 0000000000..18521b63dd --- /dev/null +++ b/src/world/area_sbk/sbk_54/sbk_54_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_54.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_54_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_54_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_54_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_54_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_54 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_53_1) = EVT_EXIT_WALK(60, sbk_54_ENTRY_0, "sbk_53", sbk_53_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_55_0) = EVT_EXIT_WALK(60, sbk_54_ENTRY_1, "sbk_55", sbk_55_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_44_3) = EVT_EXIT_WALK(60, sbk_54_ENTRY_2, "sbk_44", sbk_44_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_64_2) = EVT_EXIT_WALK(60, sbk_54_ENTRY_3, "sbk_64", sbk_64_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_53_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_55_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_44_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_64_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_54/sbk_54_2_entity.c b/src/world/area_sbk/sbk_54/sbk_54_2_entity.c new file mode 100644 index 0000000000..36c068ef7e --- /dev/null +++ b/src/world/area_sbk/sbk_54/sbk_54_2_entity.c @@ -0,0 +1,31 @@ +#include "sbk_54.h" +#include "entity.h" + +TweesterPath N(TweesterPath1)[] = { + { -65, 0, 217 }, + { -262, 0, -64 }, + { 57, 0, -286 }, + { 327, 0, 8 }, + { TWEETSER_PATH_LOOP } +}; + +TweesterPath* N(TweesterPaths)[] = { + N(TweesterPath1), + PTR_LIST_END +}; + +EvtScript N(EVS_RideTweester) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(GotoMap, EVT_PTR("sbk_45"), sbk_45_ENTRY_4) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_Tweester), 327, 0, 8, 0, EVT_PTR(N(TweesterPaths)), MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_RideTweester))) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_55/952A50.c b/src/world/area_sbk/sbk_55/952A50.c deleted file mode 100644 index 03785c85f2..0000000000 --- a/src/world/area_sbk/sbk_55/952A50.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_55.h" - -static char* N(exit_str_0) = "sbk_54"; -static char* N(exit_str_1) = "sbk_56"; -static char* N(exit_str_2) = "sbk_45"; -static char* N(exit_str_3) = "sbk_65"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_55/952A90.c b/src/world/area_sbk/sbk_55/952A90.c deleted file mode 100644 index 070a83934d..0000000000 --- a/src/world/area_sbk/sbk_55/952A90.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "sbk_55.h" -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_55/952AB0.c b/src/world/area_sbk/sbk_55/952AB0.c deleted file mode 100644 index f4082c5c00..0000000000 --- a/src/world/area_sbk/sbk_55/952AB0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_55.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_sbk/sbk_55/sbk_55.h b/src/world/area_sbk/sbk_55/sbk_55.h index cdd0cd28f2..fef9454a52 100644 --- a/src/world/area_sbk/sbk_55/sbk_55.h +++ b/src/world/area_sbk/sbk_55/sbk_55.h @@ -2,8 +2,18 @@ /// @brief Dry Dry Desert - S2E2 West of Oasis #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_55_shape.h" +#include "mapfs/sbk_55_hit.h" + +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, +}; + #define NAMESPACE sbk_55 diff --git a/src/world/area_sbk/sbk_55/sbk_55_1_main.c b/src/world/area_sbk/sbk_55/sbk_55_1_main.c new file mode 100644 index 0000000000..2b00c80b50 --- /dev/null +++ b/src/world/area_sbk/sbk_55/sbk_55_1_main.c @@ -0,0 +1,55 @@ +#include "sbk_55.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); +extern EvtScript N(EVS_SetupFoliage); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_55_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_55_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_55_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_55_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_55 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_54_1) = EVT_EXIT_WALK(60, sbk_55_ENTRY_0, "sbk_54", sbk_54_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_56_0) = EVT_EXIT_WALK(60, sbk_55_ENTRY_1, "sbk_56", sbk_56_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_45_3) = EVT_EXIT_WALK(60, sbk_55_ENTRY_2, "sbk_45", sbk_45_ENTRY_3); +EvtScript N(EVS_ExitWalk_sbk_65_2) = EVT_EXIT_WALK(60, sbk_55_ENTRY_3, "sbk_65", sbk_65_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_54_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_56_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_45_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_65_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_55/sbk_55_2_npc.c b/src/world/area_sbk/sbk_55/sbk_55_2_npc.c new file mode 100644 index 0000000000..d489abfedf --- /dev/null +++ b/src/world/area_sbk/sbk_55/sbk_55_2_npc.c @@ -0,0 +1,111 @@ +#include "sbk_55.h" + +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_Pokey), + .pos = { 43.0f, 0.0f, -120.0f }, + .yaw = 270, + .flags = NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 43, 0, -120 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_Pokey), + .pos = { -100.0f, 0.0f, -120.0f }, + .yaw = 270, + .flags = NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -100, 0, -120 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_SBK_FORMATION_02, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_02), BTL_SBK_FORMATION_03, BTL_SBK_STAGE_00), + {} +}; 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 new file mode 100644 index 0000000000..ce27ec9efc --- /dev/null +++ b/src/world/area_sbk/sbk_55/sbk_55_3_foliage.c @@ -0,0 +1,48 @@ +#include "sbk_55.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = { + .count = 1, + .models = { + MODEL_o56, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_o55, + } +}; + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 77, 100, -101 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_SBK55_Tree1_Coin, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .drops = &N(Tree1_Drops), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { 77.0f, 0.0f, -126.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o191, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_55/sbk_55_4_entity.c b/src/world/area_sbk/sbk_55/sbk_55_4_entity.c new file mode 100644 index 0000000000..4977ee9f6e --- /dev/null +++ b/src/world/area_sbk/sbk_55/sbk_55_4_entity.c @@ -0,0 +1,10 @@ +#include "sbk_55.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 0, 60, -100, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK55_MultiCoinBrick) + EVT_CALL(MakeItemEntity, ITEM_TASTY_TONIC, 420, 0, 168, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_SBK55_Item_TastyTonic) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_56/953FC0.c b/src/world/area_sbk/sbk_56/953FC0.c deleted file mode 100644 index f9b72d9836..0000000000 --- a/src/world/area_sbk/sbk_56/953FC0.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "sbk_56.h" - -static char* N(exit_str_0) = "sbk_55"; -static char* N(exit_str_1) = "sbk_46"; -static char* N(exit_str_2) = "sbk_66"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" - -ApiStatus func_80240038_953FF8(void) { - bgm_set_variation(0, 1); - return ApiStatus_DONE2; -} - -ApiStatus func_8024005C_95401C(void) { - bgm_set_variation(0, 0); - return ApiStatus_DONE2; -} - -#include "world/common/atomic/SuperBlock.inc.c" diff --git a/src/world/area_sbk/sbk_56/954D80.c b/src/world/area_sbk/sbk_56/954D80.c deleted file mode 100644 index 62cfbcadd2..0000000000 --- a/src/world/area_sbk/sbk_56/954D80.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_56.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_sbk/sbk_56/sbk_56.h b/src/world/area_sbk/sbk_56/sbk_56.h index b935e9324f..fb35e713a0 100644 --- a/src/world/area_sbk/sbk_56/sbk_56.h +++ b/src/world/area_sbk/sbk_56/sbk_56.h @@ -2,8 +2,20 @@ /// @brief Dry Dry Desert - S2E3 Oasis #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_56_shape.h" +#include "mapfs/sbk_56_hit.h" + +enum { + MV_SuperBlock = MapVar(0), +}; + +enum { + MF_TreeDrop_Lemon = MapFlag(10), + MF_TreeDrop_Lime = MapFlag(12), +}; + #define NAMESPACE sbk_56 diff --git a/src/world/area_sbk/sbk_56/sbk_56_1_main.c b/src/world/area_sbk/sbk_56/sbk_56_1_main.c new file mode 100644 index 0000000000..af72722f7c --- /dev/null +++ b/src/world/area_sbk/sbk_56/sbk_56_1_main.c @@ -0,0 +1,110 @@ + +#include "sbk_56.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_SetupFoliage); + +EntryList N(Entrances) = { + [sbk_56_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_56_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_56_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_56_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_56 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +ApiStatus N(StartOasisSongVariation)(void) { + bgm_set_variation(0, 1); + return ApiStatus_DONE2; +} + +ApiStatus N(StopOasisSongVariation)(void) { + bgm_set_variation(0, 0); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ExitWalk_sbk_55_1) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, sbk_56_ENTRY_0) + EVT_EXEC(ExitWalk) + EVT_CALL(N(StopOasisSongVariation)) + EVT_CALL(GotoMap, EVT_PTR("sbk_55"), sbk_55_ENTRY_1) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_sbk_46_3) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, sbk_56_ENTRY_2) + EVT_EXEC(ExitWalk) + EVT_CALL(N(StopOasisSongVariation)) + EVT_CALL(GotoMap, EVT_PTR("sbk_46"), sbk_46_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_sbk_66_2) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, sbk_56_ENTRY_3) + EVT_EXEC(ExitWalk) + EVT_CALL(N(StopOasisSongVariation)) + EVT_CALL(GotoMap, EVT_PTR("sbk_66"), sbk_66_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_55_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_46_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_66_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Water) = { + EVT_CALL(EnableTexPanning, MODEL_o49, TRUE) + EVT_SET(LVar0, 0) + EVT_LABEL(10) + EVT_SET(LVar1, 0) + EVT_SUB(LVar1, LVar0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, LVar0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_AUX, LVar1, LVar1) + EVT_ADD(LVar0, 80) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_EXEC(N(EVS_TexPan_Water)) + EVT_CALL(MakeTransformGroup, MODEL_sui) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_CALL(N(StartOasisSongVariation)) + EVT_CALL(PlaySound, SOUND_80000061) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_56/sbk_56_2_entity.c b/src/world/area_sbk/sbk_56/sbk_56_2_entity.c new file mode 100644 index 0000000000..c33e0d2b66 --- /dev/null +++ b/src/world/area_sbk/sbk_56/sbk_56_2_entity.c @@ -0,0 +1,15 @@ + +#include "sbk_56.h" +#include "entity.h" + +#define SUPER_BLOCK_MAPVAR MV_SuperBlock +#define SUPER_BLOCK_GAMEFLAG GF_SBK56_SuperBlock +#include "world/common/atomic/SuperBlock.inc.c" +#include "world/common/atomic/SuperBlock.data.inc.c" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), 300, 60, 0, 0, MAKE_ENTITY_END) + EVT_MAKE_SUPER_BLOCK(-50, 60, 275, 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 new file mode 100644 index 0000000000..2b4b564ef0 --- /dev/null +++ b/src/world/area_sbk/sbk_56/sbk_56_3_foliage.c @@ -0,0 +1,336 @@ +#include "sbk_56.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = { + .count = 1, + .models = { + MODEL_ki, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_miki, + } +}; + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_LEMON, + .pos = { -304, 92, -176 }, + .spawnMode = ITEM_SPAWN_MODE_FALL, + .pickupFlag = GF_SBK56_Tree1_Lemon, + .spawnFlag = MF_TreeDrop_Lemon, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .drops = &N(Tree1_Drops), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -259.0f, 0.0f, -160.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = { + .count = 1, + .models = { + MODEL_ki, + } +}; + +FoliageModelList N(Tree2_TrunkModels) = { + .count = 1, + .models = { + MODEL_miki, + } +}; + +FoliageDropList N(Tree2_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_LIME, + .pos = { 230, 77, -304 }, + .spawnMode = ITEM_SPAWN_MODE_FALL, + .pickupFlag = GF_SBK56_Tree2_Lime, + .spawnFlag = MF_TreeDrop_Lime, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .drops = &N(Tree2_Drops), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { 171.0f, 0.0f, -291.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree3_LeafModels) = { + .count = 1, + .models = { + MODEL_o52, + } +}; + +FoliageModelList N(Tree3_TrunkModels) = { + .count = 1, + .models = { + MODEL_y_miki, + } +}; + +FoliageDropList N(Tree3_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -436, 100, 249 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_SBK56_Tree3_Coin, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree3) = { + .leaves = &N(Tree3_LeafModels), + .trunk = &N(Tree3_TrunkModels), + .drops = &N(Tree3_Drops), +}; + +BombTrigger N(BombPos_Tree3) = { + .pos = { -436.0f, 0.0f, 224.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree4_LeafModels) = { + .count = 1, + .models = { + MODEL_y_ha, + } +}; + +FoliageModelList N(Tree4_TrunkModels) = { + .count = 1, + .models = { + MODEL_o51, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree4) = { + .leaves = &N(Tree4_LeafModels), + .trunk = &N(Tree4_TrunkModels), +}; + +BombTrigger N(BombPos_Tree4) = { + .pos = { -320.0f, 0.0f, -21.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree5_LeafModels) = { + .count = 1, + .models = { + MODEL_o54, + } +}; + +FoliageModelList N(Tree5_TrunkModels) = { + .count = 1, + .models = { + MODEL_o53, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree5) = { + .leaves = &N(Tree5_LeafModels), + .trunk = &N(Tree5_TrunkModels), +}; + +BombTrigger N(BombPos_Tree5) = { + .pos = { -242.0f, 0.0f, 88.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree6_LeafModels) = { + .count = 1, + .models = { + MODEL_o56, + } +}; + +FoliageModelList N(Tree6_TrunkModels) = { + .count = 1, + .models = { + MODEL_o55, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree6) = { + .leaves = &N(Tree6_LeafModels), + .trunk = &N(Tree6_TrunkModels), +}; + +BombTrigger N(BombPos_Tree6) = { + .pos = { -203.0f, 0.0f, -214.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree7_LeafModels) = { + .count = 1, + .models = { + MODEL_o58, + } +}; + +FoliageModelList N(Tree7_TrunkModels) = { + .count = 1, + .models = { + MODEL_o57, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree7) = { + .leaves = &N(Tree7_LeafModels), + .trunk = &N(Tree7_TrunkModels), +}; + +BombTrigger N(BombPos_Tree7) = { + .pos = { -101.0f, 0.0f, -376.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree8_LeafModels) = { + .count = 1, + .models = { + MODEL_o60, + } +}; + +FoliageModelList N(Tree8_TrunkModels) = { + .count = 1, + .models = { + MODEL_o59, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree8) = { + .leaves = &N(Tree8_LeafModels), + .trunk = &N(Tree8_TrunkModels), +}; + +BombTrigger N(BombPos_Tree8) = { + .pos = { 104.0f, 0.0f, -386.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree9_LeafModels) = { + .count = 1, + .models = { + MODEL_o62, + } +}; + +FoliageModelList N(Tree9_TrunkModels) = { + .count = 1, + .models = { + MODEL_o61, + } +}; + +FoliageDropList N(Tree9_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 266, 100, 149 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_SBK56_Tree9_Coin, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree9) = { + .leaves = &N(Tree9_LeafModels), + .trunk = &N(Tree9_TrunkModels), + .drops = &N(Tree9_Drops), +}; + +BombTrigger N(BombPos_Tree9) = { + .pos = { 266.0f, 0.0f, 124.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree10_LeafModels) = { + .count = 1, + .models = { + MODEL_o64, + } +}; + +FoliageModelList N(Tree10_TrunkModels) = { + .count = 1, + .models = { + MODEL_o63, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree10) = { + .leaves = &N(Tree10_LeafModels), + .trunk = &N(Tree10_TrunkModels), +}; + +BombTrigger N(BombPos_Tree10) = { + .pos = { 362.0f, 0.0f, -74.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(GF_SBK56_Tree1_Lemon, FALSE) + EVT_SET(GF_SBK56_UnusedA, FALSE) + 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_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_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_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_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_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_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_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_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_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_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_60/9569F0.c b/src/world/area_sbk/sbk_60/9569F0.c deleted file mode 100644 index f0087ab4bb..0000000000 --- a/src/world/area_sbk/sbk_60/9569F0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "sbk_60.h" - -static char* N(exit_str_0) = "sbk_61"; -static char* N(exit_str_1) = "sbk_50"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_60/956A30.c b/src/world/area_sbk/sbk_60/956A30.c deleted file mode 100644 index 00750680ac..0000000000 --- a/src/world/area_sbk/sbk_60/956A30.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "sbk_60.h" -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_60/sbk_60.h b/src/world/area_sbk/sbk_60/sbk_60.h index 2408b37c0c..b63e3fb471 100644 --- a/src/world/area_sbk/sbk_60/sbk_60.h +++ b/src/world/area_sbk/sbk_60/sbk_60.h @@ -2,8 +2,18 @@ /// @brief Dry Dry Desert - S3W3 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_60_shape.h" +#include "mapfs/sbk_60_hit.h" + +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey = 0, +}; + + #define NAMESPACE sbk_60 diff --git a/src/world/area_sbk/sbk_60/sbk_60_1_main.c b/src/world/area_sbk/sbk_60/sbk_60_1_main.c new file mode 100644 index 0000000000..b6b05f7079 --- /dev/null +++ b/src/world/area_sbk/sbk_60/sbk_60_1_main.c @@ -0,0 +1,47 @@ +#include "sbk_60.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_60_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_60_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_60_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_60_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_60 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_61_0) = EVT_EXIT_WALK(60, sbk_60_ENTRY_1, "sbk_61", sbk_61_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_50_3) = EVT_EXIT_WALK(60, sbk_60_ENTRY_2, "sbk_50", sbk_50_ENTRY_3); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_61_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_50_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_60/sbk_60_2_npc.c b/src/world/area_sbk/sbk_60/sbk_60_2_npc.c new file mode 100644 index 0000000000..2cbfc2e955 --- /dev/null +++ b/src/world/area_sbk/sbk_60/sbk_60_2_npc.c @@ -0,0 +1,59 @@ +#include "sbk_60.h" + +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey) = { + .id = NPC_Pokey, + .settings = &N(NpcSettings_Pokey), + .pos = { 160.0f, 0.0f, -120.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 160, 0, -120 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey), BTL_SBK_FORMATION_03, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_61/956F90.c b/src/world/area_sbk/sbk_61/956F90.c deleted file mode 100644 index 0aa8ef3ed9..0000000000 --- a/src/world/area_sbk/sbk_61/956F90.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_61.h" - -static char* N(exit_str_0) = "sbk_60"; -static char* N(exit_str_1) = "sbk_62"; -static char* N(exit_str_2) = "sbk_51"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_61/sbk_61.h b/src/world/area_sbk/sbk_61/sbk_61.h index a4e574152e..19bbcafd78 100644 --- a/src/world/area_sbk/sbk_61/sbk_61.h +++ b/src/world/area_sbk/sbk_61/sbk_61.h @@ -2,8 +2,11 @@ /// @brief Dry Dry Desert - S3W2 Hidden AttackFX #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_61_shape.h" +#include "mapfs/sbk_61_hit.h" + #define NAMESPACE sbk_61 diff --git a/src/world/area_sbk/sbk_61/sbk_61_1_main.c b/src/world/area_sbk/sbk_61/sbk_61_1_main.c new file mode 100644 index 0000000000..aaa2b263d1 --- /dev/null +++ b/src/world/area_sbk/sbk_61/sbk_61_1_main.c @@ -0,0 +1,50 @@ +#include "sbk_61.h" +#include "entity.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_61_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_61_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_61_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_61_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_61 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_60_1) = EVT_EXIT_WALK(60, sbk_61_ENTRY_0, "sbk_60", sbk_60_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_62_0) = EVT_EXIT_WALK(60, sbk_61_ENTRY_1, "sbk_62", sbk_62_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_51_3) = EVT_EXIT_WALK(60, sbk_61_ENTRY_2, "sbk_51", sbk_51_ENTRY_3); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_60_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_62_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_51_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_61/sbk_61_2_entity.c b/src/world/area_sbk/sbk_61/sbk_61_2_entity.c new file mode 100644 index 0000000000..43cc53e5ad --- /dev/null +++ b/src/world/area_sbk/sbk_61/sbk_61_2_entity.c @@ -0,0 +1,9 @@ +#include "sbk_61.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenRedBlock), 0, 90, 0, 180, ITEM_ATTACK_FX_C, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK61_HiddenBadge_AttackFXC) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_62/957350.c b/src/world/area_sbk/sbk_62/957350.c deleted file mode 100644 index 51588b6bdd..0000000000 --- a/src/world/area_sbk/sbk_62/957350.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_62.h" - -static char* N(exit_str_0) = "sbk_61"; -static char* N(exit_str_1) = "sbk_63"; -static char* N(exit_str_2) = "sbk_52"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_62/957390.c b/src/world/area_sbk/sbk_62/957390.c deleted file mode 100644 index 72f5bdd15e..0000000000 --- a/src/world/area_sbk/sbk_62/957390.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "sbk_62.h" -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_62/sbk_62.h b/src/world/area_sbk/sbk_62/sbk_62.h index 3f3e16a0f1..3c4d37d897 100644 --- a/src/world/area_sbk/sbk_62/sbk_62.h +++ b/src/world/area_sbk/sbk_62/sbk_62.h @@ -2,8 +2,19 @@ /// @brief Dry Dry Desert - S3W1 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_62_shape.h" +#include "mapfs/sbk_62_hit.h" + +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, + NPC_Pokey_03 = 2, +}; + #define NAMESPACE sbk_62 diff --git a/src/world/area_sbk/sbk_62/sbk_62_1_main.c b/src/world/area_sbk/sbk_62/sbk_62_1_main.c new file mode 100644 index 0000000000..5b8c3a256c --- /dev/null +++ b/src/world/area_sbk/sbk_62/sbk_62_1_main.c @@ -0,0 +1,49 @@ +#include "sbk_62.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_62_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_62_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_62_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_62_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_62 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_61_1) = EVT_EXIT_WALK(60, sbk_62_ENTRY_0, "sbk_61", sbk_61_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_63_0) = EVT_EXIT_WALK(60, sbk_62_ENTRY_1, "sbk_63", sbk_63_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_52_3) = EVT_EXIT_WALK(60, sbk_62_ENTRY_2, "sbk_52", sbk_52_ENTRY_3); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_61_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_63_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_52_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_62/sbk_62_2_npc.c b/src/world/area_sbk/sbk_62/sbk_62_2_npc.c new file mode 100644 index 0000000000..346f4ec916 --- /dev/null +++ b/src/world/area_sbk/sbk_62/sbk_62_2_npc.c @@ -0,0 +1,163 @@ +#include "sbk_62.h" + +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_Pokey), + .pos = { -180.0f, 0.0f, -100.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -180, 0, -100 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_Pokey), + .pos = { 120.0f, 0.0f, 110.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 120, 0, 110 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_03) = { + .id = NPC_Pokey_03, + .settings = &N(NpcSettings_Pokey), + .pos = { 245.0f, 0.0f, 285.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 245, 0, 285 }, + .wanderSize = { 100 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_SBK_FORMATION_01, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_02), BTL_SBK_FORMATION_01, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_03), BTL_SBK_FORMATION_02, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_63/957D70.c b/src/world/area_sbk/sbk_63/957D70.c deleted file mode 100644 index 585d027aaf..0000000000 --- a/src/world/area_sbk/sbk_63/957D70.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_63.h" - -static char* N(exit_str_0) = "sbk_62"; -static char* N(exit_str_1) = "sbk_64"; -static char* N(exit_str_2) = "sbk_53"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_63/957DB0.c b/src/world/area_sbk/sbk_63/957DB0.c deleted file mode 100644 index bca2bc718c..0000000000 --- a/src/world/area_sbk/sbk_63/957DB0.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "sbk_63.h" -#include "world/common/SetNpcB5_3.inc.c" diff --git a/src/world/area_sbk/sbk_63/sbk_63.h b/src/world/area_sbk/sbk_63/sbk_63.h index 22723b7d70..286cc0a56c 100644 --- a/src/world/area_sbk/sbk_63/sbk_63.h +++ b/src/world/area_sbk/sbk_63/sbk_63.h @@ -2,8 +2,18 @@ /// @brief Dry Dry Desert - S3 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_63_shape.h" +#include "mapfs/sbk_63_hit.h" + +#include "sprite/npc/Pokey.h" + +enum { + NPC_Pokey_01 = 0, + NPC_Pokey_02 = 1, +}; + #define NAMESPACE sbk_63 diff --git a/src/world/area_sbk/sbk_63/sbk_63_1_main.c b/src/world/area_sbk/sbk_63/sbk_63_1_main.c new file mode 100644 index 0000000000..798bbe0955 --- /dev/null +++ b/src/world/area_sbk/sbk_63/sbk_63_1_main.c @@ -0,0 +1,49 @@ +#include "sbk_63.h" + +extern EvtScript N(EVS_Main); +extern NpcGroupList N(DefaultNPCs); + +EntryList N(Entrances) = { + [sbk_63_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_63_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_63_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_63_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_63 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_62_1) = EVT_EXIT_WALK(60, sbk_63_ENTRY_0, "sbk_62", sbk_62_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_64_0) = EVT_EXIT_WALK(60, sbk_63_ENTRY_1, "sbk_64", sbk_64_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_53_3) = EVT_EXIT_WALK(60, sbk_63_ENTRY_2, "sbk_53", sbk_53_ENTRY_3); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_62_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_64_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_53_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_63/sbk_63_2_npc.c b/src/world/area_sbk/sbk_63/sbk_63_2_npc.c new file mode 100644 index 0000000000..1ce81f6bd2 --- /dev/null +++ b/src/world/area_sbk/sbk_63/sbk_63_2_npc.c @@ -0,0 +1,111 @@ +#include "sbk_63.h" + +#include "world/common/enemy/complete/Pokey.inc.c" + +StaticNpc N(NpcData_Pokey_01) = { + .id = NPC_Pokey_01, + .settings = &N(NpcSettings_Pokey), + .pos = { -180.0f, 0.0f, -120.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -180, 0, -120 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Pokey_02) = { + .id = NPC_Pokey_02, + .settings = &N(NpcSettings_Pokey), + .pos = { 120.0f, 0.0f, -105.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 15, + .itemDrops = { + { ITEM_DRIED_FRUIT, 9, 0 }, + { ITEM_TASTY_TONIC, 1, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 0, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 120, 0, -105 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Pokey_Anim04, + .walk = ANIM_Pokey_Anim08, + .run = ANIM_Pokey_Anim08, + .chase = ANIM_Pokey_Anim08, + .anim_4 = ANIM_Pokey_Anim04, + .anim_5 = ANIM_Pokey_Anim04, + .death = ANIM_Pokey_Anim0C, + .hit = ANIM_Pokey_Anim0C, + .anim_8 = ANIM_Pokey_Anim08, + .anim_9 = ANIM_Pokey_Anim08, + .anim_A = ANIM_Pokey_Anim08, + .anim_B = ANIM_Pokey_Anim08, + .anim_C = ANIM_Pokey_Anim08, + .anim_D = ANIM_Pokey_Anim08, + .anim_E = ANIM_Pokey_Anim08, + .anim_F = ANIM_Pokey_Anim08, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Pokey_01), BTL_SBK_FORMATION_01, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Pokey_02), BTL_SBK_FORMATION_03, BTL_SBK_STAGE_00), + {} +}; diff --git a/src/world/area_sbk/sbk_64/958590.c b/src/world/area_sbk/sbk_64/958590.c deleted file mode 100644 index efd17dcad2..0000000000 --- a/src/world/area_sbk/sbk_64/958590.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_64.h" - -static char* N(exit_str_0) = "sbk_63"; -static char* N(exit_str_1) = "sbk_65"; -static char* N(exit_str_2) = "sbk_54"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_64/sbk_64.h b/src/world/area_sbk/sbk_64/sbk_64.h index 50e461f016..fb2a011c0b 100644 --- a/src/world/area_sbk/sbk_64/sbk_64.h +++ b/src/world/area_sbk/sbk_64/sbk_64.h @@ -2,8 +2,11 @@ /// @brief Dry Dry Desert - S3E1 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_64_shape.h" +#include "mapfs/sbk_64_hit.h" + #define NAMESPACE sbk_64 diff --git a/src/world/area_sbk/sbk_64/sbk_64_1_main.c b/src/world/area_sbk/sbk_64/sbk_64_1_main.c new file mode 100644 index 0000000000..8222a358d3 --- /dev/null +++ b/src/world/area_sbk/sbk_64/sbk_64_1_main.c @@ -0,0 +1,49 @@ +#include "sbk_64.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_64_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_64_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_64_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_64_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_64 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_63_1) = EVT_EXIT_WALK(60, sbk_64_ENTRY_0, "sbk_63", sbk_63_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_65_0) = EVT_EXIT_WALK(60, sbk_64_ENTRY_1, "sbk_65", sbk_65_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_54_3) = EVT_EXIT_WALK(60, sbk_64_ENTRY_2, "sbk_54", sbk_54_ENTRY_3); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_63_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_65_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_54_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_64/sbk_64_2_entity.c b/src/world/area_sbk/sbk_64/sbk_64_2_entity.c new file mode 100644 index 0000000000..6970ef7a8d --- /dev/null +++ b/src/world/area_sbk/sbk_64/sbk_64_2_entity.c @@ -0,0 +1,9 @@ +#include "sbk_64.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_YellowBlock), 0, 0, 0, 0, ITEM_COIN, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK64_ItemBlock_Coin) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_65/958950.c b/src/world/area_sbk/sbk_65/958950.c deleted file mode 100644 index 54fe1e54bd..0000000000 --- a/src/world/area_sbk/sbk_65/958950.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "sbk_65.h" - -static char* N(exit_str_0) = "sbk_64"; -static char* N(exit_str_1) = "sbk_66"; -static char* N(exit_str_2) = "sbk_55"; -static char* N(exit_str_3) = ""; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_65/sbk_65.h b/src/world/area_sbk/sbk_65/sbk_65.h index fd43d76dbc..c9b6905df8 100644 --- a/src/world/area_sbk/sbk_65/sbk_65.h +++ b/src/world/area_sbk/sbk_65/sbk_65.h @@ -2,8 +2,11 @@ /// @brief Dry Dry Desert - S3E2 #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_65_shape.h" +#include "mapfs/sbk_65_hit.h" + #define NAMESPACE sbk_65 diff --git a/src/world/area_sbk/sbk_65/sbk_65_1_main.c b/src/world/area_sbk/sbk_65/sbk_65_1_main.c new file mode 100644 index 0000000000..2810500a1d --- /dev/null +++ b/src/world/area_sbk/sbk_65/sbk_65_1_main.c @@ -0,0 +1,47 @@ +#include "sbk_65.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [sbk_65_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_65_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_65_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_65_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_65 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_64_1) = EVT_EXIT_WALK(60, sbk_65_ENTRY_0, "sbk_64", sbk_64_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_66_0) = EVT_EXIT_WALK(60, sbk_65_ENTRY_1, "sbk_66", sbk_66_ENTRY_0); +EvtScript N(EVS_ExitWalk_sbk_55_3) = EVT_EXIT_WALK(60, sbk_65_ENTRY_2, "sbk_55", sbk_55_ENTRY_3); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_64_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_66_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_55_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_66/958CB0.c b/src/world/area_sbk/sbk_66/958CB0.c deleted file mode 100644 index 278a141ce1..0000000000 --- a/src/world/area_sbk/sbk_66/958CB0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "sbk_66.h" - -static char* N(exit_str_0) = "sbk_65"; -static char* N(exit_str_1) = "sbk_56"; - -#include "world/common/SpawnSunEffect.inc.c" diff --git a/src/world/area_sbk/sbk_66/958CF0.c b/src/world/area_sbk/sbk_66/958CF0.c deleted file mode 100644 index 29bec15d02..0000000000 --- a/src/world/area_sbk/sbk_66/958CF0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "sbk_66.h" -#include "world/common/Bandit_DropCoin.inc.c" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_sbk/sbk_66/sbk_66.h b/src/world/area_sbk/sbk_66/sbk_66.h index 7f8610667f..bfda967c14 100644 --- a/src/world/area_sbk/sbk_66/sbk_66.h +++ b/src/world/area_sbk/sbk_66/sbk_66.h @@ -2,8 +2,22 @@ /// @brief Dry Dry Desert - S3E3 South of Oasis #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_66_shape.h" +#include "mapfs/sbk_66_hit.h" + +#include "sprite/npc/Bandit.h" + +enum { + NPC_Bandit_01 = 0, + NPC_Bandit_02 = 1, + NPC_Bandit_03 = 2, + NPC_Bandit_04 = 3, + NPC_Bandit_05 = 4, + NPC_Bandit_06 = 5, +}; + #define NAMESPACE sbk_66 diff --git a/src/world/area_sbk/sbk_66/sbk_66_1_main.c b/src/world/area_sbk/sbk_66/sbk_66_1_main.c new file mode 100644 index 0000000000..5eda516c4a --- /dev/null +++ b/src/world/area_sbk/sbk_66/sbk_66_1_main.c @@ -0,0 +1,51 @@ +#include "sbk_66.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupFoliage); +extern NpcGroupList N(DefaultNPCs); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_66_ENTRY_0] { -475.0, 0.0, 0.0, 90.0 }, + [sbk_66_ENTRY_1] { 475.0, 0.0, 0.0, 270.0 }, + [sbk_66_ENTRY_2] { 0.0, 0.0, -475.0, 180.0 }, + [sbk_66_ENTRY_3] { 0.0, 0.0, 475.0, 0.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_66 }, +}; + +#include "world/common/SpawnSunEffect.inc.c" + +EvtScript N(EVS_ExitWalk_sbk_65_1) = EVT_EXIT_WALK(60, sbk_66_ENTRY_0, "sbk_65", sbk_65_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_56_3) = EVT_EXIT_WALK(60, sbk_66_ENTRY_2, "sbk_56", sbk_56_ENTRY_3); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_65_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_56_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_IF_EQ(GB_StoryProgress, STORY_CH2_GOT_PULSE_STONE) + EVT_CALL(DisablePulseStone, FALSE) + EVT_END_IF + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(N(SpawnSunEffect)) + EVT_CALL(SetMusicTrack, 0, SONG_DRY_DRY_DESERT, 0, 8) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupFoliage)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_66/sbk_66_2_npc.c b/src/world/area_sbk/sbk_66/sbk_66_2_npc.c new file mode 100644 index 0000000000..a16bed9204 --- /dev/null +++ b/src/world/area_sbk/sbk_66/sbk_66_2_npc.c @@ -0,0 +1,313 @@ +#include "sbk_66.h" + +#include "world/common/enemy/complete/Bandit.inc.c" + +StaticNpc N(NpcData_Bandit_01) = { + .id = NPC_Bandit_01, + .settings = &N(NpcSettings_Bandit), + .pos = { -120.0f, 0.0f, 45.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -120, 0, 45 }, + .wanderSize = { 80 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit_02) = { + .id = NPC_Bandit_02, + .settings = &N(NpcSettings_Bandit), + .pos = { -76.0f, 0.0f, -20.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -76, 0, -20 }, + .wanderSize = { 80 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit_03) = { + .id = NPC_Bandit_03, + .settings = &N(NpcSettings_Bandit), + .pos = { -78.0f, 0.0f, 80.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -78, 0, 80 }, + .wanderSize = { 80 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit_04) = { + .id = NPC_Bandit_04, + .settings = &N(NpcSettings_Bandit), + .pos = { -20.0f, 0.0f, 40.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -20, 0, 40 }, + .wanderSize = { 80 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit_05) = { + .id = NPC_Bandit_05, + .settings = &N(NpcSettings_Bandit), + .pos = { 45.0f, 0.0f, -30.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 45, 0, -30 }, + .wanderSize = { 80 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_Bandit_06) = { + .id = NPC_Bandit_06, + .settings = &N(NpcSettings_Bandit), + .pos = { 40.0f, 0.0f, 150.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_HONEY_SYRUP, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 3, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 40, 0, 150 }, + .wanderSize = { 80 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 1000 }, + } + }, + .animations = { + .idle = ANIM_Bandit_Anim01, + .walk = ANIM_Bandit_Anim05, + .run = ANIM_Bandit_Anim07, + .chase = ANIM_Bandit_Anim07, + .anim_4 = ANIM_Bandit_Anim01, + .anim_5 = ANIM_Bandit_Anim01, + .death = ANIM_Bandit_Anim09, + .hit = ANIM_Bandit_Anim09, + .anim_8 = ANIM_Bandit_Anim00, + .anim_9 = ANIM_Bandit_Anim00, + .anim_A = ANIM_Bandit_Anim00, + .anim_B = ANIM_Bandit_Anim00, + .anim_C = ANIM_Bandit_Anim00, + .anim_D = ANIM_Bandit_Anim00, + .anim_E = ANIM_Bandit_Anim00, + .anim_F = ANIM_Bandit_Anim00, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Bandit_01), BTL_SBK_FORMATION_09, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit_02), BTL_SBK_FORMATION_0B, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit_03), BTL_SBK_FORMATION_0C, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit_04), BTL_SBK_FORMATION_0A, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit_05), BTL_SBK_FORMATION_0A, BTL_SBK_STAGE_00), + NPC_GROUP(N(NpcData_Bandit_06), BTL_SBK_FORMATION_0A, BTL_SBK_STAGE_00), + {} +}; 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 new file mode 100644 index 0000000000..e99a12c70f --- /dev/null +++ b/src/world/area_sbk/sbk_66/sbk_66_3_foliage.c @@ -0,0 +1,102 @@ +#include "sbk_66.h" + +#include "common/foliage.inc.c" + +FoliageModelList N(Tree1_LeafModels) = { + .count = 1, + .models = { + MODEL_o62, + } +}; + +FoliageModelList N(Tree1_TrunkModels) = { + .count = 1, + .models = { + MODEL_o61, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), +}; + +BombTrigger N(BombTrigger_Tree1) = { + .pos = { -326.0f, 0.0f, -204.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = { + .count = 1, + .models = { + MODEL_o58, + } +}; + +FoliageModelList N(Tree2_TrunkModels) = { + .count = 1, + .models = { + MODEL_o57, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), +}; + +BombTrigger N(BombTrigger_Tree2) = { + .pos = { 116.0f, 0.0f, -394.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree3_LeafModels) = { + .count = 1, + .models = { + MODEL_o56, + } +}; + +FoliageModelList N(Tree3_TrunkModels) = { + .count = 1, + .models = { + MODEL_o55, + } +}; + +FoliageDropList N(Tree3_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 398, 100, -91 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_SBK66_Tree3_Coin, + }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree3) = { + .leaves = &N(Tree3_LeafModels), + .trunk = &N(Tree3_TrunkModels), + .drops = &N(Tree3_Drops), +}; + +BombTrigger N(BombTrigger_Tree3) = { + .pos = { 398.0f, 0.0f, -116.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupFoliage) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(shakeTree)), TRIGGER_WALL_HAMMER, COLLIDER_o180, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(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_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_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_66/sbk_66_4_entity.c b/src/world/area_sbk/sbk_66/sbk_66_4_entity.c new file mode 100644 index 0000000000..ef671ac021 --- /dev/null +++ b/src/world/area_sbk/sbk_66/sbk_66_4_entity.c @@ -0,0 +1,19 @@ +#include "sbk_66.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), -80, 60, -200, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK66_MultiCoinBrickA) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 80, 60, -200, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK66_MultiCoinBrickB) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 160, 60, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK66_MultiCoinBrickC) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), -160, 60, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK66_MultiCoinBrickD) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), -60, 60, 200, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK66_MultiCoinBrickE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 60, 60, 200, 0, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_SBK66_MultiCoinBrickF) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_99/95AEB0.c b/src/world/area_sbk/sbk_99/95AEB0.c deleted file mode 100644 index 1931e2e4c7..0000000000 --- a/src/world/area_sbk/sbk_99/95AEB0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "sbk_99.h" - -static char* N(exit_str_0) = "iwa_04"; -static char* N(exit_str_1) = "sbk_30"; diff --git a/src/world/area_sbk/sbk_99/sbk_99.h b/src/world/area_sbk/sbk_99/sbk_99.h index f0f472fde0..d4c327566e 100644 --- a/src/world/area_sbk/sbk_99/sbk_99.h +++ b/src/world/area_sbk/sbk_99/sbk_99.h @@ -2,8 +2,11 @@ /// @brief Dry Dry Desert - Entrance #include "common.h" -#include "../sbk.h" #include "message_ids.h" #include "map.h" +#include "../sbk.h" +#include "mapfs/sbk_99_shape.h" +#include "mapfs/sbk_99_hit.h" + #define NAMESPACE sbk_99 diff --git a/src/world/area_sbk/sbk_99/sbk_99_1_main.c b/src/world/area_sbk/sbk_99/sbk_99_1_main.c new file mode 100644 index 0000000000..730bf1e575 --- /dev/null +++ b/src/world/area_sbk/sbk_99/sbk_99_1_main.c @@ -0,0 +1,57 @@ +#include "sbk_99.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_MakeEntities); + +EntryList N(Entrances) = { + [sbk_99_ENTRY_0] { -484.0, 100.0, 5.0, 90.0 }, + [sbk_99_ENTRY_1] { 346.0, 0.0, -342.0, 220.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_sbk_99 }, +}; + +EvtScript N(EVS_ExitWalk_iwa_04_1) = EVT_EXIT_WALK(60, sbk_99_ENTRY_0, "iwa_04", iwa_04_ENTRY_1); +EvtScript N(EVS_ExitWalk_sbk_30_0) = EVT_EXIT_WALK(60, sbk_99_ENTRY_1, "sbk_30", sbk_30_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_iwa_04_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_sbk_30_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiline, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_EXEC(EnterSavePoint) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END_IF + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_DRY_DRY_DESERT) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_MINIMAL() + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 152, 240) + EVT_CALL(SetCamBGColor, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamLeadPlayer, CAM_DEFAULT, FALSE) + EVT_CALL(SetCamEnabled, CAM_DEFAULT, TRUE) + EVT_SET(GF_MAP_DryDryDesert, TRUE) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(SetMusicTrack, 0, SONG_MT_RUGGED, 0, 8) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_sbk/sbk_99/sbk_99_2_entity.c b/src/world/area_sbk/sbk_99/sbk_99_2_entity.c new file mode 100644 index 0000000000..2ee44b924c --- /dev/null +++ b/src/world/area_sbk/sbk_99/sbk_99_2_entity.c @@ -0,0 +1,9 @@ +#include "sbk_99.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SavePoint), 145, 60, -375, 45, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), 88, 60, -324, 40, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd.h b/src/world/area_trd/trd.h index 68d3f8eef2..47c59c5e2d 100644 --- a/src/world/area_trd/trd.h +++ b/src/world/area_trd/trd.h @@ -2,24 +2,31 @@ #define _WORLD_AREA_TRD_TRD_H_ enum { - AB_TRD_0 = AreaByte(0), - AB_TRD_1 = AreaByte(1), - AB_TRD_2 = AreaByte(2), - AB_TRD_3 = AreaByte(3), - AB_TRD_4 = AreaByte(4), - AB_TRD_5 = AreaByte(5), - AB_TRD_6 = AreaByte(6), - AB_TRD_7 = AreaByte(7), - AB_TRD_8 = AreaByte(8), - AB_TRD_9 = AreaByte(9), - AB_TRD_A = AreaByte(10), - AB_TRD_B = AreaByte(11), - AB_TRD_C = AreaByte(12), - AB_TRD_D = AreaByte(13), - AB_TRD_E = AreaByte(14), - AB_TRD_F = AreaByte(15), + AB_TRD_0 = AreaByte(0), + AB_TRD_1 = AreaByte(1), + AB_TRD_2 = AreaByte(2), + AB_TRD_3 = AreaByte(3), + AB_TRD_4 = AreaByte(4), + AB_TRD_5 = AreaByte(5), + AB_TRD_6 = AreaByte(6), + AB_TRD_7 = AreaByte(7), + AB_TRD_8 = AreaByte(8), + AB_TRD_9 = AreaByte(9), + AB_TRD_A = AreaByte(10), + AB_TRD_B = AreaByte(11), + AB_TRD_C = AreaByte(12), + AB_TRD_D = AreaByte(13), + AB_TRD_E = AreaByte(14), + AB_TRD_F = AreaByte(15), }; -#define AF_TRD(index) AreaFlag(index) +enum { + AF_TRD_04 = AreaFlag(4), + AF_TRD08_FireBar1_Coins = AreaFlag(11), + AF_TRD08_FireBar2_Coins = AreaFlag(12), +}; + +extern MapSettings trd_04_settings; +extern MapSettings trd_08_settings; #endif diff --git a/src/world/area_trd/trd_04/9A83F0.c b/src/world/area_trd/trd_04/9A83F0.c deleted file mode 100644 index 049059111a..0000000000 --- a/src/world/area_trd/trd_04/9A83F0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "trd_04.h" - -static char* N(exit_str_0) = "trd_03"; -static char* N(exit_str_1) = "trd_05"; -static char* N(exit_str_2) = "trd_07"; -static char* N(exit_str_3) = "trd_06"; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_trd/trd_04/9A8700.c b/src/world/area_trd/trd_04/9A8700.c deleted file mode 100644 index 86362112fd..0000000000 --- a/src/world/area_trd/trd_04/9A8700.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "trd_04.h" - -#include "world/common/SetEntityFlags100000.inc.c" - -#include "world/common/SetEntityPosition.inc.c" - -#include "world/common/GetEntityPosition.inc.c" diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c deleted file mode 100644 index 455f137b7f..0000000000 --- a/src/world/area_trd/trd_04/9A88A0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "trd_04.h" - -#include "world/common/enemy/TackleAI.inc.c" - -#include "world/common/enemy/KoopaPatrolAI.inc.c" - -#include "world/common/enemy/ParatroopaAI.inc.c" diff --git a/src/world/area_trd/trd_04/trd_04.h b/src/world/area_trd/trd_04/trd_04.h index 5beb65b3f8..78f21a291e 100644 --- a/src/world/area_trd/trd_04/trd_04.h +++ b/src/world/area_trd/trd_04/trd_04.h @@ -2,8 +2,25 @@ /// @brief Koopa Bros Fortress - Right Starway #include "common.h" -#include "../trd.h" #include "message_ids.h" #include "map.h" +#include "../trd.h" +#include "mapfs/trd_04_shape.h" +#include "mapfs/trd_04_hit.h" + +#include "sprite/npc/KoopaTroopa.h" +#include "sprite/npc/ParaTroopa.h" + +enum { + NPC_KoopaTroopa = 0, + NPC_ParaTroopa = 1, +}; + +enum { + MV_Unk_00 = MapVar(0), + MV_Unk_01 = MapVar(1), + MV_Unk_02 = MapVar(2), +}; + #define NAMESPACE trd_04 diff --git a/src/world/area_trd/trd_04/trd_04_0_header.c b/src/world/area_trd/trd_04/trd_04_0_header.c new file mode 100644 index 0000000000..b695d7f7ac --- /dev/null +++ b/src/world/area_trd/trd_04/trd_04_0_header.c @@ -0,0 +1,26 @@ +#include "trd_04.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [trd_04_ENTRY_0] { -257.0, 0.0, 80.0, 90.0 }, + [trd_04_ENTRY_1] { 257.0, 0.0, 80.0, 270.0 }, + [trd_04_ENTRY_2] { -257.0, 187.0, -55.0, 90.0 }, + [trd_04_ENTRY_3] { 257.0, 187.0, -55.0, 270.0 }, + [trd_04_ENTRY_4] { -257.0, -187.0, 80.0, 90.0 }, + [trd_04_ENTRY_5] { 257.0, -187.0, 80.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_trd_04 }, +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_FORTRESS, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_04/trd_04_1_main.c b/src/world/area_trd/trd_04/trd_04_1_main.c new file mode 100644 index 0000000000..ed354eb01b --- /dev/null +++ b/src/world/area_trd/trd_04/trd_04_1_main.c @@ -0,0 +1,276 @@ +#include "trd_04.h" +#include "effects.h" + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_UnlockLowerRightDoors); +extern EvtScript N(EVS_UnlockUpperLeftDoors); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(NpcGroupBefore); +extern NpcGroupList N(NpcGroupAfter); + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitDoors_trd_03_1) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_0, + COLLIDER_ttw2, MODEL_o6, MODEL_o7, "trd_03", trd_03_ENTRY_1); + +EvtScript N(EVS_ExitDoors_trd_05_0) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_1, + COLLIDER_tte2, MODEL_o9, MODEL_o8, "trd_05", trd_05_ENTRY_0); + +EvtScript N(EVS_ExitDoors_trd_03_3) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_2, + COLLIDER_ttw3, MODEL_o13, MODEL_o12, "trd_03", trd_03_ENTRY_3); + +EvtScript N(EVS_ExitDoors_trd_05_3) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_3, + COLLIDER_tte3, MODEL_o10, MODEL_o11, "trd_05", trd_05_ENTRY_3); + +EvtScript N(EVS_ExitWalk_trd_07_0) = EVT_EXIT_WALK(60, trd_04_ENTRY_4, "trd_07", trd_07_ENTRY_0); + +EvtScript N(EVS_ExitDoors_trd_06_1) = EVT_EXIT_DOUBLE_DOOR(trd_04_ENTRY_5, + COLLIDER_tte, MODEL_o29, MODEL_o28, "trd_06", trd_06_ENTRY_1); + +s32 N(KeyList)[] = { + ITEM_KOOPA_FORTRESS_KEY, + ITEM_NONE +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_03_1)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw2, 1, 0) + EVT_IF_EQ(GF_TRD04_UnlockedLowerDoor, FALSE) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockLowerRightDoors)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(KeyList)), 0, 1) + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_05_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte2, 1, 0) + EVT_END_IF + EVT_IF_EQ(GF_TRD04_UnlockedUpperDoor, FALSE) + EVT_IF_EQ(GF_TRD04_UnlockedLowerDoor, TRUE) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_UnlockUpperLeftDoors)), TRIGGER_WALL_PRESS_A, EVT_ENTITY_INDEX(0), EVT_PTR(N(KeyList)), 0, 1) + EVT_END_IF + EVT_ELSE + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_03_3)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw3, 1, 0) + EVT_END_IF + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_05_3)), TRIGGER_WALL_PRESS_A, COLLIDER_tte3, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_trd_07_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_06_1)), TRIGGER_WALL_PRESS_A, COLLIDER_tte, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetLoadType, LVar1) + EVT_IF_EQ(LVar1, LOAD_FROM_FILE_SELECT) + EVT_EXEC(EnterSavePoint) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_RETURN + EVT_END_IF + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(1) + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(trd_04_ENTRY_0) + EVT_SET(LVar2, MODEL_o6) + EVT_SET(LVar3, MODEL_o7) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_04_ENTRY_1) + EVT_SET(LVar2, MODEL_o9) + EVT_SET(LVar3, MODEL_o8) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_04_ENTRY_2) + EVT_SET(LVar2, MODEL_o13) + EVT_SET(LVar3, MODEL_o12) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_04_ENTRY_3) + EVT_SET(LVar2, MODEL_o10) + EVT_SET(LVar3, MODEL_o11) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_EQ(trd_04_ENTRY_4) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_EQ(trd_04_ENTRY_5) + EVT_SET(LVar2, MODEL_o29) + EVT_SET(LVar3, MODEL_o28) + EVT_EXEC_WAIT(EnterDoubleDoor) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_SWITCH + EVT_RESUME_GROUP(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_LowerStairs) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(1) + EVT_SET(GB_StoryProgress, STORY_CH1_LOWERED_FIRST_STAIRS) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(30) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 320, EVT_FLOAT(1.0)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.7)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(0.4)) + EVT_END_THREAD + EVT_WAIT(30) + EVT_CALL(EnableModel, MODEL_o6, FALSE) + EVT_CALL(EnableModel, MODEL_o7, FALSE) + EVT_CALL(EnableModel, MODEL_bero2, FALSE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -50, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -50, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(540.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 15, -6) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -30, -60) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetPlayerPos, -185, 0, -36) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, -163, 0, -12) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_CALL(PlaySound, SOUND_80000005) + EVT_WAIT(20) + EVT_THREAD + EVT_LOOP(5) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 150) + EVT_CALL(PlayEffect, EFFECT_DUST, 0, LVar0, LVar1, LVar2, 40, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(RandInt, 20, LVar0) + EVT_ADD(LVar0, 20) + EVT_WAIT(LVar0) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_LOOP(7) + EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) + EVT_CALL(RandInt, 200, LVar4) + EVT_SUB(LVar4, 100) + EVT_CALL(RandInt, 100, LVar5) + EVT_SUB(LVar5, 100) + EVT_ADD(LVar1, LVar4) + EVT_ADD(LVar2, 200) + EVT_ADD(LVar3, LVar5) + EVT_CALL(PlayEffect, EFFECT_SHATTERING_STONES, 0, LVar1, LVar2, LVar3, 0, 0, 0, 0, 0, 0, 0, 0, 0) + EVT_CALL(RandInt, 30, LVar0) + EVT_ADD(LVar0, 30) + EVT_WAIT(LVar0) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_WAIT(15) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_WAIT(12) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_WAIT(18) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_WAIT(29) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_WAIT(13) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_WAIT(15) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_WAIT(17) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_WAIT(18) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_WAIT(17) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) + EVT_END_THREAD + EVT_WAIT(20) + EVT_CALL(MakeLerp, 187, 0, 300, EASING_COS_IN_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateModel, MODEL_k_sokumen, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_k_dan, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_k_kusari, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(UpdateColliderTransform, COLLIDER_o86) + EVT_CALL(UpdateColliderTransform, COLLIDER_o87) + EVT_CALL(StopSound, SOUND_80000005) + EVT_CALL(PlaySound, SOUND_28) + EVT_WAIT(50) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -169, 130) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 18, -6) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(2) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(EnableModel, MODEL_o6, TRUE) + EVT_CALL(EnableModel, MODEL_o7, TRUE) + EVT_CALL(EnableModel, MODEL_bero2, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RESUME_GROUP(1) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Water) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTexPanner, MODEL_suimen, 1) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_LABEL(10) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_AUX, LVar1, 0) + EVT_ADD(LVar0, 100) + EVT_SUB(LVar1, 100) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_KOOPA_BROS_FORTRESS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(SetRenderMode, MODEL_suimen, RENDER_MODE_SURFACE_XLU_LAYER2) + EVT_IF_LT(GB_StoryProgress, STORY_CH1_LOWERED_FIRST_STAIRS) + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(NpcGroupBefore))) + EVT_ELSE + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(NpcGroupAfter))) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_SET(AF_TRD_04, FALSE) + EVT_CALL(ParentColliderToModel, COLLIDER_o86, MODEL_k_dan) + EVT_CALL(ParentColliderToModel, COLLIDER_o87, MODEL_k_dan) + EVT_IF_LT(GB_StoryProgress, STORY_CH1_LOWERED_FIRST_STAIRS) + EVT_CALL(TranslateModel, MODEL_k_sokumen, 0, 187, 0) + EVT_CALL(TranslateModel, MODEL_k_dan, 0, 187, 0) + EVT_CALL(TranslateModel, MODEL_k_kusari, 0, 187, 0) + EVT_CALL(UpdateColliderTransform, COLLIDER_o86) + EVT_CALL(UpdateColliderTransform, COLLIDER_o87) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Scene_LowerStairs)), TRIGGER_AREA_FLAG_SET, AF_TRD_04, 1, 0) + EVT_END_IF + EVT_EXEC(N(EVS_TexPan_Water)) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_ttw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o34, FALSE) + EVT_CALL(EnableModel, MODEL_dai, FALSE) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_dai, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_CALL(EnableTexPanning, MODEL_suimen, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 0, 90, -60, -70) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_04/trd_04_2_entity.c b/src/world/area_trd/trd_04/trd_04_2_entity.c new file mode 100644 index 0000000000..5ec70e4526 --- /dev/null +++ b/src/world/area_trd/trd_04/trd_04_2_entity.c @@ -0,0 +1,160 @@ +#include "trd_04.h" +#include "entity.h" + +extern EvtScript N(EVS_ExitDoors_trd_05_0); +extern EvtScript N(EVS_ExitDoors_trd_03_3); + +#include "world/common/SetEntityFlags100000.inc.c" + +#include "world/common/SetEntityPosition.inc.c" + +#include "world/common/GetEntityPosition.inc.c" + +s32 N(missing_80244D70_4D70)[] = { + 0x00000000, 0x00010101, 0x01010101, 0x01010101, + 0x01000000, 0x00000000, 0x00000101, 0x01010101, + 0x01010101, 0x01010000, 0x00000000, 0x00000001, + 0x01010101, 0x01010101, 0x01010100, 0x00000000, + 0x00000000, 0x01010101, 0x01010101, 0x01010101, + 0x00000000, 0x00000000, 0x00010101, 0x01010101, + 0x01010101, 0x01000000, 0x00000000, 0x00000101, + 0x01010101, 0x01010101, 0x01010000, 0x00000000, + 0x00000001, 0x01010101, 0x01010101, 0x01010100, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x01010101, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00010101, 0x01000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000101, 0x01010000, + 0x00000000, 0x00000000, +}; + +EvtScript N(EVS_UnlockUpperLeftDoors) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(1) + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RESUME_GROUP(1) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RESUME_GROUP(1) + EVT_RETURN + EVT_END_IF + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_CALL(CloseChoicePopup) + EVT_SET(GF_TRD04_UnlockedUpperDoor, TRUE) + EVT_CALL(N(GetEntityPosition), MV_Unk_00, LVar0, LVar1, LVar2) + EVT_CALL(PlaySoundAt, SOUND_269, 0, LVar0, LVar1, LVar2) + EVT_SET(LVar0, MV_Unk_00) + EVT_CALL(N(SetEntityFlags100000)) + EVT_RESUME_GROUP(1) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UnlockLowerRightDoors) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_SUSPEND_GROUP(1) + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00D8, 160, 40) + EVT_CALL(CloseChoicePopup) + EVT_RESUME_GROUP(1) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar0, -1) + EVT_CALL(CloseChoicePopup) + EVT_RESUME_GROUP(1) + EVT_RETURN + EVT_END_IF + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_CALL(CloseChoicePopup) + EVT_SET(GF_TRD04_UnlockedLowerDoor, 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(SetEntityFlags100000)) + EVT_RESUME_GROUP(1) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Padlock_LowerDoors) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_05_0)), TRIGGER_WALL_PRESS_A, COLLIDER_tte2, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Padlock_UpperDoors) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitDoors_trd_03_3)), TRIGGER_WALL_PRESS_A, COLLIDER_ttw3, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_80245198) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(40) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -188, 0, -43) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -188, 0, -43) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(510.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(3) + EVT_CALL(PlaySoundAt, SOUND_301, 0, -180, 175, -35) + EVT_CALL(MakeLerp, 175, 0, 20, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(SetEntityPosition), MV_Unk_02, -180, LVar0, -35) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAt, SOUND_48, 0, -180, 0, -35) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_WAIT(20) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(2) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MakeEntities) = { + EVT_IF_EQ(GF_TRD04_UnlockedLowerDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), 265, 8, 90, -80, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_Padlock_LowerDoors))) + EVT_SET(MV_Unk_01, LVar0) + EVT_END_IF + EVT_IF_EQ(GF_TRD04_UnlockedUpperDoor, FALSE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Padlock), -265, 195, -55, 80, MAKE_ENTITY_END) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_Padlock_UpperDoors))) + EVT_SET(MV_Unk_00, LVar0) + EVT_END_IF + EVT_IF_LE(GB_StoryProgress, STORY_CH1_DEFEATED_BASEMENT_GUARD) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BlueSwitch), NPC_DISPOSE_LOCATION, 0, MAKE_ENTITY_END) + EVT_CALL(AssignSwitchFlag, EVT_INDEX_OF_AREA_FLAG(AF_TRD_04)) + EVT_SET(MV_Unk_02, LVar0) + EVT_IF_EQ(GB_StoryProgress, STORY_CH1_DEFEATED_BASEMENT_GUARD) + EVT_CALL(N(SetEntityPosition), MV_Unk_02, -180, 0, -35) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_04/trd_04_3_npc.c b/src/world/area_trd/trd_04/trd_04_3_npc.c new file mode 100644 index 0000000000..90ddb080b1 --- /dev/null +++ b/src/world/area_trd/trd_04/trd_04_3_npc.c @@ -0,0 +1,191 @@ +#include "trd_04.h" + +extern EvtScript N(EVS_80245198); + +#include "world/common/enemy/complete/KoopaTroopa_Wander.inc.c" +#include "world/common/enemy/complete/KoopaTroopa_Patrol.inc.c" +#include "world/common/enemy/complete/Paratroopa.inc.c" + +EvtScript N(EVS_NpcDefeat_KoopaTroopa) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_SET(GB_StoryProgress, STORY_CH1_DEFEATED_BASEMENT_GUARD) + EVT_THREAD + EVT_CALL(DoNpcDefeat) + EVT_END_THREAD + EVT_EXEC_WAIT(N(EVS_80245198)) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_KoopaTroopa) = { + EVT_IF_GE(GB_StoryProgress, STORY_CH1_DEFEATED_BASEMENT_GUARD) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END_IF + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_KoopaTroopa))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_KoopaTroopa_Wander) = { + .id = NPC_KoopaTroopa, + .settings = &N(NpcSettings_KoopaTroopa_Wander), + .pos = { 0.0f, 0.0f, 125.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_MUSHROOM, 5, 0 }, + { ITEM_P_O_W_BLOCK, 5, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 125 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 125 }, + .detectSize = { 200 }, + } + }, + .animations = { + .idle = ANIM_KoopaTroopa_Anim01, + .walk = ANIM_KoopaTroopa_Anim03, + .run = ANIM_KoopaTroopa_Anim04, + .chase = ANIM_KoopaTroopa_Anim04, + .anim_4 = ANIM_KoopaTroopa_Anim01, + .anim_5 = ANIM_KoopaTroopa_Anim01, + .death = ANIM_KoopaTroopa_Anim0B, + .hit = ANIM_KoopaTroopa_Anim0B, + .anim_8 = ANIM_KoopaTroopa_Anim07, + .anim_9 = ANIM_KoopaTroopa_Anim06, + .anim_A = ANIM_KoopaTroopa_Anim08, + .anim_B = ANIM_KoopaTroopa_Anim04, + .anim_C = ANIM_KoopaTroopa_Anim04, + .anim_D = ANIM_KoopaTroopa_Anim04, + .anim_E = ANIM_KoopaTroopa_Anim04, + .anim_F = ANIM_KoopaTroopa_Anim04, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_KoopaTroopa_Patrol) = { + .id = NPC_KoopaTroopa, + .settings = &N(NpcSettings_KoopaTroopa_Patrol), + .pos = { 220.0f, 0.0f, 30.0f }, + .yaw = 90, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING | NPC_FLAG_NO_PROJECT_SHADOW | NPC_FLAG_NO_DROPS, + .init = &N(EVS_NpcInit_KoopaTroopa), + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .territory = { + .patrol = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .numPoints = 2, + .points = { + { 220, 0, 30 }, + { 240, 0, 160 }, + }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 220, 0, 30 }, + .detectSize = { 200 }, + } + }, + .animations = { + .idle = ANIM_KoopaTroopa_Anim01, + .walk = ANIM_KoopaTroopa_Anim03, + .run = ANIM_KoopaTroopa_Anim04, + .chase = ANIM_KoopaTroopa_Anim04, + .anim_4 = ANIM_KoopaTroopa_Anim01, + .anim_5 = ANIM_KoopaTroopa_Anim01, + .death = ANIM_KoopaTroopa_Anim0B, + .hit = ANIM_KoopaTroopa_Anim0B, + .anim_8 = ANIM_KoopaTroopa_Anim07, + .anim_9 = ANIM_KoopaTroopa_Anim06, + .anim_A = ANIM_KoopaTroopa_Anim08, + .anim_B = ANIM_KoopaTroopa_Anim04, + .anim_C = ANIM_KoopaTroopa_Anim04, + .anim_D = ANIM_KoopaTroopa_Anim04, + .anim_E = ANIM_KoopaTroopa_Anim04, + .anim_F = ANIM_KoopaTroopa_Anim04, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +StaticNpc N(NpcData_ParaTroopa) = { + .id = NPC_ParaTroopa, + .settings = &N(NpcSettings_ParaTroopa), + .pos = { -5.0f, 237.0f, 157.0f }, + .yaw = 270, + .flags = NPC_FLAG_LOCK_ANIMS | NPC_FLAG_JUMPING, + .drops = { + .dropFlags = NPC_DROP_FLAGS_80, + .itemDropChance = 5, + .itemDrops = { + { ITEM_P_O_W_BLOCK, 10, 0 }, + }, + .heartDrops = STANDARD_HEART_DROPS(2), + .flowerDrops = STANDARD_FLOWER_DROPS(2), + .minCoinBonus = 1, + .maxCoinBonus = 1, + }, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -5, 237, 157 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -5, 237, 157 }, + .detectSize = { 200 }, + } + }, + .animations = { + .idle = ANIM_ParaTroopa_Anim01, + .walk = ANIM_ParaTroopa_Anim02, + .run = ANIM_ParaTroopa_Anim03, + .chase = ANIM_ParaTroopa_Anim03, + .anim_4 = ANIM_ParaTroopa_Anim01, + .anim_5 = ANIM_ParaTroopa_Anim01, + .death = ANIM_ParaTroopa_Anim06, + .hit = ANIM_ParaTroopa_Anim06, + .anim_8 = ANIM_ParaTroopa_Anim04, + .anim_9 = ANIM_ParaTroopa_Anim0C, + .anim_A = ANIM_ParaTroopa_Anim0A, + .anim_B = ANIM_ParaTroopa_Anim0E, + .anim_C = ANIM_ParaTroopa_Anim03, + .anim_D = ANIM_ParaTroopa_Anim03, + .anim_E = ANIM_ParaTroopa_Anim03, + .anim_F = ANIM_ParaTroopa_Anim03, + }, + .aiDetectFlags = AI_DETECT_SIGHT, +}; + +NpcGroupList N(NpcGroupAfter) = { + NPC_GROUP(N(NpcData_KoopaTroopa_Wander), BTL_TRD_PART_1_FORMATION_05, BTL_TRD_PART_1_STAGE_0C), + NPC_GROUP(N(NpcData_ParaTroopa), BTL_TRD_PART_1_FORMATION_0D, BTL_TRD_PART_1_STAGE_05), + {} +}; + +NpcGroupList N(NpcGroupBefore) = { + NPC_GROUP(N(NpcData_KoopaTroopa_Patrol), BTL_TRD_PART_1_FORMATION_05, BTL_TRD_PART_1_STAGE_0C), + NPC_GROUP(N(NpcData_ParaTroopa), BTL_TRD_PART_1_FORMATION_0D, BTL_TRD_PART_1_STAGE_05), + {} +}; diff --git a/src/world/area_trd/trd_08/9BB2A0.c b/src/world/area_trd/trd_08/9BB2A0.c deleted file mode 100644 index 1cbd10f219..0000000000 --- a/src/world/area_trd/trd_08/9BB2A0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "trd_08.h" - -static char* N(exit_str_0) = "trd_07"; -static char* N(exit_str_1) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_trd/trd_08/9BB5B0.c b/src/world/area_trd/trd_08/9BB5B0.c deleted file mode 100644 index 348a0cf663..0000000000 --- a/src/world/area_trd/trd_08/9BB5B0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "trd_08.h" - -#include "world/common/enemy/FireBarAI.inc.c" diff --git a/src/world/area_trd/trd_08/trd_08.h b/src/world/area_trd/trd_08/trd_08.h index 7634028a5e..49e3464b53 100644 --- a/src/world/area_trd/trd_08/trd_08.h +++ b/src/world/area_trd/trd_08/trd_08.h @@ -2,8 +2,24 @@ /// @brief Koopa Bros Fortress - Dungeon Fire Room #include "common.h" -#include "../trd.h" #include "message_ids.h" #include "map.h" +#include "../trd.h" +#include "mapfs/trd_08_shape.h" +#include "mapfs/trd_08_hit.h" + +#include "sprite/npc/Fire.h" + +enum { + NPC_FireBar_1A = 0, + NPC_FireBar_1B = 1, + NPC_FireBar_1C = 2, + NPC_FireBar_1D = 3, + NPC_FireBar_2A = 5, + NPC_FireBar_2B = 6, + NPC_FireBar_2C = 7, + NPC_FireBar_2D = 8, +}; + #define NAMESPACE trd_08 diff --git a/src/world/area_trd/trd_08/trd_08_0_header.c b/src/world/area_trd/trd_08/trd_08_0_header.c new file mode 100644 index 0000000000..ccc9d83b40 --- /dev/null +++ b/src/world/area_trd/trd_08/trd_08_0_header.c @@ -0,0 +1,21 @@ +#include "trd_08.h" + +extern EvtScript N(EVS_Main); + +EntryList N(Entrances) = { + [trd_08_ENTRY_0] { 660.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_trd_08 }, +}; + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_KOOPA_FORTRESS, 0, 8) + EVT_CALL(UseDoorSounds, DOOR_SOUNDS_METAL) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_08/trd_08_1_main.c b/src/world/area_trd/trd_08/trd_08_1_main.c new file mode 100644 index 0000000000..3891573de8 --- /dev/null +++ b/src/world/area_trd/trd_08/trd_08_1_main.c @@ -0,0 +1,57 @@ +#include "trd_08.h" + +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_trd_07_1) = EVT_EXIT_WALK(60, trd_08_ENTRY_0, "trd_07", trd_07_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_trd_07_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_Water) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTexPanner, MODEL_suimen, TEX_PANNER_1) + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_LABEL(10) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, LVar0, 0) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_AUX, LVar1, 0) + EVT_ADD(LVar0, 100) + EVT_SUB(LVar1, 100) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_KOOPA_BROS_FORTRESS) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_TexPan_Water)) + EVT_CALL(ModifyColliderFlags, 0, COLLIDER_tte, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o36, FALSE) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_CALL(EnableTexPanning, MODEL_suimen, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 0, 90, -60, -70) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_08/trd_08_2_entity.c b/src/world/area_trd/trd_08/trd_08_2_entity.c new file mode 100644 index 0000000000..19397a14a6 --- /dev/null +++ b/src/world/area_trd/trd_08/trd_08_2_entity.c @@ -0,0 +1,7 @@ +#include "trd_08.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_KOOPA_FORTRESS_KEY, -500, 16, 0, ITEM_SPAWN_MODE_KEY, GF_TRD08_Item_FortressKey) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_trd/trd_08/trd_08_3_npc.c b/src/world/area_trd/trd_08/trd_08_3_npc.c new file mode 100644 index 0000000000..3d6da66326 --- /dev/null +++ b/src/world/area_trd/trd_08/trd_08_3_npc.c @@ -0,0 +1,223 @@ +#include "trd_08.h" +#include "effects.h" + +#include "world/common/enemy/FireBarAI.inc.c" + +s32 N(FireBar_Sounds)[] = { + SOUND_FIRE_BAR_0, SOUND_FIRE_BAR_1, SOUND_FIRE_BAR_2, SOUND_FIRE_BAR_3, + SOUND_FIRE_BAR_4, SOUND_FIRE_BAR_5, SOUND_FIRE_BAR_6, SOUND_FIRE_BAR_7, + SOUND_FIRE_BAR_8, SOUND_FIRE_BAR_9, SOUND_FIRE_BAR_9, +}; + +EvtScript N(EVS_FireBar_Defeated) = { + EVT_SET(LVarA, LVar0) + EVT_SET(LVarB, LVar1) + EVT_LOOP(15) + EVT_LOOP(LVar1) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_2, TRUE) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_WAIT(1) + EVT_SET(LVar0, LVarA) + EVT_SET(LVar1, LVarB) + EVT_LOOP(LVar1) + EVT_CALL(SetNpcFlagBits, LVar0, NPC_FLAG_2, FALSE) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_WAIT(1) + EVT_SET(LVar0, LVarA) + EVT_SET(LVar1, LVarB) + EVT_END_LOOP + EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) + EVT_CALL(PlaySoundAt, SOUND_B000000A, 0, LVar1, LVar2, LVar3) + EVT_LOOP(10) + EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) + EVT_CALL(RandInt, 50, LVar4) + EVT_SUB(LVar4, 25) + EVT_CALL(RandInt, 30, LVar5) + EVT_ADD(LVar1, LVar4) + EVT_ADD(LVar2, LVar5) + EVT_CALL(PlayEffect, EFFECT_00, LVar1, LVar2, LVar3, 1, 20, 3, 2, 0, 0, 0, 0, 0, 0) + EVT_END_LOOP + EVT_IF_EQ(LVarA, NPC_FireBar_1A) + EVT_IF_EQ(AF_TRD08_FireBar1_Coins, FALSE) + EVT_SET(AF_TRD08_FireBar1_Coins, TRUE) + EVT_LOOP(10) + EVT_CALL(MakeItemEntity, ITEM_COIN, LVar1, LVar2, LVar3, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, 0) + EVT_END_LOOP + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(LVarA, NPC_FireBar_2A) + EVT_IF_EQ(AF_TRD08_FireBar2_Coins, FALSE) + EVT_SET(AF_TRD08_FireBar2_Coins, TRUE) + EVT_LOOP(10) + EVT_CALL(MakeItemEntity, ITEM_COIN, LVar1, LVar2, LVar3, ITEM_SPAWN_MODE_TOSS_SPAWN_ALWAYS, 0) + EVT_END_LOOP + EVT_END_IF + EVT_END_IF + EVT_CALL(RemoveEncounter, LVarA) + EVT_RETURN + EVT_END +}; + +FireBarAISettings N(AISettings_FireBar_01) = { + .centerPos = { -100, 0, 40 }, + .rotationRate = 8, + .firstNpc = NPC_FireBar_1A, + .npcCount = 4, + .callback = N(FireBarAI_Callback), +}; + +FireBarAISettings N(AISettings_FireBar_02) = { + .centerPos = { 300, 0, -35 }, + .rotationRate = -8, + .firstNpc = NPC_FireBar_2A, + .npcCount = 4, + .callback = N(FireBarAI_Callback), +}; + +EvtScript N(EVS_NpcAuxAI_00) = { + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, 0, TRUE) + EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) + EVT_THREAD + EVT_CALL(RandInt, 5, LVar0) + EVT_ADD(LVar0, 1) + EVT_WAIT(LVar0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fire_Brighest_Still) + EVT_WAIT(1) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fire_Brighest_Burn) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_FireBar_01) = { + EVT_CALL(N(FireBarAI_Main), EVT_PTR(N(AISettings_FireBar_01))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcAI_FireBar_02) = { + EVT_CALL(N(FireBarAI_Main), EVT_PTR(N(AISettings_FireBar_02))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_FireBar_01) = { + .defaultAnim = ANIM_Fire_Brighest_Burn, + .height = 12, + .radius = 20, + .otherAI = &N(EVS_NpcAuxAI_00), + .ai = &N(EVS_NpcAI_FireBar_01), + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, +}; + +NpcSettings N(NpcSettings_FireBar_02) = { + .defaultAnim = ANIM_Fire_Brighest_Burn, + .height = 12, + .radius = 20, + .otherAI = &N(EVS_NpcAuxAI_00), + .ai = &N(EVS_NpcAI_FireBar_02), + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, +}; + +NpcSettings N(NpcSettings_FireBar_Extra) = { + .defaultAnim = ANIM_Fire_Brighest_Burn, + .height = 12, + .radius = 20, + .otherAI = &N(EVS_NpcAuxAI_00), + .flags = ENEMY_FLAGS_100 | ENEMY_FLAGS_200 | ENEMY_FLAGS_400 | ENEMY_FLAGS_800, +}; + +StaticNpc N(NpcData_00)[] = { + { + .id = NPC_FireBar_1A, + .settings = &N(NpcSettings_FireBar_01), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE, + .init = (void*) 0x00004003, + .animations = { + }, + }, + { + .id = NPC_FireBar_1B, + .settings = &N(NpcSettings_FireBar_Extra), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE, + .init = (void*) 0x00004003, + .animations = { + }, + }, + { + .id = NPC_FireBar_1C, + .settings = &N(NpcSettings_FireBar_Extra), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE, + .init = (void*) 0x00004003, + .animations = { + }, + }, + { + .id = NPC_FireBar_1D, + .settings = &N(NpcSettings_FireBar_Extra), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE, + .init = (void*) 0x00004003, + .animations = { + }, + }, +}; + +StaticNpc N(NpcData_05)[] = { + { + .id = NPC_FireBar_2A, + .settings = &N(NpcSettings_FireBar_02), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE, + .init = (void*) 0x00004003, + .animations = { + }, + }, + { + .id = NPC_FireBar_2B, + .settings = &N(NpcSettings_FireBar_Extra), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE, + .init = (void*) 0x00004003, + .animations = { + }, + }, + { + .id = NPC_FireBar_2C, + .settings = &N(NpcSettings_FireBar_Extra), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE, + .init = (void*) 0x00004003, + .animations = { + }, + }, + { + .id = NPC_FireBar_2D, + .settings = &N(NpcSettings_FireBar_Extra), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 0, + .flags = NPC_FLAG_PASSIVE, + .init = (void*) 0x00004003, + .animations = { + }, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_00), BTL_KMR_PART_1_FORMATION_06), + NPC_GROUP(N(NpcData_05), BTL_KMR_PART_1_FORMATION_06), + {} +}; diff --git a/src/world/area_tst/tst_10/tst_10_1_main.c b/src/world/area_tst/tst_10/tst_10_1_main.c index fb8a3d1d2e..6451ac7724 100644 --- a/src/world/area_tst/tst_10/tst_10_1_main.c +++ b/src/world/area_tst/tst_10/tst_10_1_main.c @@ -103,20 +103,20 @@ EvtScript N(EVS_Main) = { EVT_END }; -s32 N(TweesterPath)[] = { - -65, 0, 217, - -262, 0, -64, - 57, 0, -286, - 327, 0, 8, - TWEETSER_PATH_LOOP +TweesterPath N(DefaultTweesterPath)[] = { + { -65, 0, 217 }, + { -262, 0, -64 }, + { 57, 0, -286 }, + { 327, 0, 8 }, + { TWEETSER_PATH_LOOP } }; - s32* N(UnusedTweesterPaths)[] = { - N(TweesterPath), - N(TweesterPath), - N(TweesterPath), - N(TweesterPath), - (s32*) -1 + TweesterPath* N(UnusedTweesterPaths)[] = { + N(DefaultTweesterPath), + N(DefaultTweesterPath), + N(DefaultTweesterPath), + N(DefaultTweesterPath), + PTR_LIST_END }; EvtScript N(EVS_MakeEntities) = { diff --git a/src/world/common/atomic/LetterChoice.inc.c b/src/world/common/atomic/LetterChoice.inc.c index af0894a7d1..6429f0fc0a 100644 --- a/src/world/common/atomic/LetterChoice.inc.c +++ b/src/world/common/atomic/LetterChoice.inc.c @@ -28,7 +28,6 @@ ApiStatus N(StashVars)(Evt* script, s32 isInitialCall) { return ApiStatus_DONE2; } - EvtScript N(Delivery_ShowGotStarPiece) = { EVT_CALL(ShowGotItem, LVar0, TRUE, 0) EVT_RETURN @@ -175,8 +174,7 @@ EvtScript N(D_802452BC_C7BF9C) = { EVT_END }; -// unused -EvtScript N(EVS_80245400) = { +EvtScript N(EVS_ShowChoiceWindow) = { EVT_CALL(N(BuildKeyItemChoiceList), LVar0) EVT_BIND_PADLOCK(N(D_802452BC_C7BF9C), TRIGGER_FORCE_ACTIVATE, 0, EVT_PTR(N(KeyItemChoiceList)), 0, 1) EVT_CALL(N(AwaitLetterChoiceResult), LVar0) @@ -245,7 +243,7 @@ EvtScript N(D_802454D0_C7C1B0) = { EVT_END }; -EvtScript N(D_802457F4_C7C4D4) = { +EvtScript N(EVS_ShowLetterChoice) = { EVT_SET(LVar0, LVarB) EVT_SET(LVar1, LVar2) EVT_CALL(N(BuildKeyItemChoiceList), LVar0) @@ -255,7 +253,7 @@ EvtScript N(D_802457F4_C7C4D4) = { EVT_END }; -EvtScript N(DoLetterDelivery) = { +EvtScript N(EVS_DoLetterDelivery) = { EVT_SET(LVarC, 0) EVT_IF_LT(GB_StoryProgress, STORY_CH2_PARAKARRY_JOINED_PARTY) EVT_RETURN @@ -275,7 +273,7 @@ EvtScript N(DoLetterDelivery) = { EVT_CALL(NpcJump1, NPC_PARTNER, LVarD, LVar0, LVarF, 10) EVT_CALL(SpeakToNpc, NPC_PARTNER, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, LVar2, LVar7) EVT_CALL(EnablePartnerAI) - EVT_EXEC_WAIT(N(D_802457F4_C7C4D4)) + EVT_EXEC_WAIT(N(EVS_ShowLetterChoice)) EVT_SWITCH(LVar0) EVT_CASE_EQ(-1) EVT_CALL(DisablePartnerAI, 0) @@ -293,7 +291,7 @@ EvtScript N(DoLetterDelivery) = { EVT_CALL(EnablePartnerAI) EVT_IF_NE(LVar6, 0) EVT_SET(LVar0, LVar6) - EVT_SET(LVar1, 1) + EVT_SET(LVar1, ITEM_TYPE_KEY) EVT_EXEC_WAIT(N(Delivery_ShowGotStarPiece)) EVT_CALL(AddKeyItem, LVar6) EVT_END_IF diff --git a/src/world/common/atomic/SuperBlock.data.inc.c b/src/world/common/atomic/SuperBlock.data.inc.c index 88350f4579..24ac340071 100644 --- a/src/world/common/atomic/SuperBlock.data.inc.c +++ b/src/world/common/atomic/SuperBlock.data.inc.c @@ -12,10 +12,12 @@ #define SUPER_BLOCK_MAPVAR MapVar(0) #endif -// use this in a script macro calling MakeEntity for this super block -#define EVT_SETUP_SUPER_BLOCK(mapVar,gameFlag) \ - EVT_SET(mapVar, LVar0)\ - EVT_CALL(AssignBlockFlag, gameFlag)\ +// use this in an EvtScript calling MakeEntity for this super block +// expects SUPER_BLOCK_GAMEFLAG and SUPER_BLOCK_MAPVAR to be valid +#define EVT_MAKE_SUPER_BLOCK(x, y, z, angle) \ + EVT_CALL(MakeEntity, EVT_PTR(Entity_SuperBlock), x, y, z, angle, MAKE_ENTITY_END)\ + EVT_SET(SUPER_BLOCK_MAPVAR, LVar0)\ + EVT_CALL(AssignBlockFlag, SUPER_BLOCK_GAMEFLAG)\ EVT_CALL(AssignScript, EVT_PTR(N(SuperBlock_OnHit))) s32 N(SuperBlock_CantUpgradeMessages)[2] = { diff --git a/src/world/common/atomic/WhaleAnim.data.inc.c b/src/world/common/atomic/WhaleAnim.data.inc.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/world/common/enemy/complete/Bandit.inc.c b/src/world/common/enemy/complete/Bandit.inc.c new file mode 100644 index 0000000000..c6cc4c1a0e --- /dev/null +++ b/src/world/common/enemy/complete/Bandit.inc.c @@ -0,0 +1,82 @@ + +#include "common.h" + +#include "world/common/Bandit_DropCoin.inc.c" + +EvtScript N(EVS_Bandit_CreateStolenCoin) = { + EVT_SET(LVarA, LVar0) + EVT_CALL(GetNpcPos, LVarA, LVar1, LVar2, LVar3) + EVT_ADD(LVar2, 30) + EVT_CALL(MakeItemEntity, ITEM_COIN, LVar1, LVar2, LVar3, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_CALL(N(Bandit_DropCoin), LVarA, LVar0, AF_SBK_01) + EVT_CALL(RemoveItemEntity, LVar0) + EVT_RETURN + EVT_END +}; + +MobileAISettings N(AISettings_Bandit) = { + .moveSpeed = 2.7f, + .moveTime = 45, + .waitTime = 30, + .alertRadius = 450.0f, + .playerSearchInterval = 10, + .chaseSpeed = 8.3f, + .chaseTurnRate = 180, + .chaseUpdateInterval = 100, + .chaseRadius = 550.0f, + .chaseOffsetDist = 100.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Bandit) = { + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_Bandit))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Bandit) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(func_80045900, 0) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(AF_SBK_01, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bandit_Anim02) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_EXEC(N(EVS_Bandit_CreateStolenCoin)) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(GetPlayerPos, LVar7, LVar8, LVar9) + EVT_ADD(LVar7, 20) + EVT_CALL(NpcJump0, NPC_SELF, LVar7, 0, LVar9, 6) + EVT_ADD(LVar7, 20) + EVT_CALL(NpcJump0, NPC_SELF, LVar7, 0, LVar9, 6) + EVT_CALL(GetNpcYaw, NPC_SELF, LVar0) + EVT_ADD(LVar0, 180) + EVT_CALL(InterpNpcYaw, NPC_SELF, LVar0, 5) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bandit_Anim08) + EVT_WAIT(10) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(16.0)) + EVT_ADD(LVar7, 200) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar7, LVar9, 0) + EVT_SET(AF_SBK_01, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_10, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Bandit) = { + .height = 26, + .radius = 24, + .level = 9, + .ai = &N(EVS_NpcAI_Bandit), + .onHit = &EnemyNpcHit, + .onDefeat = &N(EVS_NpcDefeat_Bandit), + .actionFlags = AI_ACTION_JUMP_WHEN_SEE_PLAYER | AI_ACTION_04, +}; diff --git a/src/world/common/enemy/complete/KoopaTroopa_Patrol.inc.c b/src/world/common/enemy/complete/KoopaTroopa_Patrol.inc.c new file mode 100644 index 0000000000..88becb0401 --- /dev/null +++ b/src/world/common/enemy/complete/KoopaTroopa_Patrol.inc.c @@ -0,0 +1,34 @@ +#include "common.h" + +#include "world/common/enemy/KoopaPatrolAI.inc.c" + +MobileAISettings N(AISettings_KoopaTroopa_Patrol) = { + .moveSpeed = 1.5f, + .moveTime = 25, + .waitTime = 20, + .alertRadius = 70.0f, + .alertOffsetDist = 50.0f, + .playerSearchInterval = 10, + .chaseSpeed = 7.0f, + .chaseRadius = 80.0f, + .chaseOffsetDist = 60.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_KoopaTroopa_Patrol) = { + EVT_CALL(SetSelfVar, 2, 8) + EVT_CALL(SetSelfVar, 3, 12) + EVT_CALL(SetSelfVar, 5, 10) + EVT_CALL(N(KoopaPatrolAI_Main), EVT_PTR(N(AISettings_KoopaTroopa_Patrol))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_KoopaTroopa_Patrol) = { + .height = 35, + .radius = 24, + .level = 6, + .ai = &N(EVS_NpcAI_KoopaTroopa_Patrol), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/KoopaTroopa_Wander.inc.c b/src/world/common/enemy/complete/KoopaTroopa_Wander.inc.c new file mode 100644 index 0000000000..30ee71360e --- /dev/null +++ b/src/world/common/enemy/complete/KoopaTroopa_Wander.inc.c @@ -0,0 +1,35 @@ +#include "common.h" + +#include "world/common/enemy/TackleAI.inc.c" + +MobileAISettings N(AISettings_KoopaTroopa_Wander) = { + .moveSpeed = 1.5f, + .moveTime = 45, + .waitTime = 20, + .alertRadius = 70.0f, + .alertOffsetDist = 50.0f, + .playerSearchInterval = 10, + .chaseSpeed = 7.5f, + .chaseRadius = 80.0f, + .chaseOffsetDist = 60.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_KoopaTroopa_Wander) = { + EVT_CALL(SetSelfVar, 2, 8) + EVT_CALL(SetSelfVar, 3, 12) + EVT_CALL(SetSelfVar, 5, 10) + EVT_CALL(SetSelfVar, 7, 0) + EVT_CALL(N(TackleAI_Main), EVT_PTR(N(AISettings_KoopaTroopa_Wander))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_KoopaTroopa_Wander) = { + .height = 35, + .radius = 24, + .level = 6, + .ai = &N(EVS_NpcAI_KoopaTroopa_Wander), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/LavaBubble.inc.c b/src/world/common/enemy/complete/LavaBubble.inc.c new file mode 100644 index 0000000000..54d90b5674 --- /dev/null +++ b/src/world/common/enemy/complete/LavaBubble.inc.c @@ -0,0 +1,40 @@ +#include "common.h" + +f32 N(FlyingAI_JumpVels)[] = { + 4.5, 3.5, 2.6, 2.0, 1.5, 20.0, +}; + +#include "world/common/enemy/FlyingAI.inc.c" + +#include "world/common/enemy/FlyingNoAttackAI.inc.c" + +MobileAISettings N(AISettings_LavaBubble) = { + .moveSpeed = 0.8f, + .moveTime = 100, + .alertRadius = 90.0f, + .playerSearchInterval = 4, + .chaseSpeed = 3.2f, + .chaseTurnRate = 10, + .chaseUpdateInterval = 1, + .chaseRadius = 100.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_LavaBubble) = { + EVT_CALL(SetSelfVar, 0, 1) + EVT_CALL(SetSelfVar, 5, 0) + EVT_CALL(SetSelfVar, 6, 0) + EVT_CALL(SetSelfVar, 1, 150) + EVT_CALL(N(FlyingNoAttackAI_Main), EVT_PTR(N(AISettings_LavaBubble))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_LavaBubble) = { + .height = 20, + .radius = 22, + .level = 17, + .ai = &N(EVS_NpcAI_LavaBubble), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/Paratroopa.inc.c b/src/world/common/enemy/complete/Paratroopa.inc.c new file mode 100644 index 0000000000..55668c22d0 --- /dev/null +++ b/src/world/common/enemy/complete/Paratroopa.inc.c @@ -0,0 +1,42 @@ +#include "common.h" + +#include "world/common/enemy/ParatroopaAI.inc.c" + +f32 N(FlyingAI_JumpVels)[] = { + 4.5, 3.5, 2.6, 2.0, 1.5, 20.0, +}; + +MobileAISettings N(AISettings_ParaTroopa) = { + .moveSpeed = 2.0f, + .moveTime = 30, + .waitTime = 30, + .alertRadius = 100.0f, + .alertOffsetDist = 20.0f, + .playerSearchInterval = 10, + .chaseSpeed = 2.6f, + .chaseTurnRate = 60, + .chaseUpdateInterval = 10, + .chaseRadius = 150.0f, + .chaseOffsetDist = 20.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_ParaTroopa) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetSelfVar, 5, -650) + EVT_CALL(SetSelfVar, 6, 30) + EVT_CALL(SetSelfVar, 1, 600) + EVT_CALL(N(ParatroopaAI_Main), EVT_PTR(N(AISettings_ParaTroopa))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_ParaTroopa) = { + .height = 40, + .radius = 24, + .level = 6, + .ai = &N(EVS_NpcAI_ParaTroopa), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, + .actionFlags = AI_ACTION_JUMP_WHEN_SEE_PLAYER, +}; diff --git a/src/world/common/enemy/complete/Pokey.inc.c b/src/world/common/enemy/complete/Pokey.inc.c new file mode 100644 index 0000000000..9f5785000b --- /dev/null +++ b/src/world/common/enemy/complete/Pokey.inc.c @@ -0,0 +1,32 @@ +#include "common.h" + +#include "world/common/SetNpcB5_3.inc.c" + +MobileAISettings N(AISettings_Pokey) = { + .moveSpeed = 1.8f, + .moveTime = 50, + .waitTime = 10, + .alertRadius = 250.0f, + .playerSearchInterval = 2, + .chaseSpeed = 3.5f, + .chaseTurnRate = 45, + .chaseUpdateInterval = 6, + .chaseRadius = 300.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_Pokey) = { + EVT_CALL(N(SetNpcB5_3)) + EVT_CALL(BasicAI_Main, EVT_PTR(N(AISettings_Pokey))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_Pokey) = { + .height = 72, + .radius = 15, + .level = 9, + .ai = &N(EVS_NpcAI_Pokey), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/PutridPiranha.inc.c b/src/world/common/enemy/complete/PutridPiranha.inc.c new file mode 100644 index 0000000000..e2089e0392 --- /dev/null +++ b/src/world/common/enemy/complete/PutridPiranha.inc.c @@ -0,0 +1,87 @@ +#include "common.h" +#include "sprite/npc/LargePiranha.h" + +extern EvtScript D_800936DC; + +#include "world/common/enemy/PiranhaPlantAI.inc.c" + +EvtScript N(EVS_NpcDefeat_PutridPiranha_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(func_80045900, 1) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAGS_10, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +MobileAISettings N(AISettings_Piranha) = { + .moveTime = 30, + .waitTime = 30, + .alertRadius = 150.0f, + .playerSearchInterval = 1, +}; + +EvtScript N(EVS_NpcAI_Piranha) = { + EVT_CALL(SetSelfVar, 7, 1) + EVT_CALL(SetSelfVar, 8, 10) + EVT_CALL(SetSelfVar, 9, 9) + EVT_CALL(SetSelfVar, 10, 12) + EVT_CALL(SetSelfVar, 11, 7) + EVT_CALL(SetSelfVar, 12, 30) + EVT_CALL(SetSelfVar, 13, 15) + EVT_CALL(SetSelfVar, 14, 18) + EVT_CALL(SetSelfVar, 15, 15) + EVT_CALL(N(PiranhaPlantAI_Main), EVT_PTR(N(AISettings_Piranha))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_PutridPiranha) = { + .height = 50, + .radius = 36, + .level = 17, + .ai = &N(EVS_NpcAI_Piranha), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +EvtScript N(EVS_NpcAI_PutridPiranha_Hitbox) = { + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetSelfVar, 0, 14) + EVT_CALL(SetSelfVar, 1, 28) + EVT_CALL(SetSelfVar, 4, 3) + EVT_CALL(SetSelfVar, 15, SOUND_20DE) + EVT_CALL(N(MeleeHitbox_Main)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_80244090) = { + 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(D_800936DC) + EVT_END_CASE_GROUP + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_PutridPiranha_Hitbox) = { + .height = 20, + .radius = 28, + .level = 17, + .ai = &N(EVS_NpcAI_PutridPiranha_Hitbox), + .onDefeat = &N(EVS_NpcDefeat_PutridPiranha_Hitbox), +}; diff --git a/src/world/common/enemy/complete/SpikeTop.inc.c b/src/world/common/enemy/complete/SpikeTop.inc.c new file mode 100644 index 0000000000..e1a11f0cf4 --- /dev/null +++ b/src/world/common/enemy/complete/SpikeTop.inc.c @@ -0,0 +1,129 @@ +#include "common.h" +#include "sprite/npc/BuzzyBeetle.h" + +#include "world/common/enemy/TackleAI.inc.c" + +#include "world/common/AwaitPlayerNearNpc.inc.c" + +MobileAISettings N(D_80243AA0_C647B0) = { + .moveSpeed = 1.0f, + .moveTime = 60, + .waitTime = 60, + .alertRadius = 90.0f, + .alertOffsetDist = 40.0f, + .playerSearchInterval = 1, + .chaseSpeed = 4.5f, + .chaseRadius = 100.0f, + .chaseOffsetDist = 40.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(D_80243AD0_C647E0) = { + EVT_CALL(SetSelfVar, 2, 5) + EVT_CALL(SetSelfVar, 3, 2) + EVT_CALL(SetSelfVar, 5, 5) + EVT_CALL(SetSelfVar, 7, 2) + EVT_CALL(N(TackleAI_Main), EVT_PTR(N(D_80243AA0_C647B0))) + EVT_RETURN + EVT_END +}; + +MobileAISettings N(AISettings_SpikeTop) = { + .moveSpeed = 1.0f, + .moveTime = 60, + .waitTime = 60, + .alertRadius = 90.0f, + .alertOffsetDist = 40.0f, + .playerSearchInterval = 1, + .chaseSpeed = 7.0f, + .chaseRadius = 100.0f, + .chaseOffsetDist = 40.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_SpikeTop) = { + EVT_CALL(SetSelfVar, 2, 4) + EVT_CALL(SetSelfVar, 3, 10) + EVT_CALL(SetSelfVar, 5, 4) + EVT_CALL(SetSelfVar, 7, 3) + EVT_CALL(N(TackleAI_Main), EVT_PTR(N(AISettings_SpikeTop))) + EVT_RETURN + EVT_END +}; + +MobileAISettings N(D_80243BE0_C648F0) = { + .moveSpeed = 1.0f, + .moveTime = 20, + .waitTime = 5, + .alertRadius = 120.0f, + .playerSearchInterval = 3, + .chaseSpeed = 6.0f, + .chaseRadius = 150.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(D_80243C10_C64920) = { + 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_RETURN + EVT_END +}; + +EvtScript N(D_80243C80_C64990) = { + EVT_CALL(N(func_80240814_97BE44)) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BuzzyBeetle_Anim0F) + EVT_CALL(N(AwaitPlayerNearNpc)) + EVT_CALL(SelfEnemyOverrideSyncPos, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_BuzzyBeetle_Anim00) + EVT_CALL(N(func_802408B4_97BEE4)) + EVT_CALL(SelfEnemyOverrideSyncPos, 0) + EVT_CALL(SetSelfVar, 2, 5) + EVT_CALL(SetSelfVar, 3, 2) + EVT_CALL(SetSelfVar, 5, 5) + EVT_CALL(SetSelfVar, 7, 2) + EVT_CALL(N(TackleAI_Main), EVT_PTR(N(D_80243AA0_C647B0))) + EVT_RETURN + EVT_END +}; + +// different spike top prefabs + +NpcSettings N(NpcSettings_Unused1) = { + .height = 20, + .radius = 22, + .level = 10, + .ai = &N(D_80243AD0_C647E0), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +NpcSettings N(NpcSettings_Unused2) = { + .height = 20, + .radius = 22, + .level = 10, + .ai = &N(D_80243C80_C64990), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +NpcSettings N(NpcSettings_SpikeTop) = { + .height = 20, + .radius = 22, + .level = 17, + .ai = &N(EVS_NpcAI_SpikeTop), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +NpcSettings N(NpcSettings_Unused3) = { + .height = 24, + .radius = 24, + .level = 25, + .ai = &N(D_80243C10_C64920), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/entrances.h b/src/world/entrances.h index 0b33adb99d..152dc336aa 100644 --- a/src/world/entrances.h +++ b/src/world/entrances.h @@ -129,6 +129,7 @@ enum { mac_05_ENTRY_2 = 2, mac_05_ENTRY_3 = 3, mac_06_ENTRY_0 = 0, + mac_06_ENTRY_1 = 1, tik_01_ENTRY_0 = 0, tik_01_ENTRY_1 = 1, tik_01_ENTRY_2 = 2, diff --git a/src/world/world.c b/src/world/world.c index d810492b27..39ec18e46f 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -358,57 +358,58 @@ MapConfig dro_maps[] = { }; /// Dry Dry Desert +#include "area_sbk/sbk.h" MapConfig sbk_maps[] = { - { MAP_UNSPLIT(sbk_00, 0x802400A0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_01, 0x802400A0), .bgName = "sbk_bg" }, + { MAP(sbk_00), .bgName = "sbk_bg" }, + { MAP(sbk_01), .bgName = "sbk_bg" }, { MAP_UNSPLIT(sbk_02, 0x80240C80), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_03, 0x802400A0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_04, 0x802400A0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_05, 0x802400B0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_06, 0x802403C0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_10, 0x80240080), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_11, 0x802401A0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_12, 0x802400A0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_13, 0x802401A0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_14, 0x80240090), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_15, 0x802400A0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_16, 0x802402C0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_20, 0x80240180), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_21, 0x80240080), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_22, 0x802401A0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_23, 0x80240080), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_24, 0x802403D0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_25, 0x802403C0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_26, 0x802403E0), .bgName = "sbk_bg" }, + { MAP(sbk_03), .bgName = "sbk_bg" }, + { MAP(sbk_04), .bgName = "sbk_bg" }, + { MAP(sbk_05), .bgName = "sbk_bg" }, + { MAP(sbk_06), .bgName = "sbk_bg" }, + { MAP(sbk_10), .bgName = "sbk_bg" }, + { MAP(sbk_11), .bgName = "sbk_bg" }, + { MAP(sbk_12), .bgName = "sbk_bg" }, + { MAP(sbk_13), .bgName = "sbk_bg" }, + { MAP(sbk_14), .bgName = "sbk_bg" }, + { MAP(sbk_15), .bgName = "sbk_bg" }, + { MAP(sbk_16), .bgName = "sbk_bg" }, + { MAP(sbk_20), .bgName = "sbk_bg" }, + { MAP(sbk_21), .bgName = "sbk_bg" }, + { MAP(sbk_22), .bgName = "sbk_bg" }, + { MAP(sbk_23), .bgName = "sbk_bg" }, + { MAP(sbk_24), .bgName = "sbk_bg" }, + { MAP(sbk_25), .bgName = "sbk_bg" }, + { MAP(sbk_26), .bgName = "sbk_bg" }, { MAP_UNSPLIT(sbk_30, 0x80241870), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_31, 0x80240180), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_32, 0x802401B0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_33, 0x80240080), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_34, 0x80240A20), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_35, 0x802403C0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_36, 0x802402C0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_40, 0x80240180), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_41, 0x80240080), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_42, 0x80240180), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_43, 0x80240080), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_44, 0x802401A0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_45, 0x80240090), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_46, 0x802403E0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_50, 0x80240080), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_51, 0x802401A0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_52, 0x80240080), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_53, 0x802400A0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_54, 0x80240080), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_55, 0x802402E0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_56, 0x80241040), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_60, 0x802400A0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_61, 0x80240080), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_62, 0x802400A0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_63, 0x802400A0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_64, 0x80240080), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_65, 0x80240080), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_66, 0x802403C0), .bgName = "sbk_bg" }, - { MAP_UNSPLIT(sbk_99, 0x80240020), .bgName = "sbk_bg" }, + { MAP(sbk_31), .bgName = "sbk_bg" }, + { MAP(sbk_32), .bgName = "sbk_bg" }, + { MAP(sbk_33), .bgName = "sbk_bg" }, + { MAP(sbk_34), .bgName = "sbk_bg" }, + { MAP(sbk_35), .bgName = "sbk_bg" }, + { MAP(sbk_36), .bgName = "sbk_bg" }, + { MAP(sbk_40), .bgName = "sbk_bg" }, + { MAP(sbk_41), .bgName = "sbk_bg" }, + { MAP(sbk_42), .bgName = "sbk_bg" }, + { MAP(sbk_43), .bgName = "sbk_bg" }, + { MAP(sbk_44), .bgName = "sbk_bg" }, + { MAP(sbk_45), .bgName = "sbk_bg" }, + { MAP(sbk_46), .bgName = "sbk_bg" }, + { MAP(sbk_50), .bgName = "sbk_bg" }, + { MAP(sbk_51), .bgName = "sbk_bg" }, + { MAP(sbk_52), .bgName = "sbk_bg" }, + { MAP(sbk_53), .bgName = "sbk_bg" }, + { MAP(sbk_54), .bgName = "sbk_bg" }, + { MAP(sbk_55), .bgName = "sbk_bg" }, + { MAP(sbk_56), .bgName = "sbk_bg" }, + { MAP(sbk_60), .bgName = "sbk_bg" }, + { MAP(sbk_61), .bgName = "sbk_bg" }, + { MAP(sbk_62), .bgName = "sbk_bg" }, + { MAP(sbk_63), .bgName = "sbk_bg" }, + { MAP(sbk_64), .bgName = "sbk_bg" }, + { MAP(sbk_65), .bgName = "sbk_bg" }, + { MAP(sbk_66), .bgName = "sbk_bg" }, + { MAP(sbk_99), .bgName = "sbk_bg" }, }; /// Dry Dry Ruins @@ -433,16 +434,17 @@ MapConfig isk_maps[] = { }; /// Koopa Bros. Fortress +#include "area_trd/trd.h" MapConfig trd_maps[] = { { MAP_UNSPLIT(trd_00, 0x80240690), .bgName = "nok_bg" }, { MAP_UNSPLIT(trd_01, 0x80241700), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, { MAP_UNSPLIT(trd_02, 0x80241AA0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, { MAP_UNSPLIT(trd_03, 0x80240A40), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(trd_04, 0x80243900), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, + { MAP(trd_04), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, { MAP_UNSPLIT(trd_05, 0x802407B0), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, { MAP_UNSPLIT(trd_06, 0x80240D60), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, { MAP_UNSPLIT(trd_07, 0x80242910), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, - { MAP_UNSPLIT(trd_08, 0x80240A30), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, + { MAP(trd_08), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, { MAP_UNSPLIT(trd_09, 0x80240200), .bgName = "nok_bg" }, { MAP_UNSPLIT(trd_10, 0x80240870), .unk_1C = { .bytes = { .songVariation = 1, .flags = 3 } } }, }; diff --git a/ver/us/asm/data/world/area_jan/jan_00/B220E0.data.s b/ver/us/asm/data/world/area_jan/jan_00/B220E0.data.s deleted file mode 100644 index 64e50e8760..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_00/B220E0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241BA0_B220E0 -.word 0x43160000, 0x00000000, 0x43480000, 0x00000000, 0x43AA0000, 0x00000000, 0x43AA0000, 0x439D8000, 0x43AA0000, 0x00000000, 0xC3AA0000, 0x43610000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241DEC, D_80241BA0_B220E0, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x001900EB, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000026, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_00/B22190.data.s b/ver/us/asm/data/world/area_jan/jan_00/B22190.data.s deleted file mode 100644 index 7cab4afe52..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_00/B22190.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241C50_B22190 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_00_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_00_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CEC_B2222C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247AA0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D48_B22288 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247AA8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DA4_B222E4 -.word 0x00000047, 0x00000005, D_80241CEC_B2222C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241D48_B22288, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000024, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF840633D, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024580C, 0x00000046, 0x00000001, 0x802458B8, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000D, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x0000000E, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000190, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241C50_B22190, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241C50_B22190, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x802467AC, 0x00000044, 0x00000001, 0x80247A2C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000044, 0x00000001, D_80241DA4_B222E4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241DA4_B222E4, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_8024030C_B2084C, 0x00000046, 0x00000001, 0x80241C10, 0x00000043, 0x00000002, PlaySound, 0x80000017, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s b/ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s deleted file mode 100644 index ef25119325..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_00/B226D0.data.s +++ /dev/null @@ -1,120 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242190_B226D0 -.word 0x00000000, 0x00180030, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802421BC_B226FC -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802421E8_B22728 -.word 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80242214_B22754 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242260_B227A0 -.word 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242290_B227D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242290_B227D0 -.word 0x00000043, 0x00000003, GetSelfVar, 0x00000001, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002099, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000001, jan_00_HeartPlant_SpawnHeart, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, D_80242260_B227A0, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024239C_B228DC -.word 0x00000000, 0x0014001C, D_80242214_B22754, D_80242290_B227D0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel jan_00_varStash -.word 0x00000000 - -dlabel D_802423CC_B2290C -.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_8024242C_B2296C -.word 0x00000000 - -dlabel D_80242430_B22970 -.word 0x00000000 - -dlabel D_80242434_B22974 -.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, jan_00_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_8024078C_B20CCC, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802407C4_B20D04, 0xFE363C80, 0x0000004E, 0x00000006, D_80242434_B22974, 0x00000010, 0x00000000, D_80247AF0_CCB300, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240738_B20C78, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802425C8_B22B08 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, jan_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242648_B22B88 -.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, jan_00_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_802425C8_B22B08, 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, func_8024078C_B20CCC, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024296C_B22EAC -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802407C4_B20D04, 0xFE363C80, 0x0000004E, 0x00000006, D_80242648_B22B88, 0x00000010, 0x00000000, D_80247AF0_CCB300, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240738_B20C78, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802429DC_B22F1C -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_00_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_8024296C_B22EAC, 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_802423CC_B2290C, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_00_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242CD4_B23214 -.word 0x00000054, 0x00000000 - -dlabel D_80242CDC_B2321C -.word 0x00000043, 0x0000000B, jan_00_LetterDelivery_Init, 0x00000001, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x0010001D, 0x0010001E, 0x0010001F, 0x00100020, D_80242CD4_B23214, 0x00000046, 0x00000001, D_802429DC_B22F1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D2C_B2326C -.word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_802423CC_B2290C, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D90_B232D0 -.word 0x00000043, 0x00000002, func_80240CF8_B21238, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242DB0_B232F0 -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFED4, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C83, 0xFFFFFED4, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242FA8_B234E8 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000136, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000136, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5C80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24A8E80, 0xF24A7A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000B4, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5C80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24A7A80, 0xF24A7A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C1A, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000045, 0x00000002, D_80242D90_B232D0, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000045, 0x00000002, D_80242D90_B232D0, 0xFE363C84, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000045, 0x00000002, D_80242D90_B232D0, 0xFE363C85, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_80240F14_B21454, 0x00000001, 0x00000049, 0x00000001, 0xFE363C83, 0x00000049, 0x00000001, 0xFE363C84, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000B, 0x00000049, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000B, 0x00000043, 0x00000005, func_80240B4C_B2108C, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00B60004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00B6000E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0x000000E0, 0x00000000, 0x00000014, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00B60004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000122, 0x00000014, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00B60001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000100, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, func_80240B4C_B2108C, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0x000000E0, 0x00000000, 0x00000014, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010004, 0x00000043, 0x00000004, PlayerMoveTo, 0x00000104, 0x00000014, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000005, func_80240B4C_B2108C, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x000000E0, 0x00000000, 0x00000014, 0x00000014, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x000000E6, 0x00000014, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B6000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000009E, 0xFFFFFFF6, 0xFFFFFFDA, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60000, 0x00000005, 0x00100000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000026, 0x00000000, 0x00000008, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000B, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8E80, 0x00000000, 0x0000012C, 0x0000000F, 0xF24A6280, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B60008, 0x00B60001, 0x00000001, 0x00100001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000004, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x0000032C, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000004, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B60007, 0x00B60002, 0x00000005, 0x00100002, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60001, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A9280, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00B60004, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000014A, 0x000000BE, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000B, 0x00000026, 0x00000002, 0xFE363C89, 0xF24A8A80, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C89, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80245860_B25DA0, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xFE363C89, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802437C4_B23D04 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243838_B23D78 -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000FA, 0x00000000, 0x000000C8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0x00000000, 0x000000C8, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24ACA80, 0xF24A7A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000044, 0x00000001, D_80242FA8_B234E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802438E4_B23E24 -.word 0x43910000, 0x00000000, 0x41A00000, 0x43750000, 0x40C00000, 0xC20C0000, 0x433E0000, 0x41200000, 0xC2480000 - -dlabel D_80243908_B23E48 -.word 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00B60004, 0x00B60000, 0x00000005, 0x00100003, 0x00000043, 0x00000002, ShowChoice, 0x001E0010, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000006, ContinueSpeech, 0x00000000, 0x00B60004, 0x00B60000, 0x00000005, 0x00100005, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000005, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000028, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x0000009E, 0xFFFFFFCE, 0xFFFFFFDA, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000044, 0x00000001, D_80242DB0_B232F0, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008048, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, func_80240B4C_B2108C, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7C80, 0x00000043, 0x00000005, PlayerJump, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000005, func_80240B4C_B2108C, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240CF8_B21238, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C83, 0xFE363C85, 0x00000014, 0x00000043, 0x00000005, func_80240B4C_B2108C, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000012, 0x00000043, 0x00000005, func_80240B4C_B2108C, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C80, 0xFE363C82, 0x00000012, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240CF8_B21238, 0x00000001, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000028, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00B60004, 0x00000043, 0x00000005, LoadPath, 0x00000014, D_802438E4_B23E24, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, func_80240B4C_B2108C, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00B6000E, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A7C80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00B60001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, func_80240CF8_B21238, 0x00000002, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B60008, 0x00B60001, 0x00000000, 0x00100007, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF8406042, 0x00000001, 0x00000004, 0x00000001, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000002, 0x00000000, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetNpcVar, 0x00000002, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_802437C4_B23D04, 0x00000043, 0x00000002, func_80240F14_B21454, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000005B, 0x00000000, 0x00000012, 0x00000000, 0x00000003, 0x00000001, 0x0000005A, 0x00000044, 0x00000001, D_802437C4_B23D04, 0x00000043, 0x00000002, func_80240F14_B21454, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000005B, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x80247AB0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243F78_B244B8 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x01000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008048, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80243838_B23D78, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80243908_B23E48, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000009E, 0xFFFFFFF6, 0xFFFFFFDA, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80243908_B23E48, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802440F8_B24638 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x00100006, 0x00000046, 0x00000001, D_80242CDC_B2321C, 0x00000046, 0x00000001, D_80242D2C_B2326C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244158_B24698 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000028, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000122, 0x00000000, 0x00000014, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802440F8_B24638, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802441C8_B24708 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000002, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0x00000001, 0x00000002, 0x00000000, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024423C_B2477C -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000005, 0x00100008, 0x00000045, 0x00000002, D_802441C8_B24708, 0xFE363C89, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000047, 0x00000000, 0x00000008, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x80000055, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80241134_B21674, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000055, 0x00000000, 0x00000140, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000055, 0x00000000, 0x00000140, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AD480, 0xF24A4880, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24AD680, 0xF24A7A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0021000C, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000050, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000FA, 0x00000000, 0x0000005A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24E6280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB480, 0xF24A5280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A854D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0021000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000002, StopSound, 0x80000055, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000045, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000000FA, 0x00000000, 0x0000005A, 0x00000014, 0x00000049, 0x00000001, 0xFE363C89, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00210005, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210018, 0x00210005, 0x00000005, 0x00100009, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210018, 0x00210005, 0x00000000, 0x0010000A, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00210013, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000000FA, 0x00000000, 0x0000005A, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00210013, 0x00210013, 0x00000000, 0x0010000B, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0021000A, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0021000B, 0x0021000A, 0x00000000, 0x0010000C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0021000C, 0x00000057, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000055, 0x00000000, 0x00000140, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000055, 0x00000000, 0x00000140, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A5280, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xF24ADA80, 0xF24A7A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8080, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000050, 0xFFFFFFCE, 0x0000005A, 0x00000014, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000045, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x80000055, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFDD5, 0xFFFFFFE0, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x00000003, GotoMap, 0x80247AB0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244834_B24D74 -.word 0x0000000A, 0x00000002, 0xF8406042, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFDEE, 0xFFFFFFCE, 0x00000014, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024423C_B2477C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024488C_B24DCC -.word 0x00000000, D_80242190_B226D0, 0x00000000, 0xC47A0000, 0x00000000, 0x00400F09, D_80243F78_B244B8, 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, 0x00B60001, 0x00B60004, 0x00B60006, 0x00B60006, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00000000, 0x00000000, 0x00000000, 0x001A0055, 0x00000001, D_802421BC_B226FC, 0x00000000, 0xC47A0000, 0x00000000, 0x0040090D, D_80244158_B24698, 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, 0x00B60001, 0x00B60004, 0x00B60006, 0x00B60006, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00000000, 0x00000000, 0x00000000, 0x001A0000, 0x00000002, D_802421E8_B22728, 0x00000000, 0xC47A0000, 0x00000000, 0x0040090D, D_80244834_B24D74, 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, 0x00210003, 0x00210007, 0x00210007, 0x00210007, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00210003, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80244E5C_B2539C -.word 0x00000003, D_8024239C_B228DC, 0x43E38000, 0x00000000, 0x42E60000, 0x00408905, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3 - -dlabel D_8024504C_B2558C -.word 0x00000004, D_8024239C_B228DC, 0x43270000, 0x00000000, 0x43CA0000, 0x00408905, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3 - -dlabel D_8024523C_B2577C -.word 0x00000005, D_8024239C_B228DC, 0x42B40000, 0x00000000, 0x439E0000, 0x00408905, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3 - -dlabel D_8024542C_B2596C -.word 0x00000006, D_8024239C_B228DC, 0x43D40000, 0x00000000, 0x43360000, 0x00408905, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3 - -dlabel D_8024561C_B25B5C -.word 0x00000007, D_8024239C_B228DC, 0x430F0000, 0x00000000, 0x43820000, 0x00408905, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00430000, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3, 0x00000003, D_8024488C_B24DCC, 0x00000000, 0x00000001, D_80244E5C_B2539C, 0x00000000, 0x00000001, D_8024504C_B2558C, 0x00000000, 0x00000001, D_8024523C_B2577C, 0x00000000, 0x00000001, D_8024542C_B2596C, 0x00000000, 0x00000001, D_8024561C_B25B5C, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80245860_B25DA0 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000000F, 0x00000064, 0x0000019F, 0x00000011, 0xF8406040, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000000F, 0x0000007D, 0x0000019F, 0x00000011, 0xF8406041, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000092, 0x00000172, 0x00000000, 0xFFFFFF2E, 0x00000011, 0xF8406043, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000044, 0x00000001, D_80245860_B25DA0, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SpinningFlower, 0x0000000F, 0x00000000, 0x0000019F, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_00/B25E90.data.s b/ver/us/asm/data/world/area_jan/jan_00/B25E90.data.s deleted file mode 100644 index 903a640e8f..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_00/B25E90.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel jan_00_unkAngle1 -.word 0x00000000 - -dlabel jan_00_unkAngle2 -.word 0xFFFFFFFF - -dlabel jan_00_unkAngle3 -.word 0xFFFFFFFF - -dlabel D_8024595C_B25E9C -.word 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802459D4_B25F14 -.word 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x0000001E, 0x0000001E, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000058, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x0000001E, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245C10_B26150 -.word 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFE2, 0x00000008, 0x00000001, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24AF280, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A8680, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000058, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0xFFFFFFD8, 0x00000078, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245E5C_B2639C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245E6C_B263AC -.word 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8C, 0x0000002B, 0x00000002, 0xFE363C81, 0x00000004, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000001, jan_00_UnkPlayerPosFunc, 0x00000043, 0x0000000F, PlayEffect, 0x00000018, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245F6C_B264AC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245F7C_B264BC -.word 0x0000000F, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000E, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8C, 0x0000000F, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000016, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802460A4_B265E4 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024620C_B2674C -.word 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A6280, 0xF24A9280, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C81, 0xF24A9280, 0xF24A6280, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024634C_B2688C -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000014, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0xF24A7680, 0xF24A7E80, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802464B4_B269F4 -.word 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x0000001E, 0x0000003C, 0x0000001E, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024652C_B26A6C -.word 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C8C, 0xFE363C80, 0x00000000, 0x00000008, 0x00000003, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000058, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004D, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C81, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x00000029, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000008, jan_00_UnkFloatFunc001, 0xFE363C80, 0xFE363C80, 0x0000001E, 0x0000003C, 0x00000003, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000001, 0x00000056, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000001, jan_00_unkAngleFunc002, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000056, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000004, MakeLocalVertexCopy, 0x00000002, 0x00000055, 0x00000001, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000002, jan_00_unkAngleFunc003, 0x00000000, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000055, 0x00000002, 0xFFFFFFFF, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, jan_00_UnkAngleFunc001, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xFFFFFFB0, 0x0000002D, 0x00000002, 0xFE363C81, 0xFFFFFFEE, 0x0000002D, 0x00000002, 0xFE363C82, 0x000001A4, 0x0000002C, 0x00000002, 0xFE363C80, 0x00000037, 0x0000002C, 0x00000002, 0xFE363C81, 0xFFFFFFEC, 0x0000002C, 0x00000002, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, GetNpcYaw, 0x00000000, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x0000002C, 0x00000002, 0xFE363C80, 0xFFFFFFA6, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0x00000064, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0xFFFFFFFB, 0xFFFFFFBC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0x00000066, 0x00000004, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x0000003C, 0x0000001D, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0x0000003C, 0x0000001D, 0x00000033, 0x00000043, 0x00000006, RotateModel, 0x00000059, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004B, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004D, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000053, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000051, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000004F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000058, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0xFFFFFF9C, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000005, 0x00000044, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0xFFFFFF9A, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0xFFFFFFC4, 0xFFFFFFE3, 0x00000033, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0xFFFFFFC4, 0xFFFFFFE3, 0xFFFFFFCD, 0x00000043, 0x00000005, TranslateModel, 0x00000059, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004B, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004D, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000053, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000051, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000004F, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000058, 0x00000064, 0x00000000, 0x00000000, 0x00000043, 0x00000003, GetNpcAnimation, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00B60003, 0x00000024, 0x00000002, 0xFE363C8D, D_80245C10_B26150, 0x00000016, 0x00000001, 0x00B60000, 0x00000024, 0x00000002, 0xFE363C8D, D_8024595C_B25E9C, 0x00000016, 0x00000001, 0x00B60002, 0x00000024, 0x00000002, 0xFE363C8D, D_802459D4_B25F14, 0x00000016, 0x00000001, 0x00B60001, 0x00000024, 0x00000002, 0xFE363C8D, D_802464B4_B269F4, 0x00000016, 0x00000001, 0x00B60004, 0x00000024, 0x00000002, 0xFE363C8D, D_8024652C_B26A6C, 0x00000016, 0x00000001, 0x00B60005, 0x00000024, 0x00000002, 0xFE363C8D, D_80245E5C_B2639C, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000016, 0x00000001, 0x00B60006, 0x00000024, 0x00000002, 0xFE363C8D, D_802460A4_B265E4, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000016, 0x00000001, 0x00B60007, 0x00000024, 0x00000002, 0xFE363C8D, D_8024620C_B2674C, 0x00000043, 0x00000003, EnableModel, 0x0000004B, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000004D, 0x00000000, 0x00000016, 0x00000001, 0x00B60008, 0x00000024, 0x00000002, 0xFE363C8D, D_8024634C_B2688C, 0x00000016, 0x00000001, 0x00B60009, 0x00000024, 0x00000002, 0xFE363C8D, D_80245E6C_B263AC, 0x00000016, 0x00000001, 0x00B6000A, 0x00000024, 0x00000002, 0xFE363C8D, D_80245F6C_B264AC, 0x00000016, 0x00000001, 0x00B6000C, 0x00000024, 0x00000002, 0xFE363C8D, D_80245F7C_B264BC, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0xFE363C8D, 0x00000027, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C8C, 0x000003E8, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_00/B275B0.data.s b/ver/us/asm/data/world/area_jan/jan_00/B275B0.data.s deleted file mode 100644 index bfab89d1e7..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_00/B275B0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80247070_B275B0 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_00_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, jan_00_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_802473D0_B27910 -.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, jan_00_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, jan_00_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, jan_00_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, jan_00_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_802479D4_B27F14 -.word 0x00000002, 0x0000002C, 0x0000002D - -dlabel D_802479E0_B27F20 -.word 0x00000001, 0x0000002B - -dlabel D_802479E8_B27F28 -.word 0x00000001, 0x000000AC, 0x000001E5, 0x0000005F, 0xFFFFFF6F, 0x0000000F, 0x00000000, 0xF971888D - -dlabel D_80247A08_B27F48 -.word D_802479D4_B27F14, D_802479E0_B27F20, D_802479E8_B27F28, 0x00000000, 0x00000000 - -dlabel D_80247A1C_B27F5C -.word 0x43F08000, 0x00000000, 0xC3250000, 0x00000000, 0x00000024, 0x00000002, 0xF971888D, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80247A08_B27F48, 0x00000047, 0x00000005, D_802473D0_B27910, 0x00001000, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802473D0_B27910, 0x00100000, D_80247A1C_B27F5C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_03/92F910.data.s b/ver/us/asm/data/world/area_sbk/sbk_03/92F910.data.s deleted file mode 100644 index ae73e0acd8..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_03/92F910.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240060_92F910 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240258_92FB08, D_80240060_92F910, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190064 - -dlabel D_802400E0_92F990 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240C00, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024013C_92F9EC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240C08, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240198_92FA48 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240C10, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401F4_92FAA4 -.word 0x00000047, 0x00000005, D_802400E0_92F990, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024013C_92F9EC, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240198_92FA48, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240258_92FB08 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240BB8, 0x00000043, 0x00000001, sbk_03_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_802401F4_92FAA4, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_03/92FC20.data.s b/ver/us/asm/data/world/area_sbk/sbk_03/92FC20.data.s deleted file mode 100644 index 1587678c26..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_03/92FC20.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240370_92FC20 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_802403A0_92FC50 -.word 0x00000043, 0x00000001, sbk_03_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240370_92FC20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403CC_92FC7C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_802403A0_92FC50, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_802403F8_92FCA8 -.word 0x00000000, D_802403CC_92FC7C, 0xC3AA0000, 0x00000000, 0xC2FA0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFEAC, 0x00000000, 0xFFFFFF83, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802405E8_92FE98 -.word 0x00000001, D_802403CC_92FC7C, 0x41200000, 0x00000000, 0x42C80000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x0000000A, 0x00000000, 0x00000064, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802407D8_930088 -.word 0x00000002, D_802403CC_92FC7C, 0xC2B40000, 0x00000000, 0x43820000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFFA6, 0x00000000, 0x00000104, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802409C8_930278 -.word 0x00000003, D_802403CC_92FC7C, 0x43250000, 0x00000000, 0x43960000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x000000A5, 0x00000000, 0x0000012C, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802403F8_92FCA8, 0x0A000001, 0x00000001, D_802405E8_92FE98, 0x0A030001, 0x00000001, D_802407D8_930088, 0x0A020001, 0x00000001, D_802409C8_930278, 0x0A010001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_04/930530.data.s b/ver/us/asm/data/world/area_sbk/sbk_04/930530.data.s deleted file mode 100644 index 6848994f2a..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_04/930530.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240060_930530 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240258_930728, D_80240060_930530, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190065 - -dlabel D_802400E0_9305B0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240800, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024013C_93060C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240808, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240198_930668 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240810, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401F4_9306C4 -.word 0x00000047, 0x00000005, D_802400E0_9305B0, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024013C_93060C, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240198_930668, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240258_930728 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802407D8, 0x00000043, 0x00000001, sbk_04_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_802401F4_9306C4, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_04/930840.data.s b/ver/us/asm/data/world/area_sbk/sbk_04/930840.data.s deleted file mode 100644 index eca2b37ab4..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_04/930840.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240370_930840 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_802403A0_930870 -.word 0x00000043, 0x00000001, sbk_04_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240370_930840, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403CC_93089C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_802403A0_930870, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_802403F8_9308C8 -.word 0x00000000, D_802403CC_93089C, 0xC3938000, 0x00000000, 0xC2DC0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFED9, 0x00000000, 0xFFFFFF92, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802405E8_930AB8 -.word 0x00000001, D_802403CC_93089C, 0xC30C0000, 0x00000000, 0xC1F00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF74, 0x00000000, 0xFFFFFFE2, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802403F8_9308C8, 0x0A010001, 0x00000001, D_802405E8_930AB8, 0x0A010001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_05/930D50.data.s b/ver/us/asm/data/world/area_sbk/sbk_05/930D50.data.s deleted file mode 100644 index 857d57f3ed..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_05/930D50.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240060_930D50 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x431D0000, 0x43480000, 0xC3A90000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402D8_930FC8, D_80240060_930D50, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190066 - -dlabel D_802400F0_930DE0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802418B0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024014C_930E3C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802418B8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401A8_930E98 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802418C0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240204_930EF4 -.word 0x00000047, 0x00000005, D_802400F0_930DE0, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024014C_930E3C, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401A8_930E98, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240268_930F58 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000044, 0x00000001, D_80240204_930EF4, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240204_930EF4, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402D8_930FC8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80241828, 0x00000046, 0x00000001, 0x80240400, 0x00000043, 0x00000001, sbk_05_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000044, 0x00000001, D_80240268_930F58, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_05/9310F0.data.s b/ver/us/asm/data/world/area_sbk/sbk_05/9310F0.data.s deleted file mode 100644 index 704318c77d..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_05/9310F0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240400_9310F0 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x00000080, 0xFFFFFF9C, 0x00000000, 0xFFFFFE43, 0x00000011, 0xF8405EBF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_05/931130.data.s b/ver/us/asm/data/world/area_sbk/sbk_05/931130.data.s deleted file mode 100644 index 1e4b80b2b1..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_05/931130.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240440_931130 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80240470_931160 -.word 0x00000043, 0x00000001, sbk_05_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240440_931130, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024049C_93118C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240470_931160, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_802404C8_9311B8 -.word 0x00000000, D_8024049C_93118C, 0xC38C0000, 0x00000000, 0xC2DC0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x000000B4, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFEE8, 0x00000000, 0xFFFFFF92, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802406B8_9313A8 -.word 0x00000001, D_8024049C_93118C, 0xC3480000, 0x00000000, 0xC2A00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x00000078, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF38, 0x00000000, 0xFFFFFFB0, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802408A8_931598 -.word 0x00000002, D_8024049C_93118C, 0xC3200000, 0x00000000, 0xC3610000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF60, 0x00000000, 0xFFFFFF1F, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240A98_931788 -.word 0x00000003, D_8024049C_93118C, 0xC2C80000, 0x00000000, 0x428C0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF9C, 0x00000000, 0x00000046, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240C88_931978 -.word 0x00000004, D_8024049C_93118C, 0xC1200000, 0x00000000, 0x41F00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x00000050, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFFF6, 0x00000000, 0x0000001E, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240E78_931B68 -.word 0x00000005, D_8024049C_93118C, 0x41A00000, 0x00000000, 0xC2DC0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000014, 0x00000000, 0xFFFFFF92, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241068_931D58 -.word 0x00000006, D_8024049C_93118C, 0x432A0000, 0x00000000, 0xC2480000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x000000AA, 0x00000000, 0xFFFFFFCE, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241258_931F48 -.word 0x00000007, D_8024049C_93118C, 0x437A0000, 0x00000000, 0x43020000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x000000FA, 0x00000000, 0x00000082, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241448_932138 -.word 0x00000008, D_8024049C_93118C, 0x43AA0000, 0x00000000, 0x43480000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000154, 0x00000000, 0x000000C8, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241638_932328 -.word 0x00000009, D_8024049C_93118C, 0xC3160000, 0x00000000, 0x43B40000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF6A, 0x00000000, 0x00000168, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802404C8_9311B8, 0x0A000001, 0x00000001, D_802406B8_9313A8, 0x0A000001, 0x00000001, D_802408A8_931598, 0x0A000001, 0x00000001, D_80240A98_931788, 0x0A020001, 0x00000001, D_80240C88_931978, 0x0A020001, 0x00000001, D_80240E78_931B68, 0x0A030001, 0x00000001, D_80241068_931D58, 0x0A010001, 0x00000001, D_80241258_931F48, 0x0A010001, 0x00000001, D_80241448_932138, 0x0A010001, 0x00000001, D_80241638_932328, 0x0A010001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_06/932940.data.s b/ver/us/asm/data/world/area_sbk/sbk_06/932940.data.s deleted file mode 100644 index b669e15973..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_06/932940.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240380_932940 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240500_932AC0, D_80240380_932940, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190067 - -dlabel D_80240400_9329C0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802416B0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024045C_932A1C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802416B8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404B8_932A78 -.word 0x00000047, 0x00000005, D_80240400_9329C0, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024045C_932A1C, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240500_932AC0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240B80, 0x00000046, 0x00000001, 0x802415B0, 0x00000043, 0x00000001, sbk_06_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_802404B8_932A78, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x80241558, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_06/932BF0.data.s b/ver/us/asm/data/world/area_sbk/sbk_06/932BF0.data.s deleted file mode 100644 index 370bf711bc..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_06/932BF0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240630_932BF0 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_06_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406C8_932C88 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_802406F8_932CB8 -.word 0x00000043, 0x00000002, BasicAI_Main, D_802406C8_932C88, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240718_932CD8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240630_932BF0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240964_932F24 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_802406F8_932CB8, EnemyNpcHit, 0x00000000, D_80240718_932CD8, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_80240990_932F50 -.word 0x00000000, D_80240964_932F24, 0xC3480000, 0x00000000, 0x43660000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFF38, 0x00000000, 0x000000E6, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240990_932F50, 0x0A0C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_06/933160.data.s b/ver/us/asm/data/world/area_sbk/sbk_06/933160.data.s deleted file mode 100644 index ee67f4919e..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_06/933160.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240BA0_933160 -.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, sbk_06_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, sbk_06_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_80240F00_9334C0 -.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, sbk_06_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, sbk_06_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, sbk_06_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, sbk_06_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_80241504_933AC4 -.word 0x00000001, 0x0000000D - -dlabel D_8024150C_933ACC -.word 0x00000001, 0x0000000C - -dlabel D_80241514_933AD4 -.word 0x00000001, 0x00000157, 0x000000CD, 0x00000064, 0xFFFFFECA, 0x0000000F, 0xF8405EC5, 0x00000000 - -dlabel D_80241534_933AF4 -.word D_80241504_933AC4, D_8024150C_933ACC, D_80241514_933AD4, 0x00000000, 0x00000000 - -dlabel D_80241548_933B08 -.word 0x43640000, 0x00000000, 0xC3990000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241534_933AF4, 0x00000047, 0x00000005, D_80240F00_9334C0, 0x00001000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240F00_9334C0, 0x00100000, D_80241548_933B08, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000087, 0x0000003C, 0xFFFFFF33, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB0, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFFEC, 0x0000003C, 0xFFFFFF06, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000000DC, 0x0000003C, 0x00000041, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x0000005A, 0x0000003C, 0x000000DC, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFFBA, 0x0000003C, 0x00000064, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFE8E, 0x0000003C, 0x00000096, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_10/933CC0.data.s b/ver/us/asm/data/world/area_sbk/sbk_10/933CC0.data.s deleted file mode 100644 index 82bcb3bf60..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_10/933CC0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_933CC0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240238_933EB8, D_80240040_933CC0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190068 - -dlabel D_802400C0_933D40 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403A0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024011C_933D9C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403A8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240178_933DF8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403B0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401D4_933E54 -.word 0x00000047, 0x00000005, D_802400C0_933D40, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024011C_933D9C, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240178_933DF8, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240238_933EB8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x80240350, 0x00000043, 0x00000001, sbk_10_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_802401D4_933E54, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_10/933FD0.data.s b/ver/us/asm/data/world/area_sbk/sbk_10/933FD0.data.s deleted file mode 100644 index 63beb84813..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_10/933FD0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240350_933FD0 -.word 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x0000013B, 0x0000005D, 0x0000003C, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405E9F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_11/9341A0.data.s b/ver/us/asm/data/world/area_sbk/sbk_11/9341A0.data.s deleted file mode 100644 index 6b0c15d655..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_11/9341A0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240160_9341A0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802403D0_934410, D_80240160_9341A0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190069 - -dlabel D_802401E0_934220 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240CE0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024023C_93427C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240CE8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240298_9342D8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240CF0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402F4_934334 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240CF8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240350_934390 -.word 0x00000047, 0x00000005, D_802401E0_934220, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024023C_93427C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240298_9342D8, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802402F4_934334, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403D0_934410 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240CB8, 0x00000043, 0x00000001, sbk_11_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240350_934390, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_11/934530.data.s b/ver/us/asm/data/world/area_sbk/sbk_11/934530.data.s deleted file mode 100644 index 567a8af9e7..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_11/934530.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802404F0_934530 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_11_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240588_9345C8 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_802405B8_9345F8 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80240588_9345C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405D8_934618 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802404F0_934530, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240824_934864 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_802405B8_9345F8, EnemyNpcHit, 0x00000000, D_802405D8_934618, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_80240850_934890 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80240880_9348C0 -.word 0x00000043, 0x00000001, sbk_11_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240850_934890, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408AC_9348EC -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240880_9348C0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_802408D8_934918 -.word 0x00000000, D_802408AC_9348EC, 0xC2F00000, 0x00000000, 0x42B40000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF88, 0x00000000, 0x0000005A, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240AC8_934B08 -.word 0x00000001, D_80240824_934864, 0xC3480000, 0x00000000, 0x43660000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFF38, 0x00000000, 0x000000E6, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802408D8_934918, 0x0A040001, 0x00000001, D_80240AC8_934B08, 0x0A0D0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_12/934DA0.data.s b/ver/us/asm/data/world/area_sbk/sbk_12/934DA0.data.s deleted file mode 100644 index 7fae3c3d3d..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_12/934DA0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240060_934DA0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402D0_935010, D_80240060_934DA0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019006A - -dlabel D_802400E0_934E20 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A80, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024013C_934E7C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A88, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240198_934ED8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A90, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401F4_934F34 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A98, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240250_934F90 -.word 0x00000047, 0x00000005, D_802400E0_934E20, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024013C_934E7C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240198_934ED8, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401F4_934F34, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402D0_935010 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240A48, 0x00000043, 0x00000001, sbk_12_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240250_934F90, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_12/935130.data.s b/ver/us/asm/data/world/area_sbk/sbk_12/935130.data.s deleted file mode 100644 index 42f3979391..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_12/935130.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403F0_935130 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80240420_935160 -.word 0x00000043, 0x00000001, sbk_12_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_802403F0_935130, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024044C_93518C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240420_935160, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_80240478_9351B8 -.word 0x00000000, D_8024044C_93518C, 0xC33E0000, 0x00000000, 0xC3020000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF42, 0x00000000, 0xFFFFFF7E, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240668_9353A8 -.word 0x00000001, D_8024044C_93518C, 0xC2200000, 0x00000000, 0xC3480000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFFD8, 0x00000000, 0xFFFFFF38, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240858_935598 -.word 0x00000002, D_8024044C_93518C, 0x43430000, 0x00000000, 0xC37F0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x000000C3, 0x00000000, 0xFFFFFF01, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240478_9351B8, 0x0A020001, 0x00000001, D_80240668_9353A8, 0x0A000001, 0x00000001, D_80240858_935598, 0x0A010001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_13/935940.data.s b/ver/us/asm/data/world/area_sbk/sbk_13/935940.data.s deleted file mode 100644 index 8c72a5a978..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_13/935940.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240160_935940 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802403D0_935BB0, D_80240160_935940, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019006B - -dlabel D_802401E0_9359C0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240EE0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024023C_935A1C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240EE8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240298_935A78 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240EF0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402F4_935AD4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240EF8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240350_935B30 -.word 0x00000047, 0x00000005, D_802401E0_9359C0, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024023C_935A1C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240298_935A78, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802402F4_935AD4, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403D0_935BB0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240EA8, 0x00000043, 0x00000001, sbk_13_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240350_935B30, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_13/935CD0.data.s b/ver/us/asm/data/world/area_sbk/sbk_13/935CD0.data.s deleted file mode 100644 index a6e490bac7..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_13/935CD0.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802404F0_935CD0 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_13_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240588_935D68 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_802405B8_935D98 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80240588_935D68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405D8_935DB8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802404F0_935CD0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240824_936004 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_802405B8_935D98, EnemyNpcHit, 0x00000000, D_802405D8_935DB8, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_80240850_936030 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80240880_936060 -.word 0x00000043, 0x00000001, sbk_13_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240850_936030, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408AC_93608C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240880_936060, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_802408D8_9360B8 -.word 0x00000000, D_802408AC_93608C, 0xC28C0000, 0x00000000, 0xC2700000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFFBA, 0x00000000, 0xFFFFFFC4, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240AC8_9362A8 -.word 0x00000001, D_802408AC_93608C, 0x42F00000, 0x00000000, 0xC2480000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000078, 0x00000000, 0xFFFFFFCE, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240CB8_936498 -.word 0x00000002, D_80240824_936004, 0xC3480000, 0x00000000, 0x43660000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFF38, 0x00000000, 0x000000E6, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802408D8_9360B8, 0x0A040001, 0x00000001, D_80240AC8_9362A8, 0x0A050001, 0x00000001, D_80240CB8_936498, 0x0A0E0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_14/936720.data.s b/ver/us/asm/data/world/area_sbk/sbk_14/936720.data.s deleted file mode 100644 index 5d5d5bfb5b..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_14/936720.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_936720 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x431D0000, 0x43480000, 0xC3A90000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240330_936A10, D_80240040_936720, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019006C - -dlabel D_802400D0_9367B0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802405C0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024012C_93680C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802405C8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240188_936868 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802405D0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401E4_9368C4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802405D8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240240_936920 -.word 0x00000047, 0x00000005, D_802400D0_9367B0, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024012C_93680C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240188_936868, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401E4_9368C4, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402C0_9369A0 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000044, 0x00000001, D_80240240_936920, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240240_936920, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240330_936A10 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x802404CC, 0x00000043, 0x00000001, sbk_14_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000044, 0x00000001, D_802402C0_9369A0, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_14/936B20.data.s b/ver/us/asm/data/world/area_sbk/sbk_14/936B20.data.s deleted file mode 100644 index 31a3518ebf..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_14/936B20.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240440_936B20 -.word 0xFFFFFFBF, 0x00000000, 0x000000D9, 0xFFFFFEFA, 0x00000000, 0xFFFFFFC0, 0x00000039, 0x00000000, 0xFFFFFEE2, 0x00000147, 0x00000000, 0x00000008, 0x80000001 - -dlabel D_80240474_936B54 -.word D_80240440_936B20, 0xFFFFFFFF - -dlabel D_8024047C_936B5C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x802405E0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Tweester, 0x00000147, 0x00000000, 0x00000008, 0x00000000, D_80240474_936B54, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024047C_936B5C, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000000, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB1, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF10, 0x00000000, 0x000000D7, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA0, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000DC, 0x00000000, 0x00000096, 0x00000000, 0x000000A4, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA1, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_15/936D30.data.s b/ver/us/asm/data/world/area_sbk/sbk_15/936D30.data.s deleted file mode 100644 index 9258002312..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_15/936D30.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240060_936D30 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402D0_936FA0, D_80240060_936D30, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019006D - -dlabel D_802400E0_936DB0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240880, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024013C_936E0C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240888, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240198_936E68 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240890, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401F4_936EC4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240898, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240250_936F20 -.word 0x00000047, 0x00000005, D_802400E0_936DB0, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024013C_936E0C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240198_936E68, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401F4_936EC4, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402D0_936FA0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240858, 0x00000043, 0x00000001, sbk_15_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240250_936F20, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_15/9370C0.data.s b/ver/us/asm/data/world/area_sbk/sbk_15/9370C0.data.s deleted file mode 100644 index de790f07ba..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_15/9370C0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403F0_9370C0 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80240420_9370F0 -.word 0x00000043, 0x00000001, sbk_15_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_802403F0_9370C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024044C_93711C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240420_9370F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_80240478_937148 -.word 0x00000000, D_8024044C_93711C, 0xC3660000, 0x00000000, 0x42C80000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF1A, 0x00000000, 0x00000064, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240668_937338 -.word 0x00000001, D_8024044C_93711C, 0x41A00000, 0x00000000, 0x43820000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000014, 0x00000000, 0x00000104, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240478_937148, 0x0A050001, 0x00000001, D_80240668_937338, 0x0A070001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_16/9377F0.data.s b/ver/us/asm/data/world/area_sbk/sbk_16/9377F0.data.s deleted file mode 100644 index dc0f9cb211..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_16/9377F0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240280_9377F0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240478_9379E8, D_80240280_9377F0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019006E - -dlabel D_80240300_937870 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241000, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024035C_9378CC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241008, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403B8_937928 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241010, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240414_937984 -.word 0x00000047, 0x00000005, D_80240300_937870, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024035C_9378CC, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802403B8_937928, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240478_9379E8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000001, sbk_16_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240414_937984, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x80240F5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_16/937B00.data.s b/ver/us/asm/data/world/area_sbk/sbk_16/937B00.data.s deleted file mode 100644 index 0752a6f347..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_16/937B00.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240590_937B00 -.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, sbk_16_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, sbk_16_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_802408F0_937E60 -.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, sbk_16_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, sbk_16_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, sbk_16_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, sbk_16_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_80240EF4_938464 -.word 0x00000001, 0x00000010 - -dlabel D_80240EFC_93846C -.word 0x00000001, 0x0000000F - -dlabel D_80240F04_938474 -.word D_80240EF4_938464, D_80240EFC_93846C, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240F18_938488 -.word 0xC3AF8000, 0x00000000, 0xC2CA0000, 0x00000000 - -dlabel D_80240F28_938498 -.word 0x00000001, 0x00000015 - -dlabel D_80240F30_9384A0 -.word 0x00000001, 0x00000014 - -dlabel D_80240F38_9384A8 -.word D_80240F28_938498, D_80240F30_9384A0, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240F4C_9384BC -.word 0x43640000, 0x00000000, 0xC3990000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240F04_938474, 0x00000047, 0x00000005, D_802408F0_937E60, 0x00001000, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802408F0_937E60, 0x00100000, D_80240F18_938488, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240F38_9384A8, 0x00000047, 0x00000005, D_802408F0_937E60, 0x00001000, 0x0000000F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802408F0_937E60, 0x00100000, D_80240F4C_9384BC, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_20/9386D0.data.s b/ver/us/asm/data/world/area_sbk/sbk_20/9386D0.data.s deleted file mode 100644 index 2e310188a4..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_20/9386D0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240140_9386D0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240338_9388C8, D_80240140_9386D0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019006F - -dlabel D_802401C0_938750 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240FB0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024021C_9387AC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240FB8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240278_938808 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240FC0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402D4_938864 -.word 0x00000047, 0x00000005, D_802401C0_938750, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024021C_9387AC, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240278_938808, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240338_9388C8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240F80, 0x00000046, 0x00000001, 0x80240704, 0x00000043, 0x00000001, sbk_20_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_802402D4_938864, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_20/9389F0.data.s b/ver/us/asm/data/world/area_sbk/sbk_20/9389F0.data.s deleted file mode 100644 index 9b5ef8e852..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_20/9389F0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240460_9389F0 -.word 0x00000027, 0x00000002, 0xFD050F80, 0x00000001, 0x00000014, 0x00000001, 0xFD050F80, 0x00000016, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF8405EA2, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFFB0, 0x00000049, 0xFFFFFF38, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA2, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8405EA3, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0xFFFFFF4C, 0x0000003C, 0xFFFFFF38, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFF4C, 0x00000049, 0xFFFFFF38, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF4C, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA3, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000064, 0x0000000A, 0x00000002, 0xF8405EA4, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000000B, 0x00000043, 0x00000006, PlaySoundAt, 0x00002108, 0x00000000, 0xFFFFFF7E, 0x0000003C, 0xFFFFFF6A, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000000, 0xFFFFFF7E, 0x00000049, 0xFFFFFF6A, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF7E, 0x0000003C, 0xFFFFFF6A, 0x00000000, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA4, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_InertYellowBlock, 0xFFFFFF7E, 0x00000000, 0xFFFFFF38, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80240460_9389F0, 0x0000000A, 0x00000002, 0xF8405EA2, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008A, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA2, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EA3, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF4C, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x0000008C, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA3, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405EA4, 0x00000001, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF7E, 0x0000003C, 0xFFFFFF6A, 0x00000000, 0x0000008E, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA4, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_20/938DD0.data.s b/ver/us/asm/data/world/area_sbk/sbk_20/938DD0.data.s deleted file mode 100644 index 1f57b39f46..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_20/938DD0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240840_938DD0 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_20_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408D8_938E68 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_80240908_938E98 -.word 0x00000043, 0x00000002, BasicAI_Main, D_802408D8_938E68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240928_938EB8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240840_938DD0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B74_939104 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80240908_938E98, EnemyNpcHit, 0x00000000, D_80240928_938EB8, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_80240BA0_939130 -.word 0x00000000, D_80240B74_939104, 0xC2C80000, 0x00000000, 0x42A00000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFF9C, 0x00000000, 0x00000050, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240D90_939320 -.word 0x00000001, D_80240B74_939104, 0x42F00000, 0x00000000, 0x41F00000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000078, 0x00000000, 0x0000001E, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240BA0_939130, 0x0A0C0001, 0x00000001, D_80240D90_939320, 0x0A0A0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_21/9395A0.data.s b/ver/us/asm/data/world/area_sbk/sbk_21/9395A0.data.s deleted file mode 100644 index 972b593520..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_21/9395A0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_9395A0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402B0_939810, D_80240040_9395A0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190070 - -dlabel D_802400C0_939620 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403B0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024011C_93967C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403B8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240178_9396D8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403C0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401D4_939734 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403C8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240230_939790 -.word 0x00000047, 0x00000005, D_802400C0_939620, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024011C_93967C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240178_9396D8, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401D4_939734, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402B0_939810 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000001, sbk_21_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240230_939790, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_22/939A90.data.s b/ver/us/asm/data/world/area_sbk/sbk_22/939A90.data.s deleted file mode 100644 index 594a90904e..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_22/939A90.data.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240160_939A90 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802403D0_939D00, D_80240160_939A90, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190071 - -dlabel D_802401E0_939B10 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240E10, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024023C_939B6C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240E18, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240298_939BC8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240E20, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402F4_939C24 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240E28, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240350_939C80 -.word 0x00000047, 0x00000005, D_802401E0_939B10, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024023C_939B6C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240298_939BC8, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802402F4_939C24, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403D0_939D00 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80240CB8_93A5E8, 0x00000046, 0x00000001, 0x80240CE0, 0x00000043, 0x00000001, sbk_22_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240350_939C80, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404F0_939E20 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_22_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240588_939EB8 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_802405B8_939EE8 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80240588_939EB8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405D8_939F08 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802404F0_939E20, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240824_93A154 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_802405B8_939EE8, EnemyNpcHit, 0x00000000, D_802405D8_939F08, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_80240850_93A180 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80240880_93A1B0 -.word 0x00000043, 0x00000001, sbk_22_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240850_93A180, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408AC_93A1DC -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240880_93A1B0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_802408D8_93A208 -.word 0x00000000, D_802408AC_93A1DC, 0xC30C0000, 0x00000000, 0xC3660000, 0x00002800, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF74, 0x00000000, 0xFFFFFF1A, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240AC8_93A3F8 -.word 0x00000001, D_80240824_93A154, 0x42200000, 0x00000000, 0x42B40000, 0x00002800, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000028, 0x00000000, 0x0000005A, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240CB8_93A5E8 -.word 0x00000001, D_802408D8_93A208, 0x0A080001, 0x00000001, D_80240AC8_93A3F8, 0x0A0E0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_22/93A610.data.s b/ver/us/asm/data/world/area_sbk/sbk_22/93A610.data.s deleted file mode 100644 index 58904195ca..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_22/93A610.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240CE0_93A610 -.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF1F, 0x00000000, 0xFFFFFF1F, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA5, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0xFFFFFF1F, 0x00000000, 0x000000E1, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA6, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000E1, 0x00000000, 0xFFFFFF1F, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA7, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x000000E1, 0x00000000, 0x000000E1, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA8, 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000080, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EA9, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_23/93A7A0.data.s b/ver/us/asm/data/world/area_sbk/sbk_23/93A7A0.data.s deleted file mode 100644 index 4cebd70f84..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_23/93A7A0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_93A7A0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402B0_93AA10, D_80240040_93A7A0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190072 - -dlabel D_802400C0_93A820 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404A0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024011C_93A87C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404A8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240178_93A8D8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404B0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401D4_93A934 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404B8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240230_93A990 -.word 0x00000047, 0x00000005, D_802400C0_93A820, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024011C_93A87C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240178_93A8D8, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401D4_93A934, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402B0_93AA10 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x8024044C, 0x00000043, 0x00000001, sbk_23_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240230_93A990, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_23/93AB20.data.s b/ver/us/asm/data/world/area_sbk/sbk_23/93AB20.data.s deleted file mode 100644 index b71fe56156..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_23/93AB20.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403C0_93AB20 -.word 0xFFFFFFBF, 0x00000000, 0x000000D9, 0xFFFFFEFA, 0x00000000, 0xFFFFFFC0, 0x00000039, 0x00000000, 0xFFFFFEE2, 0x00000147, 0x00000000, 0x00000008, 0x80000001 - -dlabel D_802403F4_93AB54 -.word D_802403C0_93AB20, 0xFFFFFFFF - -dlabel D_802403FC_93AB5C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x802404C0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Tweester, 0x00000147, 0x00000000, 0x00000008, 0x00000000, D_802403F4_93AB54, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802403FC_93AB5C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_24/93AFB0.data.s b/ver/us/asm/data/world/area_sbk/sbk_24/93AFB0.data.s deleted file mode 100644 index cab2bcd5e4..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_24/93AFB0.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240380_93AFB0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x431D0000, 0x43480000, 0xC3A90000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240670_93B2A0, D_80240380_93AFB0, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190073 - -dlabel D_80240410_93B040 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241630, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024046C_93B09C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241638, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404C8_93B0F8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241640, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240524_93B154 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241648, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240580_93B1B0 -.word 0x00000047, 0x00000005, D_80240410_93B040, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024046C_93B09C, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802404C8_93B0F8, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240524_93B154, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240600_93B230 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000044, 0x00000001, D_80240580_93B1B0, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240580_93B1B0, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240670_93B2A0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x80240AF0, 0x00000043, 0x00000001, sbk_24_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000044, 0x00000001, D_80240600_93B230, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241540, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_24/93B3C0.data.s b/ver/us/asm/data/world/area_sbk/sbk_24/93B3C0.data.s deleted file mode 100644 index 80c03ab1b8..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_24/93B3C0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240790_93B3C0 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_24_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240828_93B458 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_80240858_93B488 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80240828_93B458, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240878_93B4A8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240790_93B3C0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80240858_93B488, EnemyNpcHit, 0x00000000, D_80240878_93B4A8, 0x00000000, 0x00000000, 0x00090005, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenRedBlock, 0x00000154, 0x0000003C, 0xFFFFFF56, 0x00000000, 0x00000103, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_24/93B770.data.s b/ver/us/asm/data/world/area_sbk/sbk_24/93B770.data.s deleted file mode 100644 index b6497005ec..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_24/93B770.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240B40_93B770 -.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, sbk_24_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, sbk_24_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_80240EA0_93BAD0 -.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, sbk_24_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, sbk_24_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, sbk_24_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, sbk_24_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_802414A4_93C0D4 -.word 0x00000001, 0x00000013 - -dlabel D_802414AC_93C0DC -.word 0x00000001, 0x00000012 - -dlabel D_802414B4_93C0E4 -.word D_802414A4_93C0D4, D_802414AC_93C0DC, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802414C8_93C0F8 -.word 0x43848000, 0x00000000, 0xC3120000, 0x00000000 - -dlabel D_802414D8_93C108 -.word 0x00000001, 0x00000017 - -dlabel D_802414E0_93C110 -.word 0x00000001, 0x00000016 - -dlabel D_802414E8_93C118 -.word D_802414D8_93C108, D_802414E0_93C110, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802414FC_93C12C -.word 0x43C88000, 0x00000000, 0xC2EE0000, 0x00000000 - -dlabel D_8024150C_93C13C -.word 0x00000001, 0x0000001C - -dlabel D_80241514_93C144 -.word 0x00000001, 0x0000001B - -dlabel D_8024151C_93C14C -.word D_8024150C_93C13C, D_80241514_93C144, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241530_93C160 -.word 0x43B50000, 0x00000000, 0xC36A0000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802414B4_93C0E4, 0x00000047, 0x00000005, D_80240EA0_93BAD0, 0x00001000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240EA0_93BAD0, 0x00100000, D_802414C8_93C0F8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802414E8_93C118, 0x00000047, 0x00000005, D_80240EA0_93BAD0, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240EA0_93BAD0, 0x00100000, D_802414FC_93C12C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024151C_93C14C, 0x00000047, 0x00000005, D_80240EA0_93BAD0, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240EA0_93BAD0, 0x00100000, D_80241530_93C160, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_25/93C600.data.s b/ver/us/asm/data/world/area_sbk/sbk_25/93C600.data.s deleted file mode 100644 index 0d070683fd..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_25/93C600.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240380_93C600 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802405F0_93C870, D_80240380_93C600, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190074 - -dlabel D_80240400_93C680 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241A30, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024045C_93C6DC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241A38, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404B8_93C738 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241A40, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240514_93C794 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241A48, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240570_93C7F0 -.word 0x00000047, 0x00000005, D_80240400_93C680, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024045C_93C6DC, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802404B8_93C738, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240514_93C794, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405F0_93C870 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240E60, 0x00000046, 0x00000001, 0x80241900, 0x00000043, 0x00000001, sbk_25_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240570_93C7F0, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x8024185C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_25/93C9A0.data.s b/ver/us/asm/data/world/area_sbk/sbk_25/93C9A0.data.s deleted file mode 100644 index a008fdb0af..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_25/93C9A0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240720_93C9A0 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_25_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407B8_93CA38 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_802407E8_93CA68 -.word 0x00000043, 0x00000002, BasicAI_Main, D_802407B8_93CA38, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240808_93CA88 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240720_93C9A0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A54_93CCD4 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_802407E8_93CA68, EnemyNpcHit, 0x00000000, D_80240808_93CA88, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_80240A80_93CD00 -.word 0x00000000, D_80240A54_93CCD4, 0xC2A00000, 0x00000000, 0xC1A00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFFB0, 0x00000000, 0xFFFFFFEC, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240C70_93CEF0 -.word 0x00000001, D_80240A54_93CCD4, 0x42F00000, 0x00000000, 0x41A00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000078, 0x00000000, 0x00000014, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240A80_93CD00, 0x0A0A0001, 0x00000001, D_80240C70_93CEF0, 0x0A0A0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_25/93D110.data.s b/ver/us/asm/data/world/area_sbk/sbk_25/93D110.data.s deleted file mode 100644 index 196cea4696..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_25/93D110.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240E90_93D110 -.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, sbk_25_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, sbk_25_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_802411F0_93D470 -.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, sbk_25_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, sbk_25_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, sbk_25_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, sbk_25_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_802417F4_93DA74 -.word 0x00000001, 0x00000013 - -dlabel D_802417FC_93DA7C -.word 0x00000001, 0x00000012 - -dlabel D_80241804_93DA84 -.word D_802417F4_93DA74, D_802417FC_93DA7C, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241818_93DA98 -.word 0xC3C70000, 0x00000000, 0xC2D00000, 0x00000000 - -dlabel D_80241828_93DAA8 -.word 0x00000001, 0x00000017 - -dlabel D_80241830_93DAB0 -.word 0x00000001, 0x00000016 - -dlabel D_80241838_93DAB8 -.word D_80241828_93DAA8, D_80241830_93DAB0, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024184C_93DACC -.word 0xC36E0000, 0x00000000, 0xC3330000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241804_93DA84, 0x00000047, 0x00000005, D_802411F0_93D470, 0x00001000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802411F0_93D470, 0x00100000, D_80241818_93DA98, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241838_93DAB8, 0x00000047, 0x00000005, D_802411F0_93D470, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802411F0_93D470, 0x00100000, D_8024184C_93DACC, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_25/93DB80.data.s b/ver/us/asm/data/world/area_sbk/sbk_25/93DB80.data.s deleted file mode 100644 index 0d4d21e74a..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_25/93DB80.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241900_93DB80 -.word 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000000, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB2, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000078, 0x0000003C, 0x000000B9, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB3, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFED4, 0x0000003C, 0xFFFFFFB0, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF10, 0x0000003C, 0x000000E6, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFFB5, 0x0000003C, 0x00000127, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFFB5, 0x0000003C, 0xFFFFFE98, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x0000010E, 0x0000003C, 0xFFFFFF6A, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_26/93E070.data.s b/ver/us/asm/data/world/area_sbk/sbk_26/93E070.data.s deleted file mode 100644 index c30e07673c..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_26/93E070.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403A0_93E070 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240598_93E268, D_802403A0_93E070, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190075 - -dlabel D_80240420_93E0F0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802418C0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024047C_93E14C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802418C8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404D8_93E1A8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802418D0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240534_93E204 -.word 0x00000047, 0x00000005, D_80240420_93E0F0, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024047C_93E14C, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802404D8_93E1A8, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240598_93E268 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240E88, 0x00000043, 0x00000001, sbk_26_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240534_93E204, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x80241868, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_26/93E390.data.s b/ver/us/asm/data/world/area_sbk/sbk_26/93E390.data.s deleted file mode 100644 index 330f2dde5a..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_26/93E390.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802406C0_93E390 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_26_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240758_93E428 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_80240788_93E458 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80240758_93E428, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407A8_93E478 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802406C0_93E390, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409F4_93E6C4 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80240788_93E458, EnemyNpcHit, 0x00000000, D_802407A8_93E478, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_80240A20_93E6F0 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80240A50_93E720 -.word 0x00000043, 0x00000001, sbk_26_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240A20_93E6F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A7C_93E74C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240A50_93E720, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_80240AA8_93E778 -.word 0x00000000, D_802409F4_93E6C4, 0xC35F0000, 0x00000000, 0x42CA0000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x000000B4, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFF21, 0x00000000, 0x00000065, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240C98_93E968 -.word 0x00000001, D_80240A7C_93E74C, 0xC30C0000, 0x00000000, 0xC3660000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF74, 0x00000000, 0xFFFFFF1A, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240AA8_93E778, 0x0A0C0001, 0x00000001, D_80240C98_93E968, 0x0A060001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_26/93EB80.data.s b/ver/us/asm/data/world/area_sbk/sbk_26/93EB80.data.s deleted file mode 100644 index dda4e16a2c..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_26/93EB80.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240EB0_93EB80 -.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, sbk_26_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, sbk_26_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_80241210_93EEE0 -.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, sbk_26_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, sbk_26_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, sbk_26_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, sbk_26_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_80241814_93F4E4 -.word 0x00000001, 0x00000010 - -dlabel D_8024181C_93F4EC -.word 0x00000001, 0x0000000F - -dlabel D_80241824_93F4F4 -.word 0x00000001, 0x00000157, 0xFFFFFF65, 0x0000005C, 0x000000A0, 0x0000000F, 0xF8405EC6, 0x00000000 - -dlabel D_80241844_93F514 -.word D_80241814_93F4E4, D_8024181C_93F4EC, D_80241824_93F4F4, 0x00000000, 0x00000000 - -dlabel D_80241858_93F528 -.word 0xC3320000, 0x00000000, 0x43240000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241844_93F514, 0x00000047, 0x00000005, D_80241210_93EEE0, 0x00001000, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241210_93EEE0, 0x00100000, D_80241858_93F528, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_31/944140.data.s b/ver/us/asm/data/world/area_sbk/sbk_31/944140.data.s deleted file mode 100644 index 8e3594ff6d..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_31/944140.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240140_944140 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802403B0_9443B0, D_80240140_944140, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190078 - -dlabel D_802401C0_9441C0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A40, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024021C_94421C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A48, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240278_944278 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A50, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402D4_9442D4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A58, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240330_944330 -.word 0x00000047, 0x00000005, D_802401C0_9441C0, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024021C_94421C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240278_944278, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802402D4_9442D4, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403B0_9443B0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240A20, 0x00000043, 0x00000001, sbk_31_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240330_944330, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_31/9444D0.data.s b/ver/us/asm/data/world/area_sbk/sbk_31/9444D0.data.s deleted file mode 100644 index 6f19b65951..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_31/9444D0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802404D0_9444D0 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_31_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240568_944568 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_80240598_944598 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80240568_944568, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405B8_9445B8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802404D0_9444D0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240804_944804 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80240598_944598, EnemyNpcHit, 0x00000000, D_802405B8_9445B8, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_80240830_944830 -.word 0x00000000, D_80240804_944804, 0x41B80000, 0x00000000, 0xC3820000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000017, 0x00000000, 0xFFFFFEFC, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240830_944830, 0x0A0C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_32/944BC0.data.s b/ver/us/asm/data/world/area_sbk/sbk_32/944BC0.data.s deleted file mode 100644 index 6a5e842b24..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_32/944BC0.data.s +++ /dev/null @@ -1,63 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240160_944BC0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x431D0000, 0x43480000, 0xC3A90000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240450_944EB0, D_80240160_944BC0, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190079 - -dlabel D_802401F0_944C50 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240F50, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024024C_944CAC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240F58, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402A8_944D08 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240F60, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240304_944D64 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240F68, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240360_944DC0 -.word 0x00000047, 0x00000005, D_802401F0_944C50, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024024C_944CAC, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802402A8_944D08, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240304_944D64, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403E0_944E40 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000044, 0x00000001, D_80240360_944DC0, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240360_944DC0, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240450_944EB0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80240F18_945978, 0x00000043, 0x00000001, sbk_32_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000044, 0x00000001, D_802403E0_944E40, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240560_944FC0 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_32_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405F8_945058 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_80240628_945088 -.word 0x00000043, 0x00000002, BasicAI_Main, D_802405F8_945058, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240648_9450A8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240560_944FC0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240894_9452F4 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80240628_945088, EnemyNpcHit, 0x00000000, D_80240648_9450A8, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_802408C0_945320 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_802408F0_945350 -.word 0x00000043, 0x00000001, sbk_32_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_802408C0_945320, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024091C_94537C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_802408F0_945350, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_80240948_9453A8 -.word 0x00000000, D_8024091C_94537C, 0xC30C0000, 0x00000000, 0xC3870000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF74, 0x00000000, 0xFFFFFEF2, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240B38_945598 -.word 0x00000001, D_8024091C_94537C, 0xC2F00000, 0x00000000, 0x42DC0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF88, 0x00000000, 0x0000006E, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240D28_945788 -.word 0x00000002, D_80240894_9452F4, 0x41B80000, 0x00000000, 0xC3820000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000017, 0x00000000, 0xFFFFFEFC, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240F18_945978 -.word 0x00000001, D_80240948_9453A8, 0x0A010001, 0x00000001, D_80240B38_945598, 0x0A020001, 0x00000001, D_80240D28_945788, 0x0A0B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_33/945A10.data.s b/ver/us/asm/data/world/area_sbk/sbk_33/945A10.data.s deleted file mode 100644 index aaef425ce6..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_33/945A10.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_945A10 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802403C0, D_80240040_945A10, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019007A - -dlabel D_802400C0_945A90 -.word 0xFFFFFFBF, 0x00000000, 0x000000D9, 0xFFFFFEFA, 0x00000000, 0xFFFFFFC0, 0x00000039, 0x00000000, 0xFFFFFEE2, 0x00000147, 0x00000000, 0x00000008, 0x80000001 - -dlabel D_802400F4_945AC4 -.word D_802400C0_945A90, 0xFFFFFFFF - -dlabel D_802400FC_945ACC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x802404D0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000000, 0x00000000, 0x000000E1, 0x00000000, 0x00000004, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8405E9C, 0x00000043, 0x00000008, MakeEntity, Entity_Tweester, 0x00000147, 0x00000000, 0x00000008, 0x00000000, D_802400F4_945AC4, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802400FC_945ACC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_33/945BA0.data.s b/ver/us/asm/data/world/area_sbk/sbk_33/945BA0.data.s deleted file mode 100644 index c7502bab74..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_33/945BA0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802401D0_945BA0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404D8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024022C_945BFC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404E0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240288_945C58 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404E8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402E4_945CB4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404F0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240340_945D10 -.word 0x00000047, 0x00000005, D_802401D0_945BA0, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024022C_945BFC, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240288_945C58, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802402E4_945CB4, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x8024014C, 0x00000043, 0x00000001, sbk_33_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240340_945D10, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_34/9468B0.data.s b/ver/us/asm/data/world/area_sbk/sbk_34/9468B0.data.s deleted file mode 100644 index 556b2efbcb..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_34/9468B0.data.s +++ /dev/null @@ -1,78 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802409E0_9468B0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240C50_946B20, D_802409E0_9468B0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019007B - -dlabel D_80240A60_946930 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802427C0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240ABC_94698C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802427C8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B18_9469E8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802427D0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B74_946A44 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802427D8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BD0_946AA0 -.word 0x00000047, 0x00000005, D_80240A60_946930, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240ABC_94698C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240B18_9469E8, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240B74_946A44, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C50_946B20 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80241D90_947C60, 0x00000043, 0x00000001, sbk_34_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240BD0_946AA0, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x80242768, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D70_946C40 -.word 0x00000000, 0x00160019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel sbk_34_varStash -.word 0x00000000 - -dlabel D_80240DA0_946C70 -.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_80240E00_946CD0 -.word 0x00000000 - -dlabel D_80240E04_946CD4 -.word 0x00000000 - -dlabel D_80240E08_946CD8 -.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, sbk_34_AddPlayerHandsOffset, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802403D8_9462A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240410_9462E0, 0xFE363C80, 0x0000004E, 0x00000006, D_80240E08_946CD8, 0x00000010, 0x00000000, sbk_34_802427E0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240384_946254, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F9C_946E6C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, sbk_34_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, SetItemPos, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024101C_946EEC -.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, sbk_34_LetterDelivery_CalcLetterPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80240F9C_946E6C, 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, func_802403D8_9462A8, 0xFE363C8A, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241340_947210 -.word 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_80240410_9462E0, 0xFE363C80, 0x0000004E, 0x00000006, D_8024101C_946EEC, 0x00000010, 0x00000000, sbk_34_802427E0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240384_946254, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413B0_947280 -.word 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_34_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_80241340_947210, 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_80240DA0_946C70, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_34_LetterDelivery_RestoreNpcAnim, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802416A8_947578 -.word 0x0000003D, 0x00000000 - -dlabel D_802416B0_947580 -.word 0x00000043, 0x0000000B, sbk_34_LetterDelivery_Init, 0x00000000, 0x00B90002, 0x00B90001, 0x0000003D, 0x00000000, 0x000D005B, 0x000D005C, 0x000D005D, 0x000D005E, D_802416A8_947578, 0x00000046, 0x00000001, D_802413B0_947280, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241700_9475D0 -.word 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, D_80240DA0_946C70, 0x00000043, 0x00000002, AddStarPieces, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241764_947634 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0xFFFFFFBC, 0x0000000A, 0x00000002, 0xF8405E8F, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0x00000000, 0xF24E6280, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B90002, 0x00B90001, 0x00000000, 0x000D0056, 0x00000024, 0x00000002, 0xF8405E8F, 0x00000001, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000004, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B90002, 0x00B90001, 0x00000000, 0x000D0057, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0xFFFFFFC2, 0x0000000A, 0x00000002, 0xF8405E8F, 0x00000000, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0x00000000, 0xF24E6280, 0xF24AB680, 0xF24A6280, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B90002, 0x00B90001, 0x00000000, 0x000D0058, 0x00000024, 0x00000002, 0xF8405E8F, 0x00000001, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000004, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B90002, 0x00B90001, 0x00000000, 0x000D0059, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0xFFFFFFC2, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B90002, 0x00B90001, 0x00000000, 0x000D005A, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802416B0_947580, 0x00000046, 0x00000001, D_80241700_9475D0, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241954_947824 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241764_947634, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B90001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024198C_94785C -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B90004, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802419B0_947880 -.word 0x00000000, D_80240D70_946C40, 0x42E40000, 0x00000000, 0xC2480000, 0x00402D01, D_80241954_947824, 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, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00000000, 0x00000000, 0x00000000, 0x001A008E, 0x00000001, D_80240D70_946C40, 0x43060000, 0x00000000, 0xC2480000, 0x00402D01, D_8024198C_94785C, 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, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00B90001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241D90_947C60 -.word 0x00000002, D_802419B0_947880, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_34/947C80.data.s b/ver/us/asm/data/world/area_sbk/sbk_34/947C80.data.s deleted file mode 100644 index f69b74b192..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_34/947C80.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241DB0_947C80 -.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, sbk_34_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, sbk_34_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_80242110_947FE0 -.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, sbk_34_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, sbk_34_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, sbk_34_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, sbk_34_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_80242714_9485E4 -.word 0x00000001, 0x0000001A - -dlabel D_8024271C_9485EC -.word 0x00000001, 0x00000019 - -dlabel D_80242724_9485F4 -.word 0x00000001, 0x00000157, 0x00000069, 0x00000064, 0xFFFFFFA7, 0x0000000F, 0xF8405EC7, 0x00000000 - -dlabel D_80242744_948614 -.word D_80242714_9485E4, D_8024271C_9485EC, D_80242724_9485F4, 0x00000000, 0x00000000 - -dlabel D_80242758_948628 -.word 0x43030000, 0x00000000, 0xC2B20000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242744_948614, 0x00000047, 0x00000005, D_80242110_947FE0, 0x00001000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242110_947FE0, 0x00100000, D_80242758_948628, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_35/948A30.data.s b/ver/us/asm/data/world/area_sbk/sbk_35/948A30.data.s deleted file mode 100644 index ba8ef39ef7..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_35/948A30.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240380_948A30 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802405F0_948CA0, D_80240380_948A30, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019007C - -dlabel D_80240400_948AB0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241790, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024045C_948B0C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241798, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404B8_948B68 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802417A0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240514_948BC4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802417A8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240570_948C20 -.word 0x00000047, 0x00000005, D_80240400_948AB0, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024045C_948B0C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802404B8_948B68, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240514_948BC4, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405F0_948CA0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80240C60_949310, 0x00000043, 0x00000001, sbk_35_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240570_948C20, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x802416A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240710_948DC0 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_35_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407A8_948E58 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_802407D8_948E88 -.word 0x00000043, 0x00000002, BasicAI_Main, D_802407A8_948E58, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407F8_948EA8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240710_948DC0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A44_9490F4 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_802407D8_948E88, EnemyNpcHit, 0x00000000, D_802407F8_948EA8, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_80240A70_949120 -.word 0x00000000, D_80240A44_9490F4, 0xC2200000, 0x00000000, 0x431B0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFFD8, 0x00000000, 0x0000009B, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240C60_949310 -.word 0x00000001, D_80240A70_949120, 0x0A0C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_35/949330.data.s b/ver/us/asm/data/world/area_sbk/sbk_35/949330.data.s deleted file mode 100644 index 7edf072957..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_35/949330.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240C80_949330 -.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, sbk_35_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, sbk_35_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_80240FE0_949690 -.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, sbk_35_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, sbk_35_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, sbk_35_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, sbk_35_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_802415E4_949C94 -.word 0x00000001, 0x00000019 - -dlabel D_802415EC_949C9C -.word 0x00000001, 0x00000018 - -dlabel D_802415F4_949CA4 -.word 0x00000001, 0x00000157, 0xFFFFFE72, 0x00000064, 0x00000081, 0x0000000F, 0xF8405EC8, 0x00000000 - -dlabel D_80241614_949CC4 -.word D_802415E4_949C94, D_802415EC_949C9C, D_802415F4_949CA4, 0x00000000, 0x00000000 - -dlabel D_80241628_949CD8 -.word 0xC3C70000, 0x00000000, 0x42D00000, 0x00000000 - -dlabel D_80241638_949CE8 -.word 0x00000001, 0x0000001D - -dlabel D_80241640_949CF0 -.word 0x00000001, 0x0000001C - -dlabel D_80241648_949CF8 -.word D_80241638_949CE8, D_80241640_949CF0, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024165C_949D0C -.word 0xC2D80000, 0x00000000, 0xC3CB0000, 0x00000000 - -dlabel D_8024166C_949D1C -.word 0x00000001, 0x00000021 - -dlabel D_80241674_949D24 -.word 0x00000001, 0x00000020 - -dlabel D_8024167C_949D2C -.word D_8024166C_949D1C, D_80241674_949D24, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241690_949D40 -.word 0x43530000, 0x00000000, 0xC2DE0000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241614_949CC4, 0x00000047, 0x00000005, D_80240FE0_949690, 0x00001000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240FE0_949690, 0x00100000, D_80241628_949CD8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241648_949CF8, 0x00000047, 0x00000005, D_80240FE0_949690, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240FE0_949690, 0x00100000, D_8024165C_949D0C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024167C_949D2C, 0x00000047, 0x00000005, D_80240FE0_949690, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240FE0_949690, 0x00100000, D_80241690_949D40, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_36/94A0E0.data.s b/ver/us/asm/data/world/area_sbk/sbk_36/94A0E0.data.s deleted file mode 100644 index d59a10f78e..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_36/94A0E0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240280_94A0E0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802404F0_94A350, D_80240280_94A0E0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019007D - -dlabel D_80240300_94A160 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241520, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024035C_94A1BC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241528, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403B8_94A218 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241530, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240414_94A274 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241538, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240470_94A2D0 -.word 0x00000047, 0x00000005, D_80240300_94A160, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024035C_94A1BC, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802403B8_94A218, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240414_94A274, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404F0_94A350 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x802414D4, 0x00000043, 0x00000001, sbk_36_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240470_94A2D0, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x802411C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_36/94A470.data.s b/ver/us/asm/data/world/area_sbk/sbk_36/94A470.data.s deleted file mode 100644 index a409a713c1..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_36/94A470.data.s +++ /dev/null @@ -1,132 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240610_94A470 -.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, sbk_36_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, sbk_36_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_80240970_94A7D0 -.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, sbk_36_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, sbk_36_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, sbk_36_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, sbk_36_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_80240F74_94ADD4 -.word 0x00000001, 0x00000019 - -dlabel D_80240F7C_94ADDC -.word 0x00000001, 0x00000018 - -dlabel D_80240F84_94ADE4 -.word 0x00000001, 0x00000157, 0xFFFFFE5A, 0x00000064, 0x00000074, 0x0000000F, 0xF8405EC9, 0x00000000 - -dlabel D_80240FA4_94AE04 -.word D_80240F74_94ADD4, D_80240F7C_94ADDC, D_80240F84_94ADE4, 0x00000000, 0x00000000 - -dlabel D_80240FB8_94AE18 -.word 0xC3D30000, 0x00000000, 0x42B60000, 0x00000000 - -dlabel D_80240FC8_94AE28 -.word 0x00000001, 0x0000001D - -dlabel D_80240FD0_94AE30 -.word 0x00000001, 0x0000001C - -dlabel D_80240FD8_94AE38 -.word 0x00000001, 0x00000157, 0xFFFFFEBE, 0x00000064, 0xFFFFFFAA, 0x0000000F, 0xF8405ECA, 0x00000000 - -dlabel D_80240FF8_94AE58 -.word D_80240FC8_94AE28, D_80240FD0_94AE30, D_80240FD8_94AE38, 0x00000000, 0x00000000 - -dlabel D_8024100C_94AE6C -.word 0xC3A10000, 0x00000000, 0xC2DE0000, 0x00000000 - -dlabel D_8024101C_94AE7C -.word 0x00000001, 0x00000021 - -dlabel D_80241024_94AE84 -.word 0x00000001, 0x00000020 - -dlabel D_8024102C_94AE8C -.word D_8024101C_94AE7C, D_80241024_94AE84, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241040_94AEA0 -.word 0xC3740000, 0x00000000, 0x429A0000, 0x00000000 - -dlabel D_80241050_94AEB0 -.word 0x00000001, 0x00000025 - -dlabel D_80241058_94AEB8 -.word 0x00000001, 0x00000024 - -dlabel D_80241060_94AEC0 -.word D_80241050_94AEB0, D_80241058_94AEB8, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241074_94AED4 -.word 0xC3000000, 0x00000000, 0xC2DE0000, 0x00000000 - -dlabel D_80241084_94AEE4 -.word 0x00000001, 0x00000029 - -dlabel D_8024108C_94AEEC -.word 0x00000001, 0x00000028 - -dlabel D_80241094_94AEF4 -.word D_80241084_94AEE4, D_8024108C_94AEEC, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802410A8_94AF08 -.word 0x42680000, 0x00000000, 0x42CA0000, 0x00000000 - -dlabel D_802410B8_94AF18 -.word 0x00000001, 0x0000002D - -dlabel D_802410C0_94AF20 -.word 0x00000001, 0x0000002C - -dlabel D_802410C8_94AF28 -.word 0x00000001, 0x00000157, 0x0000009E, 0x00000064, 0xFFFFFFB4, 0x0000000F, 0xF8405ECB, 0x00000000 - -dlabel D_802410E8_94AF48 -.word D_802410B8_94AF18, D_802410C0_94AF20, D_802410C8_94AF28, 0x00000000, 0x00000000 - -dlabel D_802410FC_94AF5C -.word 0x431E0000, 0x00000000, 0xC2CA0000, 0x00000000 - -dlabel D_8024110C_94AF6C -.word 0x00000001, 0x00000031 - -dlabel D_80241114_94AF74 -.word 0x00000001, 0x00000030 - -dlabel D_8024111C_94AF7C -.word D_8024110C_94AF6C, D_80241114_94AF74, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241130_94AF90 -.word 0x436C0000, 0x00000000, 0x42AE0000, 0x00000000 - -dlabel D_80241140_94AFA0 -.word 0x00000001, 0x00000035 - -dlabel D_80241148_94AFA8 -.word 0x00000001, 0x00000034 - -dlabel D_80241150_94AFB0 -.word D_80241140_94AFA0, D_80241148_94AFA8, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241164_94AFC4 -.word 0x43AF8000, 0x00000000, 0xC2CA0000, 0x00000000 - -dlabel D_80241174_94AFD4 -.word 0x00000001, 0x00000039 - -dlabel D_8024117C_94AFDC -.word 0x00000001, 0x00000038 - -dlabel D_80241184_94AFE4 -.word 0x00000001, 0x00000038, 0x0000016E, 0x0000005C, 0x00000065, 0x0000000D, 0xF8405EC1, 0xFAA2B58A - -dlabel D_802411A4_94B004 -.word D_80241174_94AFD4, D_8024117C_94AFDC, D_80241184_94AFE4, 0x00000000, 0x00000000 - -dlabel D_802411B8_94B018 -.word 0x43DB0000, 0x00000000, 0x42CA0000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240FA4_94AE04, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_80240FB8_94AE18, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240FF8_94AE58, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_8024100C_94AE6C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024102C_94AE8C, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_80241040_94AEA0, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241060_94AEC0, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000014, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_80241074_94AED4, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241094_94AEF4, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_802410A8_94AF08, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802410E8_94AF48, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_802410FC_94AF5C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024111C_94AF7C, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_80241130_94AF90, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241150_94AFB0, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000018, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_80241164_94AFC4, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802411A4_94B004, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00001000, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240970_94A7D0, 0x00100000, D_802411B8_94B018, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241460_94B2C0 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D017A, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Signpost, 0x0000019A, 0x00000000, 0xFFFFFFB5, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80241460_94B2C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_40/94B4E0.data.s b/ver/us/asm/data/world/area_sbk/sbk_40/94B4E0.data.s deleted file mode 100644 index 4cfcc0fcae..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_40/94B4E0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240140_94B4E0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240338_94B6D8, D_80240140_94B4E0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019007E - -dlabel D_802401C0_94B560 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240C80, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024021C_94B5BC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240C88, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240278_94B618 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240C90, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402D4_94B674 -.word 0x00000047, 0x00000005, D_802401C0_94B560, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024021C_94B5BC, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240278_94B618, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240338_94B6D8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240BA0, 0x00000046, 0x00000001, 0x80240BD0, 0x00000043, 0x00000001, sbk_40_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_802402D4_94B674, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_40/94B800.data.s b/ver/us/asm/data/world/area_sbk/sbk_40/94B800.data.s deleted file mode 100644 index d724ee28e0..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_40/94B800.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240460_94B800 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_40_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404F8_94B898 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_80240528_94B8C8 -.word 0x00000043, 0x00000002, BasicAI_Main, D_802404F8_94B898, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240548_94B8E8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240460_94B800, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240794_94BB34 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80240528_94B8C8, EnemyNpcHit, 0x00000000, D_80240548_94B8E8, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_802407C0_94BB60 -.word 0x00000000, D_80240794_94BB34, 0xC3960000, 0x00000000, 0x42AA0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFED4, 0x00000000, 0x00000055, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802409B0_94BD50 -.word 0x00000001, D_80240794_94BB34, 0xC2A00000, 0x00000000, 0x433E0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFFB0, 0x00000000, 0x000000BE, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802407C0_94BB60, 0x0A0B0001, 0x00000001, D_802409B0_94BD50, 0x0A0B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_40/94BF70.data.s b/ver/us/asm/data/world/area_sbk/sbk_40/94BF70.data.s deleted file mode 100644 index 4fee42eb7b..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_40/94BF70.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240BD0_94BF70 -.word 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000000, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB4, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x000000A5, 0x0000003C, 0xFFFFFED4, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x0000006E, 0x0000003C, 0x00000082, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF92, 0x0000003C, 0x000000C8, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_41/94C080.data.s b/ver/us/asm/data/world/area_sbk/sbk_41/94C080.data.s deleted file mode 100644 index dd070829ef..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_41/94C080.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_94C080 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402B0_94C2F0, D_80240040_94C080, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019007F - -dlabel D_802400C0_94C100 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404A0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024011C_94C15C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404A8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240178_94C1B8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404B0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401D4_94C214 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404B8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240230_94C270 -.word 0x00000047, 0x00000005, D_802400C0_94C100, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024011C_94C15C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240178_94C1B8, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401D4_94C214, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402B0_94C2F0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x8024044C, 0x00000043, 0x00000001, sbk_41_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240230_94C270, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_41/94C400.data.s b/ver/us/asm/data/world/area_sbk/sbk_41/94C400.data.s deleted file mode 100644 index 3cea3c5598..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_41/94C400.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403C0_94C400 -.word 0xFFFFFFBF, 0x00000000, 0x000000D9, 0xFFFFFEFA, 0x00000000, 0xFFFFFFC0, 0x00000039, 0x00000000, 0xFFFFFEE2, 0x00000147, 0x00000000, 0x00000008, 0x80000001 - -dlabel D_802403F4_94C434 -.word D_802403C0_94C400, 0xFFFFFFFF - -dlabel D_802403FC_94C43C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x802404C0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Tweester, 0x00000147, 0x00000000, 0x00000008, 0x00000000, D_802403F4_94C434, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802403FC_94C43C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_42/94C650.data.s b/ver/us/asm/data/world/area_sbk/sbk_42/94C650.data.s deleted file mode 100644 index 1c4cfbe072..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_42/94C650.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240140_94C650 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802403B0_94C8C0, D_80240140_94C650, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190080 - -dlabel D_802401C0_94C6D0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240C40, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024021C_94C72C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240C48, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240278_94C788 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240C50, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402D4_94C7E4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240C58, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240330_94C840 -.word 0x00000047, 0x00000005, D_802401C0_94C6D0, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024021C_94C72C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240278_94C788, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802402D4_94C7E4, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403B0_94C8C0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240C10, 0x00000043, 0x00000001, sbk_42_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240330_94C840, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_42/94C9E0.data.s b/ver/us/asm/data/world/area_sbk/sbk_42/94C9E0.data.s deleted file mode 100644 index b834743f08..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_42/94C9E0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802404D0_94C9E0 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_42_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240568_94CA78 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_80240598_94CAA8 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80240568_94CA78, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405B8_94CAC8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802404D0_94C9E0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240804_94CD14 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80240598_94CAA8, EnemyNpcHit, 0x00000000, D_802405B8_94CAC8, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_80240830_94CD40 -.word 0x00000000, D_80240804_94CD14, 0xC2200000, 0x00000000, 0x00000000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFFD8, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240A20_94CF30 -.word 0x00000001, D_80240804_94CD14, 0x42700000, 0x00000000, 0x41F00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x0000003C, 0x00000000, 0x0000001E, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240830_94CD40, 0x0A0A0001, 0x00000001, D_80240A20_94CF30, 0x0A0B0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_43/94D1B0.data.s b/ver/us/asm/data/world/area_sbk/sbk_43/94D1B0.data.s deleted file mode 100644 index fbb6d1ddc7..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_43/94D1B0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_94D1B0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402B0_94D420, D_80240040_94D1B0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190081 - -dlabel D_802400C0_94D230 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240410, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024011C_94D28C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240418, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240178_94D2E8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240420, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401D4_94D344 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240428, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240230_94D3A0 -.word 0x00000047, 0x00000005, D_802400C0_94D230, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024011C_94D28C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240178_94D2E8, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401D4_94D344, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402B0_94D420 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x802403C0, 0x00000043, 0x00000001, sbk_43_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240230_94D3A0, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_43/94D530.data.s b/ver/us/asm/data/world/area_sbk/sbk_43/94D530.data.s deleted file mode 100644 index ef0c8ff6e7..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_43/94D530.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403C0_94D530 -.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAB, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_44/94D700.data.s b/ver/us/asm/data/world/area_sbk/sbk_44/94D700.data.s deleted file mode 100644 index 3c88d42a9e..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_44/94D700.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240160_94D700 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802403D0_94D970, D_80240160_94D700, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190082 - -dlabel D_802401E0_94D780 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240EE0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024023C_94D7DC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240EE8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240298_94D838 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240EF0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402F4_94D894 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240EF8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240350_94D8F0 -.word 0x00000047, 0x00000005, D_802401E0_94D780, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024023C_94D7DC, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240298_94D838, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802402F4_94D894, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403D0_94D970 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240EA8, 0x00000043, 0x00000001, sbk_44_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240350_94D8F0, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_44/94DA90.data.s b/ver/us/asm/data/world/area_sbk/sbk_44/94DA90.data.s deleted file mode 100644 index ad2594cbab..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_44/94DA90.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802404F0_94DA90 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_44_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240588_94DB28 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_802405B8_94DB58 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80240588_94DB28, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405D8_94DB78 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802404F0_94DA90, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240824_94DDC4 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_802405B8_94DB58, EnemyNpcHit, 0x00000000, D_802405D8_94DB78, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_80240850_94DDF0 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80240880_94DE20 -.word 0x00000043, 0x00000001, sbk_44_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240850_94DDF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408AC_94DE4C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240880_94DE20, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_802408D8_94DE78 -.word 0x00000000, D_802408AC_94DE4C, 0xC2C80000, 0x00000000, 0xC25C0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF9C, 0x00000000, 0xFFFFFFC9, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240AC8_94E068 -.word 0x00000001, D_802408AC_94DE4C, 0xC1B00000, 0x00000000, 0xC0A00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFFEA, 0x00000000, 0xFFFFFFFB, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240CB8_94E258 -.word 0x00000002, D_80240824_94DDC4, 0x43160000, 0x00000000, 0x42A00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000096, 0x00000000, 0x00000050, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802408D8_94DE78, 0x0A050001, 0x00000001, D_80240AC8_94E068, 0x0A040001, 0x00000001, D_80240CB8_94E258, 0x0A0E0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_45/94E4E0.data.s b/ver/us/asm/data/world/area_sbk/sbk_45/94E4E0.data.s deleted file mode 100644 index f2cf30ade4..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_45/94E4E0.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_94E4E0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x431D0000, 0x43480000, 0xC3A90000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240330_94E7D0, D_80240040_94E4E0, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190083 - -dlabel D_802400D0_94E570 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404E0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024012C_94E5CC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404E8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240188_94E628 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404F0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401E4_94E684 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404F8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240240_94E6E0 -.word 0x00000047, 0x00000005, D_802400D0_94E570, 0x00080000, 0x0000000A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024012C_94E5CC, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240188_94E628, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401E4_94E684, 0x00080000, 0x00000008, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402C0_94E760 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000044, 0x00000001, D_80240240_94E6E0, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240240_94E6E0, 0x00000044, 0x00000001, EnterWalk, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240330_94E7D0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x80240440, 0x00000043, 0x00000001, sbk_45_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000044, 0x00000001, D_802402C0_94E760, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_45/94E8E0.data.s b/ver/us/asm/data/world/area_sbk/sbk_45/94E8E0.data.s deleted file mode 100644 index 6010043e64..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_45/94E8E0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240440_94E8E0 -.word 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF01, 0x00000037, 0xFFFFFF6F, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFE89, 0x00000050, 0xFFFFFF6F, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000092, 0xFFFFFE89, 0x00000069, 0xFFFFFF6F, 0x0000000D, 0xF8405EC3, 0x00000043, 0x00000007, MakeItemEntity, 0x0000011C, 0x000000C1, 0x0000004F, 0xFFFFFEA7, 0x00000011, 0xF8405EC2, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_46/94ED40.data.s b/ver/us/asm/data/world/area_sbk/sbk_46/94ED40.data.s deleted file mode 100644 index 734203f7af..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_46/94ED40.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403A0_94ED40 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240598_94EF38, D_802403A0_94ED40, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190084 - -dlabel D_80240420_94EDC0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241C50, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024047C_94EE1C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241C58, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404D8_94EE78 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241C60, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240534_94EED4 -.word 0x00000047, 0x00000005, D_80240420_94EDC0, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024047C_94EE1C, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802404D8_94EE78, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240598_94EF38 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80241088, 0x00000046, 0x00000001, 0x80241BD0, 0x00000043, 0x00000001, sbk_46_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240534_94EED4, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x80241AE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_46/94F070.data.s b/ver/us/asm/data/world/area_sbk/sbk_46/94F070.data.s deleted file mode 100644 index f44e107c3c..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_46/94F070.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802406D0_94F070 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_46_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240768_94F108 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_80240798_94F138 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80240768_94F108, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407B8_94F158 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802406D0_94F070, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A04_94F3A4 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_80240798_94F138, EnemyNpcHit, 0x00000000, D_802407B8_94F158, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_80240A30_94F3D0 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80240A60_94F400 -.word 0x00000043, 0x00000001, sbk_46_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240A30_94F3D0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A8C_94F42C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240A60_94F400, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_80240AB8_94F458 -.word 0x00000000, D_80240A8C_94F42C, 0x439B0000, 0x00000000, 0xC2C80000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000136, 0x00000000, 0xFFFFFF9C, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240CA8_94F648 -.word 0x00000001, D_80240A04_94F3A4, 0xC33E0000, 0x00000000, 0xC39F0000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFF42, 0x00000000, 0xFFFFFEC2, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240E98_94F838 -.word 0x00000002, D_80240A04_94F3A4, 0xC3480000, 0x00000000, 0x42E60000, 0x00000800, 0x00000000, 0x00000000, 0x00000000, 0x0000012C, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFF38, 0x00000000, 0x00000073, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240AB8_94F458, 0x0A060001, 0x00000001, D_80240CA8_94F648, 0x0A0D0001, 0x00000001, D_80240E98_94F838, 0x0A0C0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_46/94FA60.data.s b/ver/us/asm/data/world/area_sbk/sbk_46/94FA60.data.s deleted file mode 100644 index 8649ff7de2..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_46/94FA60.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802410C0_94FA60 -.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, sbk_46_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, sbk_46_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_80241420_94FDC0 -.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, sbk_46_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, sbk_46_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, sbk_46_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, sbk_46_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_80241A24_9503C4 -.word 0x00000001, 0x00000014 - -dlabel D_80241A2C_9503CC -.word 0x00000001, 0x00000013 - -dlabel D_80241A34_9503D4 -.word D_80241A24_9503C4, D_80241A2C_9503CC, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241A48_9503E8 -.word 0xC3640000, 0x00000000, 0xC3990000, 0x00000000 - -dlabel D_80241A58_9503F8 -.word 0x00000001, 0x00000018 - -dlabel D_80241A60_950400 -.word 0x00000001, 0x00000017 - -dlabel D_80241A68_950408 -.word 0x00000001, 0x00000157, 0xFFFFFF4E, 0x00000064, 0x000000BD, 0x0000000F, 0xF8405ECC, 0x00000000 - -dlabel D_80241A88_950428 -.word D_80241A58_9503F8, D_80241A60_950400, D_80241A68_950408, 0x00000000, 0x00000000 - -dlabel D_80241A9C_95043C -.word 0xC3320000, 0x00000000, 0x43240000, 0x00000000 - -dlabel D_80241AAC_95044C -.word 0x00000001, 0x0000001C - -dlabel D_80241AB4_950454 -.word 0x00000001, 0x0000001B - -dlabel D_80241ABC_95045C -.word D_80241AAC_95044C, D_80241AB4_950454, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241AD0_950470 -.word 0x43AF8000, 0x00000000, 0xC2CA0000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241A34_9503D4, 0x00000047, 0x00000005, D_80241420_94FDC0, 0x00001000, 0x0000000E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241420_94FDC0, 0x00100000, D_80241A48_9503E8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241A88_950428, 0x00000047, 0x00000005, D_80241420_94FDC0, 0x00001000, 0x0000000F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241420_94FDC0, 0x00100000, D_80241A9C_95043C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241ABC_95045C, 0x00000047, 0x00000005, D_80241420_94FDC0, 0x00001000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241420_94FDC0, 0x00100000, D_80241AD0_950470, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_46/950570.data.s b/ver/us/asm/data/world/area_sbk/sbk_46/950570.data.s deleted file mode 100644 index 45ef6bfa88..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_46/950570.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241BD0_950570 -.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAC, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000000, 0x00000055, 0x00000000, 0x00000000, 0x00000095, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAD, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_50/950650.data.s b/ver/us/asm/data/world/area_sbk/sbk_50/950650.data.s deleted file mode 100644 index 6dca0eb58f..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_50/950650.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_950650 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240238_950848, D_80240040_950650, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190085 - -dlabel D_802400C0_9506D0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240340, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024011C_95072C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240348, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240178_950788 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240350, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401D4_9507E4 -.word 0x00000047, 0x00000005, D_802400C0_9506D0, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024011C_95072C, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240178_950788, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240238_950848 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000001, sbk_50_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_802401D4_9507E4, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_51/950AD0.data.s b/ver/us/asm/data/world/area_sbk/sbk_51/950AD0.data.s deleted file mode 100644 index 10b6e3b785..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_51/950AD0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240160_950AD0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802403D0_950D40, D_80240160_950AD0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190086 - -dlabel D_802401E0_950B50 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240CE0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024023C_950BAC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240CE8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240298_950C08 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240CF0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402F4_950C64 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240CF8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240350_950CC0 -.word 0x00000047, 0x00000005, D_802401E0_950B50, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024023C_950BAC, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240298_950C08, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802402F4_950C64, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403D0_950D40 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240CB8, 0x00000043, 0x00000001, sbk_51_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240350_950CC0, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_51/950E60.data.s b/ver/us/asm/data/world/area_sbk/sbk_51/950E60.data.s deleted file mode 100644 index a742b3c7ba..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_51/950E60.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802404F0_950E60 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_51_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240588_950EF8 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_802405B8_950F28 -.word 0x00000043, 0x00000002, BasicAI_Main, D_80240588_950EF8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405D8_950F48 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_802404F0_950E60, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240824_951194 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_802405B8_950F28, EnemyNpcHit, 0x00000000, D_802405D8_950F48, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_80240850_9511C0 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80240880_9511F0 -.word 0x00000043, 0x00000001, sbk_51_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240850_9511C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802408AC_95121C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240880_9511F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_802408D8_951248 -.word 0x00000000, D_802408AC_95121C, 0x43340000, 0x00000000, 0x42F00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x000000B4, 0x00000000, 0x00000078, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240AC8_951438 -.word 0x00000001, D_80240824_951194, 0xC2700000, 0x00000000, 0xC2B00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFFC4, 0x00000000, 0xFFFFFFA8, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802408D8_951248, 0x0A050001, 0x00000001, D_80240AC8_951438, 0x0A0E0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_52/9516B0.data.s b/ver/us/asm/data/world/area_sbk/sbk_52/9516B0.data.s deleted file mode 100644 index 2e7b77be52..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_52/9516B0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_9516B0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402B0_951920, D_80240040_9516B0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190087 - -dlabel D_802400C0_951730 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240450, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024011C_95178C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240458, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240178_9517E8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240460, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401D4_951844 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240468, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240230_9518A0 -.word 0x00000047, 0x00000005, D_802400C0_951730, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024011C_95178C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240178_9517E8, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401D4_951844, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402B0_951920 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x802403C0, 0x00000043, 0x00000001, sbk_52_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240230_9518A0, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_52/951A30.data.s b/ver/us/asm/data/world/area_sbk/sbk_52/951A30.data.s deleted file mode 100644 index 6f3f17d0e0..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_52/951A30.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403C0_951A30 -.word 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000000, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB5, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0x00000050, 0x0000003C, 0x0000010E, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BrickBlock, 0xFFFFFF2E, 0x0000003C, 0x000000A5, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_53/951B40.data.s b/ver/us/asm/data/world/area_sbk/sbk_53/951B40.data.s deleted file mode 100644 index 2724fb4468..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_53/951B40.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240060_951B40 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402D0_951DB0, D_80240060_951B40, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190088 - -dlabel D_802400E0_951BC0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A80, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024013C_951C1C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A88, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240198_951C78 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A90, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401F4_951CD4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A98, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240250_951D30 -.word 0x00000047, 0x00000005, D_802400E0_951BC0, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024013C_951C1C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240198_951C78, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401F4_951CD4, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402D0_951DB0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240A48, 0x00000043, 0x00000001, sbk_53_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240250_951D30, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_53/951ED0.data.s b/ver/us/asm/data/world/area_sbk/sbk_53/951ED0.data.s deleted file mode 100644 index a91a1ecce0..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_53/951ED0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403F0_951ED0 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80240420_951F00 -.word 0x00000043, 0x00000001, sbk_53_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_802403F0_951ED0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024044C_951F2C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240420_951F00, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_80240478_951F58 -.word 0x00000000, D_8024044C_951F2C, 0xC3300000, 0x00000000, 0xC3440000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF50, 0x00000000, 0xFFFFFF3C, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240668_952148 -.word 0x00000001, D_8024044C_951F2C, 0xC2DC0000, 0x00000000, 0xC3870000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF92, 0x00000000, 0xFFFFFEF2, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240858_952338 -.word 0x00000002, D_8024044C_951F2C, 0x437C0000, 0x00000000, 0xC3690000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x000000FC, 0x00000000, 0xFFFFFF17, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240478_951F58, 0x0A000001, 0x00000001, D_80240668_952148, 0x0A020001, 0x00000001, D_80240858_952338, 0x0A010001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_54/9525C0.data.s b/ver/us/asm/data/world/area_sbk/sbk_54/9525C0.data.s deleted file mode 100644 index 4557e71f10..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_54/9525C0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_9525C0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802402B0_952830, D_80240040_9525C0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190089 - -dlabel D_802400C0_952640 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404A0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024011C_95269C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404A8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240178_9526F8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404B0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401D4_952754 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802404B8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240230_9527B0 -.word 0x00000047, 0x00000005, D_802400C0_952640, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024011C_95269C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240178_9526F8, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802401D4_952754, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802402B0_952830 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x8024044C, 0x00000043, 0x00000001, sbk_54_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240230_9527B0, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_54/952940.data.s b/ver/us/asm/data/world/area_sbk/sbk_54/952940.data.s deleted file mode 100644 index dd2a7c2228..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_54/952940.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802403C0_952940 -.word 0xFFFFFFBF, 0x00000000, 0x000000D9, 0xFFFFFEFA, 0x00000000, 0xFFFFFFC0, 0x00000039, 0x00000000, 0xFFFFFEE2, 0x00000147, 0x00000000, 0x00000008, 0x80000001 - -dlabel D_802403F4_952974 -.word D_802403C0_952940, 0xFFFFFFFF - -dlabel D_802403FC_95297C -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000003, GotoMap, 0x802404C0, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, MakeEntity, Entity_Tweester, 0x00000147, 0x00000000, 0x00000008, 0x00000000, D_802403F4_952974, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_802403FC_95297C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_55/952CF0.data.s b/ver/us/asm/data/world/area_sbk/sbk_55/952CF0.data.s deleted file mode 100644 index 331d817ec3..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_55/952CF0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802402A0_952CF0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240510_952F60, D_802402A0_952CF0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019008A - -dlabel D_80240320_952D70 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241550, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024037C_952DCC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241558, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403D8_952E28 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241560, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240434_952E84 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80241568, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240490_952EE0 -.word 0x00000047, 0x00000005, D_80240320_952D70, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024037C_952DCC, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802403D8_952E28, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240434_952E84, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240510_952F60 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240AA8, 0x00000046, 0x00000001, 0x802414E0, 0x00000043, 0x00000001, sbk_55_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240490_952EE0, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x80241488, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_55/953090.data.s b/ver/us/asm/data/world/area_sbk/sbk_55/953090.data.s deleted file mode 100644 index 0c7296c38d..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_55/953090.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240640_953090 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80240670_9530C0 -.word 0x00000043, 0x00000001, sbk_55_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240640_953090, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024069C_9530EC -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240670_9530C0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_802406C8_953118 -.word 0x00000000, D_8024069C_9530EC, 0x422C0000, 0x00000000, 0xC2F00000, 0x00002800, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x0000002B, 0x00000000, 0xFFFFFF88, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802408B8_953308 -.word 0x00000001, D_8024069C_9530EC, 0xC2C80000, 0x00000000, 0xC2F00000, 0x00002800, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF9C, 0x00000000, 0xFFFFFF88, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802406C8_953118, 0x0A020001, 0x00000001, D_802408B8_953308, 0x0A030001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_55/953520.data.s b/ver/us/asm/data/world/area_sbk/sbk_55/953520.data.s deleted file mode 100644 index caf6491e44..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_55/953520.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240AD0_953520 -.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, sbk_55_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, sbk_55_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_80240E30_953880 -.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, sbk_55_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, sbk_55_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, sbk_55_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, sbk_55_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_80241434_953E84 -.word 0x00000001, 0x00000017 - -dlabel D_8024143C_953E8C -.word 0x00000001, 0x00000016 - -dlabel D_80241444_953E94 -.word 0x00000001, 0x00000157, 0x0000004D, 0x00000064, 0xFFFFFF9B, 0x0000000F, 0xF8405ECD, 0x00000000 - -dlabel D_80241464_953EB4 -.word D_80241434_953E84, D_8024143C_953E8C, D_80241444_953E94, 0x00000000, 0x00000000 - -dlabel D_80241478_953EC8 -.word 0x429A0000, 0x00000000, 0xC2FC0000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241464_953EB4, 0x00000047, 0x00000005, D_80240E30_953880, 0x00001000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240E30_953880, 0x00100000, D_80241478_953EC8, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000000, 0x0000003C, 0xFFFFFF9C, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB6, 0x00000043, 0x00000007, MakeItemEntity, 0x00000089, 0x000001A4, 0x00000000, 0x000000A8, 0x00000011, 0xF8405EC4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_56/954FC0.data.s b/ver/us/asm/data/world/area_sbk/sbk_56/954FC0.data.s deleted file mode 100644 index e86e784078..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_56/954FC0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241000_954FC0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802412DC_95529C, D_80241000_954FC0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019008B - -dlabel D_80241080_955040 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000001, func_8024005C_95401C, 0x00000043, 0x00000003, GotoMap, 0x80242A10, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410E8_9550A8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000001, func_8024005C_95401C, 0x00000043, 0x00000003, GotoMap, 0x80242A18, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241150_955110 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000001, func_8024005C_95401C, 0x00000043, 0x00000003, GotoMap, 0x80242A20, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411B8_955178 -.word 0x00000047, 0x00000005, D_80241080_955040, 0x00080000, 0x0000000C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802410E8_9550A8, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241150_955110, 0x00080000, 0x00000008, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024121C_9551DC -.word 0x00000043, 0x00000003, EnableTexPanning, 0x00000003, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0xFE363C80, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000001, 0xFE363C81, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x00000050, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412DC_95529C -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x80241A78, 0x00000043, 0x00000001, sbk_56_SpawnSunEffect, 0x00000044, 0x00000001, D_8024121C_9551DC, 0x00000043, 0x00000002, MakeTransformGroup, 0x00000004, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000043, 0x00000001, func_80240038_953FF8, 0x00000043, 0x00000002, PlaySound, 0x80000061, 0x00000024, 0x00000002, 0xFE363C80, D_802411B8_955178, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x802426EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s b/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s deleted file mode 100644 index 64d41bb876..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_56/9553F0.data.s +++ /dev/null @@ -1,156 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel sbk_56_SuperBlock_CantUpgradeMessages -.word 0x001D00F0, 0x001D00F1 - -dlabel sbk_56_SuperBlock_PartnerIDs -.word 0x00010002, 0x00030004, 0x00090006, 0x00070008 - -dlabel sbk_56_SuperBlock_UpgradeDescMessages -.word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF - -dlabel sbk_56_SuperBlock_UpgradeOrbAngles -.word 0x430C0000, 0x43340000, 0x435C0000 - -dlabel D_80241494_955454 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, sbk_56_SuperBlock_GatherEnergyFX, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, sbk_56_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, sbk_56_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, sbk_56_SuperBlock_HideBlockContent, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, sbk_56_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, sbk_56_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, sbk_56_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, sbk_56_SuperBlock_AnimateEnergyOrbs, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415F8_9555B8 -.word 0x0000000A, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_56_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, sbk_56_SuperBlock_StartGlowEffect, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, sbk_56_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, sbk_56_SuperBlock_SwitchToPartner, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, func_802CF56C, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, ShowChoice, 0x001E000D, 0x00000043, 0x00000001, CloseMessage, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80241494_955454, 0x00000043, 0x00000003, sbk_56_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF8405EBD, 0x00000001, 0x00000043, 0x00000002, sbk_56_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, sbk_56_SuperBlock_LoadCurrentPartnerName, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, sbk_56_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x0000012C, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0xFFFFFFCE, 0x0000003C, 0x00000113, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBD, 0x00000043, 0x00000002, AssignScript, D_802415F8_9555B8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, sbk_56_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, sbk_56_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_80241E60_955E20 -.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, sbk_56_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, sbk_56_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, sbk_56_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, sbk_56_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_80242464_956424 -.word 0x00000001, 0x00000019 - -dlabel D_8024246C_95642C -.word 0x00000001, 0x0000001A - -dlabel D_80242474_956434 -.word 0x00000001, 0x0000009C, 0xFFFFFED0, 0x0000005C, 0xFFFFFF50, 0x0000000E, 0xF8405E98, 0xFAA2B58A - -dlabel D_80242494_956454 -.word D_80242464_956424, D_8024246C_95642C, D_80242474_956434, 0x00000000, 0x00000000 - -dlabel D_802424A8_956468 -.word 0xC3818000, 0x00000000, 0xC3200000, 0x00000000 - -dlabel D_802424B8_956478 -.word 0x00000001, 0x00000019 - -dlabel D_802424C0_956480 -.word 0x00000001, 0x0000001A - -dlabel D_802424C8_956488 -.word 0x00000001, 0x0000009D, 0x000000E6, 0x0000004D, 0xFFFFFED0, 0x0000000E, 0xF8405E9A, 0xFAA2B58C - -dlabel D_802424E8_9564A8 -.word D_802424B8_956478, D_802424C0_956480, D_802424C8_956488, 0x00000000, 0x00000000 - -dlabel D_802424FC_9564BC -.word 0x432B0000, 0x00000000, 0xC3918000, 0x00000000 - -dlabel D_8024250C_9564CC -.word 0x00000001, 0x00000020 - -dlabel D_80242514_9564D4 -.word 0x00000001, 0x0000001F - -dlabel D_8024251C_9564DC -.word 0x00000001, 0x00000157, 0xFFFFFE4C, 0x00000064, 0x000000F9, 0x0000000F, 0xF8405ECE, 0x00000000 - -dlabel D_8024253C_9564FC -.word D_8024250C_9564CC, D_80242514_9564D4, D_8024251C_9564DC, 0x00000000, 0x00000000 - -dlabel D_80242550_956510 -.word 0xC3DA0000, 0x00000000, 0x43600000, 0x00000000 - -dlabel D_80242560_956520 -.word 0x00000001, 0x00000024 - -dlabel D_80242568_956528 -.word 0x00000001, 0x00000023 - -dlabel D_80242570_956530 -.word D_80242560_956520, D_80242568_956528, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242584_956544 -.word 0xC3A00000, 0x00000000, 0xC1A80000, 0x00000000 - -dlabel D_80242594_956554 -.word 0x00000001, 0x00000028 - -dlabel D_8024259C_95655C -.word 0x00000001, 0x00000027 - -dlabel D_802425A4_956564 -.word D_80242594_956554, D_8024259C_95655C, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802425B8_956578 -.word 0xC3720000, 0x00000000, 0x42B00000, 0x00000000 - -dlabel D_802425C8_956588 -.word 0x00000001, 0x0000002C - -dlabel D_802425D0_956590 -.word 0x00000001, 0x0000002B - -dlabel D_802425D8_956598 -.word D_802425C8_956588, D_802425D0_956590, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802425EC_9565AC -.word 0xC34B0000, 0x00000000, 0xC3560000, 0x00000000 - -dlabel D_802425FC_9565BC -.word 0x00000001, 0x00000030 - -dlabel D_80242604_9565C4 -.word 0x00000001, 0x0000002F - -dlabel D_8024260C_9565CC -.word D_802425FC_9565BC, D_80242604_9565C4, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242620_9565E0 -.word 0xC2CA0000, 0x00000000, 0xC3BC0000, 0x00000000 - -dlabel D_80242630_9565F0 -.word 0x00000001, 0x00000034 - -dlabel D_80242638_9565F8 -.word 0x00000001, 0x00000033 - -dlabel D_80242640_956600 -.word D_80242630_9565F0, D_80242638_9565F8, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242654_956614 -.word 0x42D00000, 0x00000000, 0xC3C10000, 0x00000000 - -dlabel D_80242664_956624 -.word 0x00000001, 0x0000003A - -dlabel D_8024266C_95662C -.word 0x00000001, 0x00000039 - -dlabel D_80242674_956634 -.word 0x00000001, 0x00000157, 0x0000010A, 0x00000064, 0x00000095, 0x0000000F, 0xF8405ECF, 0x00000000 - -dlabel D_80242694_956654 -.word D_80242664_956624, D_8024266C_95662C, D_80242674_956634, 0x00000000, 0x00000000 - -dlabel D_802426A8_956668 -.word 0x43850000, 0x00000000, 0x42F80000, 0x00000000 - -dlabel D_802426B8_956678 -.word 0x00000001, 0x0000003D - -dlabel D_802426C0_956680 -.word 0x00000001, 0x0000003C - -dlabel D_802426C8_956688 -.word D_802426B8_956678, D_802426C0_956680, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802426DC_95669C -.word 0x43B50000, 0x00000000, 0xC2940000, 0x00000000, 0x00000024, 0x00000002, 0xF8405E98, 0x00000000, 0x00000024, 0x00000002, 0xF8405E99, 0x00000000, 0x00000024, 0x00000002, 0xF8405E9A, 0x00000000, 0x00000024, 0x00000002, 0xF8405E9B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242494_956454, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00100000, D_802424A8_956468, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802424E8_9564A8, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00100000, D_802424FC_9564BC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024253C_9564FC, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00001000, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00100000, D_80242550_956510, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242570_956530, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00100000, D_80242584_956544, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802425A4_956564, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00001000, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00100000, D_802425B8_956578, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802425D8_956598, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00001000, 0x00000018, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00100000, D_802425EC_9565AC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024260C_9565CC, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00001000, 0x00000019, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00100000, D_80242620_9565E0, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242640_956600, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00001000, 0x0000001A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00100000, D_80242654_956614, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242694_956654, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00001000, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00100000, D_802426A8_956668, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802426C8_956688, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00001000, 0x0000001C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241E60_955E20, 0x00100000, D_802426DC_95669C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_60/956A50.data.s b/ver/us/asm/data/world/area_sbk/sbk_60/956A50.data.s deleted file mode 100644 index 2949436a19..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_60/956A50.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240060_956A50 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802401E0_956BD0, D_80240060_956A50, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019008C - -dlabel D_802400E0_956AD0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240590, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024013C_956B2C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240598, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240198_956B88 -.word 0x00000047, 0x00000005, D_802400E0_956AD0, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024013C_956B2C, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401E0_956BD0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80240578, 0x00000043, 0x00000001, sbk_60_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_80240198_956B88, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_60/956CF0.data.s b/ver/us/asm/data/world/area_sbk/sbk_60/956CF0.data.s deleted file mode 100644 index 4383c12f41..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_60/956CF0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240300_956CF0 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_80240330_956D20 -.word 0x00000043, 0x00000001, sbk_60_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240300_956CF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024035C_956D4C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_80240330_956D20, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_80240388_956D78 -.word 0x00000000, D_8024035C_956D4C, 0x43200000, 0x00000000, 0xC2F00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x000000A0, 0x00000000, 0xFFFFFF88, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240388_956D78, 0x0A030001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_61/956FD0.data.s b/ver/us/asm/data/world/area_sbk/sbk_61/956FD0.data.s deleted file mode 100644 index 6fe4505dab..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_61/956FD0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_956FD0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240238_9571C8, D_80240040_956FD0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019008D - -dlabel D_802400C0_957050 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403A0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024011C_9570AC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403A8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240178_957108 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403B0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401D4_957164 -.word 0x00000047, 0x00000005, D_802400C0_957050, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024011C_9570AC, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240178_957108, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240238_9571C8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x80240350, 0x00000043, 0x00000001, sbk_61_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_802401D4_957164, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_61/9572E0.data.s b/ver/us/asm/data/world/area_sbk/sbk_61/9572E0.data.s deleted file mode 100644 index 221d6a10cc..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_61/9572E0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240350_9572E0 -.word 0x00000043, 0x00000008, MakeEntity, Entity_HiddenRedBlock, 0x00000000, 0x0000005A, 0x00000000, 0x000000B4, 0x00000148, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAE, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_62/9573B0.data.s b/ver/us/asm/data/world/area_sbk/sbk_62/9573B0.data.s deleted file mode 100644 index 52f67287cd..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_62/9573B0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240060_9573B0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240258_9575A8, D_80240060_9573B0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019008E - -dlabel D_802400E0_957430 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A00, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024013C_95748C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A08, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240198_9574E8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240A10, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401F4_957544 -.word 0x00000047, 0x00000005, D_802400E0_957430, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024013C_95748C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240198_9574E8, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240258_9575A8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802409C8, 0x00000043, 0x00000001, sbk_62_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_802401F4_957544, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_62/9576C0.data.s b/ver/us/asm/data/world/area_sbk/sbk_62/9576C0.data.s deleted file mode 100644 index f7f7d3f149..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_62/9576C0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240370_9576C0 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_802403A0_9576F0 -.word 0x00000043, 0x00000001, sbk_62_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240370_9576C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403CC_95771C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_802403A0_9576F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_802403F8_957748 -.word 0x00000000, D_802403CC_95771C, 0xC3340000, 0x00000000, 0xC2C80000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF4C, 0x00000000, 0xFFFFFF9C, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802405E8_957938 -.word 0x00000001, D_802403CC_95771C, 0x42F00000, 0x00000000, 0x42DC0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000078, 0x00000000, 0x0000006E, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802407D8_957B28 -.word 0x00000002, D_802403CC_95771C, 0x43750000, 0x00000000, 0x438E8000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x000000F5, 0x00000000, 0x0000011D, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802403F8_957748, 0x0A010001, 0x00000001, D_802405E8_957938, 0x0A010001, 0x00000001, D_802407D8_957B28, 0x0A020001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_63/957DD0.data.s b/ver/us/asm/data/world/area_sbk/sbk_63/957DD0.data.s deleted file mode 100644 index 9f0804ab39..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_63/957DD0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240060_957DD0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240258_957FC8, D_80240060_957DD0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019008F - -dlabel D_802400E0_957E50 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240800, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024013C_957EAC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240808, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240198_957F08 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240810, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401F4_957F64 -.word 0x00000047, 0x00000005, D_802400E0_957E50, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024013C_957EAC, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240198_957F08, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240258_957FC8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x802407D8, 0x00000043, 0x00000001, sbk_63_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_802401F4_957F64, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_63/9580E0.data.s b/ver/us/asm/data/world/area_sbk/sbk_63/9580E0.data.s deleted file mode 100644 index 855e135dd8..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_63/9580E0.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240370_9580E0 -.word 0x3FE66666, 0x00000032, 0x0000000A, 0x437A0000, 0x00000000, 0x00000002, 0x40600000, 0x0000002D, 0x00000006, 0x43960000, 0x00000000, 0x00000001 - -dlabel D_802403A0_958110 -.word 0x00000043, 0x00000001, sbk_63_SetNpcB5_3, 0x00000043, 0x00000002, BasicAI_Main, D_80240370_9580E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403CC_95813C -.word 0x00000000, 0x0048000F, 0x00000000, 0x00000000, D_802403A0_958110, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00090000 - -dlabel D_802403F8_958168 -.word 0x00000000, D_802403CC_95813C, 0xC3340000, 0x00000000, 0xC2F00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0xFFFFFF4C, 0x00000000, 0xFFFFFF88, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802405E8_958358 -.word 0x00000001, D_802403CC_95813C, 0x42F00000, 0x00000000, 0xC2D20000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A8, 0x00090000, 0x00890001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000078, 0x00000000, 0xFFFFFF97, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00310004, 0x00310008, 0x00310008, 0x00310008, 0x00310004, 0x00310004, 0x0031000C, 0x0031000C, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00310008, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802403F8_958168, 0x0A010001, 0x00000001, D_802405E8_958358, 0x0A030001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_64/9585D0.data.s b/ver/us/asm/data/world/area_sbk/sbk_64/9585D0.data.s deleted file mode 100644 index d968f9a6ff..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_64/9585D0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_9585D0 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240238_9587C8, D_80240040_9585D0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190090 - -dlabel D_802400C0_958650 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403A0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024011C_9586AC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403A8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240178_958708 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403B0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401D4_958764 -.word 0x00000047, 0x00000005, D_802400C0_958650, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024011C_9586AC, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240178_958708, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240238_9587C8 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000046, 0x00000001, 0x80240350, 0x00000043, 0x00000001, sbk_64_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_802401D4_958764, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_64/9588E0.data.s b/ver/us/asm/data/world/area_sbk/sbk_64/9588E0.data.s deleted file mode 100644 index c5c4705088..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_64/9588E0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240350_9588E0 -.word 0x00000043, 0x00000008, MakeEntity, Entity_YellowBlock, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000157, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EAF, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_65/958990.data.s b/ver/us/asm/data/world/area_sbk/sbk_65/958990.data.s deleted file mode 100644 index 0b105c5332..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_65/958990.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240040_958990 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240238_958B88, D_80240040_958990, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190091 - -dlabel D_802400C0_958A10 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240340, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024011C_958A6C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240348, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240178_958AC8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240350, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401D4_958B24 -.word 0x00000047, 0x00000005, D_802400C0_958A10, 0x00080000, 0x00000007, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024011C_958A6C, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240178_958AC8, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240238_958B88 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000001, sbk_65_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_802401D4_958B24, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_66/959030.data.s b/ver/us/asm/data/world/area_sbk/sbk_66/959030.data.s deleted file mode 100644 index f769e90784..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_66/959030.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240380_959030 -.word 0xC3ED8000, 0x00000000, 0x00000000, 0x42B40000, 0x43ED8000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3ED8000, 0x43340000, 0x00000000, 0x00000000, 0x43ED8000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240500_9591B0, D_80240380_959030, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190092 - -dlabel D_80240400_9590B0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802421F0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024045C_95910C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802421F8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802404B8_959168 -.word 0x00000047, 0x00000005, D_80240400_9590B0, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024045C_95910C, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240500_9591B0 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFC1, 0x00000043, 0x00000002, DisablePulseStone, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80241530, 0x00000046, 0x00000001, 0x802420A0, 0x00000043, 0x00000001, sbk_66_SpawnSunEffect, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000017, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xFE363C80, D_802404B8_959168, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x80241FB0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_66/9592E0.data.s b/ver/us/asm/data/world/area_sbk/sbk_66/9592E0.data.s deleted file mode 100644 index f9232e3958..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_66/9592E0.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240630_9592E0 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C8A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000000, 0x00000043, 0x00000004, sbk_66_Bandit_DropCoin, 0xFE363C8A, 0xFE363C80, 0xF9718881, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406C8_959378 -.word 0x402CCCCD, 0x0000002D, 0x0000001E, 0x43E10000, 0x00000000, 0x0000000A, 0x4104CCCD, 0x000000B4, 0x00000064, 0x44098000, 0x42C80000, 0x00000001 - -dlabel D_802406F8_9593A8 -.word 0x00000043, 0x00000002, BasicAI_Main, D_802406C8_959378, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240718_9593C8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, func_80045900, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718881, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320002, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x00000044, 0x00000001, D_80240630_9592E0, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000027, 0x00000002, 0xFE363C87, 0x00000014, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C87, 0x00000000, 0xFE363C89, 0x00000006, 0x00000043, 0x00000003, GetNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0xFE363C80, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00320008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24ABA80, 0x00000027, 0x00000002, 0xFE363C87, 0x000000C8, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C87, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xF9718881, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240964_959614 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, D_802406F8_9593A8, EnemyNpcHit, 0x00000000, D_80240718_9593C8, 0x00000000, 0x00000000, 0x00090005 - -dlabel D_80240990_959640 -.word 0x00000000, D_80240964_959614, 0xC2F00000, 0x00000000, 0x42340000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFF88, 0x00000000, 0x0000002D, 0x00000050, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240B80_959830 -.word 0x00000001, D_80240964_959614, 0xC2980000, 0x00000000, 0xC1A00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFFB4, 0x00000000, 0xFFFFFFEC, 0x00000050, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240D70_959A20 -.word 0x00000002, D_80240964_959614, 0xC29C0000, 0x00000000, 0x42A00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFFB2, 0x00000000, 0x00000050, 0x00000050, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80240F60_959C10 -.word 0x00000003, D_80240964_959614, 0xC1A00000, 0x00000000, 0x42200000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0xFFFFFFEC, 0x00000000, 0x00000028, 0x00000050, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241150_959E00 -.word 0x00000004, D_80240964_959614, 0x42340000, 0x00000000, 0xC1F00000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x0000002D, 0x00000000, 0xFFFFFFE2, 0x00000050, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241340_959FF0 -.word 0x00000005, D_80240964_959614, 0x42200000, 0x00000000, 0x43160000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800500A4, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00030000, 0x00000028, 0x00000000, 0x00000096, 0x00000050, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00320001, 0x00320005, 0x00320007, 0x00320007, 0x00320001, 0x00320001, 0x00320009, 0x00320009, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00320000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80240990_959640, 0x0A090001, 0x00000001, D_80240B80_959830, 0x0A0B0001, 0x00000001, D_80240D70_959A20, 0x0A0C0001, 0x00000001, D_80240F60_959C10, 0x0A0A0001, 0x00000001, D_80241150_959E00, 0x0A0A0001, 0x00000001, D_80241340_959FF0, 0x0A0A0001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_66/95A240.data.s b/ver/us/asm/data/world/area_sbk/sbk_66/95A240.data.s deleted file mode 100644 index 8da905e42d..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_66/95A240.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241590_95A240 -.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, sbk_66_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, sbk_66_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_802418F0_95A5A0 -.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, sbk_66_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, sbk_66_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, sbk_66_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, sbk_66_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_80241EF4_95ABA4 -.word 0x00000001, 0x00000010 - -dlabel D_80241EFC_95ABAC -.word 0x00000001, 0x0000000F - -dlabel D_80241F04_95ABB4 -.word D_80241EF4_95ABA4, D_80241EFC_95ABAC, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241F18_95ABC8 -.word 0xC3A30000, 0x00000000, 0xC34C0000, 0x00000000 - -dlabel D_80241F28_95ABD8 -.word 0x00000001, 0x00000014 - -dlabel D_80241F30_95ABE0 -.word 0x00000001, 0x00000013 - -dlabel D_80241F38_95ABE8 -.word D_80241F28_95ABD8, D_80241F30_95ABE0, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241F4C_95ABFC -.word 0x42E80000, 0x00000000, 0xC3C50000, 0x00000000 - -dlabel D_80241F5C_95AC0C -.word 0x00000001, 0x00000018 - -dlabel D_80241F64_95AC14 -.word 0x00000001, 0x00000017 - -dlabel D_80241F6C_95AC1C -.word 0x00000001, 0x00000157, 0x0000018E, 0x00000064, 0xFFFFFFA5, 0x0000000F, 0xF8405ED0, 0x00000000 - -dlabel D_80241F8C_95AC3C -.word D_80241F5C_95AC0C, D_80241F64_95AC14, D_80241F6C_95AC1C, 0x00000000, 0x00000000 - -dlabel D_80241FA0_95AC50 -.word 0x43C70000, 0x00000000, 0xC2E80000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241F04_95ABB4, 0x00000047, 0x00000005, D_802418F0_95A5A0, 0x00001000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802418F0_95A5A0, 0x00100000, D_80241F18_95ABC8, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241F38_95ABE8, 0x00000047, 0x00000005, D_802418F0_95A5A0, 0x00001000, 0x0000000C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802418F0_95A5A0, 0x00100000, D_80241F4C_95ABFC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241F8C_95AC3C, 0x00000047, 0x00000005, D_802418F0_95A5A0, 0x00001000, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802418F0_95A5A0, 0x00100000, D_80241FA0_95AC50, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_66/95AD50.data.s b/ver/us/asm/data/world/area_sbk/sbk_66/95AD50.data.s deleted file mode 100644 index bead87e63c..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_66/95AD50.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802420A0_95AD50 -.word 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0xFFFFFFB0, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB7, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x00000050, 0x0000003C, 0xFFFFFF38, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB8, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x000000A0, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EB9, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0xFFFFFF60, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBA, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0xFFFFFFC4, 0x0000003C, 0x000000C8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBB, 0x00000043, 0x00000007, MakeEntity, Entity_MulticoinBlock, 0x0000003C, 0x0000003C, 0x000000C8, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8405EBC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_99/95AEB0.data.s b/ver/us/asm/data/world/area_sbk/sbk_99/95AEB0.data.s deleted file mode 100644 index f206ca3032..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_99/95AEB0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_95AEB0 -.word 0xC3F20000, 0x42C80000, 0x40A00000, 0x42B40000, 0x43AD0000, 0x00000000, 0xC3AB0000, 0x435C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802401D4_95B084, D_80240000_95AEB0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019005F - -dlabel D_80240060_95AF10 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240340, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802400BC_95AF6C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240348, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240118_95AFC8 -.word 0x00000047, 0x00000005, D_80240060_95AF10, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802400BC_95AF6C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240160_95B010 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80240118_95AFC8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240118_95AFC8, 0x00000044, 0x00000001, EnterWalk, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401D4_95B084 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x0000000A, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000098, 0x000000F0, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF8406334, 0x00000001, 0x00000046, 0x00000001, 0x802402E0, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000016, 0x00000000, 0x00000008, 0x00000044, 0x00000001, D_80240160_95B010, 0x00000008, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_sbk/sbk_99/95B190.data.s b/ver/us/asm/data/world/area_sbk/sbk_99/95B190.data.s deleted file mode 100644 index 7d805488f9..0000000000 --- a/ver/us/asm/data/world/area_sbk/sbk_99/95B190.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802402E0_95B190 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000091, 0x0000003C, 0xFFFFFE89, 0x0000002D, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x00000058, 0x0000003C, 0xFFFFFEBC, 0x00000028, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_04/9ABC90.data.s b/ver/us/asm/data/world/area_trd/trd_04/9ABC90.data.s deleted file mode 100644 index 74c344c1a3..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_04/9ABC90.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802438A0_9ABC90 -.word 0xC3808000, 0x00000000, 0x42A00000, 0x42B40000, 0x43808000, 0x00000000, 0x42A00000, 0x43870000, 0xC3808000, 0x433B0000, 0xC25C0000, 0x42B40000, 0x43808000, 0x433B0000, 0xC25C0000, 0x43870000, 0xC3808000, 0xC33B0000, 0x42A00000, 0x42B40000, 0x43808000, 0xC33B0000, 0x42A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80244A04, D_802438A0_9ABC90, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190052, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000014, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s b/ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s deleted file mode 100644 index 5183c522fc..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_04/9ABD70.data.s +++ /dev/null @@ -1,54 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243980_9ABD70 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_04_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_04_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243A1C_9ABE0C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000016, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245EC0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243AC0_9ABEB0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000011, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000018, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245EC8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243B64_9ABF54 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000016, 0x00000024, 0x00000002, 0xFE363C82, 0x00000020, 0x00000024, 0x00000002, 0xFE363C83, 0x00000022, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245EC0, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243C08_9ABFF8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245EC8, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243CAC_9AC09C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000004, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80245ED0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243D08_9AC0F8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0x00000007, 0x00000024, 0x00000002, 0xFE363C82, 0x00000026, 0x00000024, 0x00000002, 0xFE363C83, 0x00000024, 0x00000044, 0x00000001, ExitDoubleDoor, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000003, GotoMap, 0x80245ED8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243DAC_9AC19C -.word 0x00000010, 0x00000000 - -dlabel D_80243DB4_9AC1A4 -.word 0x00000047, 0x00000005, D_80243A1C_9ABE0C, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0D, 0x00000000, 0x0000004E, 0x00000006, D_80244FEC_9AD3DC, 0x00000100, 0x00004000, D_80243DAC_9AC19C, 0x00000000, 0x00000001, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80243AC0_9ABEB0, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0C, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0D, 0x00000001, 0x0000004E, 0x00000006, D_80244E98_9AD288, 0x00000100, 0x00004000, D_80243DAC_9AC19C, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000047, 0x00000005, D_80243B64_9ABF54, 0x00000100, 0x00000016, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80243C08_9ABFF8, 0x00000100, 0x0000001B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243CAC_9AC09C, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243D08_9AC0F8, 0x00000100, 0x00000007, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243F04_9AC2F4 -.word 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_80243DB4_9AC1A4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000016, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80243DB4_9AC1A4, 0x00000016, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000018, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80243DB4_9AC1A4, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000020, 0x00000024, 0x00000002, 0xFE363C83, 0x00000022, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80243DB4_9AC1A4, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001C, 0x00000024, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80243DB4_9AC1A4, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, D_80243DB4_9AC1A4, 0x00000044, 0x00000001, EnterWalk, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x00000026, 0x00000024, 0x00000002, 0xFE363C83, 0x00000024, 0x00000046, 0x00000001, EnterDoubleDoor, 0x00000044, 0x00000001, D_80243DB4_9AC1A4, 0x00000023, 0x00000000, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244120_9AC510 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFAA, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7D4D, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000140, 0xF24A7E80, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7D4D, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7C1A, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, EnableModel, 0x00000014, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000016, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000003, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF252EA80, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000F, 0xFFFFFFFA, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFFE2, 0xFFFFFFC4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF47, 0x00000000, 0xFFFFFFDC, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF5D, 0x00000000, 0xFFFFFFF4, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x80000005, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000096, 0x00000043, 0x0000000F, PlayEffect, 0x00000015, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000014, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000008, 0x00000001, 0xFE363C80, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000007, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C84, 0x00000064, 0x00000043, 0x00000003, RandInt, 0x00000064, 0xFE363C85, 0x00000028, 0x00000002, 0xFE363C85, 0x00000064, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C85, 0x00000043, 0x0000000F, PlayEffect, 0x00000016, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x0000001E, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000008, 0x00000001, 0xFE363C80, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000001D, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, MakeLerp, 0x000000BB, 0x00000000, 0x0000012C, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0x00000010, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000011, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000012, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000028, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000029, 0x00000043, 0x00000002, StopSound, 0x80000005, 0x00000043, 0x00000002, PlaySound, 0x00000028, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFF57, 0x00000082, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000012, 0xFFFFFFFA, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000014, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000016, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000003, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000050, 0x00000001, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244938_9ACD28 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000007, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000001, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000064, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000007, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetRenderMode, 0x00000007, 0x00000016, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFAA, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80245E98, 0x00000012, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80245E74, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_8024540C_9AD7FC, 0x00000044, 0x00000001, 0x80243940, 0x00000024, 0x00000002, 0xF9718884, 0x00000000, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000028, 0x00000011, 0x00000043, 0x00000003, ParentColliderToModel, 0x00000029, 0x00000011, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFAA, 0x00000043, 0x00000005, TranslateModel, 0x00000010, 0x00000000, 0x000000BB, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000011, 0x00000000, 0x000000BB, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000012, 0x00000000, 0x000000BB, 0x00000000, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000028, 0x00000043, 0x00000002, UpdateColliderTransform, 0x00000029, 0x00000047, 0x00000005, D_80244120_9AC510, 0x00020000, 0xF9718884, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80244938_9ACD28, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000028, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001E, 0x7FFFFE00, 0x00000044, 0x00000001, D_80243F04_9AC2F4, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000007, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80243980_9ABD70, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010101, 0x01010101, 0x01010101, 0x01000000, 0x00000000, 0x00000101, 0x01010101, 0x01010101, 0x01010000, 0x00000000, 0x00000001, 0x01010101, 0x01010101, 0x01010100, 0x00000000, 0x00000000, 0x01010101, 0x01010101, 0x01010101, 0x00000000, 0x00000000, 0x00010101, 0x01010101, 0x01010101, 0x01000000, 0x00000000, 0x00000101, 0x01010101, 0x01010101, 0x01010000, 0x00000000, 0x00000001, 0x01010101, 0x01010101, 0x01010100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01010101, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010101, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000101, 0x01010000, 0x00000000, 0x00000000 - -dlabel D_80244E98_9AD288 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF8405E0C, 0x00000001, 0x00000043, 0x00000005, trd_04_GetEntityPosition, 0xFD050F80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000043, 0x00000001, trd_04_SetEntityFlags100000, 0x00000050, 0x00000001, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244FEC_9AD3DC -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000004F, 0x00000001, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00D8, 0x000000A0, 0x00000028, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000050, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000024, 0x00000002, 0xF8405E0D, 0x00000001, 0x00000043, 0x00000005, trd_04_GetEntityPosition, 0xFD050F81, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, PlaySoundAt, 0x00000269, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F81, 0x00000043, 0x00000001, trd_04_SetEntityFlags100000, 0x00000050, 0x00000001, 0x00000001, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245140_9AD530 -.word 0x00000047, 0x00000005, D_80243AC0_9ABEB0, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024516C_9AD55C -.word 0x00000047, 0x00000005, D_80243B64_9ABF54, 0x00000100, 0x00000016, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF44, 0x00000000, 0xFFFFFFD5, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFF44, 0x00000000, 0xFFFFFFD5, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2527280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, PlaySoundAt, 0x00000301, 0x00000000, 0xFFFFFF4C, 0x000000AF, 0xFFFFFFDD, 0x00000043, 0x00000005, MakeLerp, 0x000000AF, 0x00000000, 0x00000014, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, trd_04_SetEntityPosition, 0xFD050F82, 0xFFFFFF4C, 0xFE363C80, 0xFFFFFFDD, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x00000048, 0x00000000, 0xFFFFFF4C, 0x00000000, 0xFFFFFFDD, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF250BA80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024540C_9AD7FC -.word 0x0000000A, 0x00000002, 0xF8405E0D, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0x00000109, 0x00000008, 0x0000005A, 0xFFFFFFB0, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_80245140_9AD530, 0x00000024, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405E0C, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_Padlock, 0xFFFFFEF7, 0x000000C3, 0xFFFFFFC9, 0x00000050, 0x80000000, 0x00000043, 0x00000002, AssignScript, D_8024516C_9AD55C, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE0180, 0xFFFFFFA9, 0x00000043, 0x00000007, MakeEntity, Entity_BlueSwitch, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignSwitchFlag, 0x00000004, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x0000000A, 0x00000002, 0xF5DE0180, 0xFFFFFFA9, 0x00000043, 0x00000005, trd_04_SetEntityPosition, 0xFD050F82, 0xFFFFFF4C, 0x00000000, 0xFFFFFFDD, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_04/9AD960.data.s b/ver/us/asm/data/world/area_trd/trd_04/9AD960.data.s deleted file mode 100644 index c4e3198f19..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_04/9AD960.data.s +++ /dev/null @@ -1,48 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80245570_9AD960 -.word 0x3FC00000, 0x0000002D, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40F00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 - -dlabel D_802455A0_9AD990 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000002, trd_04_TackleAI_Main, D_80245570_9AD960, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245610_9ADA00 -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_802455A0_9AD990, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel D_8024563C_9ADA2C -.word 0x3FC00000, 0x00000019, 0x00000014, 0x428C0000, 0x42480000, 0x0000000A, 0x40E00000, 0x00000000, 0x00000000, 0x42A00000, 0x42700000, 0x00000001 - -dlabel D_8024566C_9ADA5C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000008, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0x0000000A, 0x00000043, 0x00000002, trd_04_KoopaPatrolAI_Main, D_8024563C_9ADA2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802456C8_9ADAB8 -.word 0x00000000, 0x00230018, 0x00000000, 0x00000000, D_8024566C_9ADA5C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel trd_04_FlyingAI_JumpVels -.float 4.5, 3.5, 2.6, 2.0, 1.5, 20.0 - -dlabel D_8024570C_9ADAFC -.word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x41A00000, 0x0000000A, 0x40266666, 0x0000003C, 0x0000000A, 0x43160000, 0x41A00000, 0x00000001 - -dlabel D_8024573C_9ADB2C -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, SetSelfVar, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000258, 0x00000043, 0x00000002, trd_04_ParatroopaAI_Main, D_8024570C_9ADAFC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802457AC_9ADB9C -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, D_8024573C_9ADB2C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060001 - -dlabel D_802457D8_9ADBC8 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0xFFFFFFA9, 0x00000056, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000057, 0x00000000, 0x00000046, 0x00000001, 0x80245198, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245850_9ADC40 -.word 0x0000000F, 0x00000002, 0xF5DE0180, 0xFFFFFFA9, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_802457D8_9ADBC8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802458A4_9ADC94 -.word 0x00000000, D_80245610_9ADA00, 0x00000000, 0x00000000, 0x42FA0000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008A, 0x00050000, 0x00900005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00010000, 0x00000000, 0x00000000, 0x0000007D, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x0000007D, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80245A94_9ADE84 -.word 0x00000000, D_802456C8_9ADAB8, 0x435C0000, 0x00000000, 0x41F00000, 0x00802C00, D_80245850_9ADC40, 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, 0x00000002, 0x000000DC, 0x00000000, 0x0000001E, 0x000000F0, 0x00000000, 0x000000A0, 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, 0x000000DC, 0x00000000, 0x0000001E, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00290101, 0x00290103, 0x00290104, 0x00290104, 0x00290101, 0x00290101, 0x0029010B, 0x0029010B, 0x00290107, 0x00290106, 0x00290108, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00290104, 0x00000001, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80245C84_9AE074 -.word 0x00000001, D_802457AC_9ADB9C, 0xC0A00000, 0x436D0000, 0x431D0000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050090, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00010000, 0xFFFFFFFB, 0x000000ED, 0x0000009D, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFFB, 0x000000ED, 0x0000009D, 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, 0x002A0101, 0x002A0102, 0x002A0103, 0x002A0103, 0x002A0101, 0x002A0101, 0x002A0106, 0x002A0106, 0x002A0104, 0x002A010C, 0x002A010A, 0x002A010E, 0x002A0103, 0x002A0103, 0x002A0103, 0x002A0103, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802458A4_9ADC94, 0x0605000D, 0x00000001, D_80245C84_9AE074, 0x060D0006, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80245A94_9ADE84, 0x0605000D, 0x00000001, D_80245C84_9AE074, 0x060D0006, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_08/9BBCC0.data.s b/ver/us/asm/data/world/area_trd/trd_08/9BBCC0.data.s deleted file mode 100644 index 32b376e084..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_08/9BBCC0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240A20_9BBCC0 -.word 0x44250000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240CA0, D_80240A20_9BBCC0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190056, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000014, 0x00000000, 0x00000008, 0x00000043, 0x00000002, UseDoorSounds, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_08/9BBD50.data.s b/ver/us/asm/data/world/area_trd/trd_08/9BBD50.data.s deleted file mode 100644 index b1ae55c6df..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_08/9BBD50.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240AB0_9BBD50 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, trd_08_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, trd_08_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B4C_9BBDEC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802423B0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BA8_9BBE48 -.word 0x00000047, 0x00000005, D_80240B4C_9BBDEC, 0x00080000, 0x00000001, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240BD4_9BBE74 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000008, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000001, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000064, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000007, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000001, 0x80242388, 0x00000046, 0x00000001, D_80240EC0_9BC160, 0x00000044, 0x00000001, 0x80240A70, 0x00000044, 0x00000001, D_80240BD4_9BBE74, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000002, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x0000000E, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80240BA8_9BBE48, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000008, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFBA, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80240AB0_9BBD50, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240EC0_9BC160 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x00000010, 0xFFFFFE0C, 0x00000010, 0x00000000, 0x00000000, 0xF8405E08, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_trd/trd_08/9BC1A0.data.s b/ver/us/asm/data/world/area_trd/trd_08/9BC1A0.data.s deleted file mode 100644 index 8d85535445..0000000000 --- a/ver/us/asm/data/world/area_trd/trd_08/9BC1A0.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel trd_08_FireBar_Sounds -.word D_B0000000, 0xB0000001, 0xB0000002, 0xB0000003, 0xB0000004, 0xB0000005, 0xB0000006, 0xB0000007, D_B0000008, 0xB0000009, 0xB0000009 - -dlabel trd_08_EVS_FireBar_Defeated -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000005, 0x00000001, 0x0000000F, 0x00000005, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C80, 0x00000002, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000005, 0x00000001, 0xFE363C81, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFE363C80, 0x00000002, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000006, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000006, PlaySoundAt, 0xB000000A, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, RandInt, 0x00000032, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C84, 0x00000019, 0x00000043, 0x00000003, RandInt, 0x0000001E, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000043, 0x0000000F, PlayEffect, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000001, 0x00000014, 0x00000003, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x0000000A, 0x00000002, 0xF971888B, 0x00000000, 0x00000024, 0x00000002, 0xF971888B, 0x00000001, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000003, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000005, 0x0000000A, 0x00000002, 0xF971888C, 0x00000000, 0x00000024, 0x00000002, 0xF971888C, 0x00000001, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000003, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveEncounter, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241248_9BC4E8 -.word 0xFFFFFF9C, 0x00000000, 0x00000028, 0x00000008, 0x00000000, 0x00000004, trd_08_FireBarAI_Callback - -dlabel D_80241264_9BC504 -.word 0x0000012C, 0x00000000, 0xFFFFFFDD, 0xFFFFFFF8, 0x00000005, 0x00000004, trd_08_FireBarAI_Callback - -dlabel D_80241280_9BC520 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000000, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00D40000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00D40001, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241344_9BC5E4 -.word 0x00000043, 0x00000002, trd_08_FireBarAI_Main, D_80241248_9BC4E8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241364_9BC604 -.word 0x00000043, 0x00000002, trd_08_FireBarAI_Main, D_80241264_9BC504, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241384_9BC624 -.word 0x00D40001, 0x000C0014, D_80241280_9BC520, 0x00000000, D_80241344_9BC5E4, 0x00000000, 0x00000000, 0x00000000, 0x00000F00, 0x00000000, 0x00000000 - -dlabel D_802413B0_9BC650 -.word 0x00D40001, 0x000C0014, D_80241280_9BC520, 0x00000000, D_80241364_9BC604, 0x00000000, 0x00000000, 0x00000000, 0x00000F00, 0x00000000, 0x00000000 - -dlabel D_802413DC_9BC67C -.word 0x00D40001, 0x000C0014, D_80241280_9BC520, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000F00, 0x00000000, 0x00000000 - -dlabel D_80241408_9BC6A8 -.word 0x00000000, D_80241384_9BC624, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00004003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802413DC_9BC67C, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00004003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_802413DC_9BC67C, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00004003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_802413DC_9BC67C, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00004003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241BC8_9BCE68 -.word 0x00000005, D_802413B0_9BC650, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00004003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, D_802413DC_9BC67C, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00004003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, D_802413DC_9BC67C, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00004003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, D_802413DC_9BC67C, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00004003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, D_80241408_9BC6A8, 0x00060000, 0x00000004, D_80241BC8_9BCE68, 0x00060000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240738_B20C78.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240738_B20C78.s deleted file mode 100644 index b856a71b87..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240738_B20C78.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240738_B20C78 -/* B20C78 80240738 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B20C7C 8024073C AFBF0010 */ sw $ra, 0x10($sp) -/* B20C80 80240740 10A00003 */ beqz $a1, .L80240750 -/* B20C84 80240744 8C86000C */ lw $a2, 0xc($a0) -/* B20C88 80240748 3C018024 */ lui $at, %hi(D_8024242C_B2296C) -/* B20C8C 8024074C AC20242C */ sw $zero, %lo(D_8024242C_B2296C)($at) -.L80240750: -/* B20C90 80240750 3C038024 */ lui $v1, %hi(D_8024242C_B2296C) -/* B20C94 80240754 2463242C */ addiu $v1, $v1, %lo(D_8024242C_B2296C) -/* B20C98 80240758 8C620000 */ lw $v0, ($v1) -/* B20C9C 8024075C 54400003 */ bnel $v0, $zero, .L8024076C -/* B20CA0 80240760 AC600000 */ sw $zero, ($v1) -/* B20CA4 80240764 080901E0 */ j .L80240780 -/* B20CA8 80240768 0000102D */ daddu $v0, $zero, $zero -.L8024076C: -/* B20CAC 8024076C 8CC50000 */ lw $a1, ($a2) -/* B20CB0 80240770 3C068024 */ lui $a2, %hi(D_80242430_B22970) -/* B20CB4 80240774 0C0B2026 */ jal evt_set_variable -/* B20CB8 80240778 8CC62430 */ lw $a2, %lo(D_80242430_B22970)($a2) -/* B20CBC 8024077C 24020002 */ addiu $v0, $zero, 2 -.L80240780: -/* B20CC0 80240780 8FBF0010 */ lw $ra, 0x10($sp) -/* B20CC4 80240784 03E00008 */ jr $ra -/* B20CC8 80240788 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024078C_B20CCC.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024078C_B20CCC.s deleted file mode 100644 index 9970d660de..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024078C_B20CCC.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024078C_B20CCC -/* B20CCC 8024078C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B20CD0 80240790 AFBF0010 */ sw $ra, 0x10($sp) -/* B20CD4 80240794 8C82000C */ lw $v0, 0xc($a0) -/* B20CD8 80240798 0C0B1EAF */ jal evt_get_variable -/* B20CDC 8024079C 8C450000 */ lw $a1, ($v0) -/* B20CE0 802407A0 3C018024 */ lui $at, %hi(D_80242430_B22970) -/* B20CE4 802407A4 AC222430 */ sw $v0, %lo(D_80242430_B22970)($at) -/* B20CE8 802407A8 24020002 */ addiu $v0, $zero, 2 -/* B20CEC 802407AC 8FBF0010 */ lw $ra, 0x10($sp) -/* B20CF0 802407B0 24030001 */ addiu $v1, $zero, 1 -/* B20CF4 802407B4 3C018024 */ lui $at, %hi(D_8024242C_B2296C) -/* B20CF8 802407B8 AC23242C */ sw $v1, %lo(D_8024242C_B2296C)($at) -/* B20CFC 802407BC 03E00008 */ jr $ra -/* B20D00 802407C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802407C4_B20D04.s b/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802407C4_B20D04.s deleted file mode 100644 index ad24716b8f..0000000000 --- a/ver/us/asm/nonmatchings/world/area_jan/jan_00/B20540/func_802407C4_B20D04.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407C4_B20D04 -/* B20D04 802407C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B20D08 802407C8 AFBF0010 */ sw $ra, 0x10($sp) -/* B20D0C 802407CC 8C82000C */ lw $v0, 0xc($a0) -/* B20D10 802407D0 0C0B1EAF */ jal evt_get_variable -/* B20D14 802407D4 8C450000 */ lw $a1, ($v0) -/* B20D18 802407D8 0040182D */ daddu $v1, $v0, $zero -/* B20D1C 802407DC 10600012 */ beqz $v1, .L80240828 -/* B20D20 802407E0 0000202D */ daddu $a0, $zero, $zero -/* B20D24 802407E4 8C620000 */ lw $v0, ($v1) -/* B20D28 802407E8 5040000A */ beql $v0, $zero, .L80240814 -/* B20D2C 802407EC 00041080 */ sll $v0, $a0, 2 -/* B20D30 802407F0 3C058024 */ lui $a1, %hi(D_80247AF0_CCB300) -/* B20D34 802407F4 24A57AF0 */ addiu $a1, $a1, %lo(D_80247AF0_CCB300) -.L802407F8: -/* B20D38 802407F8 24630004 */ addiu $v1, $v1, 4 -/* B20D3C 802407FC 24840001 */ addiu $a0, $a0, 1 -/* B20D40 80240800 ACA20000 */ sw $v0, ($a1) -/* B20D44 80240804 8C620000 */ lw $v0, ($v1) -/* B20D48 80240808 1440FFFB */ bnez $v0, .L802407F8 -/* B20D4C 8024080C 24A50004 */ addiu $a1, $a1, 4 -/* B20D50 80240810 00041080 */ sll $v0, $a0, 2 -.L80240814: -/* B20D54 80240814 3C018024 */ lui $at, %hi(D_80247AF0_CCB300) -/* B20D58 80240818 00220821 */ addu $at, $at, $v0 -/* B20D5C 8024081C AC207AF0 */ sw $zero, %lo(D_80247AF0_CCB300)($at) -/* B20D60 80240820 08090214 */ j .L80240850 -/* B20D64 80240824 00000000 */ nop -.L80240828: -/* B20D68 80240828 3C038024 */ lui $v1, %hi(D_80247AF0_CCB300) -/* B20D6C 8024082C 24637AF0 */ addiu $v1, $v1, %lo(D_80247AF0_CCB300) -/* B20D70 80240830 0060282D */ daddu $a1, $v1, $zero -.L80240834: -/* B20D74 80240834 24820010 */ addiu $v0, $a0, 0x10 -/* B20D78 80240838 AC620000 */ sw $v0, ($v1) -/* B20D7C 8024083C 24630004 */ addiu $v1, $v1, 4 -/* B20D80 80240840 24840001 */ addiu $a0, $a0, 1 -/* B20D84 80240844 28820070 */ slti $v0, $a0, 0x70 -/* B20D88 80240848 1440FFFA */ bnez $v0, .L80240834 -/* B20D8C 8024084C ACA001C0 */ sw $zero, 0x1c0($a1) -.L80240850: -/* B20D90 80240850 8FBF0010 */ lw $ra, 0x10($sp) -/* B20D94 80240854 24020002 */ addiu $v0, $zero, 2 -/* B20D98 80240858 03E00008 */ jr $ra -/* B20D9C 8024085C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241098_865BD8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241098_865BD8.s deleted file mode 100644 index 2d53a114da..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241098_865BD8.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241098_865BD8 -/* 865BD8 80241098 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 865BDC 8024109C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 865BE0 802410A0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 865BE4 802410A4 AFBF0014 */ sw $ra, 0x14($sp) -/* 865BE8 802410A8 AFB00010 */ sw $s0, 0x10($sp) -/* 865BEC 802410AC 8C500010 */ lw $s0, 0x10($v0) -/* 865BF0 802410B0 0C00EAD2 */ jal get_npc_safe -/* 865BF4 802410B4 0000202D */ daddu $a0, $zero, $zero -/* 865BF8 802410B8 3C048024 */ lui $a0, %hi(D_8024343C_867F7C) -/* 865BFC 802410BC 2484343C */ addiu $a0, $a0, %lo(D_8024343C_867F7C) -/* 865C00 802410C0 8C830000 */ lw $v1, ($a0) -/* 865C04 802410C4 1060000E */ beqz $v1, .L80241100 -/* 865C08 802410C8 0040282D */ daddu $a1, $v0, $zero -/* 865C0C 802410CC 0460006B */ bltz $v1, .L8024127C -/* 865C10 802410D0 2402000A */ addiu $v0, $zero, 0xa -/* 865C14 802410D4 10620019 */ beq $v1, $v0, .L8024113C -/* 865C18 802410D8 0062102A */ slt $v0, $v1, $v0 -/* 865C1C 802410DC 14400068 */ bnez $v0, .L80241280 -/* 865C20 802410E0 0000102D */ daddu $v0, $zero, $zero -/* 865C24 802410E4 2402000B */ addiu $v0, $zero, 0xb -/* 865C28 802410E8 10620021 */ beq $v1, $v0, .L80241170 -/* 865C2C 802410EC 2402000C */ addiu $v0, $zero, 0xc -/* 865C30 802410F0 1062004D */ beq $v1, $v0, .L80241228 -/* 865C34 802410F4 0000102D */ daddu $v0, $zero, $zero -/* 865C38 802410F8 080904A0 */ j .L80241280 -/* 865C3C 802410FC 00000000 */ nop -.L80241100: -/* 865C40 80241100 32028000 */ andi $v0, $s0, 0x8000 -/* 865C44 80241104 10400003 */ beqz $v0, .L80241114 -/* 865C48 80241108 2402000A */ addiu $v0, $zero, 0xa -/* 865C4C 8024110C 0809049F */ j .L8024127C -/* 865C50 80241110 AC820000 */ sw $v0, ($a0) -.L80241114: -/* 865C54 80241114 3C048024 */ lui $a0, %hi(D_80243440_867F80) -/* 865C58 80241118 24843440 */ addiu $a0, $a0, %lo(D_80243440_867F80) -/* 865C5C 8024111C 8C830000 */ lw $v1, ($a0) -/* 865C60 80241120 28620096 */ slti $v0, $v1, 0x96 -/* 865C64 80241124 14400003 */ bnez $v0, .L80241134 -/* 865C68 80241128 24620001 */ addiu $v0, $v1, 1 -/* 865C6C 8024112C 080904A0 */ j .L80241280 -/* 865C70 80241130 24020002 */ addiu $v0, $zero, 2 -.L80241134: -/* 865C74 80241134 0809049F */ j .L8024127C -/* 865C78 80241138 AC820000 */ sw $v0, ($a0) -.L8024113C: -/* 865C7C 8024113C 3C0200B6 */ lui $v0, 0xb6 -/* 865C80 80241140 3C0140A0 */ lui $at, 0x40a0 -/* 865C84 80241144 44810000 */ mtc1 $at, $f0 -/* 865C88 80241148 34420009 */ ori $v0, $v0, 9 -/* 865C8C 8024114C ACA20028 */ sw $v0, 0x28($a1) -/* 865C90 80241150 2402000B */ addiu $v0, $zero, 0xb -/* 865C94 80241154 3C018024 */ lui $at, %hi(D_80243434_867F74) -/* 865C98 80241158 AC203434 */ sw $zero, %lo(D_80243434_867F74)($at) -/* 865C9C 8024115C AC820000 */ sw $v0, ($a0) -/* 865CA0 80241160 3C018024 */ lui $at, %hi(D_80243438_867F78) -/* 865CA4 80241164 E4203438 */ swc1 $f0, %lo(D_80243438_867F78)($at) -/* 865CA8 80241168 080904A0 */ j .L80241280 -/* 865CAC 8024116C 0000102D */ daddu $v0, $zero, $zero -.L80241170: -/* 865CB0 80241170 3C028024 */ lui $v0, %hi(D_80243434_867F74) -/* 865CB4 80241174 24423434 */ addiu $v0, $v0, %lo(D_80243434_867F74) -/* 865CB8 80241178 3C038024 */ lui $v1, %hi(D_80243438_867F78) -/* 865CBC 8024117C 24633438 */ addiu $v1, $v1, %lo(D_80243438_867F78) -/* 865CC0 80241180 C4400000 */ lwc1 $f0, ($v0) -/* 865CC4 80241184 C4640000 */ lwc1 $f4, ($v1) -/* 865CC8 80241188 46040000 */ add.s $f0, $f0, $f4 -/* 865CCC 8024118C 3C01428C */ lui $at, 0x428c -/* 865CD0 80241190 44811000 */ mtc1 $at, $f2 -/* 865CD4 80241194 00000000 */ nop -/* 865CD8 80241198 4602003C */ c.lt.s $f0, $f2 -/* 865CDC 8024119C 00000000 */ nop -/* 865CE0 802411A0 4500000D */ bc1f .L802411D8 -/* 865CE4 802411A4 E4400000 */ swc1 $f0, ($v0) -/* 865CE8 802411A8 3C014080 */ lui $at, 0x4080 -/* 865CEC 802411AC 44810000 */ mtc1 $at, $f0 -/* 865CF0 802411B0 00000000 */ nop -/* 865CF4 802411B4 4600203C */ c.lt.s $f4, $f0 -/* 865CF8 802411B8 00000000 */ nop -/* 865CFC 802411BC 45030001 */ bc1tl .L802411C4 -/* 865D00 802411C0 E4600000 */ swc1 $f0, ($v1) -.L802411C4: -/* 865D04 802411C4 C4600000 */ lwc1 $f0, ($v1) -/* 865D08 802411C8 3C013F80 */ lui $at, 0x3f80 -/* 865D0C 802411CC 44811000 */ mtc1 $at, $f2 -/* 865D10 802411D0 0809047A */ j .L802411E8 -/* 865D14 802411D4 46020000 */ add.s $f0, $f0, $f2 -.L802411D8: -/* 865D18 802411D8 3C014000 */ lui $at, 0x4000 -/* 865D1C 802411DC 44810000 */ mtc1 $at, $f0 -/* 865D20 802411E0 00000000 */ nop -/* 865D24 802411E4 46002001 */ sub.s $f0, $f4, $f0 -.L802411E8: -/* 865D28 802411E8 E4600000 */ swc1 $f0, ($v1) -/* 865D2C 802411EC 3C0300B6 */ lui $v1, 0xb6 -/* 865D30 802411F0 8CA20028 */ lw $v0, 0x28($a1) -/* 865D34 802411F4 34630001 */ ori $v1, $v1, 1 -/* 865D38 802411F8 14430021 */ bne $v0, $v1, .L80241280 -/* 865D3C 802411FC 0000102D */ daddu $v0, $zero, $zero -/* 865D40 80241200 3C038024 */ lui $v1, %hi(D_8024343C_867F7C) -/* 865D44 80241204 2463343C */ addiu $v1, $v1, %lo(D_8024343C_867F7C) -/* 865D48 80241208 8C620000 */ lw $v0, ($v1) -/* 865D4C 8024120C 3C014080 */ lui $at, 0x4080 -/* 865D50 80241210 44810000 */ mtc1 $at, $f0 -/* 865D54 80241214 24420001 */ addiu $v0, $v0, 1 -/* 865D58 80241218 3C018024 */ lui $at, %hi(D_80243438_867F78) -/* 865D5C 8024121C E4203438 */ swc1 $f0, %lo(D_80243438_867F78)($at) -/* 865D60 80241220 0809049F */ j .L8024127C -/* 865D64 80241224 AC620000 */ sw $v0, ($v1) -.L80241228: -/* 865D68 80241228 3C028024 */ lui $v0, %hi(D_80243434_867F74) -/* 865D6C 8024122C 24423434 */ addiu $v0, $v0, %lo(D_80243434_867F74) -/* 865D70 80241230 3C038024 */ lui $v1, %hi(D_80243438_867F78) -/* 865D74 80241234 24633438 */ addiu $v1, $v1, %lo(D_80243438_867F78) -/* 865D78 80241238 C4400000 */ lwc1 $f0, ($v0) -/* 865D7C 8024123C C4620000 */ lwc1 $f2, ($v1) -/* 865D80 80241240 46020001 */ sub.s $f0, $f0, $f2 -/* 865D84 80241244 44802000 */ mtc1 $zero, $f4 -/* 865D88 80241248 00000000 */ nop -/* 865D8C 8024124C 4604003C */ c.lt.s $f0, $f4 -/* 865D90 80241250 00000000 */ nop -/* 865D94 80241254 45000004 */ bc1f .L80241268 -/* 865D98 80241258 E4400000 */ swc1 $f0, ($v0) -/* 865D9C 8024125C E4440000 */ swc1 $f4, ($v0) -/* 865DA0 80241260 080904A0 */ j .L80241280 -/* 865DA4 80241264 24020002 */ addiu $v0, $zero, 2 -.L80241268: -/* 865DA8 80241268 3C013F80 */ lui $at, 0x3f80 -/* 865DAC 8024126C 44810000 */ mtc1 $at, $f0 -/* 865DB0 80241270 00000000 */ nop -/* 865DB4 80241274 46001000 */ add.s $f0, $f2, $f0 -/* 865DB8 80241278 E4600000 */ swc1 $f0, ($v1) -.L8024127C: -/* 865DBC 8024127C 0000102D */ daddu $v0, $zero, $zero -.L80241280: -/* 865DC0 80241280 8FBF0014 */ lw $ra, 0x14($sp) -/* 865DC4 80241284 8FB00010 */ lw $s0, 0x10($sp) -/* 865DC8 80241288 03E00008 */ jr $ra -/* 865DCC 8024128C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241290_865DD0.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241290_865DD0.s deleted file mode 100644 index f68019ea2d..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241290_865DD0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241290_865DD0 -/* 865DD0 80241290 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 865DD4 80241294 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 865DD8 80241298 8C420010 */ lw $v0, 0x10($v0) -/* 865DDC 8024129C 30424000 */ andi $v0, $v0, 0x4000 -/* 865DE0 802412A0 0002102B */ sltu $v0, $zero, $v0 -/* 865DE4 802412A4 03E00008 */ jr $ra -/* 865DE8 802412A8 00021040 */ sll $v0, $v0, 1 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_802412AC_865DEC.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_802412AC_865DEC.s deleted file mode 100644 index 3f1689f3dc..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_802412AC_865DEC.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412AC_865DEC -/* 865DEC 802412AC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 865DF0 802412B0 AFB10014 */ sw $s1, 0x14($sp) -/* 865DF4 802412B4 0080882D */ daddu $s1, $a0, $zero -/* 865DF8 802412B8 AFBF0020 */ sw $ra, 0x20($sp) -/* 865DFC 802412BC AFB3001C */ sw $s3, 0x1c($sp) -/* 865E00 802412C0 AFB20018 */ sw $s2, 0x18($sp) -/* 865E04 802412C4 AFB00010 */ sw $s0, 0x10($sp) -/* 865E08 802412C8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 865E0C 802412CC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 865E10 802412D0 8E30000C */ lw $s0, 0xc($s1) -/* 865E14 802412D4 8E050000 */ lw $a1, ($s0) -/* 865E18 802412D8 0C0B1EAF */ jal evt_get_variable -/* 865E1C 802412DC 26100004 */ addiu $s0, $s0, 4 -/* 865E20 802412E0 8E120000 */ lw $s2, ($s0) -/* 865E24 802412E4 26100004 */ addiu $s0, $s0, 4 -/* 865E28 802412E8 8E130000 */ lw $s3, ($s0) -/* 865E2C 802412EC 8E100004 */ lw $s0, 4($s0) -/* 865E30 802412F0 0C046C04 */ jal get_model_list_index_from_tree_index -/* 865E34 802412F4 0040202D */ daddu $a0, $v0, $zero -/* 865E38 802412F8 0C046B4C */ jal get_model_from_list_index -/* 865E3C 802412FC 0040202D */ daddu $a0, $v0, $zero -/* 865E40 80241300 0040302D */ daddu $a2, $v0, $zero -/* 865E44 80241304 94C20000 */ lhu $v0, ($a2) -/* 865E48 80241308 30420400 */ andi $v0, $v0, 0x400 -/* 865E4C 8024130C 10400005 */ beqz $v0, .L80241324 -/* 865E50 80241310 0220202D */ daddu $a0, $s1, $zero -/* 865E54 80241314 C4C00088 */ lwc1 $f0, 0x88($a2) -/* 865E58 80241318 C4D6008C */ lwc1 $f22, 0x8c($a2) -/* 865E5C 8024131C 080904CD */ j .L80241334 -/* 865E60 80241320 C4D40090 */ lwc1 $f20, 0x90($a2) -.L80241324: -/* 865E64 80241324 4480A000 */ mtc1 $zero, $f20 -/* 865E68 80241328 00000000 */ nop -/* 865E6C 8024132C 4600A586 */ mov.s $f22, $f20 -/* 865E70 80241330 4600A006 */ mov.s $f0, $f20 -.L80241334: -/* 865E74 80241334 44060000 */ mfc1 $a2, $f0 -/* 865E78 80241338 0C0B2190 */ jal evt_set_float_variable -/* 865E7C 8024133C 0240282D */ daddu $a1, $s2, $zero -/* 865E80 80241340 0220202D */ daddu $a0, $s1, $zero -/* 865E84 80241344 4406B000 */ mfc1 $a2, $f22 -/* 865E88 80241348 0C0B2190 */ jal evt_set_float_variable -/* 865E8C 8024134C 0260282D */ daddu $a1, $s3, $zero -/* 865E90 80241350 0220202D */ daddu $a0, $s1, $zero -/* 865E94 80241354 4406A000 */ mfc1 $a2, $f20 -/* 865E98 80241358 0C0B2190 */ jal evt_set_float_variable -/* 865E9C 8024135C 0200282D */ daddu $a1, $s0, $zero -/* 865EA0 80241360 8FBF0020 */ lw $ra, 0x20($sp) -/* 865EA4 80241364 8FB3001C */ lw $s3, 0x1c($sp) -/* 865EA8 80241368 8FB20018 */ lw $s2, 0x18($sp) -/* 865EAC 8024136C 8FB10014 */ lw $s1, 0x14($sp) -/* 865EB0 80241370 8FB00010 */ lw $s0, 0x10($sp) -/* 865EB4 80241374 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 865EB8 80241378 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 865EBC 8024137C 24020002 */ addiu $v0, $zero, 2 -/* 865EC0 80241380 03E00008 */ jr $ra -/* 865EC4 80241384 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241388_865EC8.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241388_865EC8.s deleted file mode 100644 index 980ed18c65..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_80241388_865EC8.s +++ /dev/null @@ -1,175 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -.section .rodata - -dlabel D_80244968_8694A8 -.double 0.1 - -.section .text - -glabel func_80241388_865EC8 -/* 865EC8 80241388 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 865ECC 8024138C AFB00010 */ sw $s0, 0x10($sp) -/* 865ED0 80241390 0080802D */ daddu $s0, $a0, $zero -/* 865ED4 80241394 3C05FE36 */ lui $a1, 0xfe36 -/* 865ED8 80241398 AFBF0014 */ sw $ra, 0x14($sp) -/* 865EDC 8024139C F7BC0038 */ sdc1 $f28, 0x38($sp) -/* 865EE0 802413A0 F7BA0030 */ sdc1 $f26, 0x30($sp) -/* 865EE4 802413A4 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 865EE8 802413A8 F7B60020 */ sdc1 $f22, 0x20($sp) -/* 865EEC 802413AC F7B40018 */ sdc1 $f20, 0x18($sp) -/* 865EF0 802413B0 0C0B210B */ jal evt_get_float_variable -/* 865EF4 802413B4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 865EF8 802413B8 0200202D */ daddu $a0, $s0, $zero -/* 865EFC 802413BC 3C05FE36 */ lui $a1, 0xfe36 -/* 865F00 802413C0 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 865F04 802413C4 0C0B210B */ jal evt_get_float_variable -/* 865F08 802413C8 46000706 */ mov.s $f28, $f0 -/* 865F0C 802413CC 0200202D */ daddu $a0, $s0, $zero -/* 865F10 802413D0 3C05FE36 */ lui $a1, 0xfe36 -/* 865F14 802413D4 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 865F18 802413D8 0C0B210B */ jal evt_get_float_variable -/* 865F1C 802413DC 46000606 */ mov.s $f24, $f0 -/* 865F20 802413E0 0200202D */ daddu $a0, $s0, $zero -/* 865F24 802413E4 3C05FE36 */ lui $a1, 0xfe36 -/* 865F28 802413E8 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 865F2C 802413EC 0C0B210B */ jal evt_get_float_variable -/* 865F30 802413F0 46000686 */ mov.s $f26, $f0 -/* 865F34 802413F4 0200202D */ daddu $a0, $s0, $zero -/* 865F38 802413F8 3C05FE36 */ lui $a1, 0xfe36 -/* 865F3C 802413FC 34A53C87 */ ori $a1, $a1, 0x3c87 -/* 865F40 80241400 0C0B210B */ jal evt_get_float_variable -/* 865F44 80241404 46000506 */ mov.s $f20, $f0 -/* 865F48 80241408 46000586 */ mov.s $f22, $f0 -/* 865F4C 8024140C 0200202D */ daddu $a0, $s0, $zero -/* 865F50 80241410 3C05FBD3 */ lui $a1, 0xfbd3 -/* 865F54 80241414 0C0B1EAF */ jal evt_get_variable -/* 865F58 80241418 34A5E280 */ ori $a1, $a1, 0xe280 -/* 865F5C 8024141C 10400017 */ beqz $v0, .L8024147C -/* 865F60 80241420 0200202D */ daddu $a0, $s0, $zero -/* 865F64 80241424 4480A000 */ mtc1 $zero, $f20 -/* 865F68 80241428 3C05FE36 */ lui $a1, 0xfe36 -/* 865F6C 8024142C 4406A000 */ mfc1 $a2, $f20 -/* 865F70 80241430 0C0B2190 */ jal evt_set_float_variable -/* 865F74 80241434 34A53C86 */ ori $a1, $a1, 0x3c86 -/* 865F78 80241438 0200202D */ daddu $a0, $s0, $zero -/* 865F7C 8024143C 3C05FE36 */ lui $a1, 0xfe36 -/* 865F80 80241440 4406A000 */ mfc1 $a2, $f20 -/* 865F84 80241444 0C0B2190 */ jal evt_set_float_variable -/* 865F88 80241448 34A53C87 */ ori $a1, $a1, 0x3c87 -/* 865F8C 8024144C 0200202D */ daddu $a0, $s0, $zero -/* 865F90 80241450 3C05FBD3 */ lui $a1, 0xfbd3 -/* 865F94 80241454 34A5E280 */ ori $a1, $a1, 0xe280 -/* 865F98 80241458 0C0B2026 */ jal evt_set_variable -/* 865F9C 8024145C 0000302D */ daddu $a2, $zero, $zero -/* 865FA0 80241460 0200202D */ daddu $a0, $s0, $zero -/* 865FA4 80241464 3C05FBD3 */ lui $a1, 0xfbd3 -/* 865FA8 80241468 34A5E281 */ ori $a1, $a1, 0xe281 -/* 865FAC 8024146C 0C0B2026 */ jal evt_set_variable -/* 865FB0 80241470 24060001 */ addiu $a2, $zero, 1 -/* 865FB4 80241474 08090576 */ j .L802415D8 -/* 865FB8 80241478 24020002 */ addiu $v0, $zero, 2 -.L8024147C: -/* 865FBC 8024147C 461AE032 */ c.eq.s $f28, $f26 -/* 865FC0 80241480 00000000 */ nop -/* 865FC4 80241484 45000007 */ bc1f .L802414A4 -/* 865FC8 80241488 3C05FBD3 */ lui $a1, 0xfbd3 -/* 865FCC 8024148C 4614C032 */ c.eq.s $f24, $f20 -/* 865FD0 80241490 00000000 */ nop -/* 865FD4 80241494 45010050 */ bc1t .L802415D8 -/* 865FD8 80241498 24020002 */ addiu $v0, $zero, 2 -/* 865FDC 8024149C 0200202D */ daddu $a0, $s0, $zero -/* 865FE0 802414A0 3C05FBD3 */ lui $a1, 0xfbd3 -.L802414A4: -/* 865FE4 802414A4 0C0B1EAF */ jal evt_get_variable -/* 865FE8 802414A8 34A5E281 */ ori $a1, $a1, 0xe281 -/* 865FEC 802414AC 10400018 */ beqz $v0, .L80241510 -/* 865FF0 802414B0 4600C386 */ mov.s $f14, $f24 -/* 865FF4 802414B4 4600D687 */ neg.s $f26, $f26 -/* 865FF8 802414B8 4407A000 */ mfc1 $a3, $f20 -/* 865FFC 802414BC 4406D000 */ mfc1 $a2, $f26 -/* 866000 802414C0 0C00A720 */ jal atan2 -/* 866004 802414C4 4600E307 */ neg.s $f12, $f28 -/* 866008 802414C8 46000506 */ mov.s $f20, $f0 -/* 86600C 802414CC 0200202D */ daddu $a0, $s0, $zero -/* 866010 802414D0 3C05FE36 */ lui $a1, 0xfe36 -/* 866014 802414D4 4406A000 */ mfc1 $a2, $f20 -/* 866018 802414D8 0C0B2190 */ jal evt_set_float_variable -/* 86601C 802414DC 34A53C86 */ ori $a1, $a1, 0x3c86 -/* 866020 802414E0 0200202D */ daddu $a0, $s0, $zero -/* 866024 802414E4 3C05FE36 */ lui $a1, 0xfe36 -/* 866028 802414E8 4406A000 */ mfc1 $a2, $f20 -/* 86602C 802414EC 0C0B2190 */ jal evt_set_float_variable -/* 866030 802414F0 34A53C87 */ ori $a1, $a1, 0x3c87 -/* 866034 802414F4 0200202D */ daddu $a0, $s0, $zero -/* 866038 802414F8 3C05FBD3 */ lui $a1, 0xfbd3 -/* 86603C 802414FC 34A5E281 */ ori $a1, $a1, 0xe281 -/* 866040 80241500 0C0B2026 */ jal evt_set_variable -/* 866044 80241504 0000302D */ daddu $a2, $zero, $zero -/* 866048 80241508 08090576 */ j .L802415D8 -/* 86604C 8024150C 24020002 */ addiu $v0, $zero, 2 -.L80241510: -/* 866050 80241510 4407A000 */ mfc1 $a3, $f20 -/* 866054 80241514 4600D687 */ neg.s $f26, $f26 -/* 866058 80241518 4406D000 */ mfc1 $a2, $f26 -/* 86605C 8024151C 0C00A720 */ jal atan2 -/* 866060 80241520 4600E307 */ neg.s $f12, $f28 -/* 866064 80241524 0C00A6C9 */ jal clamp_angle -/* 866068 80241528 46000306 */ mov.s $f12, $f0 -/* 86606C 8024152C 46000506 */ mov.s $f20, $f0 -/* 866070 80241530 0200202D */ daddu $a0, $s0, $zero -/* 866074 80241534 3C05FE36 */ lui $a1, 0xfe36 -/* 866078 80241538 4406A000 */ mfc1 $a2, $f20 -/* 86607C 8024153C 0C0B2190 */ jal evt_set_float_variable -/* 866080 80241540 34A53C86 */ ori $a1, $a1, 0x3c86 -/* 866084 80241544 4614B081 */ sub.s $f2, $f22, $f20 -/* 866088 80241548 3C014334 */ lui $at, 0x4334 -/* 86608C 8024154C 44810000 */ mtc1 $at, $f0 -/* 866090 80241550 00000000 */ nop -/* 866094 80241554 4602003E */ c.le.s $f0, $f2 -/* 866098 80241558 00000000 */ nop -/* 86609C 8024155C 45000005 */ bc1f .L80241574 -/* 8660A0 80241560 00000000 */ nop -/* 8660A4 80241564 3C0143B4 */ lui $at, 0x43b4 -/* 8660A8 80241568 44810000 */ mtc1 $at, $f0 -/* 8660AC 8024156C 08090568 */ j .L802415A0 -/* 8660B0 80241570 4600B581 */ sub.s $f22, $f22, $f0 -.L80241574: -/* 8660B4 80241574 3C01C334 */ lui $at, 0xc334 -/* 8660B8 80241578 44810000 */ mtc1 $at, $f0 -/* 8660BC 8024157C 00000000 */ nop -/* 8660C0 80241580 4600103E */ c.le.s $f2, $f0 -/* 8660C4 80241584 00000000 */ nop -/* 8660C8 80241588 45020006 */ bc1fl .L802415A4 -/* 8660CC 8024158C 4616A001 */ sub.s $f0, $f20, $f22 -/* 8660D0 80241590 3C0143B4 */ lui $at, 0x43b4 -/* 8660D4 80241594 44810000 */ mtc1 $at, $f0 -/* 8660D8 80241598 00000000 */ nop -/* 8660DC 8024159C 4600B580 */ add.s $f22, $f22, $f0 -.L802415A0: -/* 8660E0 802415A0 4616A001 */ sub.s $f0, $f20, $f22 -.L802415A4: -/* 8660E4 802415A4 3C018024 */ lui $at, %hi(D_80244968_8694A8) -/* 8660E8 802415A8 D4224968 */ ldc1 $f2, %lo(D_80244968_8694A8)($at) -/* 8660EC 802415AC 46000021 */ cvt.d.s $f0, $f0 -/* 8660F0 802415B0 46220002 */ mul.d $f0, $f0, $f2 -/* 8660F4 802415B4 00000000 */ nop -/* 8660F8 802415B8 46200020 */ cvt.s.d $f0, $f0 -/* 8660FC 802415BC 4600B580 */ add.s $f22, $f22, $f0 -/* 866100 802415C0 0200202D */ daddu $a0, $s0, $zero -/* 866104 802415C4 3C05FE36 */ lui $a1, 0xfe36 -/* 866108 802415C8 4406B000 */ mfc1 $a2, $f22 -/* 86610C 802415CC 0C0B2190 */ jal evt_set_float_variable -/* 866110 802415D0 34A53C87 */ ori $a1, $a1, 0x3c87 -/* 866114 802415D4 24020002 */ addiu $v0, $zero, 2 -.L802415D8: -/* 866118 802415D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 86611C 802415DC 8FB00010 */ lw $s0, 0x10($sp) -/* 866120 802415E0 D7BC0038 */ ldc1 $f28, 0x38($sp) -/* 866124 802415E4 D7BA0030 */ ldc1 $f26, 0x30($sp) -/* 866128 802415E8 D7B80028 */ ldc1 $f24, 0x28($sp) -/* 86612C 802415EC D7B60020 */ ldc1 $f22, 0x20($sp) -/* 866130 802415F0 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 866134 802415F4 03E00008 */ jr $ra -/* 866138 802415F8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_802415FC_86613C.s b/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_802415FC_86613C.s deleted file mode 100644 index 863cd73c81..0000000000 --- a/ver/us/asm/nonmatchings/world/area_mac/mac_06/mac_06_3/func_802415FC_86613C.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415FC_86613C -/* 86613C 802415FC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 866140 80241600 AFBF0018 */ sw $ra, 0x18($sp) -/* 866144 80241604 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 866148 80241608 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 86614C 8024160C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 866150 80241610 0C00EAD2 */ jal get_npc_safe -/* 866154 80241614 24040003 */ addiu $a0, $zero, 3 -/* 866158 80241618 C4420038 */ lwc1 $f2, 0x38($v0) -/* 86615C 8024161C 3C014120 */ lui $at, 0x4120 -/* 866160 80241620 44810000 */ mtc1 $at, $f0 -/* 866164 80241624 C454003C */ lwc1 $f20, 0x3c($v0) -/* 866168 80241628 46001600 */ add.s $f24, $f2, $f0 -/* 86616C 8024162C 44800000 */ mtc1 $zero, $f0 -/* 866170 80241630 C4560040 */ lwc1 $f22, 0x40($v0) -/* 866174 80241634 4600A03C */ c.lt.s $f20, $f0 -/* 866178 80241638 00000000 */ nop -/* 86617C 8024163C 4500000C */ bc1f .L80241670 -/* 866180 80241640 0000202D */ daddu $a0, $zero, $zero -/* 866184 80241644 4405C000 */ mfc1 $a1, $f24 -/* 866188 80241648 4406A000 */ mfc1 $a2, $f20 -/* 86618C 8024164C 4407B000 */ mfc1 $a3, $f22 -/* 866190 80241650 0C01C16C */ jal fx_rising_bubble -/* 866194 80241654 E7A00010 */ swc1 $f0, 0x10($sp) -/* 866198 80241658 24040046 */ addiu $a0, $zero, 0x46 -/* 86619C 8024165C 4406C000 */ mfc1 $a2, $f24 -/* 8661A0 80241660 4407A000 */ mfc1 $a3, $f20 -/* 8661A4 80241664 0000282D */ daddu $a1, $zero, $zero -/* 8661A8 80241668 0C05267B */ jal sfx_adjust_env_sound_pos -/* 8661AC 8024166C E7B60010 */ swc1 $f22, 0x10($sp) -.L80241670: -/* 8661B0 80241670 8FBF0018 */ lw $ra, 0x18($sp) -/* 8661B4 80241674 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 8661B8 80241678 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8661BC 8024167C D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8661C0 80241680 24020002 */ addiu $v0, $zero, 2 -/* 8661C4 80241684 03E00008 */ jr $ra -/* 8661C8 80241688 27BD0038 */ addiu $sp, $sp, 0x38 -/* 8661CC 8024168C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s deleted file mode 100644 index 6e93a8f9e6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240384_946254.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240384_946254 -/* 946254 80240384 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 946258 80240388 AFBF0010 */ sw $ra, 0x10($sp) -/* 94625C 8024038C 10A00003 */ beqz $a1, .L8024039C -/* 946260 80240390 8C86000C */ lw $a2, 0xc($a0) -/* 946264 80240394 3C018024 */ lui $at, %hi(D_80240E00_946CD0) -/* 946268 80240398 AC200E00 */ sw $zero, %lo(D_80240E00_946CD0)($at) -.L8024039C: -/* 94626C 8024039C 3C038024 */ lui $v1, %hi(D_80240E00_946CD0) -/* 946270 802403A0 24630E00 */ addiu $v1, $v1, %lo(D_80240E00_946CD0) -/* 946274 802403A4 8C620000 */ lw $v0, ($v1) -/* 946278 802403A8 54400003 */ bnel $v0, $zero, .L802403B8 -/* 94627C 802403AC AC600000 */ sw $zero, ($v1) -/* 946280 802403B0 080900F3 */ j .L802403CC -/* 946284 802403B4 0000102D */ daddu $v0, $zero, $zero -.L802403B8: -/* 946288 802403B8 8CC50000 */ lw $a1, ($a2) -/* 94628C 802403BC 3C068024 */ lui $a2, %hi(D_80240E04_946CD4) -/* 946290 802403C0 0C0B2026 */ jal evt_set_variable -/* 946294 802403C4 8CC60E04 */ lw $a2, %lo(D_80240E04_946CD4)($a2) -/* 946298 802403C8 24020002 */ addiu $v0, $zero, 2 -.L802403CC: -/* 94629C 802403CC 8FBF0010 */ lw $ra, 0x10($sp) -/* 9462A0 802403D0 03E00008 */ jr $ra -/* 9462A4 802403D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8_9462A8.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8_9462A8.s deleted file mode 100644 index c2aef74bf6..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8_9462A8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403D8_9462A8 -/* 9462A8 802403D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9462AC 802403DC AFBF0010 */ sw $ra, 0x10($sp) -/* 9462B0 802403E0 8C82000C */ lw $v0, 0xc($a0) -/* 9462B4 802403E4 0C0B1EAF */ jal evt_get_variable -/* 9462B8 802403E8 8C450000 */ lw $a1, ($v0) -/* 9462BC 802403EC 3C018024 */ lui $at, %hi(D_80240E04_946CD4) -/* 9462C0 802403F0 AC220E04 */ sw $v0, %lo(D_80240E04_946CD4)($at) -/* 9462C4 802403F4 24020002 */ addiu $v0, $zero, 2 -/* 9462C8 802403F8 8FBF0010 */ lw $ra, 0x10($sp) -/* 9462CC 802403FC 24030001 */ addiu $v1, $zero, 1 -/* 9462D0 80240400 3C018024 */ lui $at, %hi(D_80240E00_946CD0) -/* 9462D4 80240404 AC230E00 */ sw $v1, %lo(D_80240E00_946CD0)($at) -/* 9462D8 80240408 03E00008 */ jr $ra -/* 9462DC 8024040C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240410_9462E0.s b/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240410_9462E0.s deleted file mode 100644 index 25aaa49c60..0000000000 --- a/ver/us/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_80240410_9462E0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240410_9462E0 -/* 9462E0 80240410 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9462E4 80240414 AFBF0010 */ sw $ra, 0x10($sp) -/* 9462E8 80240418 8C82000C */ lw $v0, 0xc($a0) -/* 9462EC 8024041C 0C0B1EAF */ jal evt_get_variable -/* 9462F0 80240420 8C450000 */ lw $a1, ($v0) -/* 9462F4 80240424 0040182D */ daddu $v1, $v0, $zero -/* 9462F8 80240428 10600012 */ beqz $v1, .L80240474 -/* 9462FC 8024042C 0000202D */ daddu $a0, $zero, $zero -/* 946300 80240430 8C620000 */ lw $v0, ($v1) -/* 946304 80240434 5040000A */ beql $v0, $zero, .L80240460 -/* 946308 80240438 00041080 */ sll $v0, $a0, 2 -/* 94630C 8024043C 3C058024 */ lui $a1, %hi(sbk_34_802427E0) -/* 946310 80240440 24A527E0 */ addiu $a1, $a1, %lo(sbk_34_802427E0) -.L80240444: -/* 946314 80240444 24630004 */ addiu $v1, $v1, 4 -/* 946318 80240448 24840001 */ addiu $a0, $a0, 1 -/* 94631C 8024044C ACA20000 */ sw $v0, ($a1) -/* 946320 80240450 8C620000 */ lw $v0, ($v1) -/* 946324 80240454 1440FFFB */ bnez $v0, .L80240444 -/* 946328 80240458 24A50004 */ addiu $a1, $a1, 4 -/* 94632C 8024045C 00041080 */ sll $v0, $a0, 2 -.L80240460: -/* 946330 80240460 3C018024 */ lui $at, %hi(sbk_34_802427E0) -/* 946334 80240464 00220821 */ addu $at, $at, $v0 -/* 946338 80240468 AC2027E0 */ sw $zero, %lo(sbk_34_802427E0)($at) -/* 94633C 8024046C 08090127 */ j .L8024049C -/* 946340 80240470 00000000 */ nop -.L80240474: -/* 946344 80240474 3C038024 */ lui $v1, %hi(sbk_34_802427E0) -/* 946348 80240478 246327E0 */ addiu $v1, $v1, %lo(sbk_34_802427E0) -/* 94634C 8024047C 0060282D */ daddu $a1, $v1, $zero -.L80240480: -/* 946350 80240480 24820010 */ addiu $v0, $a0, 0x10 -/* 946354 80240484 AC620000 */ sw $v0, ($v1) -/* 946358 80240488 24630004 */ addiu $v1, $v1, 4 -/* 94635C 8024048C 24840001 */ addiu $a0, $a0, 1 -/* 946360 80240490 28820070 */ slti $v0, $a0, 0x70 -/* 946364 80240494 1440FFFA */ bnez $v0, .L80240480 -/* 946368 80240498 ACA001C0 */ sw $zero, 0x1c0($a1) -.L8024049C: -/* 94636C 8024049C 8FBF0010 */ lw $ra, 0x10($sp) -/* 946370 802404A0 24020002 */ addiu $v0, $zero, 2 -/* 946374 802404A4 03E00008 */ jr $ra -/* 946378 802404A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 352ed21714..6ae15d0ae0 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -7068,8 +7068,9 @@ segments: start: 0x929270 vram: 0x80240000 subsegments: - - [0x929270, c] - - [0x9292B0, c] + - [0x929270, c, sbk_00_1_main] + - [0x9292B0, c, sbk_00_2_npc] + - [0x9292B0, c, sbk_00_3_entity] - [0x9292D0] - name: sbk_01 dir: world/area_sbk/sbk_01 @@ -7077,10 +7078,10 @@ segments: start: 0x929A90 vram: 0x80240000 subsegments: - - [0x929A90, c] - - [0x929AD0, c] + - [0x929A90, c, sbk_01_1_main] + - [0x929AD0, c, sbk_01_2_npc] - [0x929AF0] - - name: sbk_02 + - name: sbk_02 #TODO dir: world/area_sbk/sbk_02 type: code start: 0x92A2B0 @@ -7100,202 +7101,172 @@ segments: start: 0x92F8B0 vram: 0x80240000 subsegments: - - [0x92F8B0, c] - - [0x92F8F0, c] - - [0x92F910, data] - - [0x92FC20, data] - - [0x9304B0] + - [0x92F8B0, c, sbk_03_1_main] + - [0x92F8F0, c, sbk_03_2_npc] + - [0x92F910] - name: sbk_04 dir: world/area_sbk/sbk_04 type: code start: 0x9304D0 vram: 0x80240000 subsegments: - - [0x9304D0, c] - - [0x930510, c] - - [0x930530, data] - - [0x930840, data] - - [0x930CD0] + - [0x9304D0, c, sbk_04_1_main] + - [0x930510, c, sbk_04_2_npc] + - [0x930530] - name: sbk_05 dir: world/area_sbk/sbk_05 type: code start: 0x930CF0 vram: 0x80240000 subsegments: - - [0x930CF0, c] - - [0x930D30, c] - - [0x930D50, data] - - [0x9310F0, data] - - [0x931130, data] - - [0x9325A0] + - [0x930CF0, c, sbk_05_1_main] + - [0x930D30, c, sbk_05_2_entity] + - [0x930D30, c, sbk_05_3_npc] + - [0x930D50] - name: sbk_06 dir: world/area_sbk/sbk_06 type: code start: 0x9325C0 vram: 0x80240000 subsegments: - - [0x9325C0, c] - - [0x932600, c] - - [0x932940, data] - - [0x932BF0, data] - - [0x933160, data] - - [0x933C70] + - [0x9325C0, c, sbk_06_1_main] + - [0x932600, c, sbk_06_2_npc] + - [0x932600, c, sbk_06_3_foliage] + - [0x932600, c, sbk_06_4_entity] + - [0x932940] - name: sbk_10 dir: world/area_sbk/sbk_10 type: code start: 0x933C80 vram: 0x80240000 subsegments: - - [0x933C80, c] - - [0x933CC0, data] - - [0x933FD0, data] - - [0x934020] + - [0x933C80, c, sbk_10_1_main] + - [0x933C80, c, sbk_10_2_entity] + - [0x933CC0] - name: sbk_11 dir: world/area_sbk/sbk_11 type: code start: 0x934040 vram: 0x80240000 subsegments: - - [0x934040, c] - - [0x934080, c] - - [0x9341A0, data] - - [0x934530, data] - - [0x934D20] + - [0x934040, c, sbk_11_1_main] + - [0x934080, c, sbk_11_2_npc] + - [0x9341A0] - name: sbk_12 dir: world/area_sbk/sbk_12 type: code start: 0x934D40 vram: 0x80240000 subsegments: - - [0x934D40, c] - - [0x934D80, c] - - [0x934DA0, data] - - [0x935130, data] - - [0x9357C0] + - [0x934D40, c, sbk_12_1_main] + - [0x934D80, c, sbk_12_2_npc] + - [0x934DA0] - name: sbk_13 dir: world/area_sbk/sbk_13 type: code start: 0x9357E0 vram: 0x80240000 subsegments: - - [0x9357E0, c] - - [0x935820, c] - - [0x935940, data] - - [0x935CD0, data] - - [0x9366C0] + - [0x9357E0, c, sbk_13_1_main] + - [0x935820, c, sbk_13_2_npc] + - [0x935940] - name: sbk_14 dir: world/area_sbk/sbk_14 type: code start: 0x9366E0 vram: 0x80240000 subsegments: - - [0x9366E0, c] - - [0x936720, data] - - [0x936B20, data] - - [0x936CA0] + - [0x9366E0, c, sbk_14_1_main] + - [0x9366E0, c, sbk_14_2_entity] + - [0x936720] - name: sbk_15 dir: world/area_sbk/sbk_15 type: code start: 0x936CD0 vram: 0x80240000 subsegments: - - [0x936CD0, c] - - [0x936D10, c] - - [0x936D30, data] - - [0x9370C0, data] - - [0x937550] + - [0x936CD0, c, sbk_15_1_main] + - [0x936D10, c, sbk_15_2_npc] + - [0x936D30] - name: sbk_16 dir: world/area_sbk/sbk_16 type: code start: 0x937570 vram: 0x80240000 subsegments: - - [0x937570, c] - - [0x9375B0, c] - - [0x9377F0, data] - - [0x937B00, data] - - [0x938570] + - [0x937570, c, sbk_16_1_main] + - [0x9375B0, c, sbk_16_2_foliage] + - [0x9377F0] - name: sbk_20 dir: world/area_sbk/sbk_20 type: code start: 0x938590 vram: 0x80240000 subsegments: - - [0x938590, c] - - [0x9385D0, c] - - [0x9386D0, data] - - [0x9389F0, data] - - [0x938DD0, data] - - [0x939540] + - [0x938590, c, sbk_20_1_main] + - [0x9385D0, c, sbk_20_2_entity] + - [0x9385D0, c, sbk_20_2_npc] + - [0x9386D0] - name: sbk_21 dir: world/area_sbk/sbk_21 type: code start: 0x939560 vram: 0x80240000 subsegments: - - [0x939560, c] - - [0x9395A0, data] - - [0x939910] + - [0x939560, c, sbk_21_1_main] + - [0x9395A0] - name: sbk_22 dir: world/area_sbk/sbk_22 type: code start: 0x939930 vram: 0x80240000 subsegments: - - [0x939930, c] - - [0x939970, c] - - [0x939A90, data] - - [0x93A610, data] - - [0x93A740] + - [0x939930, c, sbk_22_1_main] + - [0x939970, c, sbk_22_2_npc] + - [0x939970, c, sbk_22_3_entity] + - [0x939A90] - name: sbk_23 dir: world/area_sbk/sbk_23 type: code start: 0x93A760 vram: 0x80240000 subsegments: - - [0x93A760, c] - - [0x93A7A0, data] - - [0x93AB20, data] - - [0x93AC00] + - [0x93A760, c, sbk_23_1_main] + - [0x93A760, c, sbk_23_2_entity] + - [0x93A7A0] - name: sbk_24 dir: world/area_sbk/sbk_24 type: code start: 0x93AC30 vram: 0x80240000 subsegments: - - [0x93AC30, c] - - [0x93AC70, c] - - [0x93AFB0, data] - - [0x93B3C0, data] - - [0x93B770, data] - - [0x93C260] + - [0x93AC30, c, sbk_24_1_main] + - [0x93AC70, c, sbk_24_2_npc] + - [0x93AC70, c, sbk_24_3_entity] + - [0x93AC70, c, sbk_24_4_foliage] + - [0x93AFB0] - name: sbk_25 dir: world/area_sbk/sbk_25 type: code start: 0x93C280 vram: 0x80240000 subsegments: - - [0x93C280, c] - - [0x93C2C0, c] - - [0x93C600, data] - - [0x93C9A0, data] - - [0x93D110, data] - - [0x93DB80, data] - - [0x93DCB0] + - [0x93C280, c, sbk_25_1_main] + - [0x93C2C0, c, sbk_25_2_npc] + - [0x93C2C0, c, sbk_25_3_foliage] + - [0x93C2C0, c, sbk_25_4_entity] + - [0x93C600] - name: sbk_26 dir: world/area_sbk/sbk_26 type: code start: 0x93DCD0 vram: 0x80240000 subsegments: - - [0x93DCD0, c] - - [0x93DD10, c] - - [0x93DE30, c] - - [0x93E070, data] - - [0x93E390, data] - - [0x93EB80, data] - - [0x93F590] - - name: sbk_30 + - [0x93DCD0, c, sbk_26_1_main] + - [0x93DD10, c, sbk_26_2_npc] + - [0x93DE30, c, sbk_26_3_foliage] + - [0x93E070] + - name: sbk_30 #TODO dir: world/area_sbk/sbk_30 type: code start: 0x93F5B0 @@ -7304,59 +7275,57 @@ segments: - [0x93F5B0, c] - [0x940DC0, data] - [0x943E20] +# - [0x93F5B0, c, sbk_30_1_main] +# - [0x93F5B0, c, sbk_30_2_npc] +# - [0x93F5B0, c, sbk_30_3_foliage] +# - [0x940DC0] - name: sbk_31 dir: world/area_sbk/sbk_31 type: code start: 0x944000 vram: 0x80240000 subsegments: - - [0x944000, c] - - [0x944040, c] - - [0x944140, data] - - [0x9444D0, data] - - [0x944A40] + - [0x944000, c, sbk_31_1_main] + - [0x944040, c, sbk_31_2_npc] + - [0x944140] - name: sbk_32 dir: world/area_sbk/sbk_32 type: code start: 0x944A60 vram: 0x80240000 subsegments: - - [0x944A60, c] - - [0x944AA0, c] - - [0x944BC0, data] - - [0x9459B0] + - [0x944A60, c, sbk_32_1_main] + - [0x944AA0, c, sbk_32_2_npc] + - [0x944BC0] - name: sbk_33 dir: world/area_sbk/sbk_33 type: code start: 0x9459D0 vram: 0x80240000 - subsegments: - - [0x9459D0, c] - - [0x945A10, data] - - [0x945BA0, data] - - [0x945EA0] + subsegments: # unusual organization + - [0x9459D0, c, sbk_33_0_header] + - [0x9459D0, c, sbk_33_1_entity] + - [0x9459D0, c, sbk_33_2_main] + - [0x945A10] - name: sbk_34 dir: world/area_sbk/sbk_34 type: code start: 0x945ED0 vram: 0x80240000 subsegments: - - [0x945ED0, c] - - [0x945F10, c] - - [0x946670, c] - - [0x9468B0, data] - - [0x947C80, data] - - [0x948690] + - [0x945ED0, c, sbk_34_1_main] + - [0x945F10, c, sbk_34_2_npc] + - [0x946670, c, sbk_34_3_foliage] + - [0x9468B0] - name: sbk_35 dir: world/area_sbk/sbk_35 type: code start: 0x9486B0 vram: 0x80240000 subsegments: - - [0x9486B0, c] - - [0x9486F0, c] - - [0x948A30, data] - - [0x949330, data] + - [0x9486B0, c, sbk_35_1_main] + - [0x9486F0, c, sbk_35_2_npc] + - [0x9486F0, c, sbk_35_3_foliage] - [0x949E40] - name: sbk_36 dir: world/area_sbk/sbk_36 @@ -7364,249 +7333,214 @@ segments: start: 0x949E60 vram: 0x80240000 subsegments: - - [0x949E60, c] - - [0x949EA0, c] - - [0x94A0E0, data] - - [0x94A470, data] - - [0x94B380] + - [0x949E60, c, sbk_36_1_main] + - [0x949EA0, c, sbk_36_2_foliage] + - [0x949EA0, c, sbk_36_3_entity] + - [0x94A0E0] - name: sbk_40 dir: world/area_sbk/sbk_40 type: code start: 0x94B3A0 vram: 0x80240000 subsegments: - - [0x94B3A0, c] - - [0x94B3E0, c] - - [0x94B4E0, data] - - [0x94B800, data] - - [0x94BF70, data] - - [0x94C020] + - [0x94B3A0, c, sbk_40_1_main] + - [0x94B3E0, c, sbk_40_2_npc] + - [0x94B3E0, c, sbk_40_3_entity] + - [0x94B4E0] - name: sbk_41 dir: world/area_sbk/sbk_41 type: code start: 0x94C040 vram: 0x80240000 subsegments: - - [0x94C040, c] - - [0x94C080, data] - - [0x94C400, data] - - [0x94C4E0] + - [0x94C040, c, sbk_41_1_main] + - [0x94C040, c, sbk_41_2_entity] + - [0x94C080] - name: sbk_42 dir: world/area_sbk/sbk_42 type: code start: 0x94C510 vram: 0x80240000 subsegments: - - [0x94C510, c] - - [0x94C550, c] - - [0x94C650, data] - - [0x94C9E0, data] - - [0x94D150] + - [0x94C510, c, sbk_42_1_main] + - [0x94C550, c, sbk_42_2_npc] + - [0x94C650] - name: sbk_43 dir: world/area_sbk/sbk_43 type: code start: 0x94D170 vram: 0x80240000 subsegments: - - [0x94D170, c] - - [0x94D1B0, data] - - [0x94D530, data] - - [0x94D580] + - [0x94D170, c, sbk_43_1_main] + - [0x94D170, c, sbk_43_2_entity] + - [0x94D170] - name: sbk_44 dir: world/area_sbk/sbk_44 type: code start: 0x94D5A0 vram: 0x80240000 subsegments: - - [0x94D5A0, c] - - [0x94D5E0, c] - - [0x94D700, data] - - [0x94DA90, data] - - [0x94E480] + - [0x94D5A0, c, sbk_44_1_main] + - [0x94D5E0, c, sbk_44_2_npc] + - [0x94D700] - name: sbk_45 dir: world/area_sbk/sbk_45 type: code start: 0x94E4A0 vram: 0x80240000 subsegments: - - [0x94E4A0, c] - - [0x94E4E0, data] - - [0x94E8E0, data] - - [0x94E980] + - [0x94E4A0, c, sbk_45_1_main] + - [0x94E4A0, c, sbk_45_2_entity] + - [0x94E4E0] - name: sbk_46 dir: world/area_sbk/sbk_46 type: code start: 0x94E9A0 vram: 0x80240000 subsegments: - - [0x94E9A0, c] - - [0x94E9E0, c] - - [0x94EB00, c] - - [0x94ED40, data] - - [0x94F070, data] - - [0x94FA60, data] - - [0x950570, data] - - [0x9505F0] + - [0x94E9A0, c, sbk_46_1_main] + - [0x94E9E0, c, sbk_46_2_npc] + - [0x94EB00, c, sbk_46_3_foliage] + - [0x94EB00, c, sbk_46_4_entity] + - [0x94ED40] - name: sbk_50 dir: world/area_sbk/sbk_50 type: code start: 0x950610 vram: 0x80240000 subsegments: - - [0x950610, c] - - [0x950650, data] - - [0x950950] + - [0x950610, c, sbk_50_1_main] + - [0x950650] - name: sbk_51 dir: world/area_sbk/sbk_51 type: code start: 0x950970 vram: 0x80240000 subsegments: - - [0x950970, c] - - [0x9509B0, c] - - [0x950AD0, data] - - [0x950E60, data] - - [0x951650] + - [0x950970, c, sbk_51_1_main] + - [0x9509B0, c, sbk_51_2_npc] + - [0x950AD0] - name: sbk_52 dir: world/area_sbk/sbk_52 type: code start: 0x951670 vram: 0x80240000 subsegments: - - [0x951670, c] - - [0x9516B0, data] - - [0x951A30, data] - - [0x951AC0] + - [0x951670, c, sbk_52_1_main] + - [0x951670, c, sbk_52_2_entity] + - [0x9516B0] - name: sbk_53 dir: world/area_sbk/sbk_53 type: code start: 0x951AE0 vram: 0x80240000 subsegments: - - [0x951AE0, c] - - [0x951B20, c] - - [0x951B40, data] - - [0x951ED0, data] - - [0x952560] + - [0x951AE0, c, sbk_53_1_main] + - [0x951B20, c, sbk_53_2_npc] + - [0x951B40] - name: sbk_54 dir: world/area_sbk/sbk_54 type: code start: 0x952580 vram: 0x80240000 subsegments: - - [0x952580, c] - - [0x9525C0, data] - - [0x952940, data] - - [0x952A20] + - [0x952580, c, sbk_54_1_main] + - [0x952580, c, sbk_54_2_entity] + - [0x9525C0] - name: sbk_55 dir: world/area_sbk/sbk_55 type: code start: 0x952A50 vram: 0x80240000 subsegments: - - [0x952A50, c] - - [0x952A90, c] - - [0x952AB0, c] - - [0x952CF0, data] - - [0x953090, data] - - [0x953520, data] - - [0x953FA0] + - [0x952A50, c, sbk_55_1_main] + - [0x952A90, c, sbk_55_2_npc] + - [0x952AB0, c, sbk_55_3_foliage] + - [0x952AB0, c, sbk_55_4_entity] + - [0x952CF0] - name: sbk_56 dir: world/area_sbk/sbk_56 type: code start: 0x953FC0 vram: 0x80240000 subsegments: - - [0x953FC0, c] - - [0x954D80, c] - - [0x954FC0, data] - - [0x9553F0, data] - - [0x9569D0] + - [0x953FC0, c, sbk_56_1_main] + - [0x954D80, c, sbk_56_2_entity] + - [0x954D80, c, sbk_56_3_foliage] + - [0x954FC00] - name: sbk_60 dir: world/area_sbk/sbk_60 type: code start: 0x9569F0 vram: 0x80240000 subsegments: - - [0x9569F0, c] - - [0x956A30, c] - - [0x956A50, data] - - [0x956CF0, data] - - [0x956F80] + - [0x9569F0, c, sbk_60_1_main] + - [0x956A30, c, sbk_60_2_npc] + - [0x956A50] - name: sbk_61 dir: world/area_sbk/sbk_61 type: code start: 0x956F90 vram: 0x80240000 subsegments: - - [0x956F90, c] - - [0x956FD0, data] - - [0x9572E0, data] - - [0x957330] + - [0x956F90, c, sbk_61_1_main] + - [0x956F90, c, sbk_61_2_entity] + - [0x956FD0] - name: sbk_62 dir: world/area_sbk/sbk_62 type: code start: 0x957350 vram: 0x80240000 subsegments: - - [0x957350, c] - - [0x957390, c] - - [0x9573B0, data] - - [0x9576C0, data] - - [0x957D50] + - [0x957350, c, sbk_62_1_main] + - [0x957390, c, sbk_62_2_npc] + - [0x9573B0] - name: sbk_63 dir: world/area_sbk/sbk_63 type: code start: 0x957D70 vram: 0x80240000 subsegments: - - [0x957D70, c] - - [0x957DB0, c] - - [0x957DD0, data] - - [0x9580E0, data] - - [0x958570] + - [0x957D70, c, sbk_63_1_main] + - [0x957DB0, c, sbk_63_2_npc] + - [0x957DD0] - name: sbk_64 dir: world/area_sbk/sbk_64 type: code start: 0x958590 vram: 0x80240000 subsegments: - - [0x958590, c] - - [0x9585D0, data] - - [0x9588E0, data] - - [0x958930] + - [0x958590, c, sbk_64_1_main] + - [0x958590, c, sbk_64_2_entity] + - [0x9585D0] - name: sbk_65 dir: world/area_sbk/sbk_65 type: code start: 0x958950 vram: 0x80240000 subsegments: - - [0x958950, c] - - [0x958990, data] - - [0x958C90] + - [0x958950, c, sbk_65_1_main] + - [0x958990] - name: sbk_66 dir: world/area_sbk/sbk_66 type: code start: 0x958CB0 vram: 0x80240000 subsegments: - - [0x958CB0, c] - - [0x958CF0, c] - - [0x959030, data] - - [0x9592E0, data] - - [0x95A240, data] - - [0x95AD50, data] - - [0x95AEA0] + - [0x958CB0, c, sbk_66_1_main] + - [0x958CF0, c, sbk_66_2_npc] + - [0x958CF0, c, sbk_66_3_foliage] + - [0x958CF0, c, sbk_66_4_entity] + - [0x959030] - name: sbk_99 dir: world/area_sbk/sbk_99 type: code start: 0x95AEB0 vram: 0x80240000 subsegments: - - [0x95AEB0, c] - - [0x95AEB0, data] - - [0x95B190, data] - - [0x95B1F0] + - [0x95AEB0, c, sbk_99_1_main] + - [0x95AEB0, c, sbk_99_2_entity] + - [0x95AEB0] - name: dro_01 dir: world/area_dro/dro_01 type: code @@ -7904,13 +7838,11 @@ segments: start: 0x9A83F0 vram: 0x80240000 subsegments: - - [0x9A83F0, c] - - [0x9A8700, c] - - [0x9A88A0, c] - - [0x9ABC90, data] - - [0x9ABD70, data] - - [0x9AD960, data] - - [0x9AE2B0] + - [0x9A83F0, c, trd_04_0_header] + - [0x9A83F0, c, trd_04_1_main] + - [0x9A8700, c, trd_04_2_entity] + - [0x9A88A0, c, trd_04_3_npc] + - [0x9ABC90] - name: trd_05 dir: world/area_trd/trd_05 type: code @@ -7957,12 +7889,11 @@ segments: start: 0x9BB2A0 vram: 0x80240000 subsegments: - - [0x9BB2A0, c] - - [0x9BB5B0, c] - - [0x9BBCC0, data] - - [0x9BBD50, data] - - [0x9BC1A0, data] - - [0x9BD650] + - [0x9BB2A0, c, trd_08_0_header] + - [0x9BB2A0, c, trd_08_1_main] + - [0x9BB2A0, c, trd_08_2_entity] + - [0x9BB5B0, c, trd_08_3_npc] + - [0x9BBCC0] - name: trd_09 dir: world/area_trd/trd_09 type: code @@ -9316,15 +9247,13 @@ segments: start: 0xB20540 vram: 0x80240000 subsegments: - - [0xB20540, c] - - [0xB216E0, c] - - [0xB21EA0, c] - - [0xB220E0, data] - - [0xB22190, data] - - [0xB226D0, data] - - [0xB25E90, data] - - [0xB275B0, data] - - [0xB27FE0] + - [0xB20540, c, jan_00_0_header] + - [0xB20540, c, jan_00_1_main] + - [0xB20880, c, jan_00_2_npc] + - [0xB20880, c, jan_00_3_entity] + - [0xB216E0, c, jan_00_4_whale] + - [0xB21EA0, c, jan_00_5_foliage] + - [0xB220E0] - name: jan_01 dir: world/area_jan/jan_01 type: code diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 8e59c6daf4..657aa3071f 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -15479,12 +15479,12 @@ mac_06_UnkPlayerPosFunc = 0x80240B88; // type:func rom:0x8656C8 mac_06_CreateWhaleGeyser = 0x80240C74; // type:func rom:0x8657B4 mac_06_SetWhaleGeyserPos = 0x80240DA4; // type:func rom:0x8658E4 mac_06_DisposeWhaleGeyser = 0x80240E48; // type:func rom:0x865988 -func_80240E80_8659C0 = 0x80240E80; // type:func rom:0x8659C0 -func_80241098_865BD8 = 0x80241098; // type:func rom:0x865BD8 -func_80241290_865DD0 = 0x80241290; // type:func rom:0x865DD0 -func_802412AC_865DEC = 0x802412AC; // type:func rom:0x865DEC -func_80241388_865EC8 = 0x80241388; // type:func rom:0x865EC8 -func_802415FC_86613C = 0x802415FC; // type:func rom:0x86613C +mac_06_func_80240E80_8659C0 = 0x80240E80; // type:func rom:0x8659C0 +mac_06_func_80241098_865BD8 = 0x80241098; // type:func rom:0x865BD8 +mac_06_func_80241290_865DD0 = 0x80241290; // type:func rom:0x865DD0 +mac_06_func_802412AC_865DEC = 0x802412AC; // type:func rom:0x865DEC +mac_06_GullYawInterp = 0x80241388; // type:func rom:0x865EC8 +mac_06_MakeJrTroopaBubbles = 0x802415FC; // type:func rom:0x86613C D_80241B60_8666A0 = 0x80241B60; // type:data rom:0x8666A0 D_80241B64_8666A4 = 0x80241B64; // type:data rom:0x8666A4 D_80241B68_8666A8 = 0x80241B68; // type:data rom:0x8666A8 @@ -16537,8 +16537,8 @@ sbk_01_npcGroupList_802407D8 = 0x802407D8; // type:data rom:0x92A268 sbk_02_get_tattle = 0x80240000; // type:func rom:0x92A2B0 sbk_02_UnkFunc27 = 0x80240040; // type:func rom:0x92A2F0 sbk_02_UnkFunc26 = 0x80240164; // type:func rom:0x92A414 -func_80240338_92A5E8 = 0x80240338; // type:func rom:0x92A5E8 -func_80240364_92A614 = 0x80240364; // type:func rom:0x92A614 +sbk_02_func_80240338_92A5E8 = 0x80240338; // type:func rom:0x92A5E8 +sbk_02_func_80240364_92A614 = 0x80240364; // type:func rom:0x92A614 sbk_02_GetNpcCollisionHeight = 0x802406F0; // type:func rom:0x92A9A0 sbk_02_AddPlayerHandsOffset = 0x8024074C; // type:func rom:0x92A9FC func_8024091C_92ABCC = 0x8024091C; // type:func rom:0x92ABCC @@ -16642,9 +16642,9 @@ sbk_34_StashVars = 0x80240040; // type:func rom:0x945F10 sbk_34_GetItemName = 0x802400F4; // type:func rom:0x945FC4 sbk_34_GetNpcCollisionHeight = 0x80240158; // type:func rom:0x946028 sbk_34_AddPlayerHandsOffset = 0x802401B4; // type:func rom:0x946084 -func_80240384_946254 = 0x80240384; // type:func rom:0x946254 -func_802403D8_9462A8 = 0x802403D8; // type:func rom:0x9462A8 -func_80240410_9462E0 = 0x80240410; // type:func rom:0x9462E0 +sbk_34_AwaitLetterChoiceResult = 0x80240384; // type:func rom:0x946254 +sbk_34_SetLetterChoiceResult = 0x802403D8; // type:func rom:0x9462A8 +sbk_34_BuildKeyItemChoiceList = 0x80240410; // type:func rom:0x9462E0 sbk_34_LetterDelivery_Init = 0x802404AC; // type:func rom:0x94637C sbk_34_LetterDelivery_CalcLetterPos = 0x8024059C; // type:func rom:0x94646C sbk_34_LetterDelivery_SaveNpcAnim = 0x80240728; // type:func rom:0x9465F8 @@ -16689,8 +16689,8 @@ sbk_55_SetNpcB5_3 = 0x80240040; // type:func rom:0x952A90 sbk_55_foliage_setup_shear_mtx = 0x80240060; // type:func rom:0x952AB0 sbk_55_TransformFoliage = 0x802400D0; // type:func rom:0x952B20 sbk_56_SpawnSunEffect = 0x80240000; // type:func rom:0x953FC0 -func_80240038_953FF8 = 0x80240038; // type:func rom:0x953FF8 -func_8024005C_95401C = 0x8024005C; // type:func rom:0x95401C +sbk_56_StartOasisSongVariation = 0x80240038; // type:func rom:0x953FF8 +sbk_56_StopOasisSongVariation = 0x8024005C; // type:func rom:0x95401C sbk_56_SuperBlock_SetOverride40 = 0x80240080; // type:func rom:0x954040 sbk_56_SuperBlock_ClearOverride40 = 0x8024009C; // type:func rom:0x95405C sbk_56_SuperBlock_HideBlockContent = 0x802400BC; // type:func rom:0x95407C @@ -19109,9 +19109,9 @@ jan_00_StashVars = 0x802403F4; // type:func rom:0xB20934 jan_00_GetItemName = 0x802404A8; // type:func rom:0xB209E8 jan_00_GetNpcCollisionHeight = 0x8024050C; // type:func rom:0xB20A4C jan_00_AddPlayerHandsOffset = 0x80240568; // type:func rom:0xB20AA8 -func_80240738_B20C78 = 0x80240738; // type:func rom:0xB20C78 -func_8024078C_B20CCC = 0x8024078C; // type:func rom:0xB20CCC -func_802407C4_B20D04 = 0x802407C4; // type:func rom:0xB20D04 +jan_00_AwaitLetterChoiceResult = 0x80240738; // type:func rom:0xB20C78 +jan_00_SetLetterChoiceResult = 0x8024078C; // type:func rom:0xB20CCC +jan_00_BuildKeyItemChoiceList = 0x802407C4; // type:func rom:0xB20D04 jan_00_LetterDelivery_Init = 0x80240860; // type:func rom:0xB20DA0 jan_00_LetterDelivery_CalcLetterPos = 0x80240950; // type:func rom:0xB20E90 jan_00_LetterDelivery_SaveNpcAnim = 0x80240ADC; // type:func rom:0xB2101C