From 768e88f20de52cd61144c7240a14845f4ea7f2d7 Mon Sep 17 00:00:00 2001 From: HailSanta <53960937+HailSanta@users.noreply.github.com> Date: Fri, 10 Feb 2023 03:00:28 -0500 Subject: [PATCH] area jan (#937) * couple jan * pipe includes cleanup * jan_13 checkpoint * Rafael checkpoint * jan_05 ok * jan_0X done * fix spear guy name * all jan ok * jan done * no halves --------- Co-authored-by: HailSanta --- include/dead_structs.h | 2 +- include/enums.h | 16 +- include/npc.h | 2 +- src/23680.c | 36 +- src/25AF0.c | 2 +- src/battle/area_jan/actor/spear_guy.c | 188 +- .../area_kmr_part_3/actor/final_jr_troopa.c | 2 +- .../area_kmr_part_3/actor/mage_jr_troopa.c | 2 +- .../area_kmr_part_3/actor/para_jr_troopa.c | 2 +- .../actor/spiked_para_jr_troopa.c | 2 +- src/battle/area_tik/stage/tik_05.c | 64 +- src/battle/area_tik2/stage/tik_05.c | 64 +- src/battle/area_tik3/stage/tik_05.c | 64 +- src/battle/item/sleepy_sheep.c | 2 +- src/encounter.c | 26 +- src/encounter_api.c | 2 +- src/state_demo.c | 186 +- src/world/area_arn/arn_05/arn_05_3_npc.c | 14 +- src/world/area_dgb/dgb_00/dgb_00_3_npc.c | 12 +- src/world/area_dgb/dgb_04/dgb_04_4_entity.c | 1 - src/world/area_dgb/dgb_06/dgb_06_3_entity.c | 2 +- src/world/area_dgb/dgb_12/dgb_12_4_entity.c | 2 +- src/world/area_dgb/dgb_18/dgb_18_4_entity.c | 2 +- src/world/area_dro/dro_01/dro_01_2_main.c | 1 - src/world/area_dro/dro_01/dro_01_3_npc.c | 2 +- src/world/area_dro/dro_01/dro_01_6_entity.c | 1 - src/world/area_dro/dro_02/dro_02_5_npc.c | 2 +- src/world/area_end/end_00/end_00.h | 4 +- .../area_end/end_00/end_00_3_parade_setup.c | 14 +- src/world/area_end/end_00/end_00_6_caravan.c | 4 +- src/world/area_end/end_00/end_00_8_yoshis.c | 6 +- src/world/area_flo/flo_03/flo_03_3_npc.c | 12 +- src/world/area_flo/flo_08/flo_08_2_entity.c | 1 - src/world/area_flo/flo_08/flo_08_4_npc.c | 2 +- src/world/area_flo/flo_10/flo_10_5_npc.c | 2 +- src/world/area_flo/flo_11/flo_11_2_main.c | 1 - src/world/area_flo/flo_16/flo_16_4_entity.c | 1 - src/world/area_flo/flo_23/flo_23_3_npc.c | 2 +- src/world/area_flo/flo_25/flo_25_3_npc.c | 2 +- src/world/area_gv/gv_01/gv_01_1_main.c | 1 - src/world/area_hos/hos_00/hos_00_6_scenes.c | 2 +- src/world/area_hos/hos_01/hos_01_4_npc.c | 2 +- src/world/area_hos/hos_03/hos_03_6_npc.c | 16 +- .../area_hos/hos_06/hos_06_5_merluvlee.c | 2 +- src/world/area_isk/isk_09/isk_09_3_entity.c | 2 +- src/world/area_isk/isk_10/isk_10_2_entity.c | 1 - src/world/area_iwa/iwa_03/iwa_03_2_entity.c | 2 +- src/world/area_iwa/iwa_10/iwa_10_3_npc.c | 16 +- src/world/area_iwa/iwa_10/iwa_10_5_entity.c | 1 - .../area_iwa/iwa_10/iwa_10_6_parakarry.c | 2 +- src/world/area_iwa/iwa_11/iwa_11_5_npc.c | 2 +- .../common/MoveBush.inc.c} | 8 +- src/world/area_jan/common/MoveBushTemplates.h | 55 + src/world/area_jan/common/PullVine.inc.c | 193 ++ src/world/area_jan/jan.h | 71 +- src/world/area_jan/jan_00/jan_00.h | 7 +- src/world/area_jan/jan_00/jan_00_2_npc.c | 301 +--- src/world/area_jan/jan_01/jan_01.h | 15 +- src/world/area_jan/jan_01/jan_01_3_npc.c | 52 +- src/world/area_jan/jan_02/jan_02_3_npc.c | 12 +- src/world/area_jan/jan_03/jan_03.h | 38 +- src/world/area_jan/jan_03/jan_03_2_main.c | 1 - src/world/area_jan/jan_03/jan_03_4_npc.c | 67 +- src/world/area_jan/jan_04/B44770.c | 12 - src/world/area_jan/jan_04/B447B0.c | 4 - src/world/area_jan/jan_04/B44AC0.c | 9 - src/world/area_jan/jan_04/B44D80.c | 3 - src/world/area_jan/jan_04/B44F10.c | 4 - src/world/area_jan/jan_04/B45150.c | 28 - src/world/area_jan/jan_04/B451F0.c | 48 - src/world/area_jan/jan_04/B45730.c | 39 - src/world/area_jan/jan_04/jan_04.h | 45 +- src/world/area_jan/jan_04/jan_04_0_header.c | 25 + src/world/area_jan/jan_04/jan_04_10_demo.c | 143 ++ src/world/area_jan/jan_04/jan_04_1_music.c | 30 + src/world/area_jan/jan_04/jan_04_2_main.c | 86 + src/world/area_jan/jan_04/jan_04_3_entity.c | 18 + src/world/area_jan/jan_04/jan_04_4_npc.c | 339 ++++ src/world/area_jan/jan_04/jan_04_5_unused.c | 33 + src/world/area_jan/jan_04/jan_04_6_trees.c | 99 ++ src/world/area_jan/jan_04/jan_04_7_scenes.c | 109 ++ src/world/area_jan/jan_04/jan_04_8_treasure.c | 151 ++ src/world/area_jan/jan_04/jan_04_9_bushes.c | 170 ++ src/world/area_jan/jan_05/B4AA70.c | 14 - src/world/area_jan/jan_05/B4AAB0.c | 4 - src/world/area_jan/jan_05/B4ADC0.c | 3 - src/world/area_jan/jan_05/B4AF10.c | 6 - src/world/area_jan/jan_05/B4B260.c | 20 - src/world/area_jan/jan_05/jan_05.h | 34 +- src/world/area_jan/jan_05/jan_05_0_header.c | 24 + src/world/area_jan/jan_05/jan_05_1_music.c | 8 + src/world/area_jan/jan_05/jan_05_2_main.c | 54 + src/world/area_jan/jan_05/jan_05_3_log.c | 154 ++ src/world/area_jan/jan_05/jan_05_4_bushes.c | 287 +++ src/world/area_jan/jan_05/jan_05_5_npc.c | 327 ++++ src/world/area_jan/jan_05/jan_05_6_trees.c | 118 ++ src/world/area_jan/jan_05/jan_05_7_entity.c | 11 + src/world/area_jan/jan_06/B52830.c | 9 - src/world/area_jan/jan_06/B52B40.c | 12 - src/world/area_jan/jan_06/B52BE0.c | 3 - src/world/area_jan/jan_06/B52D30.c | 4 - src/world/area_jan/jan_06/B52F70.c | 11 - src/world/area_jan/jan_06/jan_06.h | 32 +- src/world/area_jan/jan_06/jan_06_0_header.c | 16 + src/world/area_jan/jan_06/jan_06_1_main.c | 99 ++ src/world/area_jan/jan_06/jan_06_2_statue.c | 141 ++ src/world/area_jan/jan_06/jan_06_3_log.c | 154 ++ src/world/area_jan/jan_06/jan_06_4_trees.c | 74 + src/world/area_jan/jan_06/jan_06_5_entity.c | 9 + src/world/area_jan/jan_06/jan_06_6_npc.c | 123 ++ src/world/area_jan/jan_06/jan_06_7_bushes.c | 234 +++ src/world/area_jan/jan_07/B59870.c | 6 - src/world/area_jan/jan_07/B5A610.c | 4 - src/world/area_jan/jan_07/B5A850.c | 7 - src/world/area_jan/jan_07/jan_07.h | 19 +- src/world/area_jan/jan_07/jan_07_0_header.c | 13 + src/world/area_jan/jan_07/jan_07_1_music.c | 8 + src/world/area_jan/jan_07/jan_07_2_main.c | 26 + src/world/area_jan/jan_07/jan_07_3_npc.c | 364 ++++ src/world/area_jan/jan_07/jan_07_4_trees.c | 48 + src/world/area_jan/jan_07/jan_07_5_bushes.c | 74 + src/world/area_jan/jan_08/B5E2B0.c | 9 - src/world/area_jan/jan_08/B5E5C0.c | 5 - src/world/area_jan/jan_08/B5E910.c | 3 - src/world/area_jan/jan_08/B5F650.c | 5 - src/world/area_jan/jan_08/B604A0.c | 7 - src/world/area_jan/jan_08/jan_08.h | 29 +- src/world/area_jan/jan_08/jan_08_0_header.c | 15 + src/world/area_jan/jan_08/jan_08_1_music.c | 8 + src/world/area_jan/jan_08/jan_08_2_main.c | 51 + src/world/area_jan/jan_08/jan_08_3_bushes.c | 312 ++++ src/world/area_jan/jan_08/jan_08_4_entity.c | 19 + src/world/area_jan/jan_08/jan_08_5_npc.c | 223 +++ src/world/area_jan/jan_08/jan_08_6_trees.c | 111 ++ src/world/area_jan/jan_09/B65AB0.c | 11 - src/world/area_jan/jan_09/B660A0.c | 5 - src/world/area_jan/jan_09/B663F0.c | 3 - src/world/area_jan/jan_09/B67190.c | 5 - src/world/area_jan/jan_09/jan_09.h | 27 +- src/world/area_jan/jan_09/jan_09_0_header.c | 16 + src/world/area_jan/jan_09/jan_09_1_main.c | 81 + src/world/area_jan/jan_09/jan_09_2_bushes.c | 498 ++++++ src/world/area_jan/jan_09/jan_09_3_npc.c | 51 + src/world/area_jan/jan_09/jan_09_4_trees.c | 111 ++ src/world/area_jan/jan_09/jan_09_5_entity.c | 9 + src/world/area_jan/jan_10/B6C390.c | 7 - src/world/area_jan/jan_10/B6C6A0.c | 3 - src/world/area_jan/jan_10/B6D4C0.c | 3 - src/world/area_jan/jan_10/B6D610.c | 12 - src/world/area_jan/jan_10/B6D890.c | 5 - src/world/area_jan/jan_10/jan_10.h | 22 +- src/world/area_jan/jan_10/jan_10_0_header.c | 13 + src/world/area_jan/jan_10/jan_10_1_music.c | 8 + src/world/area_jan/jan_10/jan_10_2_main.c | 43 + src/world/area_jan/jan_10/jan_10_3_npc.c | 146 ++ src/world/area_jan/jan_10/jan_10_4_log.c | 154 ++ src/world/area_jan/jan_10/jan_10_5_trees.c | 55 + src/world/area_jan/jan_10/jan_10_6_bushes.c | 106 ++ src/world/area_jan/jan_10/jan_10_7_entity.c | 8 + src/world/area_jan/jan_11/B70860.c | 10 - src/world/area_jan/jan_11/B71010.c | 12 - src/world/area_jan/jan_11/jan_11.h | 15 +- src/world/area_jan/jan_11/jan_11_0_header.c | 12 + src/world/area_jan/jan_11/jan_11_1_music.c | 8 + src/world/area_jan/jan_11/jan_11_2_main.c | 66 + src/world/area_jan/jan_11/jan_11_3_npc.c | 138 ++ src/world/area_jan/jan_12/B730B0.c | 10 - src/world/area_jan/jan_12/B73570.c | 3 - src/world/area_jan/jan_12/jan_12.h | 22 +- src/world/area_jan/jan_12/jan_12_0_header.c | 14 + src/world/area_jan/jan_12/jan_12_1_main.c | 29 + src/world/area_jan/jan_12/jan_12_2_vines.c | 58 + src/world/area_jan/jan_12/jan_12_3_trees.c | 73 + src/world/area_jan/jan_12/jan_12_4_entity.c | 11 + src/world/area_jan/jan_12/jan_12_5_npc.c | 33 + src/world/area_jan/jan_13/B767B0.c | 55 - src/world/area_jan/jan_13/jan_13.h | 18 +- src/world/area_jan/jan_13/jan_13_0_header.c | 14 + src/world/area_jan/jan_13/jan_13_1_main.c | 28 + src/world/area_jan/jan_13/jan_13_2_puzzle.c | 680 +++++++ src/world/area_jan/jan_13/jan_13_3_trees.c | 73 + src/world/area_jan/jan_13/jan_13_4_entity.c | 11 + src/world/area_jan/jan_14/B7A050.c | 8 - src/world/area_jan/jan_14/B7A510.c | 3 - src/world/area_jan/jan_14/jan_14.h | 21 +- src/world/area_jan/jan_14/jan_14_0_header.c | 14 + src/world/area_jan/jan_14/jan_14_1_main.c | 28 + src/world/area_jan/jan_14/jan_14_2_vines.c | 126 ++ src/world/area_jan/jan_14/jan_14_3_trees.c | 135 ++ src/world/area_jan/jan_14/jan_14_4_npc.c | 69 + src/world/area_jan/jan_15/B7D920.c | 6 - src/world/area_jan/jan_15/B7D9E0.c | 4 - src/world/area_jan/jan_15/jan_15.h | 21 +- src/world/area_jan/jan_15/jan_15_0_header.c | 14 + src/world/area_jan/jan_15/jan_15_1_main.c | 41 + src/world/area_jan/jan_15/jan_15_2_npc.c | 235 +++ src/world/area_jan/jan_15/jan_15_3_trees.c | 73 + src/world/area_jan/jan_15/jan_15_4_entity.c | 10 + src/world/area_jan/jan_16/B80000.c | 8 - src/world/area_jan/jan_16/B80300.c | 4 - src/world/area_jan/jan_16/jan_16.h | 29 +- src/world/area_jan/jan_16/jan_16_0_header.c | 17 + src/world/area_jan/jan_16/jan_16_1_music.c | 20 + src/world/area_jan/jan_16/jan_16_2_main.c | 150 ++ src/world/area_jan/jan_16/jan_16_3_npc.c | 418 +++++ src/world/area_jan/jan_16/jan_16_4_entity.c | 9 + src/world/area_jan/jan_16/jan_16_5_bushes.c | 74 + src/world/area_jan/jan_22/B84180.c | 26 - src/world/area_jan/jan_22/B851A0.c | 72 - src/world/area_jan/jan_22/B858A0.c | 5 - src/world/area_jan/jan_22/jan_22.h | 52 +- src/world/area_jan/jan_22/jan_22_0_header.c | 16 + src/world/area_jan/jan_22/jan_22_1_music.c | 40 + src/world/area_jan/jan_22/jan_22_2_main.c | 149 ++ src/world/area_jan/jan_22/jan_22_3_npc.c | 1578 +++++++++++++++++ src/world/area_jan/jan_22/jan_22_4_entity.c | 17 + src/world/area_jan/jan_22/jan_22_5_zipline.c | 229 +++ src/world/area_jan/jan_22/jan_22_6_bushes.c | 168 ++ src/world/area_jan/jan_22/jan_22_7_trees.c | 58 + src/world/area_jan/jan_23/B8FCD0.c | 4 - src/world/area_jan/jan_23/jan_23.h | 29 +- src/world/area_jan/jan_23/jan_23_0_header.c | 13 + src/world/area_jan/jan_23/jan_23_1_music.c | 7 + src/world/area_jan/jan_23/jan_23_2_main.c | 108 ++ src/world/area_jan/jan_23/jan_23_3_npc.c | 662 +++++++ src/world/area_kgr/kgr_01/kgr_01_1_main.c | 1 - src/world/area_kgr/kgr_02/kgr_02_1_main.c | 1 - src/world/area_kmr/kmr_00/kmr_00_3_revival.c | 2 +- src/world/area_kmr/kmr_02/kmr_02_2_main.c | 1 - src/world/area_kmr/kmr_02/kmr_02_3_npc.c | 4 +- src/world/area_kmr/kmr_03/kmr_03_3_npc.c | 2 +- src/world/area_kmr/kmr_05/kmr_05_3_npc.c | 2 +- src/world/area_kmr/kmr_10/kmr_10_4_entity.c | 2 +- src/world/area_kmr/kmr_20/kmr_20_10_npc.c | 14 +- .../area_kmr/kmr_20/kmr_20_11_npc_intro.c | 1 - .../area_kmr/kmr_20/kmr_20_12_npc_epilogue.c | 3 +- src/world/area_kmr/kmr_20/kmr_20_2_main.c | 1 - src/world/area_kpa/kpa_01/kpa_01_2_main.c | 10 +- src/world/area_kpa/kpa_03/kpa_03_2_main.c | 10 +- src/world/area_kpa/kpa_15/kpa_15_3_entity.c | 2 +- src/world/area_kpa/kpa_16/kpa_16_4_npc.c | 6 +- src/world/area_kpa/kpa_53/kpa_53_3_npc.c | 4 +- src/world/area_kpa/kpa_96/kpa_96_3_npc.c | 2 +- src/world/area_kzn/kzn_03/kzn_03_2_npc.c | 13 +- src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c | 44 +- src/world/area_kzn/kzn_04/kzn_04_2_entity.c | 1 - src/world/area_kzn/kzn_08/kzn_08_2_entity.c | 2 +- src/world/area_kzn/kzn_09/kzn_09_2_entity.c | 1 - src/world/area_kzn/kzn_09/kzn_09_4_npc.c | 2 +- src/world/area_kzn/kzn_20/kzn_20_3_npc.c | 8 +- src/world/area_kzn/kzn_22/kzn_22_4_npc.c | 4 +- src/world/area_kzn/kzn_23/kzn_23_3_npc.c | 4 +- .../area_mac/mac_00/mac_00_10_shared_npc.c | 20 +- .../area_mac/mac_00/mac_00_11_intro_npc.c | 10 +- .../area_mac/mac_00/mac_00_13_epilogue_npc.c | 14 +- src/world/area_mac/mac_00/mac_00_2_main.c | 1 - src/world/area_mac/mac_00/mac_00_5_npc.c | 18 +- .../area_mac/mac_01/mac_01_10_intro_npc.c | 6 +- .../area_mac/mac_01/mac_01_11_epilogue_npc.c | 20 +- src/world/area_mac/mac_01/mac_01_9_npc.c | 38 +- .../area_mac/mac_01/npc/rowf_and_rhuff.inc.c | 6 +- src/world/area_mac/mac_02/mac_02_2_main.c | 1 - src/world/area_mac/mac_02/mac_02_6_npc.c | 18 +- src/world/area_mac/mac_03/mac_03_2_main.c | 1 - src/world/area_mac/mac_03/mac_03_4_npc.c | 16 +- src/world/area_mac/mac_04/mac_04_6_npc.c | 40 +- .../area_mac/mac_04/mac_04_7_wish_scene.c | 2 +- .../area_mac/mac_04/npc_toybox_shyguy.inc.c | 2 +- src/world/area_mac/mac_05/mac_05_4_npc.c | 28 +- src/world/area_mac/mac_06/mac_06_3_npc.c | 2 +- src/world/area_mgm/mgm_00/mgm_00_1_main.c | 1 - src/world/area_mim/mim_11/mim_11_2_main.c | 1 - src/world/area_nok/nok_01/nok_01_4_npc.c | 2 +- src/world/area_nok/nok_01/npcs_crisis.inc.c | 2 +- src/world/area_nok/nok_02/nok_02_2_main.c | 1 - src/world/area_nok/nok_02/nok_02_6_npc.c | 28 +- .../area_nok/nok_02/nok_02_8_koot_favors.c | 4 +- ..._04_5_partner.c => nok_04_5_new_partner.c} | 0 src/world/area_nok/nok_15/nok_15_2_main.c | 1 - src/world/area_obk/obk_07/obk_07_3_entity.c | 2 +- src/world/area_omo/omo_04/omo_04_4_entity.c | 2 +- src/world/area_omo/omo_04/omo_04_6_scenes.c | 2 +- src/world/area_omo/omo_06/omo_06_6_entity.c | 2 +- src/world/area_omo/omo_07/omo_07_5_entity.c | 2 +- src/world/area_omo/omo_07/omo_07_6_scenes.c | 2 +- src/world/area_omo/omo_09/omo_09_6_entity.c | 2 +- src/world/area_omo/omo_09/omo_09_8_scenes.c | 2 +- src/world/area_omo/omo_11/omo_11_4_entity.c | 1 - src/world/area_omo/omo_12/omo_12_3_npc.c | 18 +- ..._12_4_partner.c => omo_12_4_new_partner.c} | 0 src/world/area_omo/omo_13/omo_13_4_npc.c | 2 +- src/world/area_omo/omo_13/omo_13_5_entity.c | 2 +- src/world/area_omo/omo_14/omo_14_2_main.c | 10 +- .../area_osr/osr_00/osr_00_4_npc_epilogue.c | 26 +- src/world/area_osr/osr_01/osr_01_3_npc.c | 2 +- src/world/area_pra/pra_01/pra_01_3_npc.c | 2 +- src/world/area_pra/pra_05/pra_05_3_entity.c | 2 +- src/world/area_pra/pra_09/pra_09_3_npc.c | 10 +- src/world/area_pra/pra_11/pra_11_3_entity.c | 2 +- src/world/area_pra/pra_12/pra_12_3_entity.c | 2 +- src/world/area_pra/pra_13/pra_13_3_npc.c | 4 +- src/world/area_pra/pra_14/pra_14_3_entity.c | 2 +- src/world/area_pra/pra_19/pra_19_3_npc.c | 10 +- src/world/area_pra/pra_27/pra_27_3_entity.c | 2 +- src/world/area_pra/pra_28/pra_28_3_entity.c | 2 +- src/world/area_pra/pra_31/pra_31_2_npc.c | 6 +- src/world/area_pra/pra_32/pra_32_3_npc.c | 2 +- src/world/area_pra/pra_35/pra_35_4_entity.c | 2 +- src/world/area_sam/sam_01/sam_01_4_npc.c | 16 +- src/world/area_sam/sam_01/sam_01_5_scenes.c | 2 +- src/world/area_sam/sam_01/sam_01_6_entity.c | 2 +- src/world/area_sam/sam_02/sam_02_2_main.c | 1 - src/world/area_sam/sam_02/sam_02_4_npc.c | 6 +- src/world/area_sam/sam_04/sam_04_4_npc.c | 12 +- src/world/area_sam/sam_06/sam_06_4_npc.c | 30 +- src/world/area_sam/sam_08/sam_08_3_entity.c | 1 - src/world/area_sam/sam_08/sam_08_4_npc.c | 6 +- src/world/area_sam/sam_08/sam_08_5_scenes.c | 8 +- src/world/area_sam/sam_11/sam_11_5_npc.c | 24 +- src/world/area_sbk/sbk_02/sbk_02_4_npc.c | 2 +- src/world/area_sbk/sbk_56/sbk_56_2_entity.c | 1 - src/world/area_tik/tik_01/tik_01_2_main.c | 1 - src/world/area_tik/tik_02/tik_02_3_entity.c | 2 +- src/world/area_tik/tik_03/tik_03_2_main.c | 1 - src/world/area_tik/tik_04/tik_04_2_main.c | 1 - src/world/area_tik/tik_05/tik_05_4_entity.c | 2 +- src/world/area_tik/tik_06/tik_06_2_main.c | 1 - src/world/area_tik/tik_07/tik_07_2_main.c | 1 - src/world/area_tik/tik_07/tik_07_3_entity.c | 1 - src/world/area_tik/tik_08/tik_08_2_main.c | 1 - src/world/area_tik/tik_09/tik_09_2_main.c | 1 - src/world/area_tik/tik_10/tik_10_4_entity.c | 1 - src/world/area_tik/tik_12/tik_12_2_main.c | 1 - src/world/area_tik/tik_12/tik_12_4_entity.c | 3 +- src/world/area_tik/tik_14/tik_14_2_main.c | 1 - src/world/area_tik/tik_15/tik_15_2_main.c | 1 - src/world/area_tik/tik_17/tik_17_2_entity.c | 1 - src/world/area_tik/tik_17/tik_17_3_main.c | 1 - src/world/area_tik/tik_19/tik_19_2_main.c | 1 - src/world/area_tik/tik_19/tik_19_3_entity.c | 1 - src/world/area_tik/tik_20/tik_20_2_main.c | 1 - src/world/area_tik/tik_21/tik_21_2_main.c | 1 - src/world/area_tik/tik_22/tik_22_2_main.c | 1 - src/world/area_tik/tik_23/tik_23_2_main.c | 1 - src/world/area_trd/trd_00/trd_00_2_entity.c | 2 +- src/world/area_trd/trd_01/trd_01_1_main.c | 8 +- src/world/area_trd/trd_05/trd_05_4_npc.c | 2 +- .../area_trd/trd_06/trd_06_3_npc_prisoners.c | 2 +- src/world/area_tst/tst_13/tst_13_1_main.c | 20 +- .../common/atomic/CreateDarkness.data.inc.c | 9 - src/world/common/atomic/CreateDarkness.inc.c | 8 + .../common/atomic/ItemChoice_PartA.inc.c | 29 - src/world/common/atomic/WhaleAnim.data.inc.c | 0 src/world/common/complete/Quizmo.inc.c | 2 +- src/world/common/enemy/ai/AvoidPlayerAI.inc.c | 6 +- src/world/common/enemy/ai/BulletBillAI.inc.c | 12 +- src/world/common/enemy/ai/CleftAI.inc.c | 6 +- .../common/enemy/ai/ClubbaNappingAI.inc.c | 6 +- .../common/enemy/ai/ClubbaPatrolAI.inc.c | 6 +- src/world/common/enemy/ai/FlyingAI.inc.c | 6 +- .../common/enemy/ai/FlyingMagikoopaAI.inc.c | 6 +- .../common/enemy/ai/FlyingNoAttackAI.inc.c | 6 +- src/world/common/enemy/ai/GrooveGuyAI.inc.c | 6 +- src/world/common/enemy/ai/GuardAI.inc.c | 6 +- src/world/common/enemy/ai/HoppingAI.inc.c | 6 +- src/world/common/enemy/ai/KoopaPatrolAI.inc.c | 6 +- src/world/common/enemy/ai/LakituAI.inc.c | 6 +- src/world/common/enemy/ai/MagikoopaAI.inc.c | 6 +- .../common/enemy/ai/MagikoopaSpellAI.inc.c | 6 +- src/world/common/enemy/ai/MeleeHitbox.inc.c | 6 +- src/world/common/enemy/ai/MontyMoleAI.inc.c | 6 +- src/world/common/enemy/ai/ParatroopaAI.inc.c | 6 +- .../common/enemy/ai/PatrolNoAttackAI.inc.c | 6 +- .../common/enemy/ai/PiranhaPlantAI.inc.c | 380 +++- .../common/enemy/ai/ProjectileHitbox.inc.c | 6 +- .../common/enemy/ai/RangedAttackAI.inc.c | 8 +- .../common/enemy/ai/ShyGuyPatrolAI.inc.c | 6 +- .../common/enemy/ai/ShyGuyWanderAI.inc.c | 6 +- src/world/common/enemy/ai/SpearGuyAI.inc.c | 14 +- src/world/common/enemy/ai/SpinyAI.inc.c | 4 +- src/world/common/enemy/ai/SwooperAI.inc.c | 6 +- src/world/common/enemy/ai/TackleAI.inc.c | 6 +- src/world/common/enemy/ai/WanderMeleeAI.inc.c | 6 +- src/world/common/enemy/complete/HeartPlant.h | 22 + .../common/enemy/complete/HeartPlant.inc.c | 56 + src/world/common/enemy/complete/HurtPlant.h | 36 + .../common/enemy/complete/HurtPlant.inc.c | 75 + .../common/enemy/complete/JungleFuzzy.inc.c | 9 + src/world/common/enemy/complete/MBush.h | 36 + src/world/common/enemy/complete/MBush.inc.c | 102 ++ src/world/common/enemy/complete/SpearGuy.h | 48 + .../enemy/complete/SpearGuy_Patrol.inc.c | 24 + .../enemy/complete/SpearGuy_Wander.inc.c | 99 ++ .../enemy/wip/Dead_PiranhaPlantAI_Main.inc.c | 82 - .../common/enemy/wip/PiranhaPlantAI_00.inc.c | 17 - .../common/enemy/wip/PiranhaPlantAI_01.inc.c | 18 - .../common/enemy/wip/PiranhaPlantAI_10.inc.c | 187 -- .../common/enemy/wip/PiranhaPlantAI_11.inc.c | 16 - .../common/enemy/wip/PiranhaPlantAI_12.inc.c | 24 - .../common/enemy/wip/PiranhaPlantAI_13.inc.c | 13 - .../common/enemy/wip/PiranhaPlantAI_14.inc.c | 18 - .../enemy/wip/PiranhaPlantAI_Main.inc.c | 90 - .../common/{atomic => entity}/Chest.inc.c | 0 src/world/common/entity/Pipe.data.inc.c | 271 --- src/world/common/entity/Pipe.inc.c | 281 ++- src/world/common/entity/Pipe.inc.h | 19 - src/world/common/entity/SuperBlock.data.inc.c | 167 -- src/world/common/entity/SuperBlock.inc.c | 175 +- src/world/common/entity/SuperBlock.inc.h | 32 - src/world/common/npc/RaphaelRaven.h | 22 + src/world/common/npc/RaphaelRaven.inc.c | 14 + src/world/common/npc/Sushie.h | 22 + src/world/common/npc/Sushie.inc.c | 11 + src/world/common/npc/YoshiKid.h | 7 - src/world/common/todo/GetFloorCollider.inc.c | 2 +- src/world/common/todo/LetterDelivery.inc.c | 58 - src/world/common/todo/PullVine.inc.c | 35 - ...dowFunc001.inc.c => UpdateLogShadow.inc.c} | 20 +- src/world/dead/area_flo/flo_03/flo_03_3_npc.c | 12 +- .../dead/area_flo/flo_08/flo_08_2_entity.c | 1 - src/world/dead/area_flo/flo_08/flo_08_4_npc.c | 2 +- src/world/dead/area_flo/flo_10/flo_10_5_npc.c | 2 +- .../dead/area_flo/flo_11/flo_11_2_main.c | 1 - .../dead/area_flo/flo_16/flo_16_4_entity.c | 1 - src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c | 8 +- src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c | 4 +- src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c | 4 +- src/world/world.c | 30 +- tools/splat_ext/msg.yaml | 2 +- tools/splat_ext/npc.yaml | 4 +- .../data/world/area_jan/jan_04/B45860.data.s | 6 - .../data/world/area_jan/jan_04/B45A20.data.s | 30 - .../data/world/area_jan/jan_04/B461B0.data.s | 45 - .../data/world/area_jan/jan_04/B47EC0.data.s | 6 - .../data/world/area_jan/jan_04/B47FE0.data.s | 57 - .../data/world/area_jan/jan_04/B48B70.data.s | 6 - .../data/world/area_jan/jan_04/B490C0.data.s | 12 - .../data/world/area_jan/jan_04/B497F0.data.s | 96 - .../data/world/area_jan/jan_04/B4A4B0.data.s | 12 - .../data/world/area_jan/jan_05/B4D140.data.s | 6 - .../data/world/area_jan/jan_05/B4D200.data.s | 21 - .../data/world/area_jan/jan_05/B4D7A0.data.s | 21 - .../data/world/area_jan/jan_05/B4E050.data.s | 144 -- .../data/world/area_jan/jan_05/B4F170.data.s | 123 -- .../data/world/area_jan/jan_05/B517F0.data.s | 60 - .../data/world/area_jan/jan_05/B523E0.data.s | 6 - .../data/world/area_jan/jan_06/B54E10.data.s | 30 - .../data/world/area_jan/jan_06/B55860.data.s | 18 - .../data/world/area_jan/jan_06/B55F40.data.s | 21 - .../data/world/area_jan/jan_06/B567F0.data.s | 42 - .../data/world/area_jan/jan_06/B572C0.data.s | 6 - .../data/world/area_jan/jan_06/B57320.data.s | 78 - .../data/world/area_jan/jan_06/B586B0.data.s | 132 -- .../data/world/area_jan/jan_07/B5AA90.data.s | 6 - .../data/world/area_jan/jan_07/B5AB20.data.s | 9 - .../data/world/area_jan/jan_07/B5ACA0.data.s | 57 - .../data/world/area_jan/jan_07/B5CA50.data.s | 27 - .../data/world/area_jan/jan_07/B5D490.data.s | 42 - .../data/world/area_jan/jan_08/B606E0.data.s | 6 - .../data/world/area_jan/jan_08/B60790.data.s | 147 -- .../data/world/area_jan/jan_08/B620B0.data.s | 21 - .../data/world/area_jan/jan_08/B62850.data.s | 105 -- .../data/world/area_jan/jan_08/B64B90.data.s | 60 - .../data/world/area_jan/jan_09/B673D0.data.s | 39 - .../data/world/area_jan/jan_09/B687D0.data.s | 240 --- .../data/world/area_jan/jan_09/B6B400.data.s | 60 - .../data/world/area_jan/jan_09/B6BFB0.data.s | 6 - .../data/world/area_jan/jan_10/B6DAD0.data.s | 6 - .../data/world/area_jan/jan_10/B6DB60.data.s | 69 - .../data/world/area_jan/jan_10/B6F1D0.data.s | 27 - .../data/world/area_jan/jan_10/B6FC50.data.s | 60 - .../data/world/area_jan/jan_10/B707C0.data.s | 6 - .../data/world/area_jan/jan_11/B71060.data.s | 6 - .../data/world/area_jan/jan_11/B710F0.data.s | 36 - .../data/world/area_jan/jan_11/B728B0.data.s | 21 - .../data/world/area_jan/jan_12/B74310.data.s | 33 - .../data/world/area_jan/jan_12/B75250.data.s | 42 - .../data/world/area_jan/jan_12/B75D30.data.s | 30 - .../data/world/area_jan/jan_13/B76D80.data.s | 18 - .../data/world/area_jan/jan_13/B77000.data.s | 30 - .../data/world/area_jan/jan_13/B794C0.data.s | 42 - .../data/world/area_jan/jan_13/B79FA0.data.s | 6 - .../data/world/area_jan/jan_14/B7B330.data.s | 18 - .../data/world/area_jan/jan_14/B7B5C0.data.s | 15 - .../data/world/area_jan/jan_14/B7C630.data.s | 84 - .../data/world/area_jan/jan_14/B7D2C0.data.s | 24 - .../data/world/area_jan/jan_15/B7DC20.data.s | 18 - .../data/world/area_jan/jan_15/B7DEE0.data.s | 39 - .../data/world/area_jan/jan_15/B7F4A0.data.s | 42 - .../data/world/area_jan/jan_15/B7FF80.data.s | 6 - .../data/world/area_jan/jan_16/B80540.data.s | 63 - .../data/world/area_jan/jan_16/B82C70.data.s | 6 - .../data/world/area_jan/jan_16/B82CD0.data.s | 42 - .../data/world/area_jan/jan_17/B837E0.data.s | 6 - .../data/world/area_jan/jan_17/B838C0.data.s | 12 - .../data/world/area_jan/jan_17/B83B20.data.s | 6 - .../data/world/area_jan/jan_18/B83B90.data.s | 21 - .../data/world/area_jan/jan_18/B83E10.data.s | 6 - .../data/world/area_jan/jan_19/B83E80.data.s | 21 - .../data/world/area_jan/jan_19/B84110.data.s | 6 - .../data/world/area_jan/jan_22/B85AE0.data.s | 195 -- .../data/world/area_jan/jan_22/B8D910.data.s | 15 - .../data/world/area_jan/jan_22/B8E200.data.s | 93 - .../data/world/area_jan/jan_23/B8FCD0.data.s | 21 - .../data/world/area_jan/jan_23/B903A0.data.s | 75 - ver/us/splat.yaml | 253 ++- ver/us/symbol_addrs.txt | 22 +- 507 files changed, 14538 insertions(+), 6254 deletions(-) rename src/world/{common/todo/PullVineSub.inc.c => area_jan/common/MoveBush.inc.c} (76%) create mode 100644 src/world/area_jan/common/MoveBushTemplates.h create mode 100644 src/world/area_jan/common/PullVine.inc.c delete mode 100644 src/world/area_jan/jan_04/B44770.c delete mode 100644 src/world/area_jan/jan_04/B447B0.c delete mode 100644 src/world/area_jan/jan_04/B44AC0.c delete mode 100644 src/world/area_jan/jan_04/B44D80.c delete mode 100644 src/world/area_jan/jan_04/B44F10.c delete mode 100644 src/world/area_jan/jan_04/B45150.c delete mode 100644 src/world/area_jan/jan_04/B451F0.c delete mode 100644 src/world/area_jan/jan_04/B45730.c create mode 100644 src/world/area_jan/jan_04/jan_04_0_header.c create mode 100644 src/world/area_jan/jan_04/jan_04_10_demo.c create mode 100644 src/world/area_jan/jan_04/jan_04_1_music.c create mode 100644 src/world/area_jan/jan_04/jan_04_2_main.c create mode 100644 src/world/area_jan/jan_04/jan_04_3_entity.c create mode 100644 src/world/area_jan/jan_04/jan_04_4_npc.c create mode 100644 src/world/area_jan/jan_04/jan_04_5_unused.c create mode 100644 src/world/area_jan/jan_04/jan_04_6_trees.c create mode 100644 src/world/area_jan/jan_04/jan_04_7_scenes.c create mode 100644 src/world/area_jan/jan_04/jan_04_8_treasure.c create mode 100644 src/world/area_jan/jan_04/jan_04_9_bushes.c delete mode 100644 src/world/area_jan/jan_05/B4AA70.c delete mode 100644 src/world/area_jan/jan_05/B4AAB0.c delete mode 100644 src/world/area_jan/jan_05/B4ADC0.c delete mode 100644 src/world/area_jan/jan_05/B4AF10.c delete mode 100644 src/world/area_jan/jan_05/B4B260.c create mode 100644 src/world/area_jan/jan_05/jan_05_0_header.c create mode 100644 src/world/area_jan/jan_05/jan_05_1_music.c create mode 100644 src/world/area_jan/jan_05/jan_05_2_main.c create mode 100644 src/world/area_jan/jan_05/jan_05_3_log.c create mode 100644 src/world/area_jan/jan_05/jan_05_4_bushes.c create mode 100644 src/world/area_jan/jan_05/jan_05_5_npc.c create mode 100644 src/world/area_jan/jan_05/jan_05_6_trees.c create mode 100644 src/world/area_jan/jan_05/jan_05_7_entity.c delete mode 100644 src/world/area_jan/jan_06/B52830.c delete mode 100644 src/world/area_jan/jan_06/B52B40.c delete mode 100644 src/world/area_jan/jan_06/B52BE0.c delete mode 100644 src/world/area_jan/jan_06/B52D30.c delete mode 100644 src/world/area_jan/jan_06/B52F70.c create mode 100644 src/world/area_jan/jan_06/jan_06_0_header.c create mode 100644 src/world/area_jan/jan_06/jan_06_1_main.c create mode 100644 src/world/area_jan/jan_06/jan_06_2_statue.c create mode 100644 src/world/area_jan/jan_06/jan_06_3_log.c create mode 100644 src/world/area_jan/jan_06/jan_06_4_trees.c create mode 100644 src/world/area_jan/jan_06/jan_06_5_entity.c create mode 100644 src/world/area_jan/jan_06/jan_06_6_npc.c create mode 100644 src/world/area_jan/jan_06/jan_06_7_bushes.c delete mode 100644 src/world/area_jan/jan_07/B59870.c delete mode 100644 src/world/area_jan/jan_07/B5A610.c delete mode 100644 src/world/area_jan/jan_07/B5A850.c create mode 100644 src/world/area_jan/jan_07/jan_07_0_header.c create mode 100644 src/world/area_jan/jan_07/jan_07_1_music.c create mode 100644 src/world/area_jan/jan_07/jan_07_2_main.c create mode 100644 src/world/area_jan/jan_07/jan_07_3_npc.c create mode 100644 src/world/area_jan/jan_07/jan_07_4_trees.c create mode 100644 src/world/area_jan/jan_07/jan_07_5_bushes.c delete mode 100644 src/world/area_jan/jan_08/B5E2B0.c delete mode 100644 src/world/area_jan/jan_08/B5E5C0.c delete mode 100644 src/world/area_jan/jan_08/B5E910.c delete mode 100644 src/world/area_jan/jan_08/B5F650.c delete mode 100644 src/world/area_jan/jan_08/B604A0.c create mode 100644 src/world/area_jan/jan_08/jan_08_0_header.c create mode 100644 src/world/area_jan/jan_08/jan_08_1_music.c create mode 100644 src/world/area_jan/jan_08/jan_08_2_main.c create mode 100644 src/world/area_jan/jan_08/jan_08_3_bushes.c create mode 100644 src/world/area_jan/jan_08/jan_08_4_entity.c create mode 100644 src/world/area_jan/jan_08/jan_08_5_npc.c create mode 100644 src/world/area_jan/jan_08/jan_08_6_trees.c delete mode 100644 src/world/area_jan/jan_09/B65AB0.c delete mode 100644 src/world/area_jan/jan_09/B660A0.c delete mode 100644 src/world/area_jan/jan_09/B663F0.c delete mode 100644 src/world/area_jan/jan_09/B67190.c create mode 100644 src/world/area_jan/jan_09/jan_09_0_header.c create mode 100644 src/world/area_jan/jan_09/jan_09_1_main.c create mode 100644 src/world/area_jan/jan_09/jan_09_2_bushes.c create mode 100644 src/world/area_jan/jan_09/jan_09_3_npc.c create mode 100644 src/world/area_jan/jan_09/jan_09_4_trees.c create mode 100644 src/world/area_jan/jan_09/jan_09_5_entity.c delete mode 100644 src/world/area_jan/jan_10/B6C390.c delete mode 100644 src/world/area_jan/jan_10/B6C6A0.c delete mode 100644 src/world/area_jan/jan_10/B6D4C0.c delete mode 100644 src/world/area_jan/jan_10/B6D610.c delete mode 100644 src/world/area_jan/jan_10/B6D890.c create mode 100644 src/world/area_jan/jan_10/jan_10_0_header.c create mode 100644 src/world/area_jan/jan_10/jan_10_1_music.c create mode 100644 src/world/area_jan/jan_10/jan_10_2_main.c create mode 100644 src/world/area_jan/jan_10/jan_10_3_npc.c create mode 100644 src/world/area_jan/jan_10/jan_10_4_log.c create mode 100644 src/world/area_jan/jan_10/jan_10_5_trees.c create mode 100644 src/world/area_jan/jan_10/jan_10_6_bushes.c create mode 100644 src/world/area_jan/jan_10/jan_10_7_entity.c delete mode 100644 src/world/area_jan/jan_11/B70860.c delete mode 100644 src/world/area_jan/jan_11/B71010.c create mode 100644 src/world/area_jan/jan_11/jan_11_0_header.c create mode 100644 src/world/area_jan/jan_11/jan_11_1_music.c create mode 100644 src/world/area_jan/jan_11/jan_11_2_main.c create mode 100644 src/world/area_jan/jan_11/jan_11_3_npc.c delete mode 100644 src/world/area_jan/jan_12/B730B0.c delete mode 100644 src/world/area_jan/jan_12/B73570.c create mode 100644 src/world/area_jan/jan_12/jan_12_0_header.c create mode 100644 src/world/area_jan/jan_12/jan_12_1_main.c create mode 100644 src/world/area_jan/jan_12/jan_12_2_vines.c create mode 100644 src/world/area_jan/jan_12/jan_12_3_trees.c create mode 100644 src/world/area_jan/jan_12/jan_12_4_entity.c create mode 100644 src/world/area_jan/jan_12/jan_12_5_npc.c delete mode 100644 src/world/area_jan/jan_13/B767B0.c create mode 100644 src/world/area_jan/jan_13/jan_13_0_header.c create mode 100644 src/world/area_jan/jan_13/jan_13_1_main.c create mode 100644 src/world/area_jan/jan_13/jan_13_2_puzzle.c create mode 100644 src/world/area_jan/jan_13/jan_13_3_trees.c create mode 100644 src/world/area_jan/jan_13/jan_13_4_entity.c delete mode 100644 src/world/area_jan/jan_14/B7A050.c delete mode 100644 src/world/area_jan/jan_14/B7A510.c create mode 100644 src/world/area_jan/jan_14/jan_14_0_header.c create mode 100644 src/world/area_jan/jan_14/jan_14_1_main.c create mode 100644 src/world/area_jan/jan_14/jan_14_2_vines.c create mode 100644 src/world/area_jan/jan_14/jan_14_3_trees.c create mode 100644 src/world/area_jan/jan_14/jan_14_4_npc.c delete mode 100644 src/world/area_jan/jan_15/B7D920.c delete mode 100644 src/world/area_jan/jan_15/B7D9E0.c create mode 100644 src/world/area_jan/jan_15/jan_15_0_header.c create mode 100644 src/world/area_jan/jan_15/jan_15_1_main.c create mode 100644 src/world/area_jan/jan_15/jan_15_2_npc.c create mode 100644 src/world/area_jan/jan_15/jan_15_3_trees.c create mode 100644 src/world/area_jan/jan_15/jan_15_4_entity.c delete mode 100644 src/world/area_jan/jan_16/B80000.c delete mode 100644 src/world/area_jan/jan_16/B80300.c create mode 100644 src/world/area_jan/jan_16/jan_16_0_header.c create mode 100644 src/world/area_jan/jan_16/jan_16_1_music.c create mode 100644 src/world/area_jan/jan_16/jan_16_2_main.c create mode 100644 src/world/area_jan/jan_16/jan_16_3_npc.c create mode 100644 src/world/area_jan/jan_16/jan_16_4_entity.c create mode 100644 src/world/area_jan/jan_16/jan_16_5_bushes.c delete mode 100644 src/world/area_jan/jan_22/B84180.c delete mode 100644 src/world/area_jan/jan_22/B851A0.c delete mode 100644 src/world/area_jan/jan_22/B858A0.c create mode 100644 src/world/area_jan/jan_22/jan_22_0_header.c create mode 100644 src/world/area_jan/jan_22/jan_22_1_music.c create mode 100644 src/world/area_jan/jan_22/jan_22_2_main.c create mode 100644 src/world/area_jan/jan_22/jan_22_3_npc.c create mode 100644 src/world/area_jan/jan_22/jan_22_4_entity.c create mode 100644 src/world/area_jan/jan_22/jan_22_5_zipline.c create mode 100644 src/world/area_jan/jan_22/jan_22_6_bushes.c create mode 100644 src/world/area_jan/jan_22/jan_22_7_trees.c delete mode 100644 src/world/area_jan/jan_23/B8FCD0.c create mode 100644 src/world/area_jan/jan_23/jan_23_0_header.c create mode 100644 src/world/area_jan/jan_23/jan_23_1_music.c create mode 100644 src/world/area_jan/jan_23/jan_23_2_main.c create mode 100644 src/world/area_jan/jan_23/jan_23_3_npc.c rename src/world/area_nok/nok_04/{nok_04_5_partner.c => nok_04_5_new_partner.c} (100%) rename src/world/area_omo/omo_12/{omo_12_4_partner.c => omo_12_4_new_partner.c} (100%) delete mode 100644 src/world/common/atomic/CreateDarkness.data.inc.c delete mode 100644 src/world/common/atomic/ItemChoice_PartA.inc.c delete mode 100644 src/world/common/atomic/WhaleAnim.data.inc.c create mode 100644 src/world/common/enemy/complete/HeartPlant.h create mode 100644 src/world/common/enemy/complete/HeartPlant.inc.c create mode 100644 src/world/common/enemy/complete/HurtPlant.h create mode 100644 src/world/common/enemy/complete/HurtPlant.inc.c create mode 100644 src/world/common/enemy/complete/JungleFuzzy.inc.c create mode 100644 src/world/common/enemy/complete/MBush.h create mode 100644 src/world/common/enemy/complete/MBush.inc.c create mode 100644 src/world/common/enemy/complete/SpearGuy.h create mode 100644 src/world/common/enemy/complete/SpearGuy_Patrol.inc.c create mode 100644 src/world/common/enemy/complete/SpearGuy_Wander.inc.c delete mode 100644 src/world/common/enemy/wip/Dead_PiranhaPlantAI_Main.inc.c delete mode 100644 src/world/common/enemy/wip/PiranhaPlantAI_00.inc.c delete mode 100644 src/world/common/enemy/wip/PiranhaPlantAI_01.inc.c delete mode 100644 src/world/common/enemy/wip/PiranhaPlantAI_10.inc.c delete mode 100644 src/world/common/enemy/wip/PiranhaPlantAI_11.inc.c delete mode 100644 src/world/common/enemy/wip/PiranhaPlantAI_12.inc.c delete mode 100644 src/world/common/enemy/wip/PiranhaPlantAI_13.inc.c delete mode 100644 src/world/common/enemy/wip/PiranhaPlantAI_14.inc.c delete mode 100644 src/world/common/enemy/wip/PiranhaPlantAI_Main.inc.c rename src/world/common/{atomic => entity}/Chest.inc.c (100%) delete mode 100644 src/world/common/entity/Pipe.data.inc.c delete mode 100644 src/world/common/entity/Pipe.inc.h delete mode 100644 src/world/common/entity/SuperBlock.data.inc.c delete mode 100644 src/world/common/entity/SuperBlock.inc.h create mode 100644 src/world/common/npc/RaphaelRaven.h create mode 100644 src/world/common/npc/RaphaelRaven.inc.c create mode 100644 src/world/common/npc/Sushie.h create mode 100644 src/world/common/npc/Sushie.inc.c delete mode 100644 src/world/common/todo/LetterDelivery.inc.c delete mode 100644 src/world/common/todo/PullVine.inc.c rename src/world/common/todo/{UnkShadowFunc001.inc.c => UpdateLogShadow.inc.c} (66%) delete mode 100644 ver/us/asm/data/world/area_jan/jan_04/B45860.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_04/B47EC0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_04/B47FE0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_04/B48B70.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_04/B490C0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_04/B497F0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_04/B4A4B0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_05/B4D140.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_05/B4D200.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_05/B4D7A0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_05/B4E050.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_05/B4F170.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_05/B517F0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_05/B523E0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_06/B54E10.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_06/B55860.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_06/B55F40.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_06/B567F0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_06/B572C0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_06/B57320.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_06/B586B0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_07/B5AA90.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_07/B5AB20.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_07/B5CA50.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_07/B5D490.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_08/B606E0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_08/B60790.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_08/B62850.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_08/B64B90.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_09/B6B400.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_09/B6BFB0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_10/B6DAD0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_10/B6DB60.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_10/B6F1D0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_10/B6FC50.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_10/B707C0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_11/B71060.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_11/B728B0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_12/B74310.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_12/B75250.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_13/B76D80.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_13/B77000.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_13/B794C0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_13/B79FA0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_14/B7B330.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_14/B7B5C0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_14/B7C630.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_14/B7D2C0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_15/B7DC20.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_15/B7DEE0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_15/B7F4A0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_15/B7FF80.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_16/B80540.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_16/B82C70.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_16/B82CD0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_17/B837E0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_17/B838C0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_17/B83B20.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_18/B83B90.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_18/B83E10.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_19/B83E80.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_19/B84110.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_22/B8D910.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_22/B8E200.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_23/B8FCD0.data.s delete mode 100644 ver/us/asm/data/world/area_jan/jan_23/B903A0.data.s diff --git a/include/dead_structs.h b/include/dead_structs.h index ffd6d738c2..58afb1e573 100644 --- a/include/dead_structs.h +++ b/include/dead_structs.h @@ -39,7 +39,7 @@ typedef struct DeadEnemy { /* 0x06C */ s32 varTable[16]; /* 0x0AC */ s32 aiDetectFlags; /* 0x0B0 */ s32 aiFlags; - /* 0x0B4 */ s8 aiPaused; + /* 0x0B4 */ s8 aiSuspendTime; /* 0x0B5 */ s8 instigatorValue; /* 0x0B6 */ char unk_B6[2]; /* 0x0B8 */ EvtScript* unk_B8; // some bytecode diff --git a/include/enums.h b/include/enums.h index 3596b135cb..fb5d1e968d 100644 --- a/include/enums.h +++ b/include/enums.h @@ -502,7 +502,8 @@ enum Emotes { enum Emoters { EMOTER_PLAYER = 0, - EMOTER_NPC = 1 + EMOTER_NPC = 1, + EMOTER_POS = 2, }; enum EasingType { @@ -1831,9 +1832,9 @@ enum ItemIDs { ITEM_STAR_STONE = 0x0000006C, ITEM_SNEAKY_PARASOL = 0x0000006D, ITEM_KOOT_KOOPA_LEGENDS = 0x0000006E, - ITEM_KOOT_MERLUVLEE_AUTOGRAPH = 0x0000006F, + ITEM_KOOT_LUIGIS_AUTOGRAPH = 0x0000006F, ITEM_KOOT_EMPTY_WALLET = 0x00000070, - ITEM_KOOT_LUIGI_AUTOGRAPH = 0x00000071, + ITEM_KOOT_MERLUVLEES_AUTOGRAPH = 0x00000071, ITEM_KOOT_SHELL = 0x00000072, ITEM_KOOT_OLD_PHOTO = 0x00000073, ITEM_KOOT_GLASSES = 0x00000074, @@ -5023,11 +5024,18 @@ enum EnemyFlags { ENEMY_FLAG_80000000 = 0x80000000, }; +#define COMMON_PASSIVE_FLAGS \ + ENEMY_FLAG_PASSIVE \ + | ENEMY_FLAG_ENABLE_HIT_SCRIPT \ + | ENEMY_FLAG_100 \ + | ENEMY_FLAG_400 \ + | ENEMY_FLAG_800 + // used with enemy->aiFlags enum EnemyAIFlags { ENEMY_AI_FLAG_1 = 0x00000001, ENEMY_AI_FLAG_2 = 0x00000002, // do not move; do not sense player - ENEMY_AI_FLAG_4 = 0x00000004, // pause ai? reset ai? + ENEMY_AI_FLAG_SUSPEND = 0x00000004, ENEMY_AI_FLAG_8 = 0x00000008, ENEMY_AI_FLAG_10 = 0x00000010, ENEMY_AI_FLAG_20 = 0x00000020, diff --git a/include/npc.h b/include/npc.h index 84ad8911bf..c290eabb3a 100644 --- a/include/npc.h +++ b/include/npc.h @@ -343,7 +343,7 @@ typedef struct Enemy { /* 0xAC */ u8 aiDetectFlags; // detect player flags: 1 = require line of sight | 2 = adjust hitbox for moving player /* 0xAD */ char unk_AD[3]; /* 0xB0 */ u32 aiFlags; - /* 0xB4 */ s8 aiPaused; + /* 0xB4 */ s8 aiSuspendTime; /* 0xB5 */ s8 instigatorValue; // value is passed to first actor in formation if a battle is triggered with this enemy /* 0xB6 */ char unk_B6[2]; /* 0xB8 */ EvtScript* unk_B8; // some bytecode diff --git a/src/23680.c b/src/23680.c index 16560926de..b85c8bd8c7 100644 --- a/src/23680.c +++ b/src/23680.c @@ -682,21 +682,23 @@ void basic_ai_loiter(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolum f32 yaw; s32 emoteTemp; - if (aiSettings->playerSearchInterval >= 0 && basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0)) { - x = npc->pos.x; - y = npc->pos.y; - z = npc->pos.z; - yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - if (!npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, aiSettings->chaseSpeed, yaw, npc->collisionHeight, npc->collisionRadius)) { - npc->yaw = yaw; - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); - fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); - if (enemy->npcSettings->actionFlags & AI_ACTION_JUMP_WHEN_SEE_PLAYER) { - script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; - } else { - script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + if (aiSettings->playerSearchInterval >= 0) { + if (basic_ai_check_player_dist(territory, enemy, aiSettings->chaseRadius, aiSettings->chaseOffsetDist, 0)) { + x = npc->pos.x; + y = npc->pos.y; + z = npc->pos.z; + yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + if (!npc_test_move_simple_with_slipping(npc->collisionChannel, &x, &y, &z, aiSettings->chaseSpeed, yaw, npc->collisionHeight, npc->collisionRadius)) { + npc->yaw = yaw; + ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &emoteTemp); + if (enemy->npcSettings->actionFlags & AI_ACTION_JUMP_WHEN_SEE_PLAYER) { + script->AI_TEMP_STATE = AI_STATE_ALERT_INIT; + } else { + script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; + } + return; } - return; } } @@ -858,7 +860,7 @@ ApiStatus BasicAI_Main(Evt* script, s32 isInitialCall) { territory.halfHeight = 65.0f; territory.detectFlags = 0; - if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; npc->duration = 0; @@ -873,14 +875,14 @@ ApiStatus BasicAI_Main(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_8; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = AI_STATE_WANDER_INIT; } else if (enemy->flags & ENEMY_FLAG_40000000) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; } - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; enemy->flags &= ~ENEMY_FLAG_40000000; } diff --git a/src/25AF0.c b/src/25AF0.c index 5e0171cdd4..153eb7ed6a 100644 --- a/src/25AF0.c +++ b/src/25AF0.c @@ -14,7 +14,7 @@ void basic_ai_suspend(Evt* script) { Enemy* enemy = script->owner1.enemy; get_npc_unsafe(enemy->npcID); - if (enemy->aiPaused == 0) { + if (enemy->aiSuspendTime == 0) { script->functionTemp[0] = script->functionTemp[1]; } } diff --git a/src/battle/area_jan/actor/spear_guy.c b/src/battle/area_jan/actor/spear_guy.c index 1b6ddad086..87a09afb0d 100644 --- a/src/battle/area_jan/actor/spear_guy.c +++ b/src/battle/area_jan/actor/spear_guy.c @@ -3,7 +3,7 @@ #include "battle/battle.h" #include "script_api/battle.h" #include "sprite/npc/ShyGuy.h" -#include "sprite/npc/JungleGuy.h" +#include "sprite/npc/SpearGuy.h" #define NAMESPACE b_area_jan_spear_guy @@ -21,38 +21,38 @@ extern Formation N(specialFormation_8021A8C0); extern Formation N(specialFormation_8021A8DC); s32 N(idleAnimations_802185C0)[] = { - STATUS_NORMAL, ANIM_JungleGuy_Anim04, - STATUS_STONE, ANIM_JungleGuy_Anim02, - STATUS_SLEEP, ANIM_JungleGuy_Anim0D, - STATUS_POISON, ANIM_JungleGuy_Anim0F, - STATUS_STOP, ANIM_JungleGuy_Anim02, - STATUS_STATIC, ANIM_JungleGuy_Anim04, - STATUS_PARALYZE, ANIM_JungleGuy_Anim02, - STATUS_DIZZY, ANIM_JungleGuy_Anim0F, - STATUS_FEAR, ANIM_JungleGuy_Anim0F, + STATUS_NORMAL, ANIM_SpearGuy_Anim04, + STATUS_STONE, ANIM_SpearGuy_Anim02, + STATUS_SLEEP, ANIM_SpearGuy_Anim0D, + STATUS_POISON, ANIM_SpearGuy_Anim0F, + STATUS_STOP, ANIM_SpearGuy_Anim02, + STATUS_STATIC, ANIM_SpearGuy_Anim04, + STATUS_PARALYZE, ANIM_SpearGuy_Anim02, + STATUS_DIZZY, ANIM_SpearGuy_Anim0F, + STATUS_FEAR, ANIM_SpearGuy_Anim0F, STATUS_END, }; s32 N(idleAnimations_8021860C)[] = { - STATUS_NORMAL, ANIM_JungleGuy_Anim03, - STATUS_STONE, ANIM_JungleGuy_Anim0D, - STATUS_SLEEP, ANIM_JungleGuy_Anim0D, - STATUS_POISON, ANIM_JungleGuy_Anim0F, - STATUS_STOP, ANIM_JungleGuy_Anim01, - STATUS_STATIC, ANIM_JungleGuy_Anim03, - STATUS_PARALYZE, ANIM_JungleGuy_Anim01, - STATUS_DIZZY, ANIM_JungleGuy_Anim0F, - STATUS_FEAR, ANIM_JungleGuy_Anim0F, + STATUS_NORMAL, ANIM_SpearGuy_Anim03, + STATUS_STONE, ANIM_SpearGuy_Anim0D, + STATUS_SLEEP, ANIM_SpearGuy_Anim0D, + STATUS_POISON, ANIM_SpearGuy_Anim0F, + STATUS_STOP, ANIM_SpearGuy_Anim01, + STATUS_STATIC, ANIM_SpearGuy_Anim03, + STATUS_PARALYZE, ANIM_SpearGuy_Anim01, + STATUS_DIZZY, ANIM_SpearGuy_Anim0F, + STATUS_FEAR, ANIM_SpearGuy_Anim0F, STATUS_END, }; s32 N(idleAnimations_80218658)[] = { - STATUS_NORMAL, ANIM_JungleGuy_Anim14, + STATUS_NORMAL, ANIM_SpearGuy_Anim14, STATUS_END, }; s32 N(idleAnimations_80218664)[] = { - STATUS_NORMAL, ANIM_JungleGuy_Anim19, + STATUS_NORMAL, ANIM_SpearGuy_Anim19, STATUS_END, }; @@ -215,11 +215,11 @@ EvtScript N(init_80218980) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_EXEC_WAIT(N(setSpearStance)) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim04) EVT_CASE_EQ(1) EVT_EXEC_WAIT(N(setSpearStance)) EVT_CALL(SetPartEventFlags, -127, 2, 16) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim03) EVT_END_SWITCH EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8021BCB4))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80218E3C))) @@ -232,7 +232,7 @@ EvtScript N(init_80218980) = { EVT_CASE_OR_EQ(6) EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_FRONT, 0) EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021860C))) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim03) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_RETURN @@ -288,14 +288,14 @@ EvtScript N(idle_80218BE0) = { EvtScript N(80218D7C) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim06) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim06) EVT_EXEC_WAIT(DoReturnHome) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim04) EVT_CASE_EQ(1) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim03) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim03) EVT_END_SWITCH EVT_RETURN EVT_END @@ -309,8 +309,8 @@ EvtScript N(handleEvent_80218E3C) = { EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim07) - EVT_SET_CONST(LVar2, ANIM_JungleGuy_Anim08) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim07) + EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim08) EVT_EXEC_WAIT(N(80218B5C)) EVT_EXEC_WAIT(DoNormalHit) EVT_END_CASE_GROUP @@ -320,17 +320,17 @@ EvtScript N(handleEvent_80218E3C) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarB) EVT_IF_FLAG(LVarB, STATUS_FLAG_SLEEP | STATUS_FLAG_FEAR | STATUS_FLAG_DIZZY) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim0A) - EVT_SET_CONST(LVar2, ANIM_JungleGuy_Anim0C) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim0A) + EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim0C) EVT_ELSE EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim0B) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim0B) EVT_SET_CONST(LVar2, -1) EVT_END_IF EVT_ELSE EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim0A) - EVT_SET_CONST(LVar2, ANIM_JungleGuy_Anim0C) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim0A) + EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim0C) EVT_END_IF EVT_EXEC_WAIT(DoBurnHit) EVT_CASE_EQ(EVENT_BURN_DEATH) @@ -339,88 +339,88 @@ EvtScript N(handleEvent_80218E3C) = { EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarB) EVT_IF_FLAG(LVarB, STATUS_FLAG_SLEEP | STATUS_FLAG_FEAR | STATUS_FLAG_DIZZY) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim0A) - EVT_SET_CONST(LVar2, ANIM_JungleGuy_Anim0C) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim0A) + EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim0C) EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim0C) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim0C) EVT_EXEC_WAIT(DoDeath) EVT_ELSE EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim0B) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim0B) EVT_SET_CONST(LVar2, -1) EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim0B) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim0B) EVT_EXEC_WAIT(DoDeath) EVT_END_IF EVT_ELSE EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim0A) - EVT_SET_CONST(LVar2, ANIM_JungleGuy_Anim0C) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim0A) + EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim0C) EVT_EXEC_WAIT(DoBurnHit) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim0C) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim0C) EVT_EXEC_WAIT(DoDeath) EVT_END_IF EVT_RETURN EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim07) - EVT_SET_CONST(LVar2, ANIM_JungleGuy_Anim08) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim07) + EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim08) EVT_EXEC_WAIT(N(80218B5C)) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim07) - EVT_SET_CONST(LVar2, ANIM_JungleGuy_Anim08) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim07) + EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim08) EVT_EXEC_WAIT(N(80218B5C)) EVT_EXEC_WAIT(DoSpinSmashHit) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim09) - EVT_SET_CONST(LVar2, ANIM_JungleGuy_Anim08) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim09) + EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim08) EVT_EXEC_WAIT(N(80218B5C)) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_EQ(EVENT_SHOCK_HIT) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim07) - EVT_SET_CONST(LVar2, ANIM_JungleGuy_Anim08) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim07) + EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim08) EVT_EXEC_WAIT(N(80218B5C)) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim07) - EVT_SET_CONST(LVar2, ANIM_JungleGuy_Anim08) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim07) + EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim08) EVT_EXEC_WAIT(N(80218B5C)) EVT_EXEC_WAIT(DoJumpBack) EVT_EXEC_WAIT(N(80218D7C)) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim07) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim07) EVT_EXEC_WAIT(DoShockHit) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim09) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim09) EVT_EXEC_WAIT(DoDeath) EVT_RETURN EVT_CASE_OR_EQ(EVENT_SCRIPTED_IMMUNE) EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CASE_OR_EQ(EVENT_AIR_LIFT_FAILED) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim03) - EVT_SET_CONST(LVar2, ANIM_JungleGuy_Anim04) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim03) + EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim04) EVT_EXEC_WAIT(N(80218B5C)) EVT_EXEC_WAIT(DoImmune) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_DEATH) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim07) - EVT_SET_CONST(LVar2, ANIM_JungleGuy_Anim08) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim07) + EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim08) EVT_EXEC_WAIT(N(80218B5C)) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(10) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim09) - EVT_SET_CONST(LVar2, ANIM_JungleGuy_Anim08) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim09) + EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim08) EVT_EXEC_WAIT(N(80218B5C)) EVT_EXEC_WAIT(DoDeath) EVT_RETURN @@ -429,26 +429,26 @@ EvtScript N(handleEvent_80218E3C) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim04) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim04) EVT_EXEC_WAIT(DoRecover) EVT_CASE_EQ(1) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim03) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim03) EVT_EXEC_WAIT(DoRecover) EVT_END_SWITCH EVT_CASE_EQ(EVENT_SCARE_AWAY) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim06) - EVT_SET_CONST(LVar2, ANIM_JungleGuy_Anim07) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim06) + EVT_SET_CONST(LVar2, ANIM_SpearGuy_Anim07) EVT_EXEC_WAIT(DoScareAway) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim04) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim04) EVT_EXEC_WAIT(DoAirLift) EVT_CASE_EQ(EVENT_BLOW_AWAY) EVT_SET_CONST(LVar0, 2) - EVT_SET_CONST(LVar1, ANIM_JungleGuy_Anim04) + EVT_SET_CONST(LVar1, ANIM_SpearGuy_Anim04) EVT_EXEC_WAIT(DoBlowAway) EVT_RETURN EVT_CASE_EQ(EVENT_SPIKE_TAUNT) @@ -516,7 +516,7 @@ EvtScript N(spearStab) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_63) EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(func_8024ECF8, -1, 1, 0) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim06) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -530,9 +530,9 @@ EvtScript N(spearStab) = { EVT_ADD(LVar2, 1) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim04) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim04) EVT_WAIT(5) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim1A) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim1A) EVT_WAIT(15) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10) EVT_SWITCH(LVar0) @@ -540,7 +540,7 @@ EvtScript N(spearStab) = { EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_309) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim1B) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim1B) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 30) @@ -566,7 +566,7 @@ EvtScript N(spearStab) = { EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_309) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim1B) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim1B) EVT_WAIT(5) EVT_WAIT(2) EVT_CALL(SetGoalToTarget, ACTOR_SELF) @@ -593,7 +593,7 @@ EvtScript N(summonBackup) = { EVT_CALL(MoveBattleCamOver, 15) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_B) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim05) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_THREAD EVT_WAIT(5) @@ -604,10 +604,10 @@ EvtScript N(summonBackup) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 10) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim05) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim10) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim10) EVT_WAIT(25) EVT_THREAD EVT_WAIT(5) @@ -618,22 +618,22 @@ EvtScript N(summonBackup) = { EVT_CALL(SetActorYaw, ACTOR_SELF, 180) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim05) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim10) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim10) EVT_WAIT(30) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 10) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim05) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim05) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 30, 0, 0, 0, 0, 0, 0, 0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim0E) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim0E) EVT_WAIT(20) EVT_CALL(GetOriginalActorType, ACTOR_SELF, LVar0) EVT_CALL(EnemyCreateTargetList, 32772) @@ -642,7 +642,7 @@ EvtScript N(summonBackup) = { EVT_CALL(GetOwnerTarget, LVar1, LVar2) EVT_CALL(GetOriginalActorType, LVar1, LVar2) EVT_IF_EQ(LVar0, LVar2) - EVT_CALL(SetAnimation, LVar1, 2, ANIM_JungleGuy_Anim04) + EVT_CALL(SetAnimation, LVar1, 2, ANIM_SpearGuy_Anim04) EVT_CALL(GetIndexFromHome, LVar1, LVar3) EVT_IF_LT(LVarA, LVar3) EVT_CALL(GetActorVar, LVar1, 0, LVar4) @@ -650,7 +650,7 @@ EvtScript N(summonBackup) = { EVT_CALL(SetActorVar, LVar1, 0, 1) EVT_CALL(SetIdleAnimations, LVar1, 2, EVT_PTR(N(idleAnimations_8021860C))) EVT_CALL(SetPartEventFlags, LVar1, 2, 16) - EVT_CALL(SetAnimation, LVar1, 2, ANIM_JungleGuy_Anim03) + EVT_CALL(SetAnimation, LVar1, 2, ANIM_SpearGuy_Anim03) EVT_END_IF EVT_END_IF EVT_END_IF @@ -678,7 +678,7 @@ EvtScript N(summonBackup) = { EVT_END_IF EVT_SET(LVarB, LVar0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(SetAnimation, LVarB, 2, ANIM_JungleGuy_Anim10) + EVT_CALL(SetAnimation, LVarB, 2, ANIM_SpearGuy_Anim10) EVT_CALL(SetGoalToIndex, LVarB, LVarA) EVT_CALL(GetGoalPos, LVarB, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 220) @@ -701,12 +701,12 @@ EvtScript N(summonBackup) = { EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) EVT_CALL(PlayEffect, EFFECT_SPARKLES, 0, LVar0, LVar1, LVar2, 30, 0, 0, 0, 0, 0, 0, 0, 0) - EVT_CALL(SetAnimation, LVarB, 2, ANIM_JungleGuy_Anim0E) + EVT_CALL(SetAnimation, LVarB, 2, ANIM_SpearGuy_Anim0E) EVT_WAIT(20) EVT_IF_EQ(LocalFlag(0), 0) - EVT_CALL(SetAnimation, LVarB, 2, ANIM_JungleGuy_Anim04) + EVT_CALL(SetAnimation, LVarB, 2, ANIM_SpearGuy_Anim04) EVT_ELSE - EVT_CALL(SetAnimation, LVarB, 2, ANIM_JungleGuy_Anim03) + EVT_CALL(SetAnimation, LVarB, 2, ANIM_SpearGuy_Anim03) EVT_END_IF EVT_CALL(GetActorPos, LVarB, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, LVarB, LVar0, LVar1, LVar2) @@ -740,9 +740,9 @@ EvtScript N(becomeShyGuy) = { EVT_WAIT(10) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim13) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim13) EVT_WAIT(5) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim18) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim18) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 10) EVT_ADD(LVar1, 15) @@ -791,13 +791,13 @@ EvtScript N(spearThrow) = { EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetActorYaw, ACTOR_SELF, 180) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim06) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim06) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 200) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim15) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim15) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_SUB(LVar0, 100) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(6.0)) @@ -820,10 +820,10 @@ EvtScript N(spearThrow) = { EVT_CASE_OR_EQ(HIT_RESULT_MISS) EVT_CASE_OR_EQ(HIT_RESULT_LUCKY) EVT_SET(LVarA, LVar0) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim11) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim11) EVT_WAIT(5) EVT_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim17) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim17) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) @@ -832,7 +832,7 @@ EvtScript N(spearThrow) = { EVT_SUB(LVar0, 10) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim12) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim12) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, 20, LVar2) @@ -873,10 +873,10 @@ EvtScript N(spearThrow) = { EVT_RETURN EVT_END_CASE_GROUP EVT_END_SWITCH - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim11) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim11) EVT_WAIT(5) EVT_THREAD - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim17) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim17) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(0.5)) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 20) @@ -885,7 +885,7 @@ EvtScript N(spearThrow) = { EVT_SUB(LVar0, 10) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) - EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JungleGuy_Anim12) + EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim12) EVT_END_THREAD EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetPartPos, ACTOR_SELF, 3, LVar0, 20, LVar2) diff --git a/src/battle/area_kmr_part_3/actor/final_jr_troopa.c b/src/battle/area_kmr_part_3/actor/final_jr_troopa.c index c5cf4f3dcc..080d4a302e 100644 --- a/src/battle/area_kmr_part_3/actor/final_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/final_jr_troopa.c @@ -213,7 +213,7 @@ EvtScript N(8022C6D4) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) - EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, 2, LVar0, LVar1, LVar2, 5) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) EVT_WAIT(30) EVT_END_IF EVT_END_IF diff --git a/src/battle/area_kmr_part_3/actor/mage_jr_troopa.c b/src/battle/area_kmr_part_3/actor/mage_jr_troopa.c index c1d966d672..420c99449c 100644 --- a/src/battle/area_kmr_part_3/actor/mage_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/mage_jr_troopa.c @@ -144,7 +144,7 @@ EvtScript N(8022A750) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) - EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, 2, LVar0, LVar1, LVar2, 5) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) EVT_WAIT(30) EVT_END_IF EVT_END_IF diff --git a/src/battle/area_kmr_part_3/actor/para_jr_troopa.c b/src/battle/area_kmr_part_3/actor/para_jr_troopa.c index 6755cb643e..32b0480fe6 100644 --- a/src/battle/area_kmr_part_3/actor/para_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/para_jr_troopa.c @@ -130,7 +130,7 @@ EvtScript N(80225F7C) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) - EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, 2, LVar0, LVar1, LVar2, 5) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) EVT_WAIT(30) EVT_END_IF EVT_END_IF diff --git a/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c b/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c index 8906b99eba..8085d97f51 100644 --- a/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c +++ b/src/battle/area_kmr_part_3/actor/spiked_para_jr_troopa.c @@ -124,7 +124,7 @@ EvtScript N(80228084) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_263) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) - EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, 2, LVar0, LVar1, LVar2, 5) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 30, EMOTER_POS, LVar0, LVar1, LVar2, 5) EVT_WAIT(30) EVT_END_IF EVT_END_IF diff --git a/src/battle/area_tik/stage/tik_05.c b/src/battle/area_tik/stage/tik_05.c index 781e1dc472..e1039a19f8 100644 --- a/src/battle/area_tik/stage/tik_05.c +++ b/src/battle/area_tik/stage/tik_05.c @@ -5,62 +5,28 @@ #define NAMESPACE b_area_tik_tik_05 #include "world/common/atomic/TexturePan.inc.c" - -EvtScript N(80233540) = { - EVT_SET_GROUP(0) - EVT_IF_EQ(LVar5, 1) - EVT_IF_EQ(LVar6, 1) - EVT_IF_EQ(LVar7, 1) - EVT_IF_EQ(LVar8, 1) - EVT_CALL(N(UpdateTexturePanSmooth)) - EVT_RETURN - EVT_END_IF - EVT_END_IF - EVT_END_IF - EVT_END_IF - EVT_CALL(N(UpdateTexturePanStepped)) - EVT_RETURN - EVT_END -}; +#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetTexPanner, 15, TEX_PANNER_1) - EVT_CALL(EnableTexPanning, 15, 1) + EVT_CALL(SetTexPanner, MODEL_taki1, TEX_PANNER_1) + EVT_CALL(EnableTexPanning, MODEL_taki1, TRUE) EVT_THREAD - EVT_SET(LVar0, 1) - EVT_SET(LVar1, 0) - EVT_SET(LVar2, -2700) - EVT_SET(LVar3, 0) - EVT_SET(LVar4, -3000) - EVT_SET(LVar5, 1) - EVT_SET(LVar6, 1) - EVT_SET(LVar7, 1) - EVT_SET(LVar8, 1) - EVT_SET(LVar9, 0) - EVT_SET(LVarA, 0) - EVT_SET(LVarB, 0) - EVT_SET(LVarC, 0) - EVT_EXEC(N(80233540)) + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 0, -2700, 0, -3000) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) EVT_END_THREAD - EVT_CALL(SetTexPanner, 16, TEX_PANNER_2) - EVT_CALL(EnableTexPanning, 16, 1) + EVT_CALL(SetTexPanner, MODEL_taki2, TEX_PANNER_2) + EVT_CALL(EnableTexPanning, MODEL_taki2, TRUE) EVT_THREAD - EVT_SET(LVar0, 2) - EVT_SET(LVar1, 50) - EVT_SET(LVar2, -200) - EVT_SET(LVar3, 110) - EVT_SET(LVar4, -500) - EVT_SET(LVar5, 1) - EVT_SET(LVar6, 1) - EVT_SET(LVar7, 1) - EVT_SET(LVar8, 1) - EVT_SET(LVar9, 0) - EVT_SET(LVarA, 0) - EVT_SET(LVarB, 0) - EVT_SET(LVarC, 0) - EVT_EXEC(N(80233540)) + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 50, -200, 110, -500) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) EVT_END_THREAD EVT_RETURN EVT_END diff --git a/src/battle/area_tik2/stage/tik_05.c b/src/battle/area_tik2/stage/tik_05.c index 897035c82c..1651aeaf2e 100644 --- a/src/battle/area_tik2/stage/tik_05.c +++ b/src/battle/area_tik2/stage/tik_05.c @@ -5,62 +5,28 @@ #define NAMESPACE b_area_tik2_tik_05 #include "world/common/atomic/TexturePan.inc.c" - -EvtScript N(80233540) = { - EVT_SET_GROUP(0) - EVT_IF_EQ(LVar5, 1) - EVT_IF_EQ(LVar6, 1) - EVT_IF_EQ(LVar7, 1) - EVT_IF_EQ(LVar8, 1) - EVT_CALL(N(UpdateTexturePanSmooth)) - EVT_RETURN - EVT_END_IF - EVT_END_IF - EVT_END_IF - EVT_END_IF - EVT_CALL(N(UpdateTexturePanStepped)) - EVT_RETURN - EVT_END -}; +#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetTexPanner, 15, TEX_PANNER_1) - EVT_CALL(EnableTexPanning, 15, 1) + EVT_CALL(SetTexPanner, MODEL_taki1, TEX_PANNER_1) + EVT_CALL(EnableTexPanning, MODEL_taki1, TRUE) EVT_THREAD - EVT_SET(LVar0, 1) - EVT_SET(LVar1, 0) - EVT_SET(LVar2, -2700) - EVT_SET(LVar3, 0) - EVT_SET(LVar4, -3000) - EVT_SET(LVar5, 1) - EVT_SET(LVar6, 1) - EVT_SET(LVar7, 1) - EVT_SET(LVar8, 1) - EVT_SET(LVar9, 0) - EVT_SET(LVarA, 0) - EVT_SET(LVarB, 0) - EVT_SET(LVarC, 0) - EVT_EXEC(N(80233540)) + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 0, -2700, 0, -3000) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) EVT_END_THREAD - EVT_CALL(SetTexPanner, 16, TEX_PANNER_2) - EVT_CALL(EnableTexPanning, 16, 1) + EVT_CALL(SetTexPanner, MODEL_taki2, TEX_PANNER_2) + EVT_CALL(EnableTexPanning, MODEL_taki2, TRUE) EVT_THREAD - EVT_SET(LVar0, 2) - EVT_SET(LVar1, 50) - EVT_SET(LVar2, -200) - EVT_SET(LVar3, 110) - EVT_SET(LVar4, -500) - EVT_SET(LVar5, 1) - EVT_SET(LVar6, 1) - EVT_SET(LVar7, 1) - EVT_SET(LVar8, 1) - EVT_SET(LVar9, 0) - EVT_SET(LVarA, 0) - EVT_SET(LVarB, 0) - EVT_SET(LVarC, 0) - EVT_EXEC(N(80233540)) + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 50, -200, 110, -500) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) EVT_END_THREAD EVT_RETURN EVT_END diff --git a/src/battle/area_tik3/stage/tik_05.c b/src/battle/area_tik3/stage/tik_05.c index 7f12743456..51db9a9ef5 100644 --- a/src/battle/area_tik3/stage/tik_05.c +++ b/src/battle/area_tik3/stage/tik_05.c @@ -5,62 +5,28 @@ #define NAMESPACE b_area_tik3_tik_05 #include "world/common/atomic/TexturePan.inc.c" - -EvtScript N(80233540) = { - EVT_SET_GROUP(0) - EVT_IF_EQ(LVar5, 1) - EVT_IF_EQ(LVar6, 1) - EVT_IF_EQ(LVar7, 1) - EVT_IF_EQ(LVar8, 1) - EVT_CALL(N(UpdateTexturePanSmooth)) - EVT_RETURN - EVT_END_IF - EVT_END_IF - EVT_END_IF - EVT_END_IF - EVT_CALL(N(UpdateTexturePanStepped)) - EVT_RETURN - EVT_END -}; +#include "world/common/atomic/TexturePan.data.inc.c" EvtScript N(beforeBattle) = { EVT_CALL(SetSpriteShading, SHADING_NONE) EVT_CALL(SetCamBGColor, 1, 0, 0, 0) - EVT_CALL(SetTexPanner, 15, TEX_PANNER_1) - EVT_CALL(EnableTexPanning, 15, 1) + EVT_CALL(SetTexPanner, MODEL_taki1, TEX_PANNER_1) + EVT_CALL(EnableTexPanning, MODEL_taki1, TRUE) EVT_THREAD - EVT_SET(LVar0, 1) - EVT_SET(LVar1, 0) - EVT_SET(LVar2, -2700) - EVT_SET(LVar3, 0) - EVT_SET(LVar4, -3000) - EVT_SET(LVar5, 1) - EVT_SET(LVar6, 1) - EVT_SET(LVar7, 1) - EVT_SET(LVar8, 1) - EVT_SET(LVar9, 0) - EVT_SET(LVarA, 0) - EVT_SET(LVarB, 0) - EVT_SET(LVarC, 0) - EVT_EXEC(N(80233540)) + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( 0, -2700, 0, -3000) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) EVT_END_THREAD - EVT_CALL(SetTexPanner, 16, TEX_PANNER_2) - EVT_CALL(EnableTexPanning, 16, 1) + EVT_CALL(SetTexPanner, MODEL_taki2, TEX_PANNER_2) + EVT_CALL(EnableTexPanning, MODEL_taki2, TRUE) EVT_THREAD - EVT_SET(LVar0, 2) - EVT_SET(LVar1, 50) - EVT_SET(LVar2, -200) - EVT_SET(LVar3, 110) - EVT_SET(LVar4, -500) - EVT_SET(LVar5, 1) - EVT_SET(LVar6, 1) - EVT_SET(LVar7, 1) - EVT_SET(LVar8, 1) - EVT_SET(LVar9, 0) - EVT_SET(LVarA, 0) - EVT_SET(LVarB, 0) - EVT_SET(LVarC, 0) - EVT_EXEC(N(80233540)) + TEX_PAN_PARAMS_ID(TEX_PANNER_2) + TEX_PAN_PARAMS_STEP( 50, -200, 110, -500) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) EVT_END_THREAD EVT_RETURN EVT_END diff --git a/src/battle/item/sleepy_sheep.c b/src/battle/item/sleepy_sheep.c index 9a29a16787..ef10f70482 100644 --- a/src/battle/item/sleepy_sheep.c +++ b/src/battle/item/sleepy_sheep.c @@ -313,7 +313,7 @@ EvtScript N(main) = { EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 32) - EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 20, 2, LVar0, LVar1, LVar2, 10) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 20, EMOTER_POS, LVar0, LVar1, LVar2, 10) EVT_WAIT(30) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) diff --git a/src/encounter.c b/src/encounter.c index 8f7f1cda49..9c7715fb66 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -485,7 +485,7 @@ void update_encounters_neutral(void) { s32 cond; s32 cond2; s32 firstStrikeType; - s32 aiPaused; + s32 suspendTime; Enemy* enemy; Enemy* currentEnemy; @@ -548,15 +548,15 @@ void update_encounters_neutral(void) { continue; } npc = get_npc_unsafe(enemy->npcID); - if (enemy->aiPaused != 0) { + if (enemy->aiSuspendTime != 0) { if (!(gOverrideFlags & GLOBAL_OVERRIDES_40)) { - enemy->aiPaused--; - aiPaused = enemy->aiPaused; + enemy->aiSuspendTime--; + suspendTime = enemy->aiSuspendTime; } else { - aiPaused = 0; + suspendTime = 0; } - if (aiPaused & 1) { + if (suspendTime & 1) { npc->flags |= NPC_FLAG_80000000; enemy->flags |= ENEMY_FLAG_80000000; } else { @@ -1865,7 +1865,7 @@ void update_encounters_post_battle(void) { enemy = currentEncounter->currentEnemy; encounter = currentEncounter->currentEncounter; if (!(enemy->flags & ENEMY_FLAG_40000)) { - enemy->aiPaused = 45; + enemy->aiSuspendTime = 45; playerStatus->blinkTimer = 45; for (j = 0; j < encounter->count; j++) { enemy = encounter->enemy[j]; @@ -1878,7 +1878,7 @@ void update_encounters_post_battle(void) { if (enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) { continue; } - enemy->aiPaused = 45; + enemy->aiSuspendTime = 45; playerStatus->blinkTimer = 45; } } @@ -2116,7 +2116,7 @@ void update_encounters_post_battle(void) { enemy = currentEncounter->currentEnemy; if (!(enemy->flags & ENEMY_FLAG_4)) { encounter = currentEncounter->currentEncounter; - enemy->aiPaused = 45; + enemy->aiSuspendTime = 45; playerStatus->blinkTimer = 45; for (j = 0; j < encounter->count; j++) { enemy = encounter->enemy[j]; @@ -2129,7 +2129,7 @@ void update_encounters_post_battle(void) { if (enemy->flags & ENEMY_FLAG_ENABLE_HIT_SCRIPT) { continue; } - enemy->aiPaused = 45; + enemy->aiSuspendTime = 45; playerStatus->blinkTimer = 45; } } @@ -2158,8 +2158,8 @@ void update_encounters_post_battle(void) { } npc = get_npc_unsafe(enemy->npcID); - if (enemy->aiPaused != 0) { - if (enemy->aiPaused & 1) { + if (enemy->aiSuspendTime != 0) { + if (enemy->aiSuspendTime & 1) { npc->flags |= NPC_FLAG_80000000; enemy->flags |= ENEMY_FLAG_80000000; } else { @@ -2492,7 +2492,7 @@ void create_encounters(void) { enemy->aiFlags = npcData->aiFlags; enemy->unk_DC = 0; - enemy->aiPaused = 0; + enemy->aiSuspendTime = 0; enemy->unk_B8 = (EvtScript*)npcSettings->unk_24; // ?? enemy->unk_BC = NULL; enemy->unk_C0 = 0; diff --git a/src/encounter_api.c b/src/encounter_api.c index d507541237..0418eb5529 100644 --- a/src/encounter_api.c +++ b/src/encounter_api.c @@ -806,7 +806,7 @@ ApiStatus OnPlayerFled(Evt* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(enemy->npcID); s32 skipReaction = evt_get_variable(script, *script->ptrReadPos); - enemy->aiFlags |= ENEMY_AI_FLAG_4; + enemy->aiFlags |= ENEMY_AI_FLAG_SUSPEND; if (!skipReaction) { s32 unk; diff --git a/src/state_demo.c b/src/state_demo.c index 1733304528..644a2db4b8 100644 --- a/src/state_demo.c +++ b/src/state_demo.c @@ -4,36 +4,140 @@ #include "sprite.h" typedef struct DemoSceneData { - /* 0x0 */ s16 unk_0; - /* 0x2 */ u16 entryID; + /* 0x0 */ s16 sceneType; + /* 0x2 */ u16 index; // entryID for WORLD, battle index for BATTLE /* 0x4 */ char unk_4; /* 0x5 */ s8 partnerID; - /* 0x6 */ s8 unk_6; + /* 0x6 */ s8 storyProgress; /* 0x7 */ char unk_7; /* 0x8 */ char* mapName; } DemoSceneData; // size = 0xC; -DemoSceneData D_80077AE0[20] = { - { .unk_0 = 0, .entryID = 2, .unk_4 = 0, .partnerID = PARTNER_GOOMBARIO, .unk_6 = 0x9D, .mapName = "nok_12" }, - { .unk_0 = 2, .entryID = 0, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0 }, - { .unk_0 = 0, .entryID = 5, .unk_4 = 0, .partnerID = PARTNER_PARAKARRY, .unk_6 = 0x9D, .mapName = "isk_04" }, - { .unk_0 = 0, .entryID = 2, .unk_4 = 0, .partnerID = PARTNER_KOOPER, .unk_6 = 0x9D, .mapName = "tik_03" }, - { .unk_0 = 0, .entryID = 2, .unk_4 = 0, .partnerID = PARTNER_PARAKARRY, .unk_6 = 0xB3, .mapName = "trd_09" }, - { .unk_0 = 0, .entryID = 4, .unk_4 = 0, .partnerID = PARTNER_SUSHIE, .unk_6 = 0x9D, .mapName = "jan_04" }, - { .unk_0 = 2, .entryID = 1, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0x00 }, - { .unk_0 = 0, .entryID = 6, .unk_4 = 0, .partnerID = PARTNER_BOMBETTE, .unk_6 = 0x9D, .mapName = "mac_00" }, - { .unk_0 = 0, .entryID = 2, .unk_4 = 0, .partnerID = PARTNER_KOOPER, .unk_6 = 0x1B, .mapName = "kzn_02" }, - { .unk_0 = 2, .entryID = 2, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0x00 }, - { .unk_0 = 0, .entryID = 3, .unk_4 = 0, .partnerID = PARTNER_BOMBETTE, .unk_6 = 0x9D, .mapName = "mac_03" }, - { .unk_0 = 0, .entryID = 4, .unk_4 = 0, .partnerID = PARTNER_GOOMBARIO, .unk_6 = 0x9D, .mapName = "nok_02" }, - { .unk_0 = 2, .entryID = 3, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0x00 }, - { .unk_0 = 1, .entryID = 8, .unk_4 = 0, .partnerID = PARTNER_TWINK, .unk_6 = 0x26, .mapName = "kkj_11" }, - { .unk_0 = 0, .entryID = 2, .unk_4 = 0, .partnerID = PARTNER_BOW, .unk_6 = 0xE8, .mapName = "arn_08" }, - { .unk_0 = 2, .entryID = 4, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0x00 }, - { .unk_0 = 0, .entryID = 3, .unk_4 = 0, .partnerID = PARTNER_GOOMBARIO, .unk_6 = 0x9D, .mapName = "nok_12" }, - { .unk_0 = 1, .entryID = 3, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0x9D, .mapName = "kkj_26" }, - { .unk_0 = 3, .entryID = 0, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0x00, .mapName = "end" }, - { .unk_0 = 0, .entryID = 0, .unk_4 = 0, .partnerID = PARTNER_NONE, .unk_6 = 0x00, }, +enum DemoSceneType { + DEMO_SCENE_WORLD = 0, + DEMO_SCENE_PEACH = 1, + DEMO_SCENE_BATTLE = 2, + DEMO_SCENE_DONE = 3, + DEMO_SCENE_EXIT = 4, +}; + +DemoSceneData DemoScenes[] = { + { + .sceneType = DEMO_SCENE_WORLD, + .mapName = "nok_12", + .index = nok_12_ENTRY_2, + .partnerID = PARTNER_GOOMBARIO, + .storyProgress = STORY_CH1_KNOCKED_SWITCH_FROM_TREE + }, + { + .sceneType = DEMO_SCENE_BATTLE, + .index = 0 + }, + { + .sceneType = DEMO_SCENE_WORLD, + .mapName = "isk_04", + .index = isk_04_ENTRY_5, + .partnerID = PARTNER_PARAKARRY, + .storyProgress = STORY_CH1_KNOCKED_SWITCH_FROM_TREE + }, + { + .sceneType = DEMO_SCENE_WORLD, + .mapName = "tik_03", + .index = tik_03_ENTRY_2, + .partnerID = PARTNER_KOOPER, + .storyProgress = STORY_CH1_KNOCKED_SWITCH_FROM_TREE + }, + { + .sceneType = DEMO_SCENE_WORLD, + .mapName = "trd_09", + .index = trd_09_ENTRY_2, + .partnerID = PARTNER_PARAKARRY, + .storyProgress = STORY_CH1_STAR_SPIRIT_RESCUED + }, + { + .sceneType = DEMO_SCENE_WORLD, + .mapName = "jan_04", + .index = jan_04_ENTRY_4, + .partnerID = PARTNER_SUSHIE, + .storyProgress = STORY_CH1_KNOCKED_SWITCH_FROM_TREE + }, + { + .sceneType = DEMO_SCENE_BATTLE, + .index = 1 + }, + { + .sceneType = DEMO_SCENE_WORLD, + .mapName = "mac_00", + .index = mac_00_ENTRY_6, + .partnerID = PARTNER_BOMBETTE, + .storyProgress = STORY_CH1_KNOCKED_SWITCH_FROM_TREE + }, + { + .sceneType = DEMO_SCENE_WORLD, + .mapName = "kzn_02", + .index = kzn_02_ENTRY_2, + .partnerID = PARTNER_KOOPER, + .storyProgress = STORY_CH5_LAVA_STREAM_BLOCKED + }, + { + .sceneType = DEMO_SCENE_BATTLE, + .index = 2 + }, + { + .sceneType = DEMO_SCENE_WORLD, + .mapName = "mac_03", + .index = mac_03_ENTRY_3, + .partnerID = PARTNER_BOMBETTE, + .storyProgress = STORY_CH1_KNOCKED_SWITCH_FROM_TREE + }, + { + .sceneType = DEMO_SCENE_WORLD, + .mapName = "nok_02" , + .index = nok_02_ENTRY_4, + .partnerID = PARTNER_GOOMBARIO, + .storyProgress = STORY_CH1_KNOCKED_SWITCH_FROM_TREE + }, + { + .sceneType = DEMO_SCENE_BATTLE, + .index = 3 + }, + { + .sceneType = DEMO_SCENE_PEACH, + .mapName = "kkj_11", + .index = kkj_11_ENTRY_8, + .partnerID = PARTNER_TWINK, + .storyProgress = STORY_CH5_BEGAN_PEACH_MISSION + }, + { + .sceneType = DEMO_SCENE_WORLD, + .mapName = "arn_08", + .index = arn_08_ENTRY_2, + .partnerID = PARTNER_BOW, + .storyProgress = STORY_CH3_UNLOCKED_WINDY_MILL + }, + { + .sceneType = DEMO_SCENE_BATTLE, + .index = 4 + }, + { + .sceneType = DEMO_SCENE_WORLD, + .mapName = "nok_12", + .index = nok_12_ENTRY_3, + .partnerID = PARTNER_GOOMBARIO, + .storyProgress = STORY_CH1_KNOCKED_SWITCH_FROM_TREE + }, + { + .sceneType = DEMO_SCENE_PEACH, + .mapName = "kkj_26", + .index = kkj_26_ENTRY_3, + .partnerID = PARTNER_NONE, + .storyProgress = STORY_CH1_KNOCKED_SWITCH_FROM_TREE + }, + { + .sceneType = DEMO_SCENE_DONE, + .mapName = "end" + }, + {} // final entry blank }; char versionString[] = "Prg Ver.00/12/05 16:54"; @@ -57,20 +161,20 @@ void state_init_demo(void) { void state_step_demo(void) { PlayerData* playerData = &gPlayerData; - DemoSceneData* demoSceneData = &D_80077AE0[gGameStatusPtr->nextDemoScene]; - s16 mode = demoSceneData->unk_0; + DemoSceneData* demoSceneData = &DemoScenes[gGameStatusPtr->nextDemoScene]; + s16 mode = demoSceneData->sceneType; s16 mapID; s16 areaID; if (gGameStatusPtr->demoState == 4) { - mode = 3; + mode = DEMO_SCENE_DONE; } if (gGameStatusPtr->demoState == 5) { - mode = 4; + mode = DEMO_SCENE_EXIT; } switch (mode) { - case 3: + case DEMO_SCENE_DONE: intro_logos_set_fade_alpha(255); intro_logos_set_fade_color(224); gGameStatusPtr->introState = INTRO_STATE_3; @@ -78,7 +182,7 @@ void state_step_demo(void) { intro_logos_update_fade(); gGameStatusPtr->demoState = 5; break; - case 4: + case DEMO_SCENE_EXIT: if (gGameStatusPtr->introState != INTRO_STATE_0) { gGameStatusPtr->introState--; } @@ -121,15 +225,15 @@ void state_step_demo(void) { set_game_mode(GAME_MODE_TITLE_SCREEN); } return; - case 0: + case DEMO_SCENE_WORLD: get_map_IDs_by_name(demoSceneData->mapName, &areaID, &mapID); gGameStatusPtr->areaID = areaID; gGameStatusPtr->mapID = mapID; - gGameStatusPtr->entryID = demoSceneData->entryID; + gGameStatusPtr->entryID = demoSceneData->index; gGameStatusPtr->peachFlags = 0; playerData->currentPartner = demoSceneData->partnerID; set_cam_viewport(0, 29, 20, -262, 177); - evt_set_variable(NULL, GB_StoryProgress, demoSceneData->unk_6); + evt_set_variable(NULL, GB_StoryProgress, demoSceneData->storyProgress); if (gGameStatusPtr->nextDemoScene == 0) { set_map_transition_effect(3); @@ -139,15 +243,15 @@ void state_step_demo(void) { set_game_mode(GAME_MODE_ENTER_DEMO_WORLD); break; - case 1: + case DEMO_SCENE_PEACH: get_map_IDs_by_name(demoSceneData->mapName, &areaID, &mapID); gGameStatusPtr->areaID = areaID; gGameStatusPtr->mapID = mapID; - gGameStatusPtr->entryID = demoSceneData->entryID; + gGameStatusPtr->entryID = demoSceneData->index; gGameStatusPtr->peachFlags = PEACH_STATUS_FLAG_IS_PEACH; playerData->currentPartner = demoSceneData->partnerID; set_cam_viewport(0, 29, 20, -262, 177); - evt_set_variable(NULL, GB_StoryProgress, demoSceneData->unk_6); + evt_set_variable(NULL, GB_StoryProgress, demoSceneData->storyProgress); if (gGameStatusPtr->nextDemoScene == 0) { set_map_transition_effect(3); @@ -157,14 +261,14 @@ void state_step_demo(void) { set_game_mode(GAME_MODE_ENTER_DEMO_WORLD); break; - case 2: - load_demo_battle(demoSceneData->entryID); + case DEMO_SCENE_BATTLE: + load_demo_battle(demoSceneData->index); break; } - gGameStatusPtr->nextDemoScene += 1; - if (gGameStatusPtr->nextDemoScene > 0x12) { - gGameStatusPtr->nextDemoScene = 0x12; + gGameStatusPtr->nextDemoScene++; + if (gGameStatusPtr->nextDemoScene > ARRAY_COUNT(DemoScenes) - 2) { + gGameStatusPtr->nextDemoScene = ARRAY_COUNT(DemoScenes) - 2; } } diff --git a/src/world/area_arn/arn_05/arn_05_3_npc.c b/src/world/area_arn/arn_05/arn_05_3_npc.c index 4736256522..731a9f87dc 100644 --- a/src/world/area_arn/arn_05/arn_05_3_npc.c +++ b/src/world/area_arn/arn_05/arn_05_3_npc.c @@ -328,7 +328,7 @@ EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(NpcFacePlayer, NPC_Boo_03, 1) EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(GetNpcPos, NPC_Boo_03, LVar0, LVar1, LVar2) EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) @@ -356,10 +356,10 @@ EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(PlaySoundAtNpc, NPC_Boo_03, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(PlaySoundAtNpc, NPC_Boo_05, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) - EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) - EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) - EVT_CALL(ShowEmote, NPC_Boo_05, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Boo_05, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(FadeOutMusic, 0, 500) EVT_CALL(ClearAmbientSounds, 250) EVT_WAIT(20) @@ -437,8 +437,8 @@ EvtScript N(EVS_Scene_TubbaRaid) = { EVT_CALL(SetNpcPos, NPC_Boo_03, 272, 190, 214) EVT_CALL(PlaySoundAtNpc, NPC_Boo_01, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(PlaySoundAtNpc, NPC_Boo_02, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, 45, 20, TRUE, 0, 0, 0, 0) - EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, 45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_THREAD EVT_CALL(PlaySound, SOUND_BOO_APPEAR) EVT_WAIT(20) diff --git a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c index 28a255b74e..91bfe73848 100644 --- a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c +++ b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c @@ -276,12 +276,12 @@ EvtScript N(EVS_Scene_EscapeFromTubba) = { EVT_CALL(PlaySoundAtNpc, NPC_Boo_04, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(PlaySoundAtNpc, NPC_Boo_05, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(PlaySoundAtNpc, NPC_Boo_06, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, 45, 20, TRUE, 0, 0, 0, 0) - EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, 45, 20, TRUE, 0, 0, 0, 0) - EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, 45, 20, TRUE, 0, 0, 0, 0) - EVT_CALL(ShowEmote, NPC_Boo_04, EMOTE_EXCLAMATION, 45, 20, TRUE, 0, 0, 0, 0) - EVT_CALL(ShowEmote, NPC_Boo_05, EMOTE_EXCLAMATION, 45, 20, TRUE, 0, 0, 0, 0) - EVT_CALL(ShowEmote, NPC_Boo_06, EMOTE_EXCLAMATION, 45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Boo_01, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Boo_02, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Boo_03, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Boo_04, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Boo_05, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Boo_06, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(50) EVT_SET(LVar2, 1) EVT_EXEC(N(EVS_CloseDoors)) diff --git a/src/world/area_dgb/dgb_04/dgb_04_4_entity.c b/src/world/area_dgb/dgb_04/dgb_04_4_entity.c index 59013efe56..3a8492c726 100644 --- a/src/world/area_dgb/dgb_04/dgb_04_4_entity.c +++ b/src/world/area_dgb/dgb_04/dgb_04_4_entity.c @@ -4,7 +4,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_DGB04_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_MAKE_SUPER_BLOCK(500, -360, 110, 0) diff --git a/src/world/area_dgb/dgb_06/dgb_06_3_entity.c b/src/world/area_dgb/dgb_06/dgb_06_3_entity.c index 50c2737d5b..5c708ec5ad 100644 --- a/src/world/area_dgb/dgb_06/dgb_06_3_entity.c +++ b/src/world/area_dgb/dgb_06/dgb_06_3_entity.c @@ -1,7 +1,7 @@ #include "dgb_06.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_TubbaKey) = EVT_OPEN_CHEST_KEY(ITEM_TUBBA_CASTLE_KEY, GF_DGB06_Chest_CastleKey1); diff --git a/src/world/area_dgb/dgb_12/dgb_12_4_entity.c b/src/world/area_dgb/dgb_12/dgb_12_4_entity.c index 5cee30eb1e..253db1dfb6 100644 --- a/src/world/area_dgb/dgb_12/dgb_12_4_entity.c +++ b/src/world/area_dgb/dgb_12/dgb_12_4_entity.c @@ -1,7 +1,7 @@ #include "dgb_12.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_Chest_Interact) = EVT_OPEN_CHEST_KEY(ITEM_TUBBA_CASTLE_KEY, GF_DGB12_Chest_CastleKey1); diff --git a/src/world/area_dgb/dgb_18/dgb_18_4_entity.c b/src/world/area_dgb/dgb_18/dgb_18_4_entity.c index 6149ec0cf4..9a0b103375 100644 --- a/src/world/area_dgb/dgb_18/dgb_18_4_entity.c +++ b/src/world/area_dgb/dgb_18/dgb_18_4_entity.c @@ -1,7 +1,7 @@ #include "dgb_18.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_MysticalKey) = { EVT_SET(GF_DGB18_Chest_MysticalKey, TRUE) diff --git a/src/world/area_dro/dro_01/dro_01_2_main.c b/src/world/area_dro/dro_01/dro_01_2_main.c index 71fadd0d52..b20bca8176 100644 --- a/src/world/area_dro/dro_01/dro_01_2_main.c +++ b/src/world/area_dro/dro_01/dro_01_2_main.c @@ -1,7 +1,6 @@ #include "dro_01.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/UnkFunc27.inc.c" diff --git a/src/world/area_dro/dro_01/dro_01_3_npc.c b/src/world/area_dro/dro_01/dro_01_3_npc.c index 8bb2cfcec0..0ab02c6200 100644 --- a/src/world/area_dro/dro_01/dro_01_3_npc.c +++ b/src/world/area_dro/dro_01/dro_01_3_npc.c @@ -361,7 +361,7 @@ StaticNpc N(PassiveNPCs)[] = { .settings = &N(NpcSettings_Dryite_Patrol), .pos = { 40.0f, 0.0f, 105.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Dryite_06), .drops = DRYITE_DROPS, .territory = { diff --git a/src/world/area_dro/dro_01/dro_01_6_entity.c b/src/world/area_dro/dro_01/dro_01_6_entity.c index 630b06a91f..851d72c9a5 100644 --- a/src/world/area_dro/dro_01/dro_01_6_entity.c +++ b/src/world/area_dro/dro_01/dro_01_6_entity.c @@ -3,7 +3,6 @@ #define NAMESPACE dro_01_Entity #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #define NAMESPACE dro_01 EvtScript N(EVS_WarpPipeExit) = { diff --git a/src/world/area_dro/dro_02/dro_02_5_npc.c b/src/world/area_dro/dro_02/dro_02_5_npc.c index 3aef225bea..f72db9055a 100644 --- a/src/world/area_dro/dro_02/dro_02_5_npc.c +++ b/src/world/area_dro/dro_02/dro_02_5_npc.c @@ -527,7 +527,7 @@ StaticNpc N(PassiveNPCs)[] = { .id = NPC_ChuckQuizmo, .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -335.0f, 0.0f, 90.0f }, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_DRO, QUIZ_COUNT_DRO, QUIZ_MAP_DRO_02 } }, .yaw = 270, diff --git a/src/world/area_end/end_00/end_00.h b/src/world/area_end/end_00/end_00.h index 45d9cfdbf2..baba5474fa 100644 --- a/src/world/area_end/end_00/end_00.h +++ b/src/world/area_end/end_00/end_00.h @@ -34,7 +34,7 @@ #include "sprite/npc/TuffPuff.h" #include "sprite/npc/GourmetGuy.h" -#include "sprite/npc/RafaelRaven.h" +#include "sprite/npc/RaphaelRaven.h" #include "sprite/npc/LavaPiranha.h" #include "sprite/npc/ParadeYoshi.h" #include "sprite/npc/YoshiKid.h" @@ -109,7 +109,7 @@ enum { NPC_Yoshi3 = 59, NPC_Yoshi4 = 60, NPC_YoshiChief = 61, - NPC_RafaelRaven = 62, + NPC_RaphaelRaven = 62, NPC_LavaPiranha = 63, NPC_YoshiKidGreen = 64, NPC_YoshiKidBlue = 65, diff --git a/src/world/area_end/end_00/end_00_3_parade_setup.c b/src/world/area_end/end_00/end_00_3_parade_setup.c index 904547dc02..b11fbcf6ef 100644 --- a/src/world/area_end/end_00/end_00_3_parade_setup.c +++ b/src/world/area_end/end_00/end_00_3_parade_setup.c @@ -253,8 +253,8 @@ s32 N(ExtraAnims_GoombaKing)[] = { -1 }; -s32 N(ExtraAnims_RafaelRaven)[] = { - ANIM_RafaelRaven_IdleNoFeet, +s32 N(ExtraAnims_RaphaelRaven)[] = { + ANIM_RaphaelRaven_IdleNoFeet, -1 }; @@ -633,9 +633,9 @@ ParadeNpcInfo N(ParadeNpcsTable)[] = { .pos = { 232.0f, 50.0f, 25.0f }, .yaw = 270.0f }, - [NPC_RafaelRaven] { - .initialAnim = ANIM_RafaelRaven_IdleNoFeet, - .animList = N(ExtraAnims_RafaelRaven), + [NPC_RaphaelRaven] { + .initialAnim = ANIM_RaphaelRaven_IdleNoFeet, + .animList = N(ExtraAnims_RaphaelRaven), .pos = { 357.0f, -120.0f, -30.0f }, .yaw = 90.0f }, @@ -1015,7 +1015,7 @@ EvtScript N(EVS_ManageNpcPool) = { EVT_CALL(DeleteNpc, NPC_Boo3) EVT_CALL(DeleteNpc, NPC_TubbasHeart) EVT_WAIT(1) - EVT_CALL(N(CreateParadeNPC), NPC_RafaelRaven) + EVT_CALL(N(CreateParadeNPC), NPC_RaphaelRaven) EVT_CALL(N(CreateParadeNPC), NPC_LavaPiranha) EVT_CALL(N(CreateParadeNPC), NPC_Yoshi1) EVT_CALL(N(CreateParadeNPC), NPC_Yoshi2) @@ -1052,7 +1052,7 @@ EvtScript N(EVS_ManageNpcPool) = { EVT_CALL(DeleteNpc, NPC_Yoshi3) EVT_CALL(DeleteNpc, NPC_Yoshi4) EVT_CALL(DeleteNpc, NPC_YoshiChief) - EVT_CALL(DeleteNpc, NPC_RafaelRaven) + EVT_CALL(DeleteNpc, NPC_RaphaelRaven) EVT_CALL(DeleteNpc, NPC_LavaPiranha) EVT_WAIT(1) EVT_CALL(N(CreateParadeNPC), NPC_HuffNPuffBody) diff --git a/src/world/area_end/end_00/end_00_6_caravan.c b/src/world/area_end/end_00/end_00_6_caravan.c index 2e31f48efd..364d05989d 100644 --- a/src/world/area_end/end_00/end_00_6_caravan.c +++ b/src/world/area_end/end_00/end_00_6_caravan.c @@ -136,7 +136,7 @@ EvtScript N(EVS_ParadePhase_Caravan) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(20) - EVT_CALL(ShowEmote, NPC_Tutankoopa1, EMOTE_ELLIPSIS, 0, 60, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Tutankoopa1, EMOTE_ELLIPSIS, 0, 60, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(60) EVT_CALL(MakeLerp, 90, 0, 5, EASING_LINEAR) EVT_LOOP(5) @@ -190,7 +190,7 @@ EvtScript N(EVS_ParadePhase_BuzzarNest) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(200) - EVT_CALL(ShowEmote, NPC_Buzzar, EMOTE_SHOCK, 45, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Buzzar, EMOTE_SHOCK, 45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(40) EVT_CALL(SetNpcAnimation, NPC_Buzzar, ANIM_Buzzar_Anim03) EVT_CALL(NpcFlyTo, NPC_Buzzar, -855, 100, -180, 60, 0, EASING_LINEAR) diff --git a/src/world/area_end/end_00/end_00_8_yoshis.c b/src/world/area_end/end_00/end_00_8_yoshis.c index c10885132e..9274b4d3cb 100644 --- a/src/world/area_end/end_00/end_00_8_yoshis.c +++ b/src/world/area_end/end_00/end_00_8_yoshis.c @@ -11,11 +11,11 @@ EvtScript N(EVS_ParadePhase_Yoshis) = { EVT_END_LOOP EVT_END_CHILD_THREAD EVT_CHILD_THREAD - EVT_CALL(SetNpcScale, NPC_RafaelRaven, EVT_FLOAT(2.0), EVT_FLOAT(2.0), 1) + EVT_CALL(SetNpcScale, NPC_RaphaelRaven, EVT_FLOAT(2.0), EVT_FLOAT(2.0), 1) EVT_LOOP(0) - EVT_CALL(NpcFlyTo, NPC_RafaelRaven, 357, 0, -30, 10, 0, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_RaphaelRaven, 357, 0, -30, 10, 0, EASING_LINEAR) EVT_WAIT(60) - EVT_CALL(NpcFlyTo, NPC_RafaelRaven, 357, -120, -30, 10, 0, EASING_LINEAR) + EVT_CALL(NpcFlyTo, NPC_RaphaelRaven, 357, -120, -30, 10, 0, EASING_LINEAR) EVT_WAIT(60) EVT_END_LOOP EVT_END_CHILD_THREAD diff --git a/src/world/area_flo/flo_03/flo_03_3_npc.c b/src/world/area_flo/flo_03/flo_03_3_npc.c index e559c79724..bc8a2e67be 100644 --- a/src/world/area_flo/flo_03/flo_03_3_npc.c +++ b/src/world/area_flo/flo_03/flo_03_3_npc.c @@ -171,7 +171,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim16) EVT_WAIT(10) EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_QUESTION, -45, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_QUESTION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(GetNpcPos, NPC_MontyMole_02, LVar0, LVar1, LVar2) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0052) EVT_CALL(SetNpcYaw, NPC_MontyMole_02, 90) @@ -226,7 +226,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetNpcAnimation, NPC_Dayzee, ANIM_Dayzee_Anim0D) EVT_CALL(PlaySoundAtNpc, NPC_Dayzee, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Dayzee, EMOTE_EXCLAMATION, 45, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Dayzee, EMOTE_EXCLAMATION, 45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0056) EVT_SET(LVar4, EVT_FLOAT(90.0)) @@ -401,7 +401,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_SET(LVar1, 10) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF @@ -480,7 +480,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_SET(LVar1, 10) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_MontyMole_02, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_MontyMole_02, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF @@ -559,7 +559,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_SET(LVar1, 10) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_MontyMole_03, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_MontyMole_03, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF @@ -638,7 +638,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_SET(LVar1, 10) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_MontyMole_04, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_MontyMole_04, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF diff --git a/src/world/area_flo/flo_08/flo_08_2_entity.c b/src/world/area_flo/flo_08/flo_08_2_entity.c index 80e764d937..9504762b66 100644 --- a/src/world/area_flo/flo_08/flo_08_2_entity.c +++ b/src/world/area_flo/flo_08/flo_08_2_entity.c @@ -4,7 +4,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_FLO08_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_MAKE_SUPER_BLOCK(-780, 120, -110, 0) diff --git a/src/world/area_flo/flo_08/flo_08_4_npc.c b/src/world/area_flo/flo_08/flo_08_4_npc.c index 9e83e5e21c..274eabda43 100644 --- a/src/world/area_flo/flo_08/flo_08_4_npc.c +++ b/src/world/area_flo/flo_08/flo_08_4_npc.c @@ -162,7 +162,7 @@ StaticNpc N(NpcData_GateFlower) = { .settings = &N(NpcSettings_GateFlower), .pos = { -695.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_GateFlower), .drops = GATE_FLOWER_DROPS, .animations = GATE_FLOWER_YELLOW_ANIMS, diff --git a/src/world/area_flo/flo_10/flo_10_5_npc.c b/src/world/area_flo/flo_10/flo_10_5_npc.c index 457b3fd87d..d4f3c56d4e 100644 --- a/src/world/area_flo/flo_10/flo_10_5_npc.c +++ b/src/world/area_flo/flo_10/flo_10_5_npc.c @@ -137,7 +137,7 @@ EvtScript N(EVS_NpcInteract_Lily) = { EVT_CALL(NpcFacePlayer, NPC_SELF, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Lily_Idle) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_Idle, ANIM_Lily_Idle, 0, MSG_CH6_007A) EVT_CALL(EndSpeech, NPC_SELF, ANIM_Lily_Dread, ANIM_Lily_Idle, 0) diff --git a/src/world/area_flo/flo_11/flo_11_2_main.c b/src/world/area_flo/flo_11/flo_11_2_main.c index 2c2183d6a4..4b47d84174 100644 --- a/src/world/area_flo/flo_11/flo_11_2_main.c +++ b/src/world/area_flo/flo_11/flo_11_2_main.c @@ -4,7 +4,6 @@ #include "../common/FlowerSpawnRegion.inc.c" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" API_CALLABLE(N(SpawnSunEffect)) { fx_sun_undeclared(FX_SUN_FROM_LEFT, 0, 0, 0, 0, 0); diff --git a/src/world/area_flo/flo_16/flo_16_4_entity.c b/src/world/area_flo/flo_16/flo_16_4_entity.c index 1105e453ed..4139b4c35d 100644 --- a/src/world/area_flo/flo_16/flo_16_4_entity.c +++ b/src/world/area_flo/flo_16/flo_16_4_entity.c @@ -4,7 +4,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_FLO16_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_TetherCameraToPlayer) = { EVT_LABEL(0) diff --git a/src/world/area_flo/flo_23/flo_23_3_npc.c b/src/world/area_flo/flo_23/flo_23_3_npc.c index 3974e37ea9..2f96a86f93 100644 --- a/src/world/area_flo/flo_23/flo_23_3_npc.c +++ b/src/world/area_flo/flo_23/flo_23_3_npc.c @@ -162,7 +162,7 @@ StaticNpc N(NpcData_GateFlower) = { .settings = &N(NpcSettings_GateFlower), .pos = { 385.0f, 0.0f, -35.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_GateFlower), .drops = GATE_FLOWER_DROPS, .animations = GATE_FLOWER_BLUE_ANIMS, diff --git a/src/world/area_flo/flo_25/flo_25_3_npc.c b/src/world/area_flo/flo_25/flo_25_3_npc.c index 6acd33eed7..0cae4c1ffb 100644 --- a/src/world/area_flo/flo_25/flo_25_3_npc.c +++ b/src/world/area_flo/flo_25/flo_25_3_npc.c @@ -162,7 +162,7 @@ StaticNpc N(NpcData_GateFlower) = { .settings = &N(NpcSettings_GateFlower), .pos = { 505.0f, 0.0f, -25.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_GateFlower), .drops = GATE_FLOWER_DROPS, .animations = GATE_FLOWER_RED_ANIMS, diff --git a/src/world/area_gv/gv_01/gv_01_1_main.c b/src/world/area_gv/gv_01/gv_01_1_main.c index b01c238ee4..f2e46e4273 100644 --- a/src/world/area_gv/gv_01/gv_01_1_main.c +++ b/src/world/area_gv/gv_01/gv_01_1_main.c @@ -3,7 +3,6 @@ #include "hud_element.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_hos/hos_00/hos_00_6_scenes.c b/src/world/area_hos/hos_00/hos_00_6_scenes.c index 6f4291018f..035727dfed 100644 --- a/src/world/area_hos/hos_00/hos_00_6_scenes.c +++ b/src/world/area_hos/hos_00/hos_00_6_scenes.c @@ -253,7 +253,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = { EVT_CALL(GetNpcPos, NPC_Twink, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) EVT_CALL(NpcMoveTo, NPC_Twink, LVar0, LVar2, 0) - EVT_CALL(ShowEmote, NPC_Twink, EMOTE_SHOCK, 45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Twink, EMOTE_SHOCK, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_Twink, ANIM_Twink_ShoutJoy) EVT_CALL(SetNpcJumpscale, NPC_Twink, EVT_FLOAT(1.0)) diff --git a/src/world/area_hos/hos_01/hos_01_4_npc.c b/src/world/area_hos/hos_01/hos_01_4_npc.c index e84f6cd0ab..2676e36096 100644 --- a/src/world/area_hos/hos_01/hos_01_4_npc.c +++ b/src/world/area_hos/hos_01/hos_01_4_npc.c @@ -445,7 +445,7 @@ StaticNpc N(NpcData_StarSpirits)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -30.0f, 260.0f, -170.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Eldstar), .drops = NPC_NO_DROPS, .animations = ELDSTAR_ANIMS, diff --git a/src/world/area_hos/hos_03/hos_03_6_npc.c b/src/world/area_hos/hos_03/hos_03_6_npc.c index 4d88b31c7d..66afc2541d 100644 --- a/src/world/area_hos/hos_03/hos_03_6_npc.c +++ b/src/world/area_hos/hos_03/hos_03_6_npc.c @@ -149,7 +149,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_StarMan), .pos = { -463.0f, 10.0f, 400.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_StarKid_01), .drops = STAR_MAN_DROPS, .animations = STAR_MAN_ANIMS, @@ -160,7 +160,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_StarMan), .pos = { -325.0f, 10.0f, 600.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_StarKid_02), .drops = STAR_MAN_DROPS, .animations = STAR_MAN_ANIMS, @@ -171,7 +171,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_StarMan_Wander), .pos = { 0.0f, 10.0f, 300.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_StarKid_03), .drops = STAR_MAN_DROPS, .territory = { @@ -194,7 +194,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_StarMan_Wander), .pos = { 250.0f, 10.0f, 500.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_StarKid_04), .drops = STAR_MAN_DROPS, .territory = { @@ -217,7 +217,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_StarMan), .pos = { -485.0f, 335.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_StarKid_05), .drops = STAR_MAN_DROPS, .animations = STAR_MAN_ANIMS, @@ -228,7 +228,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_StarMan), .pos = { 458.0f, 35.0f, 233.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_ToadHouseKeeper), .drops = STAR_MAN_DROPS, .animations = STAR_MAN_ANIMS, @@ -239,7 +239,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_StarMan), .pos = { 140.0f, 285.0f, -315.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_ShopOwner), .drops = STAR_MAN_DROPS, .animations = STAR_MAN_ANIMS, @@ -250,7 +250,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -200.0f, 0.0f, 400.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_HOS, QUIZ_COUNT_HOS, QUIZ_MAP_HOS_03 }}, .drops = QUIZMO_DROPS, diff --git a/src/world/area_hos/hos_06/hos_06_5_merluvlee.c b/src/world/area_hos/hos_06/hos_06_5_merluvlee.c index 0e67e8600b..47781507e0 100644 --- a/src/world/area_hos/hos_06/hos_06_5_merluvlee.c +++ b/src/world/area_hos/hos_06/hos_06_5_merluvlee.c @@ -688,7 +688,7 @@ EvtScript N(EVS_KootCheckBall_Merluvlee) = { EVT_CHOOSE_KEY_ITEM_FROM(N(CrystalBallItems)) EVT_IF_NE(LVar0, -1) EVT_CALL(SpeakToPlayer, NPC_Merluvlee, ANIM_Merluvlee_Talk, ANIM_Merluvlee_Idle, 0, MSG_HOS_0049) - EVT_GIVE_KEY_REWARD(ITEM_KOOT_LUIGI_AUTOGRAPH) + EVT_GIVE_KEY_REWARD(ITEM_KOOT_MERLUVLEES_AUTOGRAPH) EVT_SET(GF_HOS06_Gift_MerluvleesAutograph, TRUE) EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_Merluvlee, ANIM_Merluvlee_Talk, ANIM_Merluvlee_Idle, 0, MSG_HOS_0048) diff --git a/src/world/area_isk/isk_09/isk_09_3_entity.c b/src/world/area_isk/isk_09/isk_09_3_entity.c index fb781c3d87..4352ddd848 100644 --- a/src/world/area_isk/isk_09/isk_09_3_entity.c +++ b/src/world/area_isk/isk_09/isk_09_3_entity.c @@ -2,7 +2,7 @@ #include "entity.h" #include "effects.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" API_CALLABLE(N(DismissGotItem)) { Entity* bigChest = get_entity_by_index(script->varTable[0]); diff --git a/src/world/area_isk/isk_10/isk_10_2_entity.c b/src/world/area_isk/isk_10/isk_10_2_entity.c index 901bacb2c1..a62199b734 100644 --- a/src/world/area_isk/isk_10/isk_10_2_entity.c +++ b/src/world/area_isk/isk_10/isk_10_2_entity.c @@ -4,7 +4,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_ISK10_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" API_CALLABLE(N(MonitorPlayerLastFloor)) { s32 level = -1; diff --git a/src/world/area_iwa/iwa_03/iwa_03_2_entity.c b/src/world/area_iwa/iwa_03/iwa_03_2_entity.c index f319068db0..545872f880 100644 --- a/src/world/area_iwa/iwa_03/iwa_03_2_entity.c +++ b/src/world/area_iwa/iwa_03/iwa_03_2_entity.c @@ -1,7 +1,7 @@ #include "iwa_03.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" MAP_RODATA_PAD(1,entity); diff --git a/src/world/area_iwa/iwa_10/iwa_10_3_npc.c b/src/world/area_iwa/iwa_10/iwa_10_3_npc.c index cd7107a3be..4c048ebfd7 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_3_npc.c +++ b/src/world/area_iwa/iwa_10/iwa_10_3_npc.c @@ -128,7 +128,7 @@ StaticNpc N(NpcData_TrainToad)[] = { .settings = &N(NpcSettings_TrainToad), .pos = { -440.0f, 20.0f, 110.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_TrainToad_01), .drops = TRAIN_CONDUCTOR_DROPS, .animations = TRAIN_TOAD_WHITE_ANIMS, @@ -139,7 +139,7 @@ StaticNpc N(NpcData_TrainToad)[] = { .settings = &N(NpcSettings_TrainToad), .pos = { -425.0f, 70.0f, -20.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_TrainToad_02), .drops = TRAIN_CONDUCTOR_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, @@ -151,7 +151,7 @@ StaticNpc N(NpcData_Toad) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -254.0f, 20.0f, 165.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -168,7 +168,7 @@ StaticNpc N(NpcData_ThreeSisters)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -562.0f, 0.0f, 384.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ThreeSisters_02), .drops = TOADETTE_DROPS, .animations = TOADETTE_PINK_ANIMS, @@ -179,7 +179,7 @@ StaticNpc N(NpcData_ThreeSisters)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -582.0f, 0.0f, 406.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ThreeSisters_02), .drops = TOADETTE_DROPS, .animations = TOADETTE_PINK_ANIMS, @@ -190,7 +190,7 @@ StaticNpc N(NpcData_ThreeSisters)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -524.0f, 0.0f, 411.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ThreeSisters_02), .drops = TOADETTE_DROPS, .animations = TOADETTE_PINK_ANIMS, @@ -204,7 +204,7 @@ StaticNpc N(NpcData_Dryite)[] = { .settings = &N(NpcSettings_Dryite), .pos = { -344.0f, 0.0f, 379.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Dryite), .drops = DRYITE_DROPS, .animations = DRYITE_GREEN_ANIMS, @@ -215,7 +215,7 @@ StaticNpc N(NpcData_Dryite)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -760.0f, 0.0f, 160.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ThreeSisters_01), .drops = TOADETTE_DROPS, .animations = TOADETTE_GREEN_ANIMS, diff --git a/src/world/area_iwa/iwa_10/iwa_10_5_entity.c b/src/world/area_iwa/iwa_10/iwa_10_5_entity.c index 16a81c7614..119e3f42d6 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_5_entity.c +++ b/src/world/area_iwa/iwa_10/iwa_10_5_entity.c @@ -4,7 +4,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_IWA10_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_OnSmashBlock) = { EVT_SET(GF_IWA10_Hammer1Block, TRUE) diff --git a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c index cbb124da5b..7ab8b0afd5 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c +++ b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c @@ -310,7 +310,7 @@ StaticNpc N(NpcData_Parakarry) = { .settings = &N(NpcSettings_Parakarry), .pos = { -610.0f, 230.0f, -485.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000, .init = &N(EVS_NpcInit_Parakarry), .drops = { .dropFlags = NPC_DROP_FLAG_80, diff --git a/src/world/area_iwa/iwa_11/iwa_11_5_npc.c b/src/world/area_iwa/iwa_11/iwa_11_5_npc.c index f08e459ac0..39e18d2c36 100644 --- a/src/world/area_iwa/iwa_11/iwa_11_5_npc.c +++ b/src/world/area_iwa/iwa_11/iwa_11_5_npc.c @@ -23,7 +23,7 @@ StaticNpc N(NpcData_TrainToad) = { .settings = &N(NpcSettings_TrainToad), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_TrainToad), .drops = TRAIN_CONDUCTOR_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, diff --git a/src/world/common/todo/PullVineSub.inc.c b/src/world/area_jan/common/MoveBush.inc.c similarity index 76% rename from src/world/common/todo/PullVineSub.inc.c rename to src/world/area_jan/common/MoveBush.inc.c index 734186c795..d73a59e8b4 100644 --- a/src/world/common/todo/PullVineSub.inc.c +++ b/src/world/area_jan/common/MoveBush.inc.c @@ -1,14 +1,14 @@ #include "common.h" #include "model.h" -void N(PullVine_apply_shear_mtx)(Matrix4f mtx, f32 f) { +void N(MoveBush_apply_shear_mtx)(Matrix4f mtx, f32 f) { guMtxIdentF(mtx); mtx[1][0] = f * 0.2; mtx[1][1] = 1.0f; mtx[1][2] = 0.0f; } -ApiStatus N(PullVine_ShearBushModel)(Evt* script) { +ApiStatus N(MoveBush_AnimateShearing)(Evt* script) { Bytecode* args = script->ptrReadPos; s32 modelID = evt_get_variable(script, *args++); s32 modelIndex = get_model_list_index_from_tree_index(modelID); @@ -17,10 +17,10 @@ ApiStatus N(PullVine_ShearBushModel)(Evt* script) { Matrix4f mtx; if (!(mdl->flags & MODEL_FLAG_HAS_TRANSFORM_APPLIED)) { - N(PullVine_apply_shear_mtx)(mdl->transformMatrix, f); + N(MoveBush_apply_shear_mtx)(mdl->transformMatrix, f); mdl->flags |= MODEL_FLAG_USES_TRANSFORM_MATRIX | MODEL_FLAG_HAS_TRANSFORM_APPLIED; } else { - N(PullVine_apply_shear_mtx)(mtx, f); + N(MoveBush_apply_shear_mtx)(mtx, f); guMtxCatF(mtx, mdl->transformMatrix, mdl->transformMatrix); } return ApiStatus_DONE2; diff --git a/src/world/area_jan/common/MoveBushTemplates.h b/src/world/area_jan/common/MoveBushTemplates.h new file mode 100644 index 0000000000..cfadbcfb9a --- /dev/null +++ b/src/world/area_jan/common/MoveBushTemplates.h @@ -0,0 +1,55 @@ +#include "common.h" +#include "model.h" + +#define EVT_MOVE_BUSHES(collider, bushModelL, bushmodelR, moveVarL, moveVarR) \ +{ \ + EVT_CALL(PlaySoundAtCollider, collider, SOUND_209F, 0) \ + EVT_SET(LVar0, moveVarL) \ + EVT_SET(LVar1, moveVarR) \ + EVT_SET(LVar6, 0) \ + EVT_SET(LVar7, 0) \ + EVT_LOOP(60) \ + EVT_SETF(LVar2, moveVarL) \ + EVT_SETF(LVar3, moveVarR) \ + EVT_SUBF(LVar2, LVar0) \ + EVT_SUBF(LVar3, LVar1) \ + EVT_SETF(LVar4, LVar2) \ + EVT_SETF(LVar5, LVar3) \ + EVT_MULF(LVar4, EVT_FLOAT(0.09375)) \ + EVT_MULF(LVar5, EVT_FLOAT(0.09375)) \ + EVT_MULF(LVar6, EVT_FLOAT(0.8)) \ + EVT_MULF(LVar7, EVT_FLOAT(0.8)) \ + EVT_ADDF(LVar6, LVar4) \ + EVT_ADDF(LVar7, LVar5) \ + EVT_ADDF(LVar0, LVar6) \ + EVT_ADDF(LVar1, LVar7) \ + EVT_CALL(TranslateModel, bushModelL, moveVarL, 0, 0) \ + EVT_CALL(TranslateModel, bushmodelR, moveVarR, 0, 0) \ + EVT_CALL(N(MoveBush_AnimateShearing), bushModelL, LVar6) \ + EVT_CALL(N(MoveBush_AnimateShearing), bushmodelR, LVar7) \ + EVT_WAIT(1) \ + EVT_END_LOOP \ + EVT_RETURN \ + EVT_END \ +} + +#define EVT_MOVE_BUSH(collider, bushModel, moveVar) \ +{ \ + EVT_CALL(PlaySoundAtCollider, collider, SOUND_209F, 0) \ + EVT_SET(LVar0, MV_CliffTopBush1OffsetR) \ + EVT_SET(LVar6, 0) \ + EVT_LOOP(60) \ + EVT_SETF(LVar2, moveVar) \ + EVT_SUBF(LVar2, LVar0) \ + EVT_SETF(LVar4, LVar2) \ + EVT_MULF(LVar4, EVT_FLOAT(0.09375)) \ + EVT_MULF(LVar6, EVT_FLOAT(0.8)) \ + EVT_ADDF(LVar6, LVar4) \ + EVT_ADDF(LVar0, LVar6) \ + EVT_CALL(TranslateModel, bushModel, moveVar, 0, 0) \ + EVT_CALL(N(MoveBush_AnimateShearing), bushModel, LVar6) \ + EVT_WAIT(1) \ + EVT_END_LOOP \ + EVT_RETURN \ + EVT_END \ +} diff --git a/src/world/area_jan/common/PullVine.inc.c b/src/world/area_jan/common/PullVine.inc.c new file mode 100644 index 0000000000..a188573dea --- /dev/null +++ b/src/world/area_jan/common/PullVine.inc.c @@ -0,0 +1,193 @@ +#include "common.h" + +// ---------------------------------------------------------------- +// Requirements + +// Script to execute when a vine is pulled (can be a MapVar) +#ifndef PULL_VINE_CALLBACK_SCRIPT + #error PULL_VINE_CALLBACK_SCRIPT is not defined! +#endif + +// ---------------------------------------------------------------- +// Implementation + +API_CALLABLE(N(PullVine_WaitForPlayerGrab)) { + Bytecode* args = script->ptrReadPos; + f32 modelX, modelY, modelZ; + f32 dx, dy, dz; + f32 dist; + s32 result; + + modelX = evt_get_float_variable(script, *args++); + modelY = evt_get_float_variable(script, *args++) + 15.0f; + modelZ = evt_get_float_variable(script, *args++); + dist = evt_get_float_variable(script, *args++); + dx = script->varTable[0] - modelX; + dy = script->varTable[1] - modelY; + dz = script->varTable[2] - modelZ; + result = 1; + if (!(SQ(dx) + SQ(dy) + SQ(dz) < SQ(dist))) { + result = 0; + } + script->varTable[0] = result; + return ApiStatus_DONE2; +} + +API_CALLABLE(N(PullVine_UpdatePosition)) { + Bytecode* args = script->ptrReadPos; + f32 x1 = evt_get_float_variable(script, *args++); + f32 x2 = evt_get_float_variable(script, *args++); + + evt_set_float_variable(script, *args++, (x2 - x1) / 10.0f); + return ApiStatus_DONE2; +} + +// LVarF ground modelID +// LVarD vine modelID 1 +// LVarE vine modelID 2 +// LVar9 tree leaves modelID 1 +// LVarA tree leaves modelID 2 +// LVarB tree leaves modelID 3 +// LVarC unique vine index +// LVar5 drop delay +EvtScript N(EVS_PullVine_Manage) = { + EVT_CALL(GetModelCenter, LVarE) + EVT_SET(LVar6, LVar0) + EVT_SET(LVar7, LVar1) + EVT_SET(LVar8, LVar2) + EVT_ADD(LVar7, -20) + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(N(PullVine_WaitForPlayerGrab), LVar6, LVar7, LVar8, 20) + EVT_CALL(GetPlayerActionState, LVar1) + EVT_IF_NE(LVar1, ACTION_STATE_JUMP) + EVT_SET(LVar0, 0) + EVT_END_IF + EVT_IF_EQ(LVar0, 1) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(GetModelCenter, LVarD) + EVT_CALL(PlaySoundAt, SOUND_2089, 0, LVar0, LVar1, LVar2) + EVT_SETF(LVar0, EVT_FLOAT(0.0)) + EVT_SETF(LVar1, EVT_FLOAT(0.0)) + EVT_THREAD + EVT_LOOP(3) + EVT_IF_NE(LVar9, 0) + EVT_CALL(TranslateModel, LVar9, -2, 0, 0) + EVT_END_IF + EVT_IF_NE(LVarA, 0) + EVT_CALL(TranslateModel, LVarA, -1, 0, 0) + EVT_END_IF + EVT_IF_NE(LVarB, 0) + EVT_CALL(TranslateModel, LVarB, 2, 0, 0) + EVT_END_IF + EVT_WAIT(1) + EVT_IF_NE(LVar9, 0) + EVT_CALL(TranslateModel, LVar9, 2, 0, 0) + EVT_END_IF + EVT_IF_NE(LVarA, 0) + EVT_CALL(TranslateModel, LVarA, 1, 0, 0) + EVT_END_IF + EVT_IF_NE(LVarB, 0) + EVT_CALL(TranslateModel, LVarB, -2, 0, 0) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_IF_NE(LVar9, 0) + EVT_CALL(TranslateModel, LVar9, 0, 0, 0) + EVT_END_IF + EVT_IF_NE(LVarA, 0) + EVT_CALL(TranslateModel, LVarA, 0, 0, 0) + EVT_END_IF + EVT_IF_NE(LVarB, 0) + EVT_CALL(TranslateModel, LVarB, 0, 0, 0) + EVT_END_IF + EVT_END_THREAD + EVT_IF_EQ(LVar5, 0) + EVT_EXEC(PULL_VINE_CALLBACK_SCRIPT) + EVT_ELSE + EVT_THREAD + EVT_WAIT(LVar5) + EVT_EXEC(PULL_VINE_CALLBACK_SCRIPT) + EVT_END_THREAD + EVT_END_IF + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000D) + EVT_LOOP(50) + EVT_CALL(N(PullVine_UpdatePosition), LVar0, EVT_FLOAT(-15.0), LVar2) + EVT_ADDF(LVar1, LVar2) + EVT_MULF(LVar1, EVT_FLOAT(0.93)) + EVT_ADDF(LVar0, LVar1) + EVT_CALL(TranslateModel, LVarD, 0, LVar0, 0) + EVT_CALL(TranslateModel, LVarE, 0, LVar0, 0) + EVT_SET(LVar3, LVar7) + EVT_ADD(LVar3, LVar0) + EVT_SET(LVar4, LVar8) + EVT_ADD(LVar4, 2) + EVT_ADD(LVar3, 5) + EVT_CALL(SetPlayerPos, LVar6, LVar3, LVar4) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(GetModelCenter, LVarF) + EVT_CALL(SetPlayerJumpscale, 1) + EVT_CALL(PlayerJump, LVar6, LVar1, LVar4, 10) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_CALL(GetModelCenter, LVarD) + EVT_CALL(PlaySoundAt, SOUND_2089, 0, LVar0, LVar1, LVar2) + EVT_THREAD + EVT_WAIT(10) + EVT_LOOP(5) + EVT_IF_NE(LVar9, 0) + EVT_CALL(TranslateModel, LVar9, -2, 0, 0) + EVT_END_IF + EVT_IF_NE(LVarA, 0) + EVT_CALL(TranslateModel, LVarA, -1, 0, 0) + EVT_END_IF + EVT_IF_NE(LVarB, 0) + EVT_CALL(TranslateModel, LVarB, 2, 0, 0) + EVT_END_IF + EVT_WAIT(1) + EVT_IF_NE(LVar9, 0) + EVT_CALL(TranslateModel, LVar9, 2, 0, 0) + EVT_END_IF + EVT_IF_NE(LVarA, 0) + EVT_CALL(TranslateModel, LVarA, 1, 0, 0) + EVT_END_IF + EVT_IF_NE(LVarB, 0) + EVT_CALL(TranslateModel, LVarB, -2, 0, 0) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_IF_NE(LVar9, 0) + EVT_CALL(TranslateModel, LVar9, 0, 0, 0) + EVT_END_IF + EVT_IF_NE(LVarA, 0) + EVT_CALL(TranslateModel, LVarA, 0, 0, 0) + EVT_END_IF + EVT_IF_NE(LVarB, 0) + EVT_CALL(TranslateModel, LVarB, 0, 0, 0) + EVT_END_IF + EVT_END_THREAD + EVT_THREAD + EVT_SETF(LVar0, EVT_FLOAT(-15.0)) + EVT_SETF(LVar1, EVT_FLOAT(0.0)) + EVT_LOOP(100) + EVT_CALL(N(PullVine_UpdatePosition), LVar0, EVT_FLOAT(20.0), LVar2) + EVT_ADDF(LVar1, LVar2) + EVT_MULF(LVar1, EVT_FLOAT(0.93)) + EVT_ADDF(LVar0, LVar1) + EVT_CALL(TranslateModel, LVarD, 0, LVar0, 0) + EVT_CALL(TranslateModel, LVarE, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END_IF + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan.h b/src/world/area_jan/jan.h index 3227d242c3..3170c4aba0 100644 --- a/src/world/area_jan/jan.h +++ b/src/world/area_jan/jan.h @@ -2,44 +2,49 @@ #define _WORLD_AREA_JAN_JAN_H_ enum { - AB_JAN_Unused_0 = AreaByte(0), - AB_JAN_Unused_1 = AreaByte(1), - AB_JAN_Unused_2 = AreaByte(2), - AB_JAN_Unused_3 = AreaByte(3), - AB_JAN_Unused_4 = AreaByte(4), - AB_JAN_Unused_5 = AreaByte(5), - AB_JAN_Unused_6 = AreaByte(6), - AB_JAN_Unused_7 = AreaByte(7), - AB_JAN_Unused_8 = AreaByte(8), - AB_JAN_Unused_9 = AreaByte(9), - AB_JAN_Unused_A = AreaByte(10), - AB_JAN_Unused_B = AreaByte(11), - AB_JAN_Unused_C = AreaByte(12), - AB_JAN_Unused_D = AreaByte(13), - AB_JAN_Unused_E = AreaByte(14), - AB_JAN_Unused_F = AreaByte(15), + AB_JAN22_ZiplineNpc1 = AreaByte(0), + AB_JAN22_ZiplineNpc2 = AreaByte(1), + AB_JAN_2 = AreaByte(2), + AB_JAN13_LastPuzzleProgress = AreaByte(3), + AB_JAN_Unused_4 = AreaByte(4), + AB_JAN_Unused_5 = AreaByte(5), + AB_JAN_Unused_6 = AreaByte(6), + AB_JAN_Unused_7 = AreaByte(7), + AB_JAN_Unused_8 = AreaByte(8), + AB_JAN_Unused_9 = AreaByte(9), + AB_JAN_Unused_A = AreaByte(10), + AB_JAN_Unused_B = AreaByte(11), + AB_JAN_Unused_C = AreaByte(12), + AB_JAN_Unused_D = AreaByte(13), + AB_JAN_Unused_E = AreaByte(14), + AB_JAN_Unused_F = AreaByte(15), }; enum { - AF_JAN_03 = AreaFlag(3), - AF_JAN02_RaphaelComment = AreaFlag(4), - AF_JAN02_MetCouncillor = AreaFlag(5), - AF_JAN_06 = AreaFlag(6), - AF_JAN_07 = AreaFlag(7), - AF_JAN01_KoloradoShouting = AreaFlag(9), - AF_JAN00_TreeDrop1 = AreaFlag(13), + AF_JAN_02 = AreaFlag(2), + AF_JAN_03 = AreaFlag(3), + AF_JAN02_RaphaelComment = AreaFlag(4), + AF_JAN02_MetCouncillor = AreaFlag(5), + AF_JAN_06 = AreaFlag(6), + AF_JAN_07 = AreaFlag(7), + AF_JAN_08 = AreaFlag(8), + AF_JAN01_KoloradoShouting = AreaFlag(9), + AF_JAN_0A = AreaFlag(10), + AF_JAN22_MisstarReleasedParty = AreaFlag(11), + AF_JAN22_MisstarReleasedKolorado = AreaFlag(12), + AF_JAN00_TreeDrop1 = AreaFlag(13), - AF_JAN01_TreeDrop2 = AreaFlag(14), - AF_JAN01_TreeDrop3 = AreaFlag(15), - AF_JAN01_TreeDrop4 = AreaFlag(16), - AF_JAN01_TreeDrop5 = AreaFlag(17), - AF_JAN01_TreeDrop6 = AreaFlag(18), - AF_JAN01_TreeDrop7 = AreaFlag(19), + AF_JAN01_TreeDrop2 = AreaFlag(14), + AF_JAN01_TreeDrop3 = AreaFlag(15), + AF_JAN01_TreeDrop4 = AreaFlag(16), + AF_JAN01_TreeDrop5 = AreaFlag(17), + AF_JAN01_TreeDrop6 = AreaFlag(18), + AF_JAN01_TreeDrop7 = AreaFlag(19), - AF_JAN02_TreeDrop2 = AreaFlag(20), - AF_JAN02_TreeDrop3 = AreaFlag(21), - AF_JAN_16 = AreaFlag(22), - AF_JAN03_TreeDrop1 = AreaFlag(23), + AF_JAN02_TreeDrop2 = AreaFlag(20), + AF_JAN02_TreeDrop3 = AreaFlag(21), + AF_JAN_16 = AreaFlag(22), + AF_JAN03_TreeDrop1 = AreaFlag(23), }; extern MapSettings jan_00_settings; diff --git a/src/world/area_jan/jan_00/jan_00.h b/src/world/area_jan/jan_00/jan_00.h index d4e63aca2c..d391cc4f6b 100644 --- a/src/world/area_jan/jan_00/jan_00.h +++ b/src/world/area_jan/jan_00/jan_00.h @@ -9,11 +9,6 @@ #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_Whale = 0, NPC_Kolorado_02 = 1, @@ -26,3 +21,5 @@ enum { }; #define NAMESPACE jan_00 + +extern EvtScript N(D_80245860_B25DA0); 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 index 377a2ccc5a..5f82b6c98b 100644 --- a/src/world/area_jan/jan_00/jan_00_2_npc.c +++ b/src/world/area_jan/jan_00/jan_00_2_npc.c @@ -2,72 +2,15 @@ #include "effects.h" #include "npc.h" -extern EvtScript N(D_80245860_B25DA0); -extern EvtScript N(EVS_NpcInteract_HeartPlant_01); - -#include "world/common/todo/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, SOUND_SPACE_MODE_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/npc/Kolorado.inc.c" +#include "world/common/npc/JrTroopa.inc.c" +#include "world/common/enemy/complete/HeartPlant.inc.c" #include "world/common/complete/LetterDelivery.inc.c" @@ -653,7 +596,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa) = { EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_JrTroopa_Panic) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 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) @@ -695,7 +638,7 @@ EvtScript N(EVS_NpcInit_JrTroopa) = { EVT_END }; -StaticNpc N(D_8024488C_B24DCC)[] = { +StaticNpc N(NpcData_Characters)[] = { { .id = NPC_Whale, .settings = &N(NpcSettings_Kolorado_01), @@ -703,61 +646,19 @@ StaticNpc N(D_8024488C_B24DCC)[] = { .yaw = 90, .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado_01), - .drops = { - .dropFlags = NPC_DROP_FLAG_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, - }, + .drops = NPC_NO_DROPS, + .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Whale, }, { .id = NPC_Kolorado_02, - .settings = &N(NpcSettings_Kolorado_02), + .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado_02), - .drops = { - .dropFlags = NPC_DROP_FLAG_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, - }, + .drops = NPC_NO_DROPS, + .animations = KOLORADO_ANIMS, .tattle = MSG_NpcTattle_Kolorado, }, { @@ -767,198 +668,72 @@ StaticNpc N(D_8024488C_B24DCC)[] = { .yaw = 90, .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_JrTroopa), - .drops = { - .dropFlags = NPC_DROP_FLAG_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, - }, + .drops = NPC_NO_DROPS, + .animations = JR_TROOPA_ANIMS, }, }; -StaticNpc N(D_80244E5C_B2539C) = { +StaticNpc N(NpcData_HeartPlant_01) = { .id = NPC_HeartPlant_01, - .settings = &N(NpcSettings_HeartPlant_01), + .settings = &N(NpcSettings_HeartPlant), .pos = { 455.0f, 0.0f, 115.0f }, .yaw = 270, .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, - .drops = { - .dropFlags = NPC_DROP_FLAG_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, - }, + .drops = NPC_NO_DROPS, + .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, }; -StaticNpc N(D_8024504C_B2558C) = { +StaticNpc N(NpcData_HeartPlant_02) = { .id = NPC_HeartPlant_02, - .settings = &N(NpcSettings_HeartPlant_01), + .settings = &N(NpcSettings_HeartPlant), .pos = { 167.0f, 0.0f, 404.0f }, .yaw = 270, .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, - .drops = { - .dropFlags = NPC_DROP_FLAG_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, - }, + .drops = NPC_NO_DROPS, + .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, }; -StaticNpc N(D_8024523C_B2577C) = { +StaticNpc N(NpcData_HeartPlant_03) = { .id = NPC_HeartPlant_03, - .settings = &N(NpcSettings_HeartPlant_01), + .settings = &N(NpcSettings_HeartPlant), .pos = { 90.0f, 0.0f, 316.0f }, .yaw = 270, .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, - .drops = { - .dropFlags = NPC_DROP_FLAG_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, - }, + .drops = NPC_NO_DROPS, + .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, }; -StaticNpc N(D_8024542C_B2596C) = { +StaticNpc N(NpcData_HeartPlant_04) = { .id = NPC_HeartPlant_04, - .settings = &N(NpcSettings_HeartPlant_01), + .settings = &N(NpcSettings_HeartPlant), .pos = { 424.0f, 0.0f, 182.0f }, .yaw = 270, .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, - .drops = { - .dropFlags = NPC_DROP_FLAG_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, - }, + .drops = NPC_NO_DROPS, + .animations = HEART_PLANT_ANIMS, .tattle = MSG_NpcTattle_HeartPlant, }; -StaticNpc N(D_8024561C_B25B5C) = { +StaticNpc N(NpcData_HeartPlant_05) = { .id = NPC_HeartPlant_05, - .settings = &N(NpcSettings_HeartPlant_01), + .settings = &N(NpcSettings_HeartPlant), .pos = { 143.0f, 0.0f, 260.0f }, .yaw = 270, .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, - .drops = { - .dropFlags = NPC_DROP_FLAG_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, - }, + .drops = NPC_NO_DROPS, + .animations = HEART_PLANT_ANIMS, .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)), + NPC_GROUP(N(NpcData_Characters)), + NPC_GROUP(N(NpcData_HeartPlant_01)), + NPC_GROUP(N(NpcData_HeartPlant_02)), + NPC_GROUP(N(NpcData_HeartPlant_03)), + NPC_GROUP(N(NpcData_HeartPlant_04)), + NPC_GROUP(N(NpcData_HeartPlant_05)), {} }; diff --git a/src/world/area_jan/jan_01/jan_01.h b/src/world/area_jan/jan_01/jan_01.h index 5b1d3fd3f9..dd64b73c38 100644 --- a/src/world/area_jan/jan_01/jan_01.h +++ b/src/world/area_jan/jan_01/jan_01.h @@ -9,19 +9,16 @@ #include "mapfs/jan_01_shape.h" #include "mapfs/jan_01_hit.h" -#include "sprite/npc/Kolorado.h" -#include "sprite/npc/Fuzzy.h" - enum { - NPC_Kolorado = 0, - NPC_Fuzzy_01 = 1, - NPC_Fuzzy_02 = 2, - NPC_Fuzzy_03 = 3, - NPC_Fuzzy_04 = 4, + NPC_Kolorado = 0, + NPC_JungleFuzzy_01 = 1, + NPC_JungleFuzzy_02 = 2, + NPC_JungleFuzzy_03 = 3, + NPC_JungleFuzzy_04 = 4, }; enum { - AF_JAN01_TreeDrop_StarPiece = MapFlag(10), + AF_JAN01_TreeDrop_StarPiece = MapFlag(10), }; #define NAMESPACE jan_01 diff --git a/src/world/area_jan/jan_01/jan_01_3_npc.c b/src/world/area_jan/jan_01/jan_01_3_npc.c index c60087f4c2..5bec0f09a1 100644 --- a/src/world/area_jan/jan_01/jan_01_3_npc.c +++ b/src/world/area_jan/jan_01/jan_01_3_npc.c @@ -2,7 +2,7 @@ #include "effects.h" #include "world/common/enemy/complete/JungleFuzzy_Wander.inc.c" -#include "world/common/enemy/complete/Fuzzy.inc.c" +#include "world/common/enemy/complete/JungleFuzzy.inc.c" #include "world/common/npc/Kolorado.inc.c" #include "world/common/todo/SetCamera0Flag1000.inc.c" #include "world/common/todo/UnsetCamera0Flag1000.inc.c" @@ -49,7 +49,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_Kolorado, EMOTE_EXCLAMATION, 0, 25, FALSE, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 25, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 25, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25) EVT_CALL(DisablePlayerInput, FALSE) EVT_LABEL(0) @@ -63,7 +63,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(InterruptUsePartner) EVT_END_IF EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(RemoveNpc, NPC_Fuzzy_01) + EVT_CALL(RemoveNpc, NPC_JungleFuzzy_01) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_0010, 0, 60) EVT_CALL(InterpPlayerYaw, 270, 4) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) @@ -152,7 +152,7 @@ EvtScript N(EVS_NpcInit_Kolorado) = { EVT_END }; -EvtScript N(EVS_NpcIdle_Fuzzy_01) = { +EvtScript N(EVS_NpcIdle_JungleFuzzy_01) = { EVT_CHILD_THREAD EVT_CALL(GetNpcPos, NPC_Kolorado, LVar3, LVar1, LVar2) EVT_SET(LVar4, LVar3) @@ -206,7 +206,7 @@ EvtScript N(EVS_NpcIdle_Fuzzy_01) = { EVT_END }; -EvtScript N(EVS_NpcDefeat_FuzzyBoss) = { +EvtScript N(EVS_NpcDefeat_JungleFuzzyBoss) = { EVT_CALL(GetBattleOutcome, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(OUTCOME_PLAYER_WON) @@ -256,12 +256,12 @@ EvtScript N(EVS_NpcDefeat_FuzzyBoss) = { EVT_END }; -EvtScript N(EVS_NpcInit_Fuzzy_01) = { +EvtScript N(EVS_NpcInit_JungleFuzzy_01) = { EVT_IF_LT(GB_StoryProgress, STORY_CH5_KOLORADO_ESCAPED_FUZZIES) EVT_CALL(SetSelfVar, 0, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Jungle_Anim04) - EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Fuzzy_01))) - EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_FuzzyBoss))) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_JungleFuzzy_01))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_JungleFuzzyBoss))) EVT_ELSE EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_IF @@ -281,18 +281,18 @@ StaticNpc N(NpcData_Kolorado) = { .tattle = MSG_NpcTattle_Kolorado, }; -StaticNpc N(NpcData_Fuzzy_01) = { - .id = NPC_Fuzzy_01, - .settings = &N(NpcSettings_Fuzzy), +StaticNpc N(NpcData_JungleFuzzy_01) = { + .id = NPC_JungleFuzzy_01, + .settings = &N(NpcSettings_JungleFuzzy), .pos = { -30.0f, 0.0f, 90.0f }, .yaw = 270, .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, - .init = &N(EVS_NpcInit_Fuzzy_01), + .init = &N(EVS_NpcInit_JungleFuzzy_01), .drops = NPC_NO_DROPS, .animations = JUNGLE_FUZZY_ANIMS, }; -EvtScript N(EVS_NpcInit_Fuzzy_02) = { +EvtScript N(EVS_NpcInit_JungleFuzzy_02) = { EVT_IF_LT(GB_StoryProgress, STORY_CH5_KOLORADO_ESCAPED_FUZZIES) EVT_CALL(RemoveNpc, NPC_SELF) EVT_END_IF @@ -300,13 +300,13 @@ EvtScript N(EVS_NpcInit_Fuzzy_02) = { EVT_END }; -StaticNpc N(NpcData_Fuzzy_02) = { - .id = NPC_Fuzzy_02, +StaticNpc N(NpcData_JungleFuzzy_02) = { + .id = NPC_JungleFuzzy_02, .settings = &N(NpcSettings_JungleFuzzy_Wander), .pos = { -350.0f, 3.0f, 40.0f }, .yaw = 270, .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Fuzzy_02), + .init = &N(EVS_NpcInit_JungleFuzzy_02), .drops = JUNGLE_FUZZY_DROPS, .territory = { .wander = { @@ -324,13 +324,13 @@ StaticNpc N(NpcData_Fuzzy_02) = { .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Fuzzy_03) = { - .id = NPC_Fuzzy_03, +StaticNpc N(NpcData_JungleFuzzy_03) = { + .id = NPC_JungleFuzzy_03, .settings = &N(NpcSettings_JungleFuzzy_Wander), .pos = { 0.0f, -10.0f, 110.0f }, .yaw = 90, .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Fuzzy_02), + .init = &N(EVS_NpcInit_JungleFuzzy_02), .drops = JUNGLE_FUZZY_DROPS, .territory = { .wander = { @@ -348,13 +348,13 @@ StaticNpc N(NpcData_Fuzzy_03) = { .aiDetectFlags = AI_DETECT_SENSITIVE_MOTION, }; -StaticNpc N(NpcData_Fuzzy_04) = { - .id = NPC_Fuzzy_04, +StaticNpc N(NpcData_JungleFuzzy_04) = { + .id = NPC_JungleFuzzy_04, .settings = &N(NpcSettings_JungleFuzzy_Wander), .pos = { 350.0f, 3.0f, 40.0f }, .yaw = 270, .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, - .init = &N(EVS_NpcInit_Fuzzy_02), + .init = &N(EVS_NpcInit_JungleFuzzy_02), .drops = JUNGLE_FUZZY_DROPS, .territory = { .wander = { @@ -374,9 +374,9 @@ StaticNpc N(NpcData_Fuzzy_04) = { NpcGroupList N(DefaultNPCs) = { NPC_GROUP(N(NpcData_Kolorado)), - NPC_GROUP(N(NpcData_Fuzzy_01), BTL_JAN_FORMATION_0A, BTL_JAN_STAGE_00), - NPC_GROUP(N(NpcData_Fuzzy_02), BTL_JAN_FORMATION_0A, BTL_JAN_STAGE_00), - NPC_GROUP(N(NpcData_Fuzzy_03), BTL_JAN_FORMATION_0B, BTL_JAN_STAGE_00), - NPC_GROUP(N(NpcData_Fuzzy_04), BTL_JAN_FORMATION_0A, BTL_JAN_STAGE_00), + NPC_GROUP(N(NpcData_JungleFuzzy_01), BTL_JAN_FORMATION_0A, BTL_JAN_STAGE_00), + NPC_GROUP(N(NpcData_JungleFuzzy_02), BTL_JAN_FORMATION_0A, BTL_JAN_STAGE_00), + NPC_GROUP(N(NpcData_JungleFuzzy_03), BTL_JAN_FORMATION_0B, BTL_JAN_STAGE_00), + NPC_GROUP(N(NpcData_JungleFuzzy_04), BTL_JAN_FORMATION_0A, BTL_JAN_STAGE_00), {} }; diff --git a/src/world/area_jan/jan_02/jan_02_3_npc.c b/src/world/area_jan/jan_02/jan_02_3_npc.c index aadabbba36..522c8c4f85 100644 --- a/src/world/area_jan/jan_02/jan_02_3_npc.c +++ b/src/world/area_jan/jan_02/jan_02_3_npc.c @@ -394,7 +394,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Yoshi), .pos = { 323.0f, 30.0f, 412.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_VillageLeader), .drops = NPC_NO_DROPS, .animations = YOSHI_LEADER_ANIMS, @@ -405,7 +405,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Yoshi), .pos = { 172.0f, 30.0f, 418.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Councillor), .drops = NPC_NO_DROPS, .animations = YOSHI_COUNCILLOR_ANIMS, @@ -417,7 +417,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Yoshi_Patrol), .pos = { -520.0f, 0.0f, -270.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Yoshi_01), .drops = NPC_NO_DROPS, .territory = { @@ -442,7 +442,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Yoshi_Patrol), .pos = { 180.0f, 0.0f, -520.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Yoshi_02), .drops = NPC_NO_DROPS, .territory = { @@ -468,7 +468,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Yoshi_Patrol), .pos = { 600.0f, 0.0f, -150.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Yoshi_03), .drops = NPC_NO_DROPS, .territory = { @@ -495,7 +495,7 @@ StaticNpc N(NpcData_ChuckQuizmo) = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -150.0f, 15.0f, 300.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_JAN, QUIZ_COUNT_JAN, QUIZ_MAP_JAN_02 }}, .drops = NPC_NO_DROPS, diff --git a/src/world/area_jan/jan_03/jan_03.h b/src/world/area_jan/jan_03/jan_03.h index e2e9ea3184..f29fba374a 100644 --- a/src/world/area_jan/jan_03/jan_03.h +++ b/src/world/area_jan/jan_03/jan_03.h @@ -9,27 +9,25 @@ #include "mapfs/jan_03_shape.h" #include "mapfs/jan_03_hit.h" -#include "sprite/npc/WorldSushie.h" - enum { - NPC_Toad = 0, - NPC_Yoshi_01 = 1, - NPC_VillageLeader = 2, - NPC_Yoshi_02 = 3, - NPC_Yoshi_03 = 4, - NPC_YoshiKid_01 = 5, - NPC_YoshiKid_02 = 6, - NPC_YoshiKid_03 = 7, - NPC_YoshiKid_04 = 8, - NPC_YoshiKid_05 = 9, - NPC_Raven_01 = 10, - NPC_Raven_02 = 11, - NPC_Raven_03 = 12, - NPC_Raven_04 = 13, - NPC_Raven_05 = 14, - NPC_Kolorado = 15, - NPC_Sushie = 16, - NPC_ChuckQuizmo = 17, + NPC_Toad = 0, + NPC_Yoshi_01 = 1, + NPC_VillageLeader = 2, + NPC_Yoshi_02 = 3, + NPC_Yoshi_03 = 4, + NPC_YoshiKid_01 = 5, + NPC_YoshiKid_02 = 6, + NPC_YoshiKid_03 = 7, + NPC_YoshiKid_04 = 8, + NPC_YoshiKid_05 = 9, + NPC_Raven_01 = 10, + NPC_Raven_02 = 11, + NPC_Raven_03 = 12, + NPC_Raven_04 = 13, + NPC_Raven_05 = 14, + NPC_Kolorado = 15, + NPC_Sushie = 16, + NPC_ChuckQuizmo = 17, }; #define NAMESPACE jan_03 diff --git a/src/world/area_jan/jan_03/jan_03_2_main.c b/src/world/area_jan/jan_03/jan_03_2_main.c index 4308ac1b56..accc0c2926 100644 --- a/src/world/area_jan/jan_03/jan_03_2_main.c +++ b/src/world/area_jan/jan_03/jan_03_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_jan/jan_03/jan_03_4_npc.c b/src/world/area_jan/jan_03/jan_03_4_npc.c index c7f3c00dd0..ffb68d1f93 100644 --- a/src/world/area_jan/jan_03/jan_03_4_npc.c +++ b/src/world/area_jan/jan_03/jan_03_4_npc.c @@ -13,15 +13,7 @@ #include "world/common/npc/Raven.inc.c" #define NAME_SUFFIX -NpcSettings N(NpcSettings_Sushie) = { - .height = 23, - .radius = 22, - .level = 14, - .onHit = &EnemyNpcHit, - .onDefeat = &EnemyNpcDefeat, - .actionFlags = AI_ACTION_JUMP_WHEN_SEE_PLAYER, -}; - +#include "world/common/npc/Sushie.inc.c" #include "world/common/npc/Kolorado.inc.c" #include "world/common/complete/ToadHouseBlanketAnim.inc.c" @@ -676,7 +668,7 @@ EvtScript N(EVS_NpcInteract_Kolorado) = { EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_001A) EVT_GIVE_KEY_REWARD(ITEM_MAGICAL_SEED4) @@ -770,7 +762,7 @@ StaticNpc N(NpcData_VillageLeader) = { .settings = &N(NpcSettings_Yoshi), .pos = { -300.0f, 0.0f, -70.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_VillageLeader), .drops = NPC_NO_DROPS, .animations = YOSHI_LEADER_ANIMS, @@ -790,27 +782,10 @@ StaticNpc N(NpcData_Sushie) = { .settings = &N(NpcSettings_Sushie), .pos = { -425.0f, 0.0f, -350.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Sushie), .drops = NPC_NO_DROPS, - .animations = { - .idle = ANIM_WorldSushie_Idle, - .walk = ANIM_WorldSushie_Idle, - .run = ANIM_WorldSushie_Idle, - .chase = ANIM_WorldSushie_Idle, - .anim_4 = ANIM_WorldSushie_Idle, - .anim_5 = ANIM_WorldSushie_Idle, - .death = ANIM_WorldSushie_Idle, - .hit = ANIM_WorldSushie_Idle, - .anim_8 = ANIM_WorldSushie_Idle, - .anim_9 = ANIM_WorldSushie_Idle, - .anim_A = ANIM_WorldSushie_Idle, - .anim_B = ANIM_WorldSushie_Idle, - .anim_C = ANIM_WorldSushie_Idle, - .anim_D = ANIM_WorldSushie_Idle, - .anim_E = ANIM_WorldSushie_Idle, - .anim_F = ANIM_WorldSushie_Idle, - }, + .animations = SUSHIE_ANIMS, .extraAnimations = N(ExtraAnims_Sushie), .tattle = MSG_NpcTattle_Sushie, }; @@ -828,7 +803,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { -475.0f, 0.0f, -75.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Kolorado), .drops = NPC_NO_DROPS, .animations = KOLORADO_ANIMS, @@ -842,7 +817,7 @@ StaticNpc N(NpcData_Toad)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 275.0f, 0.0f, -70.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad), .drops = NPC_NO_DROPS, .animations = TOAD_RED_ANIMS, @@ -853,7 +828,7 @@ StaticNpc N(NpcData_Toad)[] = { .settings = &N(NpcSettings_Yoshi), .pos = { 125.0f, 30.0f, -425.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Yoshi_01), .drops = NPC_NO_DROPS, .animations = YOSHI_BLUE_ANIMS, @@ -864,7 +839,7 @@ StaticNpc N(NpcData_Toad)[] = { .settings = &N(NpcSettings_Yoshi_Patrol), .pos = { -350.0f, 0.0f, -220.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Yoshi_02), .drops = NPC_NO_DROPS, .territory = { @@ -889,7 +864,7 @@ StaticNpc N(NpcData_Toad)[] = { .settings = &N(NpcSettings_Yoshi_Patrol), .pos = { -100.0f, 0.0f, -80.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Yoshi_03), .drops = NPC_NO_DROPS, .territory = { @@ -914,7 +889,7 @@ StaticNpc N(NpcData_Toad)[] = { .settings = &N(NpcSettings_YoshiKid_Patrol), .pos = { -450.0f, 0.0f, -160.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_YoshiKid_01), .drops = NPC_NO_DROPS, .territory = { @@ -942,7 +917,7 @@ StaticNpc N(NpcData_Toad)[] = { .settings = &N(NpcSettings_YoshiKid_Patrol), .pos = { -340.0f, 0.0f, -385.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_YoshiKid_02), .drops = NPC_NO_DROPS, .territory = { @@ -968,7 +943,7 @@ StaticNpc N(NpcData_Toad)[] = { .settings = &N(NpcSettings_YoshiKid_Patrol), .pos = { -260.0f, 0.0f, -220.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_YoshiKid_03), .drops = NPC_NO_DROPS, .territory = { @@ -994,7 +969,7 @@ StaticNpc N(NpcData_Toad)[] = { .settings = &N(NpcSettings_YoshiKid_Patrol), .pos = { -460.0f, 0.0f, 150.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_YoshiKid_04), .drops = NPC_NO_DROPS, .territory = { @@ -1020,7 +995,7 @@ StaticNpc N(NpcData_Toad)[] = { .settings = &N(NpcSettings_YoshiKid_Patrol), .pos = { -320.0f, 0.0f, 80.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_YoshiKid_05), .drops = NPC_NO_DROPS, .territory = { @@ -1056,7 +1031,7 @@ StaticNpc N(NpcData_Ravens)[] = { .settings = &N(NpcSettings_Raven), .pos = { -650.0f, 374.0f, -150.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Raven), .drops = NPC_NO_DROPS, .animations = RAVEN_ANIMS, @@ -1068,7 +1043,7 @@ StaticNpc N(NpcData_Ravens)[] = { .settings = &N(NpcSettings_Raven), .pos = { -645.0f, 457.0f, -255.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Raven), .drops = NPC_NO_DROPS, .animations = RAVEN_ANIMS, @@ -1078,7 +1053,7 @@ StaticNpc N(NpcData_Ravens)[] = { .settings = &N(NpcSettings_Raven), .pos = { -570.0f, 374.0f, -300.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Raven), .drops = NPC_NO_DROPS, .animations = RAVEN_ANIMS, @@ -1089,7 +1064,7 @@ StaticNpc N(NpcData_Ravens)[] = { .settings = &N(NpcSettings_Raven), .pos = { -500.0f, 374.0f, -285.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Raven), .drops = NPC_NO_DROPS, .animations = RAVEN_ANIMS, @@ -1100,7 +1075,7 @@ StaticNpc N(NpcData_Ravens)[] = { .settings = &N(NpcSettings_Raven), .pos = { -450.0f, 374.0f, -175.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Raven), .drops = NPC_NO_DROPS, .animations = RAVEN_ANIMS, @@ -1113,7 +1088,7 @@ StaticNpc N(NpcData_ChuckQuizmo) = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 300.0f, 0.0f, 400.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_JAN, QUIZ_COUNT_JAN, QUIZ_MAP_JAN_03 }}, .drops = NPC_NO_DROPS, diff --git a/src/world/area_jan/jan_04/B44770.c b/src/world/area_jan/jan_04/B44770.c deleted file mode 100644 index 4c80eb61e0..0000000000 --- a/src/world/area_jan/jan_04/B44770.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "jan_04.h" - -static char* N(exit_str_0) = "kmr_24"; -static char* N(exit_str_1) = "jan_05"; - -s32 N(get_tattle)(void) { - if (evt_get_variable(NULL, GB_StoryProgress) < STORY_CH5_SUSHIE_JOINED_PARTY) { - return MSG_MapTattle_jan_04_before; - } else { - return MSG_MapTattle_jan_04_after; - } -} diff --git a/src/world/area_jan/jan_04/B447B0.c b/src/world/area_jan/jan_04/B447B0.c deleted file mode 100644 index 4915be8ed4..0000000000 --- a/src/world/area_jan/jan_04/B447B0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "jan_04.h" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_jan/jan_04/B44AC0.c b/src/world/area_jan/jan_04/B44AC0.c deleted file mode 100644 index 566e37d143..0000000000 --- a/src/world/area_jan/jan_04/B44AC0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "jan_04.h" - -#include "world/common/todo/StashVars.inc.c" - -#include "world/common/todo/GetItemName.inc.c" - -#include "world/common/todo/SomeItemEntityFunc.inc.c" - -#include "world/common/todo/IsItemBadge.inc.c" diff --git a/src/world/area_jan/jan_04/B44D80.c b/src/world/area_jan/jan_04/B44D80.c deleted file mode 100644 index fcc26f7be3..0000000000 --- a/src/world/area_jan/jan_04/B44D80.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "jan_04.h" - -#include "world/common/util/ChangeNpcToPartner.inc.c" diff --git a/src/world/area_jan/jan_04/B44F10.c b/src/world/area_jan/jan_04/B44F10.c deleted file mode 100644 index ab53d1896a..0000000000 --- a/src/world/area_jan/jan_04/B44F10.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "jan_04.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_jan/jan_04/B45150.c b/src/world/area_jan/jan_04/B45150.c deleted file mode 100644 index 549a154339..0000000000 --- a/src/world/area_jan/jan_04/B45150.c +++ /dev/null @@ -1,28 +0,0 @@ -#include "jan_04.h" - -#define PARTY_IMAGE "party_opuku" - -BSS PAL_BIN N(palette)[256]; -BSS IMG_BIN N(raster)[0x3D90]; // similar to LoadPartyImage include but with D_8024A290 in the middle randomly -BSS Evt* D_8024A290; -BSS char D_8024A294[0xC]; // padding? -BSS MessageImageData N(image); - -API_CALLABLE(N(LoadPartyImage)) { - u32 decompressedSize; - void* compressed = load_asset_by_name(PARTY_IMAGE, &decompressedSize); - - decode_yay0(compressed, &N(palette)); - general_heap_free(compressed); - - N(image).raster = N(raster); - N(image).palette = N(palette); - N(image).width = 150; - N(image).height = 105; - N(image).format = G_IM_FMT_CI; - N(image).bitDepth = G_IM_SIZ_8b; - set_message_images(&N(image)); - return ApiStatus_DONE2; -} - -const char* N(exit_str_2) = "flo_00\0\0\0\0\0\0\0"; diff --git a/src/world/area_jan/jan_04/B451F0.c b/src/world/area_jan/jan_04/B451F0.c deleted file mode 100644 index 55247b626c..0000000000 --- a/src/world/area_jan/jan_04/B451F0.c +++ /dev/null @@ -1,48 +0,0 @@ -#include "jan_04.h" - -#include "world/common/todo/SetEntityPositionF.inc.c" - -#include "world/common/todo/GetEntityPosition.inc.c" - -ApiStatus func_80240BE8_B45358(Evt* script, s32 isInitialCall) { - Entity* entity = get_entity_by_index(script->varTable[10]); - - if (isInitialCall) { - script->functionTemp[0] = 0; - script->functionTemp[1] = 60; - } - - entity->scale.x = (60 - script->functionTemp[1]) / 60.0f; - entity->scale.y = (60 - script->functionTemp[1]) / 60.0f; - entity->scale.z = (60 - script->functionTemp[1]) / 60.0f; - entity->rotation.y = (1.0f - cos_rad(entity->scale.y * PI)) * 990.0 * 0.25f; - script->functionTemp[1]--; - - if (script->functionTemp[1] == -1) { - return ApiStatus_DONE2; - } - return ApiStatus_BLOCK; -} - -const char* N(exit_str_0) = "jan_04\0"; // remove \0 when this is part of a script and not an isolated symbol -const char* N(exit_str_1) = "jan_04"; - -ApiStatus func_80240D0C_B4547C(Evt* script, s32 isInitialCall) { - Entity* entity = get_entity_by_index(script->varTable[10]); - - if (isInitialCall) { - script->functionTemp[0] = -30; - } - entity->rotation.x = script->functionTemp[0]; - entity->rotation.z = script->functionTemp[0]; - script->functionTemp[0]++; - - if (script->functionTemp[0] == 1) { - return ApiStatus_DONE2; - } - return ApiStatus_BLOCK; -} - -#define NAMESPACE dup_jan_04 -#include "common/foliage.inc.c" -#define NAMESPACE jan_04 diff --git a/src/world/area_jan/jan_04/B45730.c b/src/world/area_jan/jan_04/B45730.c deleted file mode 100644 index fd65b02930..0000000000 --- a/src/world/area_jan/jan_04/B45730.c +++ /dev/null @@ -1,39 +0,0 @@ -#include "jan_04.h" -#include "world/partners.h" - -extern s32 D_8024625C_B4A9CC; -extern Evt* D_8024A290; - -ApiStatus func_80240FC0_B45730(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - EvtScript* rideScript; - - switch (D_8024625C_B4A9CC) { - case 0: - rideScript = partner_get_ride_script(); - if (rideScript != NULL) { - Evt* newScript; - - D_8024625C_B4A9CC++; - newScript = start_script(rideScript, EVT_PRIORITY_0, EVT_FLAG_RUN_IMMEDIATELY); - newScript->varTable[1] = playerStatus->position.x - 10.0f; - newScript->varTable[2] = playerStatus->position.y; - newScript->varTable[3] = playerStatus->position.z; - D_8024A290 = newScript; - newScript->varTable[12] = 1; - } - break; - case 1: - case 2: - D_8024625C_B4A9CC++; - break; - case 3: - wPartnerNpc->yaw = 270.0f; - playerStatus->targetYaw = 270.0f; - playerStatus->currentYaw = 270.0f; - playerStatus->spriteFacingAngle = 180.0f; - D_8024A290->functionTemp[1] = 1; - return ApiStatus_DONE2; - } - return ApiStatus_BLOCK; -} diff --git a/src/world/area_jan/jan_04/jan_04.h b/src/world/area_jan/jan_04/jan_04.h index 97b67bc5c1..c4e951db26 100644 --- a/src/world/area_jan/jan_04/jan_04.h +++ b/src/world/area_jan/jan_04/jan_04.h @@ -2,8 +2,51 @@ /// @brief Jade Jungle - Sushi Tree #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_04_shape.h" +#include "mapfs/jan_04_hit.h" + +#include "sprite/npc/WorldSushie.h" +#include "sprite/npc/YoshiKid.h" + +enum { + NPC_Sushie = 0, + NPC_Bubulb = 1, + NPC_YoshiKid_01 = 2, + NPC_YoshiKid_02 = 3, + NPC_YoshiKid_03 = 4, + NPC_YoshiKid_04 = 5, + NPC_YoshiKid_05 = 6, +}; + +enum { + MV_Unk_00 = MapVar(0), + MV_Unk_01 = MapVar(1), +}; + +enum { + MF_TreeDrop_Letter = MapFlag(10), +}; + #define NAMESPACE jan_04 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_PushNewPartnerSong); +extern EvtScript N(EVS_PopSong); +extern EvtScript N(EVS_GotoMap_kmr_24_0); +extern EvtScript N(EVS_Scene_TreasureChest); +extern EvtScript N(EVS_Scene_Epilogue); +extern EvtScript N(EVS_SetupTrees); +extern EvtScript N(EVS_SetupBushes); +extern EvtScript N(EVS_SetupUnused); +extern EvtScript N(EVS_MakeEntities); +extern EvtScript N(EVS_PlayDemoScene); + +extern NpcGroupList N(DefaultNPCs); +extern NpcGroupList N(EpilogueNPCs); + +API_CALLABLE(N(LoadPartyImage)); diff --git a/src/world/area_jan/jan_04/jan_04_0_header.c b/src/world/area_jan/jan_04/jan_04_0_header.c new file mode 100644 index 0000000000..79ace95639 --- /dev/null +++ b/src/world/area_jan/jan_04/jan_04_0_header.c @@ -0,0 +1,25 @@ +#include "jan_04.h" + +s32 N(get_tattle)(void) { + if (evt_get_variable(NULL, GB_StoryProgress) < STORY_CH5_SUSHIE_JOINED_PARTY) { + return MSG_MapTattle_jan_04_before; + } else { + return MSG_MapTattle_jan_04_after; + } +} + +EntryList N(Entrances) = { + [jan_04_ENTRY_0] { -483.0, 0.0, 0.0, 90.0 }, + [jan_04_ENTRY_1] { 0.0, -100.0, 0.0, 90.0 }, + [jan_04_ENTRY_2] { 0.0, -100.0, 0.0, 90.0 }, + [jan_04_ENTRY_3] { 0.0, -100.0, 0.0, 90.0 }, + [jan_04_ENTRY_4] { -110.0, -15.0, 204.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { .get = &N(get_tattle) }, +}; diff --git a/src/world/area_jan/jan_04/jan_04_10_demo.c b/src/world/area_jan/jan_04/jan_04_10_demo.c new file mode 100644 index 0000000000..6b2dc9f2ab --- /dev/null +++ b/src/world/area_jan/jan_04/jan_04_10_demo.c @@ -0,0 +1,143 @@ +#include "jan_04.h" +#include "world/partners.h" + +extern Evt* D_8024A290; + +EvtScript N(EVS_ProvideDemoInputs) = { + EVT_CALL(DemoJoystickXY, -40, 30) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -67, 50) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -67, 53) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -67, 60) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -67, 65) + EVT_WAIT(48) + EVT_CALL(DemoJoystickXY, -65, 66) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -63, 66) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -58, 68) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -53, 70) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -46, 72) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -41, 73) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -36, 74) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -34, 74) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -30, 75) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -27, 76) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -20, 77) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -14, 78) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -10, 79) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, -4, 79) + EVT_WAIT(2) + EVT_CALL(DemoSetButtons, BUTTON_C_DOWN) + EVT_WAIT(28) + EVT_CALL(DemoSetButtons, 0) + EVT_WAIT(25) + EVT_CALL(DemoJoystickXY, 4, 80) + EVT_WAIT(2) + EVT_CALL(DemoJoystickXY, 5, 80) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 7, 81) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 11, 81) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 16, 80) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 21, 79) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 31, 77) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 40, 75) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 50, 72) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 60, 70) + EVT_WAIT(1) + EVT_CALL(DemoJoystickXY, 64, 69) + EVT_WAIT(30) + EVT_IF_EQ(GF_DemoSceneDone, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_DemoSceneDone, TRUE) + EVT_CALL(GotoMapSpecial, EVT_PTR("jan_04"), jan_04_ENTRY_2, TRANSITION_2) + EVT_WAIT(110) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MonitorDemoState) = { + EVT_WAIT(10) + EVT_LOOP(0) + EVT_CALL(GetDemoState, LVar0) + EVT_IF_EQ(LVar0, DEMO_STATE_CHANGE_MAP) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_IF_EQ(GF_DemoSceneDone, TRUE) + EVT_RETURN + EVT_END_IF + EVT_SET(GF_DemoSceneDone, TRUE) + EVT_CALL(GotoMapSpecial, EVT_PTR("jan_04"), jan_04_ENTRY_2, TRANSITION_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +s32 N(DemoInitState) = 0; + +API_CALLABLE(N(SetupDemoScene)) { + PlayerStatus* playerStatus = &gPlayerStatus; + EvtScript* rideScriptSrc; + + switch (N(DemoInitState)) { + case 0: + rideScriptSrc = partner_get_ride_script(); + if (rideScriptSrc != NULL) { + Evt* newScript; + + N(DemoInitState)++; + newScript = start_script(rideScriptSrc, EVT_PRIORITY_0, EVT_FLAG_RUN_IMMEDIATELY); + newScript->varTable[1] = playerStatus->position.x - 10.0f; + newScript->varTable[2] = playerStatus->position.y; + newScript->varTable[3] = playerStatus->position.z; + D_8024A290 = newScript; + newScript->varTable[12] = 1; + } + break; + case 1: + case 2: + N(DemoInitState)++; + break; + case 3: + wPartnerNpc->yaw = 270.0f; + playerStatus->targetYaw = 270.0f; + playerStatus->currentYaw = 270.0f; + playerStatus->spriteFacingAngle = 180.0f; + D_8024A290->functionTemp[1] = 1; + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} + +EvtScript N(EVS_PlayDemoScene) = { + EVT_CALL(N(SetupDemoScene)) + EVT_SET(GF_DemoSceneDone, FALSE) + EVT_EXEC(N(EVS_MonitorDemoState)) + EVT_EXEC(N(EVS_ProvideDemoInputs)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_04/jan_04_1_music.c b/src/world/area_jan/jan_04/jan_04_1_music.c new file mode 100644 index 0000000000..ab41fab849 --- /dev/null +++ b/src/world/area_jan/jan_04/jan_04_1_music.c @@ -0,0 +1,30 @@ +#include "jan_04.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_RANGE(jan_04_ENTRY_1, jan_04_ENTRY_2) + EVT_CALL(SetMusicTrack, 0, SONG_VOLCANO_ESCAPE, 0, 8) + EVT_CASE_EQ(jan_04_ENTRY_3) + EVT_CALL(FadeInMusic, 0, SONG_JADE_JUNGLE, 0, 3000, 0, 127) + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_JADE_JUNGLE, 0, 8) + EVT_END_SWITCH + EVT_CALL(ClearAmbientSounds, 250) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PushNewPartnerSong) = { + EVT_CALL(PushSong, SONG_NEW_PARTNER, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PopSong) = { + EVT_CALL(FadeOutMusic, 0, 500) + EVT_WAIT(15) + EVT_CALL(PopSong) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_04/jan_04_2_main.c b/src/world/area_jan/jan_04/jan_04_2_main.c new file mode 100644 index 0000000000..3cd8e02e0f --- /dev/null +++ b/src/world/area_jan/jan_04/jan_04_2_main.c @@ -0,0 +1,86 @@ +#include "jan_04.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_GotoMap_kmr_24_0) = { + EVT_CALL(FadeOutMusic, 0, 1500) + EVT_CALL(GotoMapSpecial, EVT_PTR("kmr_24"), kmr_24_ENTRY_0, TRANSITION_9) + EVT_WAIT(100) +}; //@bug script not terminated + +EvtScript N(EVS_ExitWalk_jan_05_2) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, jan_04_ENTRY_0) + EVT_EXEC(ExitWalk) + EVT_CALL(GotoMap, EVT_PTR("jan_05"), jan_05_ENTRY_2) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_05_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterMap) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(jan_04_ENTRY_0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitw, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CASE_RANGE(jan_04_ENTRY_1, jan_04_ENTRY_2) + EVT_EXEC(N(EVS_Scene_TreasureChest)) + EVT_CASE_EQ(jan_04_ENTRY_3) + EVT_EXEC(N(EVS_Scene_Epilogue)) + EVT_CASE_EQ(jan_04_ENTRY_4) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(jan_04_ENTRY_0) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CASE_EQ(jan_04_ENTRY_3) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(EpilogueNPCs))) + EVT_END_SWITCH + EVT_EXEC(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupTrees)) + EVT_EXEC(N(EVS_SetupBushes)) + EVT_EXEC(N(EVS_SetupUnused)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o52, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o53, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o54, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o52, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o53, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o54, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1, SURFACE_TYPE_WATER) + EVT_CALL(MakeTransformGroup, MODEL_g12) + EVT_CALL(EnableTexPanning, MODEL_o61, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( -80, 140, 80, -100) + TEX_PAN_PARAMS_FREQ( 1, 1, 1, 1) + TEX_PAN_PARAMS_INIT( 0, 0, 0, 0) + EVT_EXEC(N(EVS_UpdateTexturePan)) + EVT_END_THREAD + EVT_CALL(GetDemoState, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_EXEC_WAIT(N(EVS_PlayDemoScene)) + EVT_RETURN + EVT_END_IF + EVT_EXEC(N(EVS_EnterMap)) + EVT_WAIT(1) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_04/jan_04_3_entity.c b/src/world/area_jan/jan_04/jan_04_3_entity.c new file mode 100644 index 0000000000..464b8117ff --- /dev/null +++ b/src/world/area_jan/jan_04/jan_04_3_entity.c @@ -0,0 +1,18 @@ +#include "jan_04.h" +#include "entity.h" + +#include "world/common/entity/Chest.inc.c" + +EvtScript N(EVS_OpenChest_VolcanoVase) = EVT_OPEN_CHEST_KEY(ITEM_VOLCANO_VASE, GF_JAN04_Chest_VolcanoVase); + +EvtScript N(EVS_MakeEntities) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_RANGE(STORY_CH5_BEGAN_PEACH_MISSION, STORY_CH8_REACHED_PEACHS_CASTLE) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 0, 0, 0, 0, 0, MAKE_ENTITY_END) + EVT_CALL(AssignChestFlag, GF_JAN04_Chest_VolcanoVase) + EVT_CALL(AssignScript, EVT_PTR(N(EVS_OpenChest_VolcanoVase))) + EVT_END_SWITCH + EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, 300, 0, -225, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_JAN04_Item_StarPiece) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_04/jan_04_4_npc.c b/src/world/area_jan/jan_04/jan_04_4_npc.c new file mode 100644 index 0000000000..bffb930391 --- /dev/null +++ b/src/world/area_jan/jan_04/jan_04_4_npc.c @@ -0,0 +1,339 @@ +#include "jan_04.h" + +#include "world/common/npc/Sushie.inc.c" +#include "world/common/npc/Bubulb.inc.c" +#include "world/common/npc/YoshiKid.inc.c" + +EvtScript N(EVS_ShakeTree_Sushie) = { + EVT_CALL(GetNpcVar, NPC_Sushie, 0, LVar0) + EVT_IF_EQ(LVar0, 2) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(AF_JAN_08, TRUE) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SET(AF_JAN_08, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Sushie, NPC_FLAG_8000, TRUE) + EVT_IF_EQ(GF_JAN04_SushieTreeHitCounterB, FALSE) + EVT_IF_EQ(GF_JAN04_SushieTreeHitCounterA, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_Sushie, EVT_FLOAT(1.0)) + EVT_CALL(PlaySoundAtNpc, NPC_Sushie, SOUND_2A0, 0) + EVT_CALL(NpcJump0, NPC_Sushie, 90, 140, -85, 20) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 90, 140, -85) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 90, 140, -85) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 280) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 16, EVT_FLOAT(-6.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_Sushie, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A1) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_SET(GF_JAN04_SushieTreeHitCounterA, TRUE) + EVT_WAIT(10) + EVT_SET(AF_JAN_08, FALSE) + EVT_ELSE + EVT_CALL(SetNpcJumpscale, NPC_Sushie, EVT_FLOAT(1.0)) + EVT_CALL(PlaySoundAtNpc, NPC_Sushie, SOUND_2A0, 0) + EVT_CALL(NpcJump0, NPC_Sushie, -10, 112, -80, 15) + EVT_SET(GF_JAN04_SushieTreeHitCounterA, FALSE) + EVT_SET(GF_JAN04_SushieTreeHitCounterB, TRUE) + EVT_WAIT(10) + EVT_SET(AF_JAN_08, FALSE) + EVT_END_IF + EVT_ELSE + EVT_CALL(SetNpcJumpscale, NPC_Sushie, EVT_FLOAT(1.0)) + EVT_CALL(PlaySoundAtNpc, NPC_Sushie, SOUND_2A0, 0) + EVT_CALL(NpcJump0, NPC_Sushie, 50, 0, 0, 20) + EVT_SET(GF_JAN04_SushieTreeHitCounterA, TRUE) + EVT_CALL(EnableNpcShadow, NPC_Sushie, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Sushie, ANIM_WorldSushie_Hurt) + EVT_CALL(SetNpcVar, NPC_Sushie, 0, 10) + EVT_UNBIND + EVT_END_IF + EVT_CALL(SetNpcFlagBits, NPC_Sushie, NPC_FLAG_8000, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Sushie_ScoldPlayerLeaving) = { + EVT_LABEL(1) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(AwaitPlayerLeave, 0, 0, 170) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetSelfVar, 0, 2) + EVT_SET(LVar0, GF_JAN04_SushieTreeHitCounterA) + EVT_SET(LVar1, GF_JAN04_SushieTreeHitCounterB) + EVT_ADD(LVar0, LVar1) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00A2, 160, 40) + EVT_ELSE + EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00A3, 160, 40) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetSelfVar, 0, 1) + EVT_CASE_EQ(1) + EVT_CALL(AwaitPlayerApproach, 0, 0, 130) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_GOTO(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Sushie_ShoutAtChildren) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_009E, 320, 60) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(AwaitPlayerApproach, 0, 0, 130) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_009F, 160, 40) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80022) + 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(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 30, 140, -60) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 16, EVT_FLOAT(-6.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Hurt, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A0) + EVT_CALL(ResetCam, CAM_DEFAULT, 3) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +BombTrigger N(BombPos_SushieTree) = { + .pos = { 30.0f, 0.0f, -110.0f }, + .radius = 0.0f +}; + +#include "world/common/util/ChangeNpcToPartner.inc.c" + +EvtScript N(EVS_NpcIdle_Sushie) = { + EVT_SET(LVar0, GF_JAN04_SushieTreeHitCounterA) + EVT_SET(LVar1, GF_JAN04_SushieTreeHitCounterB) + EVT_ADD(LVar0, LVar1) + EVT_IF_EQ(LVar0, 0) + EVT_EXEC_WAIT(N(EVS_Sushie_ShoutAtChildren)) + EVT_ELSE + EVT_CALL(SetSelfVar, 0, 1) + EVT_END_IF + EVT_SET(AF_JAN_08, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Sushie)), TRIGGER_WALL_HAMMER, COLLIDER_o34, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Sushie)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_SushieTree)), 1, 0) + EVT_EXEC_GET_TID(N(EVS_Sushie_ScoldPlayerLeaving), LVar9) + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_NE(LVar0, 10) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_KILL_THREAD(LVar9) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0)) + EVT_CALL(PlayerMoveTo, 10, 0, 0) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldSushie_Idle) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 20, 301, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A4) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(40) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A5) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldSushie_Sad) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldSushie_Idle) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A6) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(40) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A7) + EVT_CALL(CloseMessage) + EVT_CALL(N(ChangeNpcToPartner), NPC_Sushie, PARTNER_SUSHIE) + EVT_CALL(N(LoadPartyImage)) + EVT_EXEC(N(EVS_PushNewPartnerSong)) + EVT_WAIT(15) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_018F, 160, 40) + EVT_EXEC(N(EVS_PopSong)) + EVT_WAIT(10) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_SET(GB_StoryProgress, STORY_CH5_SUSHIE_JOINED_PARTY) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Sushie) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, jan_04_ENTRY_3) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_YOSHI_CHILDREN_ARE_MISSING) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldSushie_Sad) + EVT_CALL(SetNpcYaw, NPC_SELF, 270) + EVT_IF_EQ(GF_JAN04_SushieTreeHitCounterB, FALSE) + EVT_IF_EQ(GF_JAN04_SushieTreeHitCounterA, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, 55, 150, -95) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, 90, 140, -85) + EVT_END_IF + EVT_ELSE + EVT_IF_EQ(GF_JAN04_SushieTreeHitCounterA, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, -10, 112, -80) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, 50, 0, 0) + EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) + EVT_END_IF + EVT_END_IF + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Sushie))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Bubulb) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH5_RAFAEL_LEFT_NEST) + EVT_IF_EQ(GF_JAN04_Met_Bubulb, FALSE) + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Yellow_PopUp) + EVT_WAIT(10) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_BURROW_SURFACE, 0) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_MOLE_POP, 0) + EVT_WAIT(35) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Yellow_Idle) + EVT_CALL(SetNpcCollisionSize, NPC_SELF, 45, 26) + EVT_CALL(SpeakToPlayer, NPC_Bubulb, ANIM_Bubulb_Yellow_Talk, ANIM_Bubulb_Yellow_Idle, 0, MSG_CH5_00A8) + EVT_SET(GF_JAN04_Met_Bubulb, TRUE) + EVT_CALL(SetTattleMessage, NPC_Bubulb, MSG_NpcTattle_JAN_Bubulb_Revealed) + EVT_RETURN + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Bubulb, ANIM_Bubulb_Yellow_Talk, ANIM_Bubulb_Yellow_Idle, 0, MSG_CH5_00A9) + EVT_END_IF + EVT_CASE_LT(STORY_CH5_TRADED_VASE_FOR_SEED) + EVT_CALL(SpeakToPlayer, NPC_Bubulb, ANIM_Bubulb_Yellow_Talk, ANIM_Bubulb_Yellow_Idle, 0, MSG_CH5_00AA) + EVT_CASE_LT(STORY_CH6_FLOWER_GATE_OPEN) + EVT_CALL(SpeakToPlayer, NPC_Bubulb, ANIM_Bubulb_Yellow_Talk, ANIM_Bubulb_Yellow_Idle, 0, MSG_CH5_00AB) + EVT_CASE_DEFAULT + EVT_CALL(SpeakToPlayer, NPC_Bubulb, ANIM_Bubulb_Yellow_Talk, ANIM_Bubulb_Yellow_Idle, 0, MSG_CH5_00AC) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Bubulb) = { + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Bubulb))) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAFAEL_LEFT_NEST) + EVT_IF_EQ(GF_JAN04_Met_Bubulb, FALSE) + EVT_CALL(SetNpcCollisionSize, NPC_SELF, 25, 25) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Bubulb_Yellow_BuriedIdle) + EVT_CALL(SetTattleMessage, NPC_Bubulb, MSG_NpcTattle_MAC_Bubulb_Hidden) + EVT_END_IF + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Characters)[] = { + { + .id = NPC_Sushie, + .settings = &N(NpcSettings_Sushie), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_Sushie), + .drops = NPC_NO_DROPS, + .animations = SUSHIE_ANIMS, + }, + { + .id = NPC_Bubulb, + .settings = &N(NpcSettings_Bubulb), + .pos = { -230.0f, 0.0f, -320.0f }, + .yaw = 90, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_Bubulb), + .drops = NPC_NO_DROPS, + .animations = BUBULB_YELLOW_ANIMS, + .tattle = MSG_NpcTattle_JAN_Bubulb_Revealed, + }, +}; + +StaticNpc N(NpcData_YoshiKids)[] = { + { + .id = NPC_YoshiKid_01, + .settings = &N(NpcSettings_YoshiKid), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .drops = NPC_NO_DROPS, + .animations = YOSHI_KID_GREEN_ANIMS, + .tattle = MSG_NpcTattle_GreenYoshiKid, + }, + { + .id = NPC_YoshiKid_02, + .settings = &N(NpcSettings_YoshiKid), + .pos = { 45.0f, 0.0f, -70.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .drops = NPC_NO_DROPS, + .animations = YOSHI_KID_RED_ANIMS, + .tattle = MSG_NpcTattle_RedYoshiKid, + }, + { + .id = NPC_YoshiKid_03, + .settings = &N(NpcSettings_YoshiKid), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .drops = NPC_NO_DROPS, + .animations = YOSHI_KID_BLUE_ANIMS, + .tattle = MSG_NpcTattle_BlueYoshiKid, + }, + { + .id = NPC_YoshiKid_04, + .settings = &N(NpcSettings_YoshiKid), + .pos = { 20.0f, 0.0f, -70.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .drops = NPC_NO_DROPS, + .animations = YOSHI_KID_YELLOW_ANIMS, + .tattle = MSG_NpcTattle_YellowYoshiKid, + }, + { + .id = NPC_YoshiKid_05, + .settings = &N(NpcSettings_YoshiKid), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4, + .drops = NPC_NO_DROPS, + .animations = YOSHI_KID_PURPLE_ANIMS, + .tattle = MSG_NpcTattle_PurpleYoshiKid, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Characters)), + {} +}; + +NpcGroupList N(EpilogueNPCs) = { + NPC_GROUP(N(NpcData_Characters)), + NPC_GROUP(N(NpcData_YoshiKids)), + {} +}; diff --git a/src/world/area_jan/jan_04/jan_04_5_unused.c b/src/world/area_jan/jan_04/jan_04_5_unused.c new file mode 100644 index 0000000000..464f18798f --- /dev/null +++ b/src/world/area_jan/jan_04/jan_04_5_unused.c @@ -0,0 +1,33 @@ +#include "jan_04.h" + +EvtScript N(D_80243750_B47EC0) = { + EVT_IF_EQ(MV_Unk_00, 0) + EVT_SET(MV_Unk_01, 6) + EVT_END_IF + EVT_ADD(MV_Unk_01, 2) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_80243798) = { + EVT_LABEL(0) + EVT_SUB(MV_Unk_01, 1) + EVT_ADD(MV_Unk_00, MV_Unk_01) + EVT_IF_LT(MV_Unk_00, 0) + EVT_SET(MV_Unk_01, 0) + EVT_SET(MV_Unk_00, 0) + EVT_END_IF + EVT_IF_GT(MV_Unk_00, 90) + EVT_SET(MV_Unk_01, 0) + EVT_SET(MV_Unk_00, 90) + EVT_END_IF + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupUnused) = { + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_04/jan_04_6_trees.c b/src/world/area_jan/jan_04/jan_04_6_trees.c new file mode 100644 index 0000000000..7983158c4b --- /dev/null +++ b/src/world/area_jan/jan_04/jan_04_6_trees.c @@ -0,0 +1,99 @@ +#include "jan_04.h" + +#define NAME_SUFFIX _Trees +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o94, MODEL_o95, MODEL_o96, MODEL_o97, MODEL_o98); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o99); + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { -487.0f, 114.0f, -115.0f }, + { -402.0f, 114.0f, -125.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -447.0f, 0.0f, -145.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o101, MODEL_o102, MODEL_o103, MODEL_o104, MODEL_o105); +FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o100); + +FoliageDropList N(Tree2_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_LETTER_TO_RUSS_T, + .pos = { 311, 92, -221 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_NEVER_VANISH, + .pickupFlag = GF_JAN04_Tree2_Letter04, + .spawnFlag = MF_TreeDrop_Letter, + }, + } +}; + +FoliageVectorList N(Tree2_Effects) = { + .count = 2, + .vectors = { + { 327.0f, 114.0f, -230.0f }, + { 412.0f, 114.0f, -240.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .drops = &N(Tree2_Drops), + .vectors = &N(Tree2_Effects), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { 367.0f, 0.0f, -260.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree3_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o63, MODEL_o64, MODEL_o65, MODEL_o66, MODEL_o67); +FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o34); + +FoliageVectorList N(Tree3_Effects) = { + .count = 2, + .vectors = { + { -10.0f, 114.0f, -80.0f }, + { 75.0f, 114.0f, -90.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree3) = { + .leaves = &N(Tree3_LeafModels), + .trunk = &N(Tree3_TrunkModels), + .vectors = &N(Tree3_Effects), +}; + +BombTrigger N(BombPos_Tree3) = { + .pos = { 30.0f, 0.0f, -110.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupTrees) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o156, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o157, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o34, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_04/jan_04_7_scenes.c b/src/world/area_jan/jan_04/jan_04_7_scenes.c new file mode 100644 index 0000000000..dc00517ade --- /dev/null +++ b/src/world/area_jan/jan_04/jan_04_7_scenes.c @@ -0,0 +1,109 @@ +#include "jan_04.h" + +BSS PAL_BIN N(palette)[256]; +BSS IMG_BIN N(raster)[0x3D90]; // similar to LoadPartyImage include but with D_8024A290 in the middle randomly +BSS Evt* D_8024A290; +BSS char D_8024A294[0xC]; // padding? +BSS MessageImageData N(image); + +API_CALLABLE(N(LoadPartyImage)) { + u32 decompressedSize; + void* compressed = load_asset_by_name("party_opuku", &decompressedSize); + + decode_yay0(compressed, &N(palette)); + general_heap_free(compressed); + + N(image).raster = N(raster); + N(image).palette = N(palette); + N(image).width = 150; + N(image).height = 105; + N(image).format = G_IM_FMT_CI; + N(image).bitDepth = G_IM_SIZ_8b; + set_message_images(&N(image)); + return ApiStatus_DONE2; +} + +Vec3f N(YoshiKidsRunPath)[] = { + { -350.0, 0.0, 15.0 }, + { -220.0, 25.0, 15.0 }, + { -110.0, 0.0, 30.0 }, + { -50.0, 0.0, 130.0 }, + { 50.0, 0.0, 110.0 }, + { 160.0, 25.0, 160.0 }, + { 255.0, 0.0, 285.0 }, +}; + +EvtScript N(EVS_Scene_Epilogue) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(SetNpcPos, NPC_Sushie, -40, 0, 15) + EVT_CALL(SetNpcYaw, NPC_Sushie, 270) + EVT_CALL(SetNpcAnimation, NPC_Sushie, ANIM_WorldSushie_Read) + EVT_CALL(SetNpcAnimation, NPC_YoshiKid_04, ANIM_YoshiKid_Yellow_Sleep) + EVT_CALL(SetNpcAnimation, NPC_YoshiKid_02, ANIM_YoshiKid_Red_Sleep) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -20, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -20, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-7.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(90) + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_YoshiKid_01, -350, 0, 15) + EVT_CALL(SetNpcAnimation, NPC_YoshiKid_01, ANIM_YoshiKid_Green_Run) + EVT_CALL(LoadPath, 90, EVT_PTR(N(YoshiKidsRunPath)), ARRAY_COUNT(N(YoshiKidsRunPath)), EASING_LINEAR) + EVT_LABEL(10) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_YoshiKid_01, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(10) + EVT_END_IF + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(SetNpcPos, NPC_YoshiKid_05, -350, 0, 15) + EVT_CALL(SetNpcAnimation, NPC_YoshiKid_05, ANIM_YoshiKid_Purple_Run) + EVT_CALL(LoadPath, 90, EVT_PTR(N(YoshiKidsRunPath)), ARRAY_COUNT(N(YoshiKidsRunPath)), EASING_LINEAR) + EVT_LABEL(11) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_YoshiKid_05, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(11) + EVT_END_IF + EVT_END_THREAD + EVT_WAIT(60) + EVT_CALL(InterpNpcYaw, NPC_Sushie, 90, 0) + EVT_CALL(SetNpcAnimation, NPC_Sushie, ANIM_WorldSushie_Talk) + EVT_CALL(SetNpcJumpscale, NPC_Sushie, EVT_FLOAT(2.0)) + EVT_CALL(GetNpcPos, NPC_Sushie, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Sushie, LVar0, LVar1, LVar2, 10) + EVT_CALL(SetNpcAnimation, NPC_YoshiKid_01, ANIM_YoshiKid_Green_Talk) + EVT_CALL(SetNpcFlagBits, NPC_YoshiKid_03, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcPos, NPC_YoshiKid_03, -350, 0, 15) + EVT_CALL(SetNpcAnimation, NPC_YoshiKid_03, ANIM_YoshiKid_Blue_Run) + EVT_CALL(SetNpcSpeed, NPC_YoshiKid_03, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_YoshiKid_03, -100, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_YoshiKid_03, ANIM_YoshiKid_Blue_Idle) + EVT_CHILD_THREAD + EVT_WAIT(20) + EVT_CALL(SetNpcJumpscale, NPC_YoshiKid_03, EVT_FLOAT(2.0)) + EVT_LOOP(10) + EVT_CALL(SetNpcAnimation, NPC_YoshiKid_03, ANIM_YoshiKid_Blue_Jump) + EVT_CALL(GetNpcPos, NPC_YoshiKid_03, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_YoshiKid_03, LVar0, LVar1, LVar2, 10) + EVT_CALL(SetNpcAnimation, NPC_YoshiKid_03, ANIM_YoshiKid_Blue_Land) + EVT_WAIT(8) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_WAIT(90) + EVT_CALL(FadeOutMusic, 0, 1000) + EVT_CALL(GotoMap, EVT_PTR("flo_00"), flo_00_ENTRY_B) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +MAP_RODATA_PAD(2, epilogue); diff --git a/src/world/area_jan/jan_04/jan_04_8_treasure.c b/src/world/area_jan/jan_04/jan_04_8_treasure.c new file mode 100644 index 0000000000..c976b0c8f0 --- /dev/null +++ b/src/world/area_jan/jan_04/jan_04_8_treasure.c @@ -0,0 +1,151 @@ +#include "jan_04.h" +#include "entity.h" +#include "effects.h" + +#include "world/common/todo/SetEntityPositionF.inc.c" +#include "world/common/todo/GetEntityPosition.inc.c" + +API_CALLABLE(N(AnimateFlyingChestRotScale)) { + Entity* entity = get_entity_by_index(script->varTable[10]); + + if (isInitialCall) { + script->functionTemp[0] = 0; + script->functionTemp[1] = 60; + } + + entity->scale.x = (60 - script->functionTemp[1]) / 60.0f; + entity->scale.y = (60 - script->functionTemp[1]) / 60.0f; + entity->scale.z = (60 - script->functionTemp[1]) / 60.0f; + entity->rotation.y = (1.0f - cos_rad(entity->scale.y * PI)) * 990.0 * 0.25f; + script->functionTemp[1]--; + + if (script->functionTemp[1] == -1) { + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} + +API_CALLABLE(N(AnimateFallingChestRot)) { + Entity* entity = get_entity_by_index(script->varTable[10]); + + if (isInitialCall) { + script->functionTemp[0] = -30; + } + entity->rotation.x = script->functionTemp[0]; + entity->rotation.z = script->functionTemp[0]; + script->functionTemp[0]++; + + if (script->functionTemp[0] == 1) { + return ApiStatus_DONE2; + } + return ApiStatus_BLOCK; +} + +Vec3f N(ChestFlightArc)[] = { + { -40.0, 330.0, -900.0 }, + { -117.0, 420.0, -600.0 }, + { -195.0, 465.0, -300.0 }, + { -272.0, 465.0, 0.0 }, + { -350.0, 325.0, 300.0 }, + { -350.0, 250.0, 300.0 }, +}; + +Vec3f N(ChestFallPath)[] = { + { 10.0, 130.0, -20.0 }, + { 5.0, 75.0, -20.0 }, + { 0.0, 0.0, -20.0 }, +}; + +Vec3f N(ChestBouncePath)[] = { + { 0.0, 0.0, -20.0 }, + { 0.0, 30.0, -8.0 }, + { 0.0, 0.0, 0.0 }, +}; + +EvtScript N(EVS_Scene_TreasureChest) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, jan_04_ENTRY_1) + EVT_CALL(PlaySound, SOUND_302) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -350, 300, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -350, 300, 0) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 10, EVT_FLOAT(-7.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 0, 2650, 0, 148, MAKE_ENTITY_END) + EVT_SET(LVarA, LVar0) + EVT_THREAD + EVT_CALL(N(AnimateFlyingChestRotScale)) + EVT_END_THREAD + EVT_THREAD + EVT_SET(LVar9, LVarA) + EVT_CALL(LoadPath, 70, EVT_PTR(N(ChestFlightArc)), ARRAY_COUNT(N(ChestFlightArc)), EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(N(SetEntityPositionF), LVar9, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(50) + EVT_CALL(GotoMap, EVT_PTR("jan_04"), jan_04_ENTRY_2) + EVT_WAIT(100) + EVT_ELSE + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 170, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 16, EVT_FLOAT(-6.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_WAIT(20) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 0, 0) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.2)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Chest), 0, 2650, 0, 0, MAKE_ENTITY_END) + EVT_SET(LVarA, LVar0) + EVT_THREAD + EVT_CALL(N(AnimateFallingChestRot)) + EVT_END_THREAD + EVT_SET(LVar9, LVarA) + EVT_CALL(LoadPath, 12, EVT_PTR(N(ChestFallPath)), ARRAY_COUNT(N(ChestFallPath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(N(SetEntityPositionF), LVar9, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAt, SOUND_1AF, 0, LVar1, LVar2, LVar3) + EVT_THREAD + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -15, 0, 0, 10, 10) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, 0, 0, 0, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, 15, 0, 0, 350, 350) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 30, EVT_FLOAT(1.0)) + EVT_END_THREAD + EVT_CALL(LoadPath, 10, EVT_PTR(N(ChestBouncePath)), ARRAY_COUNT(N(ChestBouncePath)), EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(N(SetEntityPositionF), LVar9, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAt, SOUND_1AF, 0, LVar1, LVar2, LVar3) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -10, 0, 15, 0, 0) + EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -10, 0, 15, 0, 0) + EVT_WAIT(60) + EVT_EXEC(N(EVS_GotoMap_kmr_24_0)) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_04/jan_04_9_bushes.c b/src/world/area_jan/jan_04/jan_04_9_bushes.c new file mode 100644 index 0000000000..745d9900a4 --- /dev/null +++ b/src/world/area_jan/jan_04/jan_04_9_bushes.c @@ -0,0 +1,170 @@ +#include "jan_04.h" + +#define NAME_SUFFIX _Bushes +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o82); + +FoliageVectorList N(Bush1_Effects) = { + .count = 1, + .vectors = { + { -400.0f, 20.0f, -120.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush1) = { + .bush = &N(Bush1_BushModels), + .vectors = &N(Bush1_Effects), +}; + +FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o81); + +FoliageVectorList N(Bush2_Effects) = { + .count = 1, + .vectors = { + { -353.0f, 22.0f, -81.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush2) = { + .bush = &N(Bush2_BushModels), + .vectors = &N(Bush2_Effects), +}; + +FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o83); + +FoliageVectorList N(Bush3_Effects) = { + .count = 1, + .vectors = { + { -264.0f, 20.0f, -402.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush3) = { + .bush = &N(Bush3_BushModels), + .vectors = &N(Bush3_Effects), +}; + +FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o85); + +FoliageVectorList N(Bush4_Effects) = { + .count = 1, + .vectors = { + { -211.0f, 22.0f, -420.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush4) = { + .bush = &N(Bush4_BushModels), + .vectors = &N(Bush4_Effects), +}; + +FoliageModelList N(Bush5_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o89); + +FoliageVectorList N(Bush5_Effects) = { + .count = 1, + .vectors = { + { -111.0f, 22.0f, -62.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush5) = { + .bush = &N(Bush5_BushModels), + .vectors = &N(Bush5_Effects), +}; + +FoliageModelList N(Bush6_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o91); + +FoliageVectorList N(Bush6_Effects) = { + .count = 1, + .vectors = { + { 258.0f, 20.0f, -286.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush6) = { + .bush = &N(Bush6_BushModels), + .vectors = &N(Bush6_Effects), +}; + +FoliageModelList N(Bush7_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o92); + +FoliageVectorList N(Bush7_Effects) = { + .count = 1, + .vectors = { + { 315.0f, 20.0f, -289.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush7) = { + .bush = &N(Bush7_BushModels), + .vectors = &N(Bush7_Effects), +}; + +FoliageModelList N(Bush8_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o86); + +FoliageVectorList N(Bush8_Effects) = { + .count = 1, + .vectors = { + { 284.0f, 20.0f, 181.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush8) = { + .bush = &N(Bush8_BushModels), + .vectors = &N(Bush8_Effects), +}; + +FoliageModelList N(Bush9_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o88); + +FoliageVectorList N(Bush9_Effects) = { + .count = 1, + .vectors = { + { 378.0f, 22.0f, 185.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush9) = { + .bush = &N(Bush9_BushModels), + .vectors = &N(Bush9_Effects), +}; + +FoliageModelList N(Bush10_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o87); + +FoliageVectorList N(Bush10_Effects) = { + .count = 1, + .vectors = { + { 435.0f, 20.0f, 205.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush10) = { + .bush = &N(Bush10_BushModels), + .vectors = &N(Bush10_Effects), +}; + +EvtScript N(EVS_SetupBushes) = { + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o118, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o162, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o119, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush4))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o163, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush5))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o121, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush6))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o122, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush7))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o166, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush8))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o120, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush9))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o164, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush10))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o165, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_05/B4AA70.c b/src/world/area_jan/jan_05/B4AA70.c deleted file mode 100644 index 7a23d6fc0f..0000000000 --- a/src/world/area_jan/jan_05/B4AA70.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "jan_05.h" - -static char* N(exit_str_0) = "jan_03"; -static char* N(exit_str_1) = "jan_08"; -static char* N(exit_str_2) = "jan_04"; -static char* N(exit_str_3) = "jan_06"; - -s32 N(get_tattle)(void) { - if (evt_get_variable(NULL, GB_StoryProgress) < STORY_CH5_SUSHIE_JOINED_PARTY) { - return MSG_MapTattle_jan_05_before; - } else { - return MSG_MapTattle_jan_05_after; - } -} diff --git a/src/world/area_jan/jan_05/B4AAB0.c b/src/world/area_jan/jan_05/B4AAB0.c deleted file mode 100644 index 13ba028cd6..0000000000 --- a/src/world/area_jan/jan_05/B4AAB0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "jan_05.h" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_jan/jan_05/B4ADC0.c b/src/world/area_jan/jan_05/B4ADC0.c deleted file mode 100644 index ab93a1fd2b..0000000000 --- a/src/world/area_jan/jan_05/B4ADC0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "jan_05.h" - -#include "world/common/todo/UnkShadowFunc001.inc.c" diff --git a/src/world/area_jan/jan_05/B4AF10.c b/src/world/area_jan/jan_05/B4AF10.c deleted file mode 100644 index 18e2281518..0000000000 --- a/src/world/area_jan/jan_05/B4AF10.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "jan_05.h" -#include "model.h" - -#include "common/foliage.inc.c" - -#include "world/common/todo/PullVineSub.inc.c" diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c deleted file mode 100644 index a064482c3c..0000000000 --- a/src/world/area_jan/jan_05/B4B260.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "jan_05.h" - -#include "world/common/todo/HeartPlant_SpawnHeart.inc.c" - -#include "world/common/enemy/ai/HoppingAI.inc.c" - -#include "world/common/enemy/ai/SpearGuyAI.inc.c" - -#define NAMESPACE dup_jan_05 -#include "common/foliage.inc.c" -#define NAMESPACE jan_05 - -ApiStatus func_8024268C_B4D0FC(Evt* script, s32 isInitialCall) { - if (get_enemy_safe(0) == NULL) { - script->varTable[0] = FALSE; - } else { - script->varTable[0] = TRUE; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_jan/jan_05/jan_05.h b/src/world/area_jan/jan_05/jan_05.h index 389e3d1c5e..694acdd063 100644 --- a/src/world/area_jan/jan_05/jan_05.h +++ b/src/world/area_jan/jan_05/jan_05.h @@ -2,8 +2,40 @@ /// @brief Jade Jungle - SE Jungle (Quake Hammer) #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_05_shape.h" +#include "mapfs/jan_05_hit.h" + +enum { + NPC_JungleFuzzy = 0, + NPC_SpearGuy = 1, + NPC_SpearGuy_Hitbox = 2, + NPC_YoshiKid = 3, + NPC_HeartPlant = 4, + NPC_HurtPlant = 5, + NPC_MBush = 6, +}; + +enum { + MV_BushOffsetL = MapVar(0), + MV_BushOffsetR = MapVar(1), +}; + +enum { + MF_BushDrop_Coin = MapFlag(10), + MF_KillLogShadow = MapFlag(11), +}; + #define NAMESPACE jan_05 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupLogs); +extern EvtScript N(EVS_SetupTrees); +extern EvtScript N(EVS_SetupBushes); +extern EvtScript N(EVS_MakeEntities); + +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_jan/jan_05/jan_05_0_header.c b/src/world/area_jan/jan_05/jan_05_0_header.c new file mode 100644 index 0000000000..0c29fd97b9 --- /dev/null +++ b/src/world/area_jan/jan_05/jan_05_0_header.c @@ -0,0 +1,24 @@ +#include "jan_05.h" + +s32 N(get_tattle)(void) { + if (evt_get_variable(NULL, GB_StoryProgress) < STORY_CH5_SUSHIE_JOINED_PARTY) { + return MSG_MapTattle_jan_05_before; + } else { + return MSG_MapTattle_jan_05_after; + } +} + +EntryList N(Entrances) = { + [jan_05_ENTRY_0] { 330.0, 0.0, 330.0, 315.0 }, + [jan_05_ENTRY_1] { -500.0, -20.0, 0.0, 90.0 }, + [jan_05_ENTRY_2] { 480.0, 0.0, 0.0, 270.0 }, + [jan_05_ENTRY_3] { 0.0, 0.0, -450.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { .get = &N(get_tattle) }, +}; diff --git a/src/world/area_jan/jan_05/jan_05_1_music.c b/src/world/area_jan/jan_05/jan_05_1_music.c new file mode 100644 index 0000000000..29745c7919 --- /dev/null +++ b/src/world/area_jan/jan_05/jan_05_1_music.c @@ -0,0 +1,8 @@ +#include "jan_05.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_JADE_JUNGLE, 0, 8) + EVT_CALL(ClearAmbientSounds, 250) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_05/jan_05_2_main.c b/src/world/area_jan/jan_05/jan_05_2_main.c new file mode 100644 index 0000000000..488a2ba440 --- /dev/null +++ b/src/world/area_jan/jan_05/jan_05_2_main.c @@ -0,0 +1,54 @@ +#include "jan_05.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_jan_03_1) = EVT_EXIT_WALK(60, jan_05_ENTRY_0, "jan_03", jan_03_ENTRY_1); +EvtScript N(EVS_ExitWalk_jan_08_1) = EVT_EXIT_WALK(60, jan_05_ENTRY_1, "jan_08", jan_08_ENTRY_1); +EvtScript N(EVS_ExitWalk_jan_04_0) = EVT_EXIT_WALK(60, jan_05_ENTRY_2, "jan_04", jan_04_ENTRY_0); +EvtScript N(EVS_ExitWalk_jan_06_0) = EVT_EXIT_WALK(60, jan_05_ENTRY_3, "jan_06", jan_06_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_08_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_o227, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_03_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilise, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_04_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_06_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupLogs)) + EVT_EXEC(N(EVS_SetupTrees)) + EVT_EXEC(N(EVS_SetupBushes)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o75, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o77, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o75, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o77, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1, SURFACE_TYPE_WATER) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_deiliw, SURFACE_TYPE_WATER) + EVT_EXEC(N(EVS_SetupTrees)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitn, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitse, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitw, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(MakeTransformGroup, MODEL_g25) + EVT_CALL(EnableTexPanning, MODEL_o101, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( -80, 140, 80, -100) + 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_jan/jan_05/jan_05_3_log.c b/src/world/area_jan/jan_05/jan_05_3_log.c new file mode 100644 index 0000000000..a2ddf9c48a --- /dev/null +++ b/src/world/area_jan/jan_05/jan_05_3_log.c @@ -0,0 +1,154 @@ +#include "jan_05.h" +#include "effects.h" + +EvtScript N(EVS_SetupLogObjects) = { + EVT_IF_EQ(GF_JAN05_CreateLogBridge, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o21, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o147, FALSE) + EVT_CALL(EnableModel, MODEL_o148, FALSE) + EVT_CALL(TranslateGroup, MODEL_g31, 0, -240, 0) + EVT_CALL(TranslateGroup, MODEL_g32, 0, -240, 0) + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o94, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o92, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o21, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o147, TRUE) + EVT_CALL(EnableModel, MODEL_o148, TRUE) + EVT_CALL(TranslateGroup, MODEL_g31, 0, 10, 0) + EVT_CALL(TranslateGroup, MODEL_g32, 0, 10, 0) + EVT_CALL(RotateGroup, MODEL_g31, -90, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_g32, -90, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_g31, 90, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_g32, -90, 0, 1, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LogAnim_RiseUp) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_o94, SOUND_SMASH_GOOMNUT_TREE, 0) + EVT_CALL(MakeLerp, -240, -259, 5, EASING_QUARTIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g31, 0, LVar0, 0) + EVT_CALL(TranslateGroup, MODEL_g32, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +#include "world/common/todo/UpdateLogShadow.inc.c" + +EvtScript N(EVS_LogAnim_FallDown) = { + EVT_THREAD + EVT_WAIT(17) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(N(UpdateLogShadow), MODEL_o147, MF_KillLogShadow) + EVT_END_THREAD + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o94, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(MakeLerp, -259, 60, 30, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g31, 0, LVar0, 0) + EVT_CALL(TranslateGroup, MODEL_g32, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(1) + EVT_CALL(MakeLerp, 60, 0, 30, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g31, 0, LVar0, 0) + EVT_CALL(TranslateGroup, MODEL_g32, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o94, SOUND_209D, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, -185, 0, 320, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 2, 3, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LogAnim_FallOver) = { + EVT_THREAD + EVT_WAIT(50) + EVT_SET(MF_KillLogShadow, TRUE) + EVT_END_THREAD + EVT_CALL(MakeLerp, 0, -90, 60, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g31, 0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_g32, 0, 0, 0) + EVT_CALL(RotateGroup, MODEL_g31, LVar0, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_g32, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 2, 3, 1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LogAnim_Split) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_o94, SOUND_209E, 0) + EVT_CALL(EnableModel, MODEL_o147, TRUE) + EVT_CALL(EnableModel, MODEL_o148, TRUE) + EVT_CALL(MakeLerp, 0, 90, 30, EASING_COS_FAST_OVERSHOOT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(LVar2, LVar0) + EVT_DIVF(LVar2, 9) + EVT_CALL(TranslateGroup, MODEL_g31, 0, LVar2, 0) + EVT_CALL(TranslateGroup, MODEL_g32, 0, LVar2, 0) + EVT_CALL(RotateGroup, MODEL_g31, -90, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_g32, -90, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_g31, LVar0, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_g32, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Smash_BuriedLog) = { + EVT_SET(GF_JAN05_CreateLogBridge, TRUE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(EVS_LogAnim_RiseUp)) + EVT_WAIT(1) + EVT_EXEC_WAIT(N(EVS_LogAnim_FallDown)) + EVT_WAIT(1) + EVT_EXEC_WAIT(N(EVS_LogAnim_FallOver)) + EVT_WAIT(1) + EVT_EXEC_WAIT(N(EVS_LogAnim_Split)) + EVT_WAIT(1) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_EXEC(N(EVS_SetupLogObjects)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupLogs) = { + EVT_IF_EQ(GF_JAN05_CreateLogBridge, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Smash_BuriedLog)), TRIGGER_WALL_HAMMER, COLLIDER_o94, 1, 0) + EVT_END_IF + EVT_EXEC(N(EVS_SetupLogObjects)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_05/jan_05_4_bushes.c b/src/world/area_jan/jan_05/jan_05_4_bushes.c new file mode 100644 index 0000000000..a0be8f2def --- /dev/null +++ b/src/world/area_jan/jan_05/jan_05_4_bushes.c @@ -0,0 +1,287 @@ +#include "jan_05.h" + +#define NAME_SUFFIX _Bushes +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +#include "../common/MoveBush.inc.c" +#include "../common/MoveBushTemplates.h" + +EvtScript N(EVS_MoveBushes_Separate) = EVT_MOVE_BUSHES(COLLIDER_o64, + MODEL_o64, MODEL_o65, MV_BushOffsetL, MV_BushOffsetR); + +EvtScript N(EVS_MoveBushes) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o64, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_MoveBushes_Separate)) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(MakeLerp, 0, 45, 30, EASING_CUBIC_OUT) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_SETF(MV_BushOffsetR, LVar0) + EVT_SETF(MV_BushOffsetL, MV_BushOffsetR) + EVT_MULF(MV_BushOffsetL, -1) + EVT_IF_EQ(LVar1, 1) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o63); + +FoliageDropList N(Bush1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 168, 20, 375 }, + .spawnMode = ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE, + .pickupFlag = GF_JAN05_Bush1_Coin, + }, + } +}; + +FoliageVectorList N(Bush1_Effects) = { + .count = 1, + .vectors = { + { 168.0f, 20.0f, 375.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush1) = { + .bush = &N(Bush1_BushModels), + .drops = &N(Bush1_Drops), + .vectors = &N(Bush1_Effects), +}; + +FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o141); + +FoliageDropList N(Bush2_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -401, 20, 176 }, + .spawnMode = ITEM_SPAWN_MODE_TOSS, + .pickupFlag = GF_JAN05_Bush2_Coin, + .spawnFlag = MF_BushDrop_Coin, + }, + } +}; + +FoliageVectorList N(Bush2_Effects) = { + .count = 1, + .vectors = { + { -401.0f, 20.0f, 176.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush2) = { + .bush = &N(Bush2_BushModels), + .drops = &N(Bush2_Drops), + .vectors = &N(Bush2_Effects), +}; + +FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o140); + +FoliageVectorList N(Bush3_Effects) = { + .count = 1, + .vectors = { + { -242.0f, 22.0f, 205.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush3) = { + .bush = &N(Bush3_BushModels), + .vectors = &N(Bush3_Effects), +}; + +FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o142); + +FoliageVectorList N(Bush4_Effects) = { + .count = 1, + .vectors = { + { -206.0f, 20.0f, 248.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush4) = { + .bush = &N(Bush4_BushModels), + .vectors = &N(Bush4_Effects), +}; + +FoliageModelList N(Bush5_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o134); + +FoliageVectorList N(Bush5_Effects) = { + .count = 1, + .vectors = { + { -462.0f, 20.0f, -207.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush5) = { + .bush = &N(Bush5_BushModels), + .vectors = &N(Bush5_Effects), +}; + +FoliageModelList N(Bush6_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o137); + +FoliageVectorList N(Bush6_Effects) = { + .count = 1, + .vectors = { + { -417.0f, 20.0f, -261.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush6) = { + .bush = &N(Bush6_BushModels), + .vectors = &N(Bush6_Effects), +}; + +FoliageModelList N(Bush7_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o131); + +FoliageVectorList N(Bush7_Effects) = { + .count = 1, + .vectors = { + { -32.0f, 22.0f, -364.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush7) = { + .bush = &N(Bush7_BushModels), + .vectors = &N(Bush7_Effects), +}; + +FoliageModelList N(Bush8_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o132); + +FoliageVectorList N(Bush8_Effects) = { + .count = 1, + .vectors = { + { -91.0f, 20.0f, -485.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush8) = { + .bush = &N(Bush8_BushModels), + .vectors = &N(Bush8_Effects), +}; + +FoliageModelList N(Bush9_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o133); + +FoliageVectorList N(Bush9_Effects) = { + .count = 1, + .vectors = { + { 94.0f, 22.0f, -485.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush9) = { + .bush = &N(Bush9_BushModels), + .vectors = &N(Bush9_Effects), +}; + +FoliageModelList N(Bush10_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o139); + +FoliageVectorList N(Bush10_Effects) = { + .count = 1, + .vectors = { + { 9.0f, 20.0f, -90.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush10) = { + .bush = &N(Bush10_BushModels), + .vectors = &N(Bush10_Effects), +}; + +FoliageModelList N(Bush11_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o138); + +FoliageVectorList N(Bush11_Effects) = { + .count = 1, + .vectors = { + { 53.0f, 20.0f, -63.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush11) = { + .bush = &N(Bush11_BushModels), + .vectors = &N(Bush11_Effects), +}; + +FoliageModelList N(Bush12_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o102); + +FoliageVectorList N(Bush12_Effects) = { + .count = 1, + .vectors = { + { 339.0f, 22.0f, -151.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush12) = { + .bush = &N(Bush12_BushModels), + .vectors = &N(Bush12_Effects), +}; + +FoliageModelList N(Bush13_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o126); + +FoliageVectorList N(Bush13_Effects) = { + .count = 1, + .vectors = { + { 144.0f, 22.0f, 490.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush13) = { + .bush = &N(Bush13_BushModels), + .vectors = &N(Bush13_Effects), +}; + +FoliageModelList N(Bush14_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o106); + +FoliageVectorList N(Bush14_Effects) = { + .count = 1, + .vectors = { + { 209.0f, 20.0f, 471.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush14) = { + .bush = &N(Bush14_BushModels), + .vectors = &N(Bush14_Effects), +}; + +EvtScript N(EVS_SetupBushes) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_MoveBushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o64, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o135, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o213, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o214, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush4))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o215, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush5))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o216, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush6))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o217, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush7))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o218, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush8))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o219, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush9))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o220, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush10))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o221, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush11))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o222, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush12))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o223, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush13))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o224, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush14))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o225, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_05/jan_05_5_npc.c b/src/world/area_jan/jan_05/jan_05_5_npc.c new file mode 100644 index 0000000000..f194c63e82 --- /dev/null +++ b/src/world/area_jan/jan_05/jan_05_5_npc.c @@ -0,0 +1,327 @@ +#include "jan_05.h" + +#include "world/common/enemy/complete/MBush.inc.c" +#include "world/common/npc/YoshiKid.inc.c" +#include "world/common/enemy/complete/HeartPlant.inc.c" +#include "world/common/enemy/complete/HurtPlant.inc.c" +#include "world/common/enemy/complete/JungleFuzzy_Wander.inc.c" +#include "world/common/enemy/complete/SpearGuy_Wander.inc.c" + +EvtScript N(EVS_NpcIdle_JungleFuzzy) = { + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 7, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Jungle_Anim09) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, 125, 100, -392) + EVT_CALL(PlaySoundWithVolume, SOUND_331, 110) + EVT_WAIT(20) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8, TRUE) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_JungleFuzzy_Wander))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_JungleFuzzy) = { + EVT_CALL(SetSelfVar, 7, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_200000, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8, TRUE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_JungleFuzzy))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_YoshiKid_WatchPlayerProximinity) = { + EVT_LABEL(1) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(AwaitPlayerLeave, -308, -270, 70) + EVT_CALL(SetSelfVar, 0, 1) + EVT_CASE_EQ(1) + EVT_CALL(AwaitPlayerApproach, -308, -270, 50) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00B8, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetSelfVar, 0, 0) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_GOTO(1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnShakeTree_Yoshi) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcVar, NPC_YoshiKid, 0, 9) + EVT_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_301, 0) + EVT_CALL(SetNpcJumpscale, NPC_YoshiKid, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_YoshiKid, -308, 0, -248, 30) + EVT_END_THREAD + EVT_CALL(EnableNpcShadow, NPC_YoshiKid, TRUE) + EVT_WAIT(40) + EVT_CALL(SetNpcVar, NPC_YoshiKid, 0, 10) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_UNBIND + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_YoshiKid_Sleeping) = { + EVT_LOOP(0) + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_32F, 0) + EVT_WAIT(24) + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_334, 0) + EVT_WAIT(21) + EVT_CALL(GetNpcVar, NPC_YoshiKid, 0, LVar0) + EVT_IF_GE(LVar0, 9) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_YoshiKid_PlaySounds) = { + EVT_EXEC_GET_TID(N(EVS_YoshiKid_Sleeping), LVar9) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetNpcVar, NPC_YoshiKid, 0, LVar0) + EVT_IF_GE(LVar0, 9) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVar9) + EVT_CALL(SetNpcAnimation, NPC_YoshiKid, ANIM_YoshiKid_Purple_Cry) + EVT_LOOP(3) + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_1F0, 0) + EVT_WAIT(13) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_YoshiKid) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, jan_05_ENTRY_3) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00B8, 160, 40) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_OnShakeTree_Yoshi)), TRIGGER_WALL_HAMMER, COLLIDER_o87, 1, 0) + EVT_EXEC_GET_TID(N(EVS_YoshiKid_WatchPlayerProximinity), LVar9) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 10) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVar9) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, -270) + EVT_SET(LVar0, -324) + EVT_SET(LVar1, -355) + EVT_SET(LVar2, 27) + EVT_ELSE + EVT_SET(LVar0, -216) + EVT_SET(LVar1, -185) + EVT_SET(LVar2, -27) + EVT_END_IF + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_YoshiKid_Purple_Walk) + EVT_CALL(NpcMoveTo, NPC_SELF, -270, -248, 30) + EVT_CALL(NpcFacePlayer, NPC_SELF, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100 | NPC_FLAG_8000, TRUE) + EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar1, -250, 30) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_YoshiKid, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100 | NPC_FLAG_8000, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(PlayerMoveTo, LVar0, -248, 30) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_END_THREAD + EVT_ADD(LVar0, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, 0, -248) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, -248) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(350.0)) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(15) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_EQ(LVar0, PARTNER_SUSHIE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_YoshiKid_Purple_SadTalk, ANIM_YoshiKid_Purple_SadIdle, 0, MSG_CH5_00B9) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_YoshiKid_Purple_SadTalk, ANIM_YoshiKid_Purple_SadIdle, 0, MSG_CH5_00BA) + EVT_END_IF + EVT_CALL(EndSpeech, NPC_SELF, ANIM_YoshiKid_Purple_Talk, ANIM_YoshiKid_Purple_Idle, 0) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_YoshiKid_Purple_Run) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, -315, -135, 0) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.5)) + EVT_CALL(NpcJump0, NPC_SELF, -325, 0, 215, 25) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_END_THREAD + EVT_SET(GF_JAN05_SavedYoshi, TRUE) + EVT_SET(LVar0, 0) + EVT_ADD(LVar0, GF_JAN05_SavedYoshi) + EVT_ADD(LVar0, GF_JAN07_SavedYoshi) + EVT_ADD(LVar0, GF_JAN08_SavedYoshi) + EVT_ADD(LVar0, GF_JAN10_SavedYoshi) + EVT_ADD(LVar0, GF_JAN11_SavedYoshi) + EVT_IF_EQ(LVar0, 5) + EVT_CALL(SetMusicTrack, 0, SONG_YOSHI_KIDS_FOUND, 0, 8) + EVT_SET(GB_StoryProgress, STORY_CH5_ALL_YOSHI_CHILDREN_RESCUED) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_ThumbsUp) + EVT_WAIT(120) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_ELSE + EVT_WAIT(30) + EVT_END_IF + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_YoshiKid) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_SUSHIE_JOINED_PARTY) + EVT_IF_EQ(GF_JAN05_SavedYoshi, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, -308, 110, -300) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_YoshiKid_Purple_Sleep) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_YoshiKid))) + EVT_EXEC(N(EVS_YoshiKid_PlaySounds)) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_YoshiKid) = { + .id = NPC_YoshiKid, + .settings = &N(NpcSettings_YoshiKid), + .pos = { -320.0f, 0.0f, 80.0f }, + .yaw = 270, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_YoshiKid), + .drops = NPC_NO_DROPS, + .animations = YOSHI_KID_PURPLE_ANIMS, + .tattle = MSG_NpcTattle_PurpleYoshiKid, +}; + +s32 N(ExtraAnims_JungleFuzzy)[] = { + ANIM_Fuzzy_Jungle_Idle, + ANIM_Fuzzy_Jungle_Walk, + ANIM_Fuzzy_Jungle_Run, + ANIM_Fuzzy_Jungle_Hurt, + -1 +}; + +StaticNpc N(NpcData_JungleFuzzy) = { + .id = NPC_JungleFuzzy, + .settings = &N(NpcSettings_JungleFuzzy_Wander), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_JungleFuzzy), + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 63, 0, -366 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 63, 0, -366 }, + .detectSize = { 200 }, + } + }, + .drops = JUNGLE_FUZZY_DROPS, + .animations = JUNGLE_FUZZY_ANIMS, + .extraAnimations = N(ExtraAnims_JungleFuzzy), + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, +}; + +StaticNpc N(NpcData_SpearGuy)[] = { + { + .id = NPC_SpearGuy, + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 90, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 0, 0, 0 }, + .wanderSize = { 20 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 0, 0, 0 }, + .detectSize = { 100 }, + } + }, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800, + SPEAR_GUY_WANDER_NPC_DATA + }, + SPEAR_GUY_HITBOX(NPC_SpearGuy_Hitbox) +}; + +StaticNpc N(NpcData_HeartPlant) = { + .id = NPC_HeartPlant, + .settings = &N(NpcSettings_HeartPlant), + .pos = { 430.0f, 0.0f, 205.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .drops = NPC_NO_DROPS, + .animations = HEART_PLANT_ANIMS, + .tattle = MSG_NpcTattle_HeartPlant, +}; + +StaticNpc N(NpcData_HurtPlant) = { + .id = NPC_HurtPlant, + .pos = { 375.0f, 0.0f, 260.0f }, + .yaw = 270, + HURT_PLANT_NPC_DATA +}; + +StaticNpc N(NpcData_MBush) = { + .id = NPC_MBush, + .settings = &N(NpcSettings_MBush), + .pos = { 400.0f, 0.0f, -75.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .drops = MBUSH_DROPS, + .animations = MBUSH_ANIMS, + .tattle = MSG_NpcTattle_MBush, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_JungleFuzzy), BTL_JAN_FORMATION_0A, BTL_JAN_STAGE_01), + NPC_GROUP(N(NpcData_SpearGuy), BTL_JAN_FORMATION_00, BTL_JAN_STAGE_01), + NPC_GROUP(N(NpcData_HeartPlant)), + NPC_GROUP(N(NpcData_HurtPlant), BTL_JAN_FORMATION_08, BTL_JAN_STAGE_01), + NPC_GROUP(N(NpcData_MBush), BTL_JAN_FORMATION_0E, BTL_JAN_STAGE_01), + NPC_GROUP(N(NpcData_YoshiKid)), + {} +}; diff --git a/src/world/area_jan/jan_05/jan_05_6_trees.c b/src/world/area_jan/jan_05/jan_05_6_trees.c new file mode 100644 index 0000000000..2b483222d5 --- /dev/null +++ b/src/world/area_jan/jan_05/jan_05_6_trees.c @@ -0,0 +1,118 @@ +#include "jan_05.h" + +#define NAME_SUFFIX _Trees +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +API_CALLABLE(N(func_8024268C_B4D0FC)) { + if (get_enemy_safe(NPC_JungleFuzzy) == NULL) { + script->varTable[0] = FALSE; + } else { + script->varTable[0] = TRUE; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_OnShakeTree1) = { + EVT_WAIT(15) + EVT_CALL(N(func_8024268C_B4D0FC)) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(SetNpcVar, NPC_JungleFuzzy, 7, 1) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o95, MODEL_o96, MODEL_o97, MODEL_o98, MODEL_o99); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o94); + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { 87.0f, 114.0f, -390.0f }, + { 172.0f, 114.0f, -400.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .vectors = &N(Tree1_Effects), + .callback = &N(EVS_OnShakeTree1), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { 127.0f, 0.0f, -420.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o89, MODEL_o90, MODEL_o91, MODEL_o92, MODEL_o93); +FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o88); + +FoliageDropList N(Tree2_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 400, 100, -145 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_JAN05_Tree2_Coin, + }, + } +}; + +FoliageVectorList N(Tree2_Effects) = { + .count = 2, + .vectors = { + { 402.0f, 114.0f, -135.0f }, + { 487.0f, 114.0f, -145.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .drops = &N(Tree2_Drops), + .vectors = &N(Tree2_Effects), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { 442.0f, 0.0f, -165.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree3_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o83, MODEL_o84, MODEL_o85, MODEL_o86, MODEL_o87); +FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o34); + +FoliageVectorList N(Tree3_Effects) = { + .count = 2, + .vectors = { + { -309.0f, 112.0f, -301.0f }, + { -226.0f, 105.0f, -306.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree3) = { + .leaves = &N(Tree3_LeafModels), + .trunk = &N(Tree3_TrunkModels), + .vectors = &N(Tree3_Effects), +}; + +BombTrigger N(BombPos_Tree3) = { + .pos = { -270.0f, 0.0f, -310.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupTrees) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o187, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o188, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o87, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_05/jan_05_7_entity.c b/src/world/area_jan/jan_05/jan_05_7_entity.c new file mode 100644 index 0000000000..43dc2486f0 --- /dev/null +++ b/src/world/area_jan/jan_05/jan_05_7_entity.c @@ -0,0 +1,11 @@ +#include "jan_05.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_RedBlock), 0, 60, 0, 0, ITEM_POWER_QUAKE, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_JAN05_BadgeBlock_PowerQuake) + EVT_CALL(MakeEntity, EVT_PTR(Entity_CymbalPlant), 205, 0, 220, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_TrumpetPlant), -386, 0, -214, 160, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_06/B52830.c b/src/world/area_jan/jan_06/B52830.c deleted file mode 100644 index ef142b0b6b..0000000000 --- a/src/world/area_jan/jan_06/B52830.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "jan_06.h" - -static char* N(exit_str_0) = "jan_05"; -static char* N(exit_str_1) = "jan_07"; -static char* N(exit_str_2) = "jan_12"; -static char* N(exit_str_3) = "jan_09"; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_jan/jan_06/B52B40.c b/src/world/area_jan/jan_06/B52B40.c deleted file mode 100644 index 8cf9c8aab1..0000000000 --- a/src/world/area_jan/jan_06/B52B40.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "jan_06.h" - -ApiStatus func_80240310_B52B40(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - script->functionTemp[0] = evt_get_variable(script, *args++); - script->functionTemp[1] = evt_get_variable(script, *args++); - script->functionTemp[2] = evt_get_variable(script, *args++); - sfx_adjust_env_sound_pos(SOUND_9E, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); - - return ApiStatus_DONE2; -} diff --git a/src/world/area_jan/jan_06/B52BE0.c b/src/world/area_jan/jan_06/B52BE0.c deleted file mode 100644 index 5237660e7a..0000000000 --- a/src/world/area_jan/jan_06/B52BE0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "jan_06.h" - -#include "world/common/todo/UnkShadowFunc001.inc.c" diff --git a/src/world/area_jan/jan_06/B52D30.c b/src/world/area_jan/jan_06/B52D30.c deleted file mode 100644 index 634c427906..0000000000 --- a/src/world/area_jan/jan_06/B52D30.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "jan_06.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c deleted file mode 100644 index 0a8596ddb1..0000000000 --- a/src/world/area_jan/jan_06/B52F70.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "jan_06.h" - -#include "world/common/enemy/ai/HoppingAI.inc.c" - -#include "world/common/todo/HeartPlant_SpawnHeart.inc.c" - -#include "world/common/enemy/ai/SpearGuyAI.inc.c" - -#define NAMESPACE dup_jan_06 -#include "common/foliage.inc.c" -#define NAMESPACE jan_06 diff --git a/src/world/area_jan/jan_06/jan_06.h b/src/world/area_jan/jan_06/jan_06.h index bbf17b1ad8..22289adbd6 100644 --- a/src/world/area_jan/jan_06/jan_06.h +++ b/src/world/area_jan/jan_06/jan_06.h @@ -2,8 +2,38 @@ /// @brief Jade Jungle - NE Jungle (Raven Statue) #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_06_shape.h" +#include "mapfs/jan_06_hit.h" + +enum { + NPC_JungleFuzzy = 0, + NPC_SpearGuy = 1, + NPC_SpearGuy_Hitbox = 2, + NPC_HeartPlant = 3, + NPC_HurtPlant_01 = 4, + NPC_HurtPlant_02 = 5, +}; + +enum { + MV_JadeRavenItemIdx = MapVar(11), +}; + +enum { + MF_TreeDrop_Coin = MapFlag(10), + MF_KillLogShadow = MapFlag(11), +}; + #define NAMESPACE jan_06 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupStatue); +extern EvtScript N(EVS_SetupTrees); +extern EvtScript N(EVS_SetupBushes); +extern EvtScript N(EVS_SetupLogs); +extern EvtScript N(EVS_MakeEntities); + +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_jan/jan_06/jan_06_0_header.c b/src/world/area_jan/jan_06/jan_06_0_header.c new file mode 100644 index 0000000000..79a67ecd71 --- /dev/null +++ b/src/world/area_jan/jan_06/jan_06_0_header.c @@ -0,0 +1,16 @@ +#include "jan_06.h" + +EntryList N(Entrances) = { + [jan_06_ENTRY_0] { 0.0, 0.0, 470.0, 0.0 }, + [jan_06_ENTRY_1] { 470.0, 0.0, 0.0, 270.0 }, + [jan_06_ENTRY_2] { 0.0, 0.0, -470.0, 180.0 }, + [jan_06_ENTRY_3] { -470.0, 0.0, 0.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_jan_06 }, +}; diff --git a/src/world/area_jan/jan_06/jan_06_1_main.c b/src/world/area_jan/jan_06/jan_06_1_main.c new file mode 100644 index 0000000000..b5d07e78c3 --- /dev/null +++ b/src/world/area_jan/jan_06/jan_06_1_main.c @@ -0,0 +1,99 @@ +#include "jan_06.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_jan_05_3) = EVT_EXIT_WALK(60, jan_06_ENTRY_0, "jan_05", jan_05_ENTRY_3); +EvtScript N(EVS_ExitWalk_jan_07_0) = EVT_EXIT_WALK(60, jan_06_ENTRY_1, "jan_07", jan_07_ENTRY_0); +EvtScript N(EVS_ExitWalk_jan_12_0) = EVT_EXIT_WALK(60, jan_06_ENTRY_2, "jan_12", jan_12_ENTRY_0); +EvtScript N(EVS_ExitWalk_jan_09_1) = EVT_EXIT_WALK(60, jan_06_ENTRY_3, "jan_09", jan_09_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_05_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_07_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_12_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_09_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_InitRavenStatueObjects) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH5_MOVED_RAVEN_STATUE) + EVT_CALL(TranslateModel, MODEL_o55, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o56, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o57, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o58, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o146, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o147, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o148, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o151, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o162, 0, 0, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o180, COLLIDER_FLAGS_UPPER_MASK) + EVT_ELSE + EVT_CALL(TranslateModel, MODEL_o55, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o56, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o57, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o58, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o146, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o147, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o148, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o151, -100, 0, 0) + EVT_CALL(TranslateModel, MODEL_o162, -100, 0, 0) + EVT_CALL(RotateModel, MODEL_o55, 0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o56, 0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o57, 0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o146, 0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o147, 0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o148, 0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o151, 0, 0, 1, 0) + EVT_CALL(RotateModel, MODEL_o162, 0, 0, 1, 0) + EVT_CALL(MakeItemEntity, ITEM_JADE_RAVEN, -100, 15, -400, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o166, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o247, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(SetZoneEnabled, ZONE_o59, FALSE) + EVT_EXEC(N(EVS_InitRavenStatueObjects)) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o69, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o71, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o74, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o69, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o71, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o74, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1, SURFACE_TYPE_WATER) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o257, SURFACE_TYPE_WATER) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o258, SURFACE_TYPE_WATER) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o259, SURFACE_TYPE_WATER) + EVT_EXEC(N(EVS_SetupStatue)) + EVT_EXEC(N(EVS_SetupTrees)) + EVT_EXEC(N(EVS_SetupBushes)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilits, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitn, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupLogs)) + EVT_CALL(SetMusicTrack, 0, SONG_JADE_JUNGLE, 0, 8) + EVT_CALL(ClearAmbientSounds, 250) + EVT_CALL(MakeTransformGroup, MODEL_g14) + EVT_CALL(EnableTexPanning, MODEL_o61, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( -80, 140, 80, -100) + 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_jan/jan_06/jan_06_2_statue.c b/src/world/area_jan/jan_06/jan_06_2_statue.c new file mode 100644 index 0000000000..0710a1d793 --- /dev/null +++ b/src/world/area_jan/jan_06/jan_06_2_statue.c @@ -0,0 +1,141 @@ +#include "jan_06.h" +#include "sprite.h" + +s32 N(JadeRavenList)[] = { + ITEM_JADE_RAVEN, + ITEM_NONE +}; + +EvtScript N(EVS_MoveStatue) = { + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 25, EVT_FLOAT(0.8)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 25, EVT_FLOAT(0.7)) + EVT_END_THREAD + EVT_CALL(MakeLerp, 1, 5, 50, EASING_CUBIC_IN) + EVT_SET(LVar2, 1) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_MUL(LVar2, -1) + EVT_SET(LVar3, LVar2) + EVT_MUL(LVar3, LVar0) + EVT_CALL(TranslateGroup, MODEL_g11, LVar3, 0, 0) + EVT_CALL(RotateGroup, MODEL_g11, 0, 0, 1, 0) + EVT_CALL(SetItemPos, MV_JadeRavenItemIdx, LVar3, 15, -400) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 25, EVT_FLOAT(0.6)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 25, EVT_FLOAT(0.5)) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 25, EVT_FLOAT(0.4)) + EVT_END_THREAD + EVT_CALL(MakeLerp, 5, 0, 75, EASING_CUBIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_MUL(LVar2, -1) + EVT_SET(LVar3, LVar2) + EVT_MUL(LVar3, LVar0) + EVT_CALL(TranslateGroup, MODEL_g11, LVar3, 0, 0) + EVT_CALL(RotateGroup, MODEL_g11, 0, 0, 1, 0) + EVT_CALL(SetItemPos, MV_JadeRavenItemIdx, LVar3, 15, -400) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +API_CALLABLE(N(AdjustEnvSoundPosition)) { + Bytecode* args = script->ptrReadPos; + + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + sfx_adjust_env_sound_pos(SOUND_9E, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + + return ApiStatus_DONE2; +} + +EvtScript N(PlayMovingStatueSound) = { + EVT_LOOP(0) + EVT_CALL(GetModelCenter, MODEL_o162) + EVT_CALL(N(AdjustEnvSoundPosition), LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Scene_MoveStatue) = { + EVT_CALL(PlaySound, SOUND_80000018) + EVT_EXEC_WAIT(N(EVS_MoveStatue)) + EVT_CALL(GetModelCenter, MODEL_o162) + EVT_CALL(PlaySoundAt, SOUND_80000010, 0, LVar0, LVar1, LVar2) + EVT_EXEC_GET_TID(N(PlayMovingStatueSound), LVar9) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 180, EVT_FLOAT(0.4)) + EVT_END_THREAD + EVT_CALL(MakeLerp, 0, -100, 180, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g11, LVar0, 0, 0) + EVT_CALL(RotateGroup, MODEL_g11, 0, 0, 1, 0) + EVT_CALL(SetItemPos, MV_JadeRavenItemIdx, LVar0, 15, -400) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(1.0)) + EVT_KILL_THREAD(LVar9) + EVT_CALL(StopSound, SOUND_80000010) + EVT_CALL(StopSound, SOUND_80000018) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o166, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o247, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o180, COLLIDER_FLAGS_UPPER_MASK) + EVT_WAIT(10) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_RETURN + EVT_END +}; + +EvtScript N(ItemPrompt_Statue) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(ShowKeyChoicePopup) + EVT_IF_LE(LVar0, 0) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_Inspect_RaphaelStatue, 160, 40) + EVT_END_IF + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(RemoveKeyItemAt, LVar1) + EVT_CALL(MakeItemEntity, ITEM_JADE_RAVEN, 0, 15, -400, ITEM_SPAWN_MODE_DECORATION, 0) + EVT_SET(MV_JadeRavenItemIdx, LVar0) + EVT_CALL(CloseChoicePopup) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_60006 | SPRITE_ID_BACK_FACING) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_Scene_MoveStatue)) + EVT_SET(GB_StoryProgress, STORY_CH5_MOVED_RAVEN_STATUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupStatue) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH5_MOVED_RAVEN_STATUE) + EVT_BIND_PADLOCK(EVT_PTR(N(ItemPrompt_Statue)), TRIGGER_WALL_PRESS_A, COLLIDER_o166, EVT_PTR(N(JadeRavenList)), 0, 1) + EVT_END_IF + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_06/jan_06_3_log.c b/src/world/area_jan/jan_06/jan_06_3_log.c new file mode 100644 index 0000000000..77d0b1002d --- /dev/null +++ b/src/world/area_jan/jan_06/jan_06_3_log.c @@ -0,0 +1,154 @@ +#include "jan_06.h" +#include "effects.h" + +EvtScript N(EVS_SetupLogObjects) = { + EVT_IF_EQ(GF_JAN06_CreateLogBridge, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o169, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o95, FALSE) + EVT_CALL(EnableModel, MODEL_o96, FALSE) + EVT_CALL(TranslateGroup, MODEL_g20, 0, -150, 0) + EVT_CALL(TranslateGroup, MODEL_g21, 0, -150, 0) + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o167, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o168, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o169, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o95, TRUE) + EVT_CALL(EnableModel, MODEL_o96, TRUE) + EVT_CALL(TranslateGroup, MODEL_g20, 0, 10, 0) + EVT_CALL(TranslateGroup, MODEL_g21, 0, 10, 0) + EVT_CALL(RotateGroup, MODEL_g20, -90, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_g21, -90, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_g20, 90, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_g21, -90, 0, 1, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LogAnim_RiseUp) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_o167, SOUND_SMASH_GOOMNUT_TREE, 0) + EVT_CALL(MakeLerp, -150, -169, 5, EASING_QUARTIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g20, 0, LVar0, 0) + EVT_CALL(TranslateGroup, MODEL_g21, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +#include "world/common/todo/UpdateLogShadow.inc.c" + +EvtScript N(EVS_LogAnim_FallDown) = { + EVT_THREAD + EVT_WAIT(17) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(N(UpdateLogShadow), 130, MF_KillLogShadow) + EVT_END_THREAD + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o167, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(MakeLerp, -169, 60, 30, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g20, 0, LVar0, 0) + EVT_CALL(TranslateGroup, MODEL_g21, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(1) + EVT_CALL(MakeLerp, 60, 0, 30, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g20, 0, LVar0, 0) + EVT_CALL(TranslateGroup, MODEL_g21, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o167, SOUND_209D, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, -100, 0, 60, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 2, 3, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LogAnim_FallOver) = { + EVT_THREAD + EVT_WAIT(50) + EVT_SET(MF_KillLogShadow, TRUE) + EVT_END_THREAD + EVT_CALL(MakeLerp, 0, -90, 60, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g20, 0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_g21, 0, 0, 0) + EVT_CALL(RotateGroup, MODEL_g20, LVar0, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_g21, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 2, 3, 1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LogAnim_Split) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_o167, SOUND_209E, 0) + EVT_CALL(EnableModel, MODEL_o95, TRUE) + EVT_CALL(EnableModel, MODEL_o96, TRUE) + EVT_CALL(MakeLerp, 0, 90, 30, EASING_COS_FAST_OVERSHOOT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(LVar2, LVar0) + EVT_DIVF(LVar2, 9) + EVT_CALL(TranslateGroup, MODEL_g20, 0, LVar2, 0) + EVT_CALL(TranslateGroup, MODEL_g21, 0, LVar2, 0) + EVT_CALL(RotateGroup, MODEL_g20, -90, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_g21, -90, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_g20, LVar0, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_g21, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Smash_BuriedLog) = { + EVT_SET(GF_JAN06_CreateLogBridge, TRUE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(EVS_LogAnim_RiseUp)) + EVT_WAIT(1) + EVT_EXEC_WAIT(N(EVS_LogAnim_FallDown)) + EVT_WAIT(1) + EVT_EXEC_WAIT(N(EVS_LogAnim_FallOver)) + EVT_WAIT(1) + EVT_EXEC_WAIT(N(EVS_LogAnim_Split)) + EVT_WAIT(1) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_EXEC(N(EVS_SetupLogObjects)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupLogs) = { + EVT_IF_EQ(GF_JAN06_CreateLogBridge, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Smash_BuriedLog)), TRIGGER_WALL_HAMMER, COLLIDER_o167, 1, 0) + EVT_END_IF + EVT_EXEC(N(EVS_SetupLogObjects)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_06/jan_06_4_trees.c b/src/world/area_jan/jan_06/jan_06_4_trees.c new file mode 100644 index 0000000000..85afe3a642 --- /dev/null +++ b/src/world/area_jan/jan_06/jan_06_4_trees.c @@ -0,0 +1,74 @@ +#include "jan_06.h" + +#define NAME_SUFFIX _Trees +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_g35); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o97); + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -225, 80, -380 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_JAN06_Tree1_Coin, + .spawnFlag = MF_TreeDrop_Coin, + }, + } +}; + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { -325.0f, 114.0f, -330.0f }, + { -240.0f, 114.0f, -340.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .drops = &N(Tree1_Drops), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -285.0f, 0.0f, -360.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_g36); +FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o103); + +FoliageVectorList N(Tree2_Effects) = { + .count = 2, + .vectors = { + { 412.0f, 114.0f, -105.0f }, + { 497.0f, 114.0f, -115.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .vectors = &N(Tree2_Effects), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { 452.0f, 0.0f, -135.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupTrees) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o183, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o185, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_06/jan_06_5_entity.c b/src/world/area_jan/jan_06/jan_06_5_entity.c new file mode 100644 index 0000000000..cf26303439 --- /dev/null +++ b/src/world/area_jan/jan_06/jan_06_5_entity.c @@ -0,0 +1,9 @@ +#include "jan_06.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_PinkFlower), 84, 0, -320, 5, MAKE_ENTITY_END) + EVT_CALL(MakeItemEntity, ITEM_COIN, 285, -60, 220, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_JAN06_Item_Coin) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_06/jan_06_6_npc.c b/src/world/area_jan/jan_06/jan_06_6_npc.c new file mode 100644 index 0000000000..f7b3894c1e --- /dev/null +++ b/src/world/area_jan/jan_06/jan_06_6_npc.c @@ -0,0 +1,123 @@ +#include "jan_06.h" + +#include "world/common/enemy/complete/JungleFuzzy_Wander.inc.c" +#include "world/common/enemy/complete/HeartPlant.inc.c" +#include "world/common/enemy/complete/HurtPlant.inc.c" +#include "world/common/enemy/complete/SpearGuy_Wander.inc.c" + +s32 N(ExtraAnims_JungleFuzzy)[] = { + ANIM_Fuzzy_Blue_Idle, + ANIM_Fuzzy_Blue_Walk, + ANIM_Fuzzy_Blue_Run, + ANIM_Fuzzy_Blue_Hurt, + -1 +}; + +StaticNpc N(NpcData_JungleFuzzy) = { + .id = NPC_JungleFuzzy, + .settings = &N(NpcSettings_JungleFuzzy_Wander), + .pos = { 310.0f, 24.0f, 35.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .drops = JUNGLE_FUZZY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 310, 24, 35 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 310, 24, 35 }, + .detectSize = { 150 }, + } + }, + .animations = JUNGLE_FUZZY_ANIMS, + .extraAnimations = N(ExtraAnims_JungleFuzzy), + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, +}; + +s32 N(ExtraAnims_SpearGuy_Custom)[] = { + ANIM_SpearGuy_Anim03, + ANIM_SpearGuy_Anim04, + ANIM_SpearGuy_Anim05, + ANIM_SpearGuy_Anim06, + ANIM_SpearGuy_Anim0F, + ANIM_SpearGuy_Anim10, + ANIM_SpearGuy_Anim07, + ANIM_SpearGuy_Anim08, + ANIM_SpearGuy_Anim09, + ANIM_SpearGuy_Anim0D, + ANIM_SpearGuy_Anim1A, + ANIM_SpearGuy_Anim1B, + -1 +}; + +StaticNpc N(NpcData_SpearGuy)[] = { + { + .id = NPC_SpearGuy, + .pos = { -298.0f, 35.0f, 37.0f }, + .yaw = 90, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -298, 0, 37 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -298, 0, 37 }, + .detectSize = { 150 }, + } + }, + .settings = &N(NpcSettings_SpearGuy_Wander), + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .drops = SPEAR_GUY_DROPS, + .animations = SPEAR_GUY_ANIMS, + .extraAnimations = N(ExtraAnims_SpearGuy_Custom), + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, + }, + SPEAR_GUY_HITBOX(NPC_SpearGuy_Hitbox), +}; + +StaticNpc N(NpcData_HeartPlant) = { + .id = NPC_HeartPlant, + .pos = { 410.0f, 0.0f, -30.0f }, + .yaw = 270, + .settings = &N(NpcSettings_HeartPlant), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .drops = NPC_NO_DROPS, + .animations = HEART_PLANT_ANIMS, + .tattle = MSG_NpcTattle_HeartPlant, +}; + +StaticNpc N(NpcData_HurtPlant_01) = { + .id = NPC_HurtPlant_01, + .pos = { 110.0f, 0.0f, 55.0f }, + .yaw = 90, + .settings = &N(NpcSettings_HurtPlant), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .drops = HURT_PLANT_DROPS, + .animations = HURT_PLANT_ANIMS, + .tattle = MSG_NpcTattle_HeartPlant, +}; + +StaticNpc N(NpcData_HurtPlant_02) = { + .id = NPC_HurtPlant_02, + .pos = { -430.0f, 0.0f, -80.0f }, + .yaw = 90, + .settings = &N(NpcSettings_HurtPlant), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .drops = HURT_PLANT_DROPS, + .animations = HURT_PLANT_ANIMS, + .tattle = MSG_NpcTattle_HeartPlant, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_JungleFuzzy), BTL_JAN_FORMATION_0D, BTL_JAN_STAGE_01), + NPC_GROUP(N(NpcData_SpearGuy), BTL_JAN_FORMATION_02, BTL_JAN_STAGE_01), + NPC_GROUP(N(NpcData_HeartPlant)), + NPC_GROUP(N(NpcData_HurtPlant_01), BTL_JAN_FORMATION_08, BTL_JAN_STAGE_01), + NPC_GROUP(N(NpcData_HurtPlant_02), BTL_JAN_FORMATION_08, BTL_JAN_STAGE_01), + {} +}; diff --git a/src/world/area_jan/jan_06/jan_06_7_bushes.c b/src/world/area_jan/jan_06/jan_06_7_bushes.c new file mode 100644 index 0000000000..cc8d7e5d68 --- /dev/null +++ b/src/world/area_jan/jan_06/jan_06_7_bushes.c @@ -0,0 +1,234 @@ +#include "jan_06.h" + +#define NAME_SUFFIX _Bushes +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o136); + +FoliageVectorList N(Bush1_Effects) = { + .count = 1, + .vectors = { + { -469.0f, 20.0f, -117.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush1) = { + .bush = &N(Bush1_BushModels), + .vectors = &N(Bush1_Effects), +}; + +FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o135); + +FoliageVectorList N(Bush2_Effects) = { + .count = 1, + .vectors = { + { -451.0f, 22.0f, -145.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush2) = { + .bush = &N(Bush2_BushModels), + .vectors = &N(Bush2_Effects), +}; + +FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o130); + +FoliageVectorList N(Bush3_Effects) = { + .count = 1, + .vectors = { + { -256.0f, 22.0f, -422.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush3) = { + .bush = &N(Bush3_BushModels), + .vectors = &N(Bush3_Effects), +}; + +FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o127); + +FoliageVectorList N(Bush4_Effects) = { + .count = 1, + .vectors = { + { -141.0f, 20.0f, -484.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush4) = { + .bush = &N(Bush4_BushModels), + .vectors = &N(Bush4_Effects), +}; + +FoliageModelList N(Bush5_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o128); + +FoliageVectorList N(Bush5_Effects) = { + .count = 1, + .vectors = { + { -80.0f, 20.0f, -490.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush5) = { + .bush = &N(Bush5_BushModels), + .vectors = &N(Bush5_Effects), +}; + +FoliageModelList N(Bush6_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o129); + +FoliageVectorList N(Bush6_Effects) = { + .count = 1, + .vectors = { + { 84.0f, 22.0f, -490.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush6) = { + .bush = &N(Bush6_BushModels), + .vectors = &N(Bush6_Effects), +}; + +FoliageModelList N(Bush7_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o132); + +FoliageVectorList N(Bush7_Effects) = { + .count = 1, + .vectors = { + { 200.0f, 20.0f, -464.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush7) = { + .bush = &N(Bush7_BushModels), + .vectors = &N(Bush7_Effects), +}; + +FoliageModelList N(Bush8_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o125); + +FoliageVectorList N(Bush8_Effects) = { + .count = 1, + .vectors = { + { 114.0f, 20.0f, -7.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush8) = { + .bush = &N(Bush8_BushModels), + .vectors = &N(Bush8_Effects), +}; + +FoliageModelList N(Bush9_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o126); + +FoliageVectorList N(Bush9_Effects) = { + .count = 1, + .vectors = { + { 164.0f, 22.0f, -25.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush9) = { + .bush = &N(Bush9_BushModels), + .vectors = &N(Bush9_Effects), +}; + +FoliageModelList N(Bush10_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o123); + +FoliageVectorList N(Bush10_Effects) = { + .count = 1, + .vectors = { + { -124.0f, 22.0f, 372.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush10) = { + .bush = &N(Bush10_BushModels), + .vectors = &N(Bush10_Effects), +}; + +FoliageModelList N(Bush11_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o124); + +FoliageVectorList N(Bush11_Effects) = { + .count = 1, + .vectors = { + { -87.0f, 20.0f, 341.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush11) = { + .bush = &N(Bush11_BushModels), + .vectors = &N(Bush11_Effects), +}; + +FoliageModelList N(Bush12_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o137); + +FoliageVectorList N(Bush12_Effects) = { + .count = 1, + .vectors = { + { 150.0f, 20.0f, 486.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush12) = { + .bush = &N(Bush12_BushModels), + .vectors = &N(Bush12_Effects), +}; + +FoliageModelList N(Bush13_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o131); + +FoliageVectorList N(Bush13_Effects) = { + .count = 1, + .vectors = { + { 396.0f, 20.0f, -90.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush13) = { + .bush = &N(Bush13_BushModels), + .vectors = &N(Bush13_Effects), +}; + +FoliageModelList N(Bush14_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o139); + +FoliageVectorList N(Bush14_Effects) = { + .count = 1, + .vectors = { + { 439.0f, 22.0f, 140.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush14) = { + .bush = &N(Bush14_BushModels), + .vectors = &N(Bush14_Effects), +}; + +EvtScript N(EVS_SetupBushes) = { + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o232, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o233, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o234, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush4))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o235, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush5))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o236, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush6))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o237, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush7))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o238, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush8))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o239, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush9))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o240, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush10))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o241, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush11))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o242, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush12))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o243, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush13))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o244, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush14))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o245, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_07/B59870.c b/src/world/area_jan/jan_07/B59870.c deleted file mode 100644 index 05b05da9bc..0000000000 --- a/src/world/area_jan/jan_07/B59870.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "jan_07.h" - -static char* N(exit_str_0) = "jan_06"; -static char* N(exit_str_1) = "\0\0\0\0"; - -#include "world/common/enemy/ai/SpearGuyAI.inc.c" diff --git a/src/world/area_jan/jan_07/B5A610.c b/src/world/area_jan/jan_07/B5A610.c deleted file mode 100644 index 73bdb96c98..0000000000 --- a/src/world/area_jan/jan_07/B5A610.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "jan_07.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_jan/jan_07/B5A850.c b/src/world/area_jan/jan_07/B5A850.c deleted file mode 100644 index 1ea0a807c0..0000000000 --- a/src/world/area_jan/jan_07/B5A850.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "jan_07.h" - -#define NAMESPACE dup_jan_07 -#include "common/foliage.inc.c" -#define NAMESPACE jan_07 - - diff --git a/src/world/area_jan/jan_07/jan_07.h b/src/world/area_jan/jan_07/jan_07.h index 9821e948f9..5aa18566ce 100644 --- a/src/world/area_jan/jan_07/jan_07.h +++ b/src/world/area_jan/jan_07/jan_07.h @@ -2,8 +2,25 @@ /// @brief Jade Jungle - Small Jungle Ledge #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_07_shape.h" +#include "mapfs/jan_07_hit.h" + +enum { + NPC_YoshiKid = 0, + NPC_PutridPiranha_01 = 1, + NPC_PutridPiranha_02 = 2, + NPC_SpearGuy = 10, + NPC_SpearGuy_Hitbox = 11, +}; + #define NAMESPACE jan_07 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupTrees); +extern EvtScript N(EVS_SetupBushes); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_jan/jan_07/jan_07_0_header.c b/src/world/area_jan/jan_07/jan_07_0_header.c new file mode 100644 index 0000000000..886582d8dc --- /dev/null +++ b/src/world/area_jan/jan_07/jan_07_0_header.c @@ -0,0 +1,13 @@ +#include "jan_07.h" + +EntryList N(Entrances) = { + [jan_07_ENTRY_0] { -220.0, 0.0, 0.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_jan_07 }, +}; diff --git a/src/world/area_jan/jan_07/jan_07_1_music.c b/src/world/area_jan/jan_07/jan_07_1_music.c new file mode 100644 index 0000000000..524dc858af --- /dev/null +++ b/src/world/area_jan/jan_07/jan_07_1_music.c @@ -0,0 +1,8 @@ +#include "jan_07.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_JADE_JUNGLE, 0, 8) + EVT_CALL(ClearAmbientSounds, 250) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_07/jan_07_2_main.c b/src/world/area_jan/jan_07/jan_07_2_main.c new file mode 100644 index 0000000000..a8ca89db1c --- /dev/null +++ b/src/world/area_jan/jan_07/jan_07_2_main.c @@ -0,0 +1,26 @@ +#include "jan_07.h" + +EvtScript N(EVS_ExitWalk_jan_06_1) = EVT_EXIT_WALK(60, jan_07_ENTRY_0, "jan_06", jan_06_ENTRY_1); + +MAP_RODATA_PAD(1, exits); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_06_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC(N(EVS_SetupTrees)) + EVT_EXEC(N(EVS_SetupBushes)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitw, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_07/jan_07_3_npc.c b/src/world/area_jan/jan_07/jan_07_3_npc.c new file mode 100644 index 0000000000..7b59a58b27 --- /dev/null +++ b/src/world/area_jan/jan_07/jan_07_3_npc.c @@ -0,0 +1,364 @@ +#include "jan_07.h" + +#include "world/common/npc/YoshiKid.inc.c" + +#include "world/common/enemy/complete/PutridPiranha.h" + +NpcSettings N(NpcSettings_PutridPiranha) = { + .height = 24, + .radius = 24, + .level = 99, +}; + +#include "world/common/enemy/complete/SpearGuy_Wander.inc.c" + +EvtScript N(EVS_YoshiKid_CryForHelp) = { + EVT_SET(AF_JAN_02, FALSE) + EVT_LOOP(0) + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_1F0, 0) + EVT_WAIT(20) + EVT_IF_EQ(AF_JAN_02, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_YoshiKid) = { + EVT_IF_EQ(GF_JAN07_YoshiCriedForHelp, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00B4, 320, 60) + EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_YoshiKid, EMOTE_EXCLAMATION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) + EVT_WAIT(30) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -183, 50, -11) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 50, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 500) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 16, EVT_FLOAT(-6.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_YoshiKid_Yellow_Cry, ANIM_YoshiKid_Yellow_Cry, 5, MSG_CH5_00B5) + EVT_WAIT(10) + EVT_EXEC(N(EVS_YoshiKid_CryForHelp)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_SET(GF_JAN07_YoshiCriedForHelp, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_NE(LVar0, 1) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -20, 0, 20) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -20, 0, 20) + EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(300.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100 | NPC_FLAG_8000, TRUE) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) + EVT_CALL(NpcMoveTo, NPC_PARTNER, -55, 5, 30) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_SELF, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100 | NPC_FLAG_8000, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_CALL(PlayerMoveTo, -20, 10, 25) + EVT_WAIT(15) + EVT_SET(AF_JAN_02, TRUE) + EVT_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) + EVT_END_THREAD + EVT_WAIT(30) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_YoshiKid_Yellow_SadIdle) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_WAIT(30) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_WAIT(15) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_WAIT(10) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_EQ(LVar0, PARTNER_SUSHIE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_YoshiKid_Yellow_SadTalk, ANIM_YoshiKid_Yellow_SadIdle, 0, MSG_CH5_00B6) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_YoshiKid_Yellow_SadTalk, ANIM_YoshiKid_Yellow_SadIdle, 0, MSG_CH5_00B7) + EVT_END_IF + EVT_CALL(EndSpeech, NPC_SELF, ANIM_YoshiKid_Yellow_Talk, ANIM_YoshiKid_Yellow_Idle, 0) + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_YoshiKid_Yellow_Run) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, -150, 15, 0) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_END_THREAD + EVT_SET(GF_JAN07_SavedYoshi, TRUE) + EVT_SET(LVar0, 0) + EVT_ADD(LVar0, GF_JAN05_SavedYoshi) + EVT_ADD(LVar0, GF_JAN07_SavedYoshi) + EVT_ADD(LVar0, GF_JAN08_SavedYoshi) + EVT_ADD(LVar0, GF_JAN10_SavedYoshi) + EVT_ADD(LVar0, GF_JAN11_SavedYoshi) + EVT_IF_EQ(LVar0, 5) + EVT_CALL(SetMusicTrack, 0, SONG_YOSHI_KIDS_FOUND, 0, 8) + EVT_SET(GB_StoryProgress, STORY_CH5_ALL_YOSHI_CHILDREN_RESCUED) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_ThumbsUp) + EVT_WAIT(120) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_ELSE + EVT_THREAD + EVT_WAIT(12) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_END_THREAD + EVT_WAIT(30) + EVT_END_IF + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.5)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_YoshiKid) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_SUSHIE_JOINED_PARTY) + EVT_IF_EQ(GF_JAN07_SavedYoshi, FALSE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_YoshiKid_Yellow_Cry) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_YoshiKid))) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_PutridPiranha) = { + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, -190) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_10000000, 1) + EVT_ELSE + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_10000000, 0) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CALL(SetNpcCollisionSize, NPC_PutridPiranha_01, 48, 40) + EVT_CALL(SetNpcCollisionSize, NPC_PutridPiranha_02, 48, 40) + EVT_CALL(AwaitPlayerApproach, 60, 20, 140) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(GetPartnerInUse, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_CALL(InterruptUsePartner) + EVT_END_IF + EVT_WAIT(5) + EVT_THREAD + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -60, 0, 20) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -50, 0, 20) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(InterpNpcYaw, NPC_PutridPiranha_01, 270, 0) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim04) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_02, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_PutridPiranha_02, EMOTE_EXCLAMATION, 0, 38, EMOTER_NPC, 0, 0, 0, 0) + EVT_WAIT(3) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim04) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_PutridPiranha_01, EMOTE_EXCLAMATION, 0, 35, EMOTER_NPC, 0, 0, 0, 0) + EVT_WAIT(35) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim01) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim01) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim04) + EVT_SET(LVar0, 0) + EVT_LOOP(15) + EVT_ADD(LVar0, 24) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_01, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B1, 0) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim01) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim04) + EVT_SET(LVar0, 0) + EVT_LOOP(15) + EVT_ADD(LVar0, 24) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_02, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_02, SOUND_20B1, 0) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim01) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim04) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim04) + EVT_SET(LVar0, 0) + EVT_LOOP(12) + EVT_ADD(LVar0, 30) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_01, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_02, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B2, 0) + EVT_SET(LVar0, 0) + EVT_LOOP(12) + EVT_ADD(LVar0, 30) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_01, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_02, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B2, 0) + EVT_SET(LVar0, 0) + EVT_LOOP(12) + EVT_ADD(LVar0, 30) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_01, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_02, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B2, 0) + EVT_LOOP(3) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B3, 0) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim05) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim05) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim06) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim06) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_3B2, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_PutridPiranha) = { + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -20, 0, 20) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -20, 0, 20) + 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(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(SetNpcVar, NPC_YoshiKid, 0, 1) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_PutridPiranha) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_SUSHIE_JOINED_PARTY) + EVT_IF_EQ(GF_JAN07_SavedYoshi, FALSE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_PutridPiranha))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_PutridPiranha))) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(RemoveEncounter, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_SpearGuy_Hitbox) = { + EVT_IF_EQ(GF_JAN07_SavedYoshi, FALSE) + EVT_CALL(RemoveNpc, NPC_SpearGuy) + EVT_CALL(RemoveNpc, NPC_SpearGuy_Hitbox) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_SpearGuy)[] = { + { + .id = NPC_SpearGuy, + .settings = &N(NpcSettings_SpearGuy_Wander), + .pos = { -28.0f, 0.0f, 13.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .drops = SPEAR_GUY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -28, 0, 13 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -28, 0, 13 }, + .detectSize = { 150 }, + } + }, + .animations = SPEAR_GUY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, + }, + { + .id = NPC_SpearGuy_Hitbox, + .settings = &N(NpcSettings_SpearGuy_Hitbox), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 0, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_SpearGuy_Hitbox), + .drops = NPC_NO_DROPS, + .animations = SPEAR_GUY_ANIMS, + }, +}; + +StaticNpc N(NpcData_PutridPiranhas)[] = { + { + .id = NPC_PutridPiranha_01, + .settings = &N(NpcSettings_PutridPiranha), + .pos = { -20.0f, 0.0f, 20.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .init = &N(EVS_NpcInit_PutridPiranha), + .drops = NPC_NO_DROPS, + .animations = PUTRID_PIRANHA_ANIMS, + }, + { + .id = NPC_PutridPiranha_02, + .settings = &N(NpcSettings_PutridPiranha), + .pos = { 80.0f, 0.0f, 20.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .drops = NPC_NO_DROPS, + .animations = PUTRID_PIRANHA_ANIMS, + }, +}; + +StaticNpc N(NpcData_YoshiKid) = { + .id = NPC_YoshiKid, + .settings = &N(NpcSettings_YoshiKid), + .pos = { 30.0f, 0.0f, 20.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_YoshiKid), + .drops = NPC_NO_DROPS, + .animations = YOSHI_KID_YELLOW_ANIMS, + .tattle = MSG_NpcTattle_YellowYoshiKid, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_SpearGuy), BTL_JAN_FORMATION_01, BTL_JAN_STAGE_03), + NPC_GROUP(N(NpcData_PutridPiranhas), BTL_JAN2_FORMATION_01, BTL_JAN2_STAGE_03), + NPC_GROUP(N(NpcData_YoshiKid)), + {} +}; diff --git a/src/world/area_jan/jan_07/jan_07_4_trees.c b/src/world/area_jan/jan_07/jan_07_4_trees.c new file mode 100644 index 0000000000..945fd0e58d --- /dev/null +++ b/src/world/area_jan/jan_07/jan_07_4_trees.c @@ -0,0 +1,48 @@ +#include "jan_07.h" + +#define NAME_SUFFIX _Trees +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o7, MODEL_o8, MODEL_o9, MODEL_o10, MODEL_o11); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o6); + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -150, 100, -80 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_JAN07_Tree1_Coin, + }, + } +}; + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { -232.0f, 114.0f, -75.0f }, + { -147.0f, 114.0f, -85.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .drops = &N(Tree1_Drops), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -192.0f, 0.0f, -105.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupTrees) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o62, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_07/jan_07_5_bushes.c b/src/world/area_jan/jan_07/jan_07_5_bushes.c new file mode 100644 index 0000000000..c59d07a7ab --- /dev/null +++ b/src/world/area_jan/jan_07/jan_07_5_bushes.c @@ -0,0 +1,74 @@ +#include "jan_07.h" + +#define NAME_SUFFIX _Bushes +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o53); + +FoliageVectorList N(Bush1_Effects) = { + .count = 1, + .vectors = { + { -105.0f, 20.0f, 115.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush1) = { + .bush = &N(Bush1_BushModels), + .vectors = &N(Bush1_Effects), +}; + +FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o52); + +FoliageVectorList N(Bush2_Effects) = { + .count = 1, + .vectors = { + { 142.0f, 20.0f, 66.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush2) = { + .bush = &N(Bush2_BushModels), + .vectors = &N(Bush2_Effects), +}; + +FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o30); + +FoliageVectorList N(Bush3_Effects) = { + .count = 1, + .vectors = { + { -116.0f, 20.0f, -102.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush3) = { + .bush = &N(Bush3_BushModels), + .vectors = &N(Bush3_Effects), +}; + +FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o25); + +FoliageVectorList N(Bush4_Effects) = { + .count = 1, + .vectors = { + { -75.0f, 20.0f, -135.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush4) = { + .bush = &N(Bush4_BushModels), + .vectors = &N(Bush4_Effects), +}; + +EvtScript N(EVS_SetupBushes) = { + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o65, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o66, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o67, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush4))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o68, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_08/B5E2B0.c b/src/world/area_jan/jan_08/B5E2B0.c deleted file mode 100644 index a74012b0e6..0000000000 --- a/src/world/area_jan/jan_08/B5E2B0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "jan_08.h" - -static char* N(exit_str_0) = "jan_00"; -static char* N(exit_str_1) = "jan_05"; -static char* N(exit_str_2) = "jan_09"; -static char* N(exit_str_3) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_jan/jan_08/B5E5C0.c b/src/world/area_jan/jan_08/B5E5C0.c deleted file mode 100644 index 9ae722e059..0000000000 --- a/src/world/area_jan/jan_08/B5E5C0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "jan_08.h" - -#include "common/foliage.inc.c" - -#include "world/common/todo/PullVineSub.inc.c" diff --git a/src/world/area_jan/jan_08/B5E910.c b/src/world/area_jan/jan_08/B5E910.c deleted file mode 100644 index 5fa9bd3e05..0000000000 --- a/src/world/area_jan/jan_08/B5E910.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "jan_08.h" - -#include "world/common/entity/SuperBlock.inc.c" diff --git a/src/world/area_jan/jan_08/B5F650.c b/src/world/area_jan/jan_08/B5F650.c deleted file mode 100644 index 208fa0a017..0000000000 --- a/src/world/area_jan/jan_08/B5F650.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "jan_08.h" - -#include "world/common/todo/HeartPlant_SpawnHeart.inc.c" - -#include "world/common/enemy/ai/SpearGuyAI.inc.c" diff --git a/src/world/area_jan/jan_08/B604A0.c b/src/world/area_jan/jan_08/B604A0.c deleted file mode 100644 index f1a12f6626..0000000000 --- a/src/world/area_jan/jan_08/B604A0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "jan_08.h" - -#define NAMESPACE dup_jan_08 -#include "common/foliage.inc.c" -#define NAMESPACE jan_08 - - diff --git a/src/world/area_jan/jan_08/jan_08.h b/src/world/area_jan/jan_08/jan_08.h index 6797cede07..bb5e4e5253 100644 --- a/src/world/area_jan/jan_08/jan_08.h +++ b/src/world/area_jan/jan_08/jan_08.h @@ -2,8 +2,35 @@ /// @brief Jade Jungle - SW Jungle (Super Block) #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_08_shape.h" +#include "mapfs/jan_08_hit.h" + +enum { + NPC_SpearGuy = 0, + NPC_SpearGuy_Hitbox = 1, + NPC_HurtPlant = 2, + NPC_MBush_01 = 3, + NPC_MBush_02 = 4, + NPC_HeartPlant_01 = 5, + NPC_HeartPlant_02 = 6, + NPC_YoshiKid = 7, +}; + +enum { + MV_Unk_00 = MapVar(0), + MV_Unk_01 = MapVar(1), + MV_SuperBlock = MapVar(2), +}; + #define NAMESPACE jan_08 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupBushes); +extern EvtScript N(EVS_SetupTrees); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_jan/jan_08/jan_08_0_header.c b/src/world/area_jan/jan_08/jan_08_0_header.c new file mode 100644 index 0000000000..b4445d8b5e --- /dev/null +++ b/src/world/area_jan/jan_08/jan_08_0_header.c @@ -0,0 +1,15 @@ +#include "jan_08.h" + +EntryList N(Entrances) = { + [jan_08_ENTRY_0] { -330.0, 0.0, 330.0, 45.0 }, + [jan_08_ENTRY_1] { 500.0, -20.0, 0.0, 270.0 }, + [jan_08_ENTRY_2] { 0.0, 0.0, -450.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_jan_08 }, +}; diff --git a/src/world/area_jan/jan_08/jan_08_1_music.c b/src/world/area_jan/jan_08/jan_08_1_music.c new file mode 100644 index 0000000000..e1bb07b2a9 --- /dev/null +++ b/src/world/area_jan/jan_08/jan_08_1_music.c @@ -0,0 +1,8 @@ +#include "jan_08.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_JADE_JUNGLE, 0, 8) + EVT_CALL(ClearAmbientSounds, 250) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_08/jan_08_2_main.c b/src/world/area_jan/jan_08/jan_08_2_main.c new file mode 100644 index 0000000000..1f9d734bee --- /dev/null +++ b/src/world/area_jan/jan_08/jan_08_2_main.c @@ -0,0 +1,51 @@ +#include "jan_08.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_jan_00_2) = EVT_EXIT_WALK(60, jan_08_ENTRY_0, "jan_00", jan_00_ENTRY_2); +EvtScript N(EVS_ExitWalk_jan_05_1) = EVT_EXIT_WALK(60, jan_08_ENTRY_1, "jan_05", jan_05_ENTRY_1); +EvtScript N(EVS_ExitWalk_jan_09_0) = EVT_EXIT_WALK(60, jan_08_ENTRY_2, "jan_09", jan_09_ENTRY_0); + +MAP_RODATA_PAD(1, exits); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_00_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilisw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_05_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_o221, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_09_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o79, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o81, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o79, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o81, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1, SURFACE_TYPE_WATER) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_odeilie, SURFACE_TYPE_WATER) + EVT_EXEC(N(EVS_SetupBushes)) + EVT_EXEC(N(EVS_SetupTrees)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitn, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitsw, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(MakeTransformGroup, MODEL_g40) + EVT_CALL(EnableTexPanning, MODEL_o111, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( -80, 140, 80, -100) + 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_jan/jan_08/jan_08_3_bushes.c b/src/world/area_jan/jan_08/jan_08_3_bushes.c new file mode 100644 index 0000000000..d089b1b524 --- /dev/null +++ b/src/world/area_jan/jan_08/jan_08_3_bushes.c @@ -0,0 +1,312 @@ +#include "jan_08.h" + +#define NAME_SUFFIX _Bushes +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +#include "../common/MoveBush.inc.c" +#include "../common/MoveBushTemplates.h" + +EvtScript N(EVS_MoveBush_Separate) = EVT_MOVE_BUSHES(COLLIDER_o70, + MODEL_o67, MODEL_o68, MV_Unk_00, MV_Unk_01); + +EvtScript N(EVS_Inspect_SeparateBushes) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o70, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_MoveBush_Separate)) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(MakeLerp, 0, 45, 30, EASING_CUBIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(MV_Unk_01, LVar0) + EVT_SETF(MV_Unk_00, MV_Unk_01) + EVT_MULF(MV_Unk_00, -1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Inspect_FlipBush) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o88, SOUND_SEARCH_BUSH, 0) + EVT_LOOP(3) + EVT_CALL(N(MoveBush_AnimateShearing), LVar1, 1) + EVT_WAIT(1) + EVT_CALL(N(MoveBush_AnimateShearing), LVar1, 0) + EVT_WAIT(1) + EVT_CALL(N(MoveBush_AnimateShearing), LVar1, -1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(TranslateModel, LVar1, 0, 0, 0) + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_SUSHIE_JOINED_PARTY) + EVT_IF_EQ(GF_JAN08_SavedYoshi, FALSE) + EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100 | NPC_FLAG_8000, TRUE) + EVT_CALL(NpcMoveTo, NPC_PARTNER, -315, LVar5, 20) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_YoshiKid, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100 | NPC_FLAG_8000, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_CALL(PlayerMoveTo, -340, LVar5, 20) + EVT_CALL(PlayerFaceNpc, NPC_YoshiKid, FALSE) + EVT_WAIT(10) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o88, SOUND_209F, 0) + EVT_SET(LVar3, 0) + EVT_LOOP(10) + EVT_ADD(LVar3, 9) + EVT_CALL(RotateModel, LVar1, LVar3, 0, 1, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_SET(LVar4, 270) + EVT_CALL(SetNpcRotation, NPC_YoshiKid, 0, LVar4, 0) + EVT_CALL(SetNpcPos, NPC_YoshiKid, -391, 0, -144) + EVT_CALL(SetNpcFlagBits, NPC_YoshiKid, NPC_FLAG_2 | NPC_FLAG_100, FALSE) + EVT_LOOP(10) + EVT_ADD(LVar3, 9) + EVT_CALL(RotateModel, LVar1, LVar3, 0, 1, 0) + EVT_ADD(LVar4, 9) + EVT_CALL(SetNpcRotation, NPC_YoshiKid, 0, LVar4, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(EnableNpcShadow, NPC_YoshiKid, TRUE) + EVT_CALL(PlayerFaceNpc, NPC_YoshiKid, FALSE) + EVT_WAIT(20) + EVT_CALL(SetNpcVar, NPC_YoshiKid, 0, 1) + EVT_END_IF + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o59);; + +FoliageDropList N(Bush1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 117, 20, -424 }, + .spawnMode = ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE, + .pickupFlag = GF_JAN08_Bush1_Coin, + }, + } +}; + +FoliageVectorList N(Bush1_Effects) = { + .count = 1, + .vectors = { + { 117.0f, 20.0f, -424.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush1) = { + .bush = &N(Bush1_BushModels), + .drops = &N(Bush1_Drops), + .vectors = &N(Bush1_Effects), +}; + +FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o164);; + +FoliageDropList N(Bush2_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -202, 20, 167 }, + .spawnMode = ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE, + .pickupFlag = GF_JAN08_Bush2_Coin, + }, + } +}; + +FoliageVectorList N(Bush2_Effects) = { + .count = 1, + .vectors = { + { -202.0f, 20.0f, 167.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush2) = { + .bush = &N(Bush2_BushModels), + .drops = &N(Bush2_Drops), + .vectors = &N(Bush2_Effects), +}; + +FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o123);; + +FoliageVectorList N(Bush3_Effects) = { + .count = 1, + .vectors = { + { -459.0f, 20.0f, 126.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush3) = { + .bush = &N(Bush3_BushModels), + .vectors = &N(Bush3_Effects), +}; + +FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o114);; + +FoliageVectorList N(Bush4_Effects) = { + .count = 1, + .vectors = { + { -461.0f, 20.0f, -39.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush4) = { + .bush = &N(Bush4_BushModels), + .vectors = &N(Bush4_Effects), +}; + +FoliageModelList N(Bush5_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o156);; + +FoliageVectorList N(Bush5_Effects) = { + .count = 1, + .vectors = { + { -321.0f, 20.0f, -44.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush5) = { + .bush = &N(Bush5_BushModels), + .vectors = &N(Bush5_Effects), +}; + +FoliageModelList N(Bush6_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o115);; + +FoliageVectorList N(Bush6_Effects) = { + .count = 1, + .vectors = { + { -279.0f, 20.0f, -55.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush6) = { + .bush = &N(Bush6_BushModels), + .vectors = &N(Bush6_Effects), +}; + +FoliageModelList N(Bush7_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o113);; + +FoliageVectorList N(Bush7_Effects) = { + .count = 1, + .vectors = { + { -304.0f, 22.0f, -242.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush7) = { + .bush = &N(Bush7_BushModels), + .vectors = &N(Bush7_Effects), +}; + +FoliageModelList N(Bush8_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o158);; + +FoliageVectorList N(Bush8_Effects) = { + .count = 1, + .vectors = { + { -95.0f, 20.0f, -485.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush8) = { + .bush = &N(Bush8_BushModels), + .vectors = &N(Bush8_Effects), +}; + +FoliageModelList N(Bush9_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o159);; + +FoliageVectorList N(Bush9_Effects) = { + .count = 1, + .vectors = { + { 89.0f, 20.0f, -485.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush9) = { + .bush = &N(Bush9_BushModels), + .vectors = &N(Bush9_Effects), +}; + +FoliageModelList N(Bush10_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o160);; + +FoliageVectorList N(Bush10_Effects) = { + .count = 1, + .vectors = { + { 152.0f, 20.0f, -489.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush10) = { + .bush = &N(Bush10_BushModels), + .vectors = &N(Bush10_Effects), +}; + +FoliageModelList N(Bush11_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o163);; + +FoliageVectorList N(Bush11_Effects) = { + .count = 1, + .vectors = { + { 394.0f, 20.0f, 176.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush11) = { + .bush = &N(Bush11_BushModels), + .vectors = &N(Bush11_Effects), +}; + +FoliageModelList N(Bush12_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o161);; + +FoliageVectorList N(Bush12_Effects) = { + .count = 1, + .vectors = { + { 239.0f, 22.0f, 430.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush12) = { + .bush = &N(Bush12_BushModels), + .vectors = &N(Bush12_Effects), +}; + +EvtScript N(EVS_SetupBushes) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_SeparateBushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o70, 1, 0) + EVT_SET(LVar1, MODEL_o64) + EVT_BIND_PADLOCK(EVT_PTR(N(EVS_Inspect_FlipBush)), TRIGGER_WALL_PRESS_A, COLLIDER_o88, 0, 0, 1) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o59, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o209, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o210, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush4))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o211, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush5))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o212, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush6))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o213, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush7))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o214, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush8))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o215, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush9))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o216, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush10))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o217, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush11))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o218, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush12))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o219, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_08/jan_08_4_entity.c b/src/world/area_jan/jan_08/jan_08_4_entity.c new file mode 100644 index 0000000000..030b70db60 --- /dev/null +++ b/src/world/area_jan/jan_08/jan_08_4_entity.c @@ -0,0 +1,19 @@ +#include "jan_08.h" +#include "entity.h" + +#define SUPER_BLOCK_MAPVAR MV_SuperBlock +#define SUPER_BLOCK_GAMEFLAG GF_JAN08_SuperBlock +#include "world/common/entity/SuperBlock.inc.c" + +EvtScript N(EVS_MakeEntities) = { + EVT_MAKE_SUPER_BLOCK(250, 60, 300, 0) + EVT_CALL(MakeItemEntity, ITEM_COIN, 75, -60, 90, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_JAN08_Item_CoinA) + EVT_CALL(MakeItemEntity, ITEM_COIN, 100, -60, 90, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_JAN08_Item_CoinB) + EVT_CALL(MakeItemEntity, ITEM_COIN, 125, -60, 90, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_JAN08_Item_CoinC) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BellbellPlant), 54, 0, -380, 35, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), 24, 60, -410, 0, ITEM_THUNDER_RAGE, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_JAN08_HiddenItem_ThunderRage) + EVT_CALL(MakeEntity, EVT_PTR(Entity_TrumpetPlant), -450, 0, 166, 170, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_08/jan_08_5_npc.c b/src/world/area_jan/jan_08/jan_08_5_npc.c new file mode 100644 index 0000000000..a46ba8fbd0 --- /dev/null +++ b/src/world/area_jan/jan_08/jan_08_5_npc.c @@ -0,0 +1,223 @@ +#include "jan_08.h" + +#include "world/common/npc/YoshiKid.inc.c" +#include "world/common/enemy/complete/MBush.inc.c" +#include "world/common/enemy/complete/HeartPlant.inc.c" + +#include "world/common/enemy/complete/HurtPlant.inc.c" +#include "world/common/enemy/complete/SpearGuy_Wander.inc.c" + +EvtScript N(EVS_YoshiKid_CryForHelp) = { + EVT_SET(AF_JAN_02, FALSE) + EVT_LOOP(0) + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_1F0, 0) + EVT_WAIT(20) + EVT_IF_EQ(AF_JAN_02, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_YoshiKid) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) + EVT_IF_LE(LVar1, -90) + EVT_IF_GT(LVar3, 280) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, jan_08_ENTRY_0) + EVT_WAIT(18) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00AF, 160, 40) + EVT_EXEC(N(EVS_YoshiKid_CryForHelp)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_SET(LVar0, 1) + EVT_END_IF + EVT_END_IF + EVT_IF_NE(LVar0, 1) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_LABEL(10) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), -23, 350, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_CALL(NpcFacePlayer, NPC_SELF, 0) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_SET(AF_JAN_02, TRUE) + EVT_WAIT(15) + EVT_IF_EQ(LVar0, PARTNER_SUSHIE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_YoshiKid_Red_SadTalk, ANIM_YoshiKid_Red_SadIdle, 0, MSG_CH5_00B0) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_YoshiKid_Red_SadTalk, ANIM_YoshiKid_Red_SadIdle, 0, MSG_CH5_00B1) + EVT_END_IF + EVT_CALL(EndSpeech, NPC_SELF, ANIM_YoshiKid_Red_Talk, ANIM_YoshiKid_Red_Idle, 0) + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_YoshiKid_Red_Run) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, -418, -60, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, -300, 80, 0) + EVT_CALL(NpcMoveTo, NPC_SELF, -320, 115, 0) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_END_THREAD + EVT_SET(GF_JAN08_SavedYoshi, TRUE) + EVT_SET(LVar0, 0) + EVT_ADD(LVar0, GF_JAN05_SavedYoshi) + EVT_ADD(LVar0, GF_JAN07_SavedYoshi) + EVT_ADD(LVar0, GF_JAN08_SavedYoshi) + EVT_ADD(LVar0, GF_JAN10_SavedYoshi) + EVT_ADD(LVar0, GF_JAN11_SavedYoshi) + EVT_IF_EQ(LVar0, 5) + EVT_CALL(SetMusicTrack, 0, SONG_YOSHI_KIDS_FOUND, 0, 8) + EVT_SET(GB_StoryProgress, STORY_CH5_ALL_YOSHI_CHILDREN_RESCUED) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_ThumbsUp) + EVT_WAIT(120) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_ELSE + EVT_WAIT(40) + EVT_END_IF + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_YoshiKid) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_SUSHIE_JOINED_PARTY) + EVT_IF_EQ(GF_JAN08_SavedYoshi, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2 | NPC_FLAG_100, TRUE) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_YoshiKid_Red_Cry) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_CALL(SetNpcPos, NPC_SELF, -391, 0, -164) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_YoshiKid))) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +// unchanged from MBush.inc.c +EvtScript N(EVS_NpcDefeat_MBush_Copy) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MBush_Anim05) + EVT_CALL(GetSelfVar, 10, LVar0) + EVT_CALL(GetSelfVar, 11, LVar1) + EVT_CALL(GetSelfVar, 12, LVar2) + EVT_CALL(NpcJump1, NPC_SELF, LVar0, LVar1, LVar2, 8) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MBush_Anim00) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_MBush))) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_MBush_01) = { + EVT_CALL(SetNpcCollisionSize, NPC_SELF, 60, 30) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_MBush_Copy))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_SpearGuy)[] = { + { + .id = NPC_SpearGuy, + .pos = { 255.0f, 15.0f, -65.0f }, + .yaw = 90, + .territory = { + .wander = { + .isFlying = FALSE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 255, 0, -65 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 255, 0, -65 }, + .detectSize = { 150 }, + } + }, + .flags = ENEMY_FLAG_400, + SPEAR_GUY_WANDER_NPC_DATA + }, + SPEAR_GUY_HITBOX(NPC_SpearGuy_Hitbox) +}; + +StaticNpc N(NpcData_HurtPlant) = { + .id = NPC_HurtPlant, + .pos = { 400.0f, 0.0f, 235.0f }, + .yaw = 270, + HURT_PLANT_NPC_DATA +}; + +StaticNpc N(NpcData_MBush_01) = { + .id = NPC_MBush_01, + .init = &N(EVS_NpcInit_MBush_01), + .pos = { -407.0f, 0.0f, -42.0f }, + .yaw = 90, + MBUSH_NPC_DATA +}; + +StaticNpc N(NpcData_MBush_02) = { + .id = NPC_MBush_02, + .pos = { -120.0f, 0.0f, -395.0f }, + .yaw = 90, + MBUSH_NPC_DATA +}; + +StaticNpc N(NpcData_HeartPlant_01) = { + .id = NPC_HeartPlant_01, + .pos = { -219.0f, 0.0f, 420.0f }, + .yaw = 270, + HEART_PLANT_NPC_DATA +}; + +StaticNpc N(NpcData_HeartPlant_02) = { + .id = NPC_HeartPlant_02, + .pos = { -157.0f, 0.0f, 452.0f }, + .yaw = 270, + HEART_PLANT_NPC_DATA +}; + +StaticNpc N(NpcData_YoshiKid) = { + .id = NPC_YoshiKid, + .pos = { -450.0f, 0.0f, -290.0f }, + .yaw = 90, + .settings = &N(NpcSettings_YoshiKid), + .init = &N(EVS_NpcInit_YoshiKid), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NPC_NO_DROPS, + .animations = YOSHI_KID_RED_ANIMS, + .tattle = MSG_NpcTattle_RedYoshiKid, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_SpearGuy), BTL_JAN_FORMATION_01, BTL_JAN_STAGE_01), + NPC_GROUP(N(NpcData_HurtPlant), BTL_JAN_FORMATION_08, BTL_JAN_STAGE_01), + NPC_GROUP(N(NpcData_MBush_01), BTL_JAN_FORMATION_10, BTL_JAN_STAGE_01), + NPC_GROUP(N(NpcData_MBush_02), BTL_JAN_FORMATION_0E, BTL_JAN_STAGE_01), + NPC_GROUP(N(NpcData_HeartPlant_01)), + NPC_GROUP(N(NpcData_HeartPlant_02)), + NPC_GROUP(N(NpcData_YoshiKid)), + {} +}; diff --git a/src/world/area_jan/jan_08/jan_08_6_trees.c b/src/world/area_jan/jan_08/jan_08_6_trees.c new file mode 100644 index 0000000000..dd2eb63caa --- /dev/null +++ b/src/world/area_jan/jan_08/jan_08_6_trees.c @@ -0,0 +1,111 @@ +#include "jan_08.h" + +#define NAME_SUFFIX _Trees +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o144, MODEL_o145, MODEL_o146, MODEL_o147, MODEL_o148); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o143); + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { -397.0f, 114.0f, -240.0f }, + { -312.0f, 114.0f, -250.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -357.0f, 0.0f, -270.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o138, MODEL_o139, MODEL_o140, MODEL_o141, MODEL_o142); +FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o137); + +FoliageDropList N(Tree2_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -73, 76, -474 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_JAN08_Tree2_Coin, + }, + } +}; + +FoliageVectorList N(Tree2_Effects) = { + .count = 2, + .vectors = { + { -185.0f, 114.0f, -430.0f }, + { -100.0f, 114.0f, -440.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .drops = &N(Tree2_Drops), + .vectors = &N(Tree2_Effects), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { -145.0f, 0.0f, -460.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree3_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o150, MODEL_o151, MODEL_o152, MODEL_o153, MODEL_o154); +FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o149); + +FoliageDropList N(Tree3_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 380, 100, -95 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_JAN08_Tree3_Coin, + }, + } +}; + +FoliageVectorList N(Tree3_Effects) = { + .count = 2, + .vectors = { + { 301.0f, 114.0f, -94.0f }, + { 386.0f, 114.0f, -104.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree3) = { + .leaves = &N(Tree3_LeafModels), + .trunk = &N(Tree3_TrunkModels), + .drops = &N(Tree3_Drops), + .vectors = &N(Tree3_Effects), +}; + +BombTrigger N(BombPos_Tree3) = { + .pos = { 341.0f, 0.0f, -124.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupTrees) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o202, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o203, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o204, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_09/B65AB0.c b/src/world/area_jan/jan_09/B65AB0.c deleted file mode 100644 index e92fc11f74..0000000000 --- a/src/world/area_jan/jan_09/B65AB0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "jan_09.h" - -static char* N(exit_str_0) = "jan_10"; -static char* N(exit_str_1) = "jan_08"; -static char* N(exit_str_2) = "jan_06"; -static char* N(exit_str_3) = "jan_11"; - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_jan/jan_09/B660A0.c b/src/world/area_jan/jan_09/B660A0.c deleted file mode 100644 index ad1c10947d..0000000000 --- a/src/world/area_jan/jan_09/B660A0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "jan_09.h" - -#include "common/foliage.inc.c" - -#include "world/common/todo/PullVineSub.inc.c" diff --git a/src/world/area_jan/jan_09/B663F0.c b/src/world/area_jan/jan_09/B663F0.c deleted file mode 100644 index 9b28bcc63c..0000000000 --- a/src/world/area_jan/jan_09/B663F0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "jan_09.h" - -#include "world/common/enemy/ai/SpearGuyAI.inc.c" diff --git a/src/world/area_jan/jan_09/B67190.c b/src/world/area_jan/jan_09/B67190.c deleted file mode 100644 index 46d57520cd..0000000000 --- a/src/world/area_jan/jan_09/B67190.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "jan_09.h" - -#define NAMESPACE dup_jan_09 -#include "common/foliage.inc.c" -#define NAMESPACE jan_09 diff --git a/src/world/area_jan/jan_09/jan_09.h b/src/world/area_jan/jan_09/jan_09.h index 02bd3abead..b69d4cf4f0 100644 --- a/src/world/area_jan/jan_09/jan_09.h +++ b/src/world/area_jan/jan_09/jan_09.h @@ -2,8 +2,33 @@ /// @brief Jade Jungle - NW Jungle (Large Ledge) #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_09_shape.h" +#include "mapfs/jan_09_hit.h" + +enum { + NPC_SpearGuy = 30, + NPC_SpearGuy_Hitbox = 31, + NPC_MBush_01 = 70, + NPC_MBush_02 = 80, +}; + +enum { + MV_RightShoreBushOffsetL = MapVar(0), + MV_RightShoreBushOffsetR = MapVar(1), + MV_CliffTopBush1OffsetR = MapVar(2), + MV_CliffTopBush2OffsetL = MapVar(3), + MV_CliffTopBush2OffsetR = MapVar(4), + MV_Unk_05 = MapVar(5), +}; + #define NAMESPACE jan_09 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupBushes); +extern EvtScript N(EVS_SetupTrees); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_jan/jan_09/jan_09_0_header.c b/src/world/area_jan/jan_09/jan_09_0_header.c new file mode 100644 index 0000000000..5ce44423fb --- /dev/null +++ b/src/world/area_jan/jan_09/jan_09_0_header.c @@ -0,0 +1,16 @@ +#include "jan_09.h" + +EntryList N(Entrances) = { + [jan_09_ENTRY_0] { 0.0, 0.0, 480.0, 0.0 }, + [jan_09_ENTRY_1] { 480.0, 0.0, 0.0, 270.0 }, + [jan_09_ENTRY_2] { -480.0, -20.0, 0.0, 90.0 }, + [jan_09_ENTRY_3] { -177.0, 125.0, -435.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_jan_09 }, +}; diff --git a/src/world/area_jan/jan_09/jan_09_1_main.c b/src/world/area_jan/jan_09/jan_09_1_main.c new file mode 100644 index 0000000000..be70b27b2c --- /dev/null +++ b/src/world/area_jan/jan_09/jan_09_1_main.c @@ -0,0 +1,81 @@ +#include "jan_09.h" + +#include "world/common/entity/Pipe.inc.c" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_jan_10_0) = EVT_EXIT_WALK(60, jan_09_ENTRY_2, "jan_10", jan_10_ENTRY_0); +EvtScript N(EVS_ExitWalk_jan_08_2) = EVT_EXIT_WALK(60, jan_09_ENTRY_0, "jan_08", jan_08_ENTRY_2); +EvtScript N(EVS_ExitWalk_jan_06_3) = EVT_EXIT_WALK(60, jan_09_ENTRY_1, "jan_06", jan_06_ENTRY_3); + +EvtScript N(EVS_GotoMap_jan_11_0) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(GotoMap, EVT_PTR("jan_11"), jan_11_ENTRY_0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TouchFloor_Pipe) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_SET(LVarA, LVar0) + EVT_SET(LVarB, LVar1) + EVT_SET(LVarC, LVar2) + EVT_EXEC_WAIT(N(EVS_Pipe_ExitVertical)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_10_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_o245, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_08_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_06_3)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_SET(LVar0, jan_09_ENTRY_3) + EVT_SET(LVar1, COLLIDER_o208) + EVT_SET(LVar2, EVT_PTR(N(EVS_GotoMap_jan_11_0))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_TouchFloor_Pipe)), TRIGGER_FLOOR_TOUCH, LVar1, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(SetZoneEnabled, ZONE_o79, FALSE) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupBushes)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o97, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o99, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o97, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o99, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1, SURFACE_TYPE_WATER) + EVT_EXEC(N(EVS_SetupTrees)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilits, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, jan_09_ENTRY_3) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_ELSE + EVT_SET(LVarA, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(N(EVS_Pipe_EnterVertical)) + EVT_WAIT(1) + EVT_END_IF + EVT_CALL(SetMusicTrack, 0, SONG_JADE_JUNGLE, 0, 8) + EVT_CALL(ClearAmbientSounds, 250) + EVT_CALL(MakeTransformGroup, MODEL_g51) + EVT_CALL(EnableTexPanning, MODEL_o180, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( -80, 140, 80, -100) + 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_jan/jan_09/jan_09_2_bushes.c b/src/world/area_jan/jan_09/jan_09_2_bushes.c new file mode 100644 index 0000000000..a8821f86e5 --- /dev/null +++ b/src/world/area_jan/jan_09/jan_09_2_bushes.c @@ -0,0 +1,498 @@ +#include "jan_09.h" + +#define NAME_SUFFIX _Bushes +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +#include "../common/MoveBush.inc.c" +#include "../common/MoveBushTemplates.h" + +EvtScript N(EVS_MoveBush_RightShore) = EVT_MOVE_BUSHES(COLLIDER_o84, + MODEL_o83, MODEL_o84, MV_RightShoreBushOffsetL, MV_RightShoreBushOffsetR); + +EvtScript N(EVS_MoveBush_CliffTop1) = EVT_MOVE_BUSH(COLLIDER_o82, + MODEL_o82, MV_CliffTopBush1OffsetR); + +EvtScript N(EVS_MoveBush_CliffTop2) = EVT_MOVE_BUSHES(COLLIDER_o88, + MODEL_o88, MODEL_o81, MV_CliffTopBush2OffsetL, MV_CliffTopBush2OffsetR); + +EvtScript N(EVS_Inspect_MoveBush_RightShore) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o84, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_MoveBush_RightShore)) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(MakeLerp, 0, 45, 30, EASING_CUBIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(MV_RightShoreBushOffsetR, LVar0) + EVT_SETF(MV_RightShoreBushOffsetL, MV_RightShoreBushOffsetR) + EVT_MULF(MV_RightShoreBushOffsetL, -1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Inspect_MoveBush_CliffTop1) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o82, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_MoveBush_CliffTop1)) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(MakeLerp, 0, 45, 30, EASING_CUBIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(MV_CliffTopBush1OffsetR, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Inspect_MoveBush_CliffTop2) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o88, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_MoveBush_CliffTop2)) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(MakeLerp, 0, 45, 30, EASING_CUBIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(MV_CliffTopBush2OffsetR, LVar0) + EVT_SETF(MV_CliffTopBush2OffsetL, MV_CliffTopBush2OffsetR) + EVT_MULF(MV_CliffTopBush2OffsetL, -1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ForceMoveCliffTopBushes) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o82, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o88, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_MoveBush_CliffTop1)) + EVT_EXEC(N(EVS_MoveBush_CliffTop2)) + EVT_CALL(MakeLerp, 0, 45, 30, EASING_CUBIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(MV_CliffTopBush1OffsetR, LVar0) + EVT_SETF(MV_CliffTopBush2OffsetR, LVar0) + EVT_SETF(MV_CliffTopBush2OffsetL, MV_CliffTopBush2OffsetR) + EVT_MULF(MV_CliffTopBush2OffsetL, -1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_80243EC0) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_LOOP(3) + EVT_CALL(N(MoveBush_AnimateShearing), LVar1, 1) + EVT_WAIT(1) + EVT_CALL(N(MoveBush_AnimateShearing), LVar1, 0) + EVT_WAIT(1) + EVT_CALL(N(MoveBush_AnimateShearing), LVar1, -1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(TranslateModel, LVar1, 0, 0, 0) + EVT_SET(LVarA, LVar2) + EVT_CALL(GetModelCenter, LVar1) + EVT_CALL(DropItemEntity, ITEM_COIN, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE, LVarA) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_80243FC4_B69A74) = { + EVT_LABEL(10) + EVT_LABEL(0) + EVT_IF_EQ(MV_Unk_05, 0) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_SET(LVar3, MV_Unk_05) + EVT_CALL(MakeLerp, 0, MV_Unk_05, 120, EASING_COS_IN_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(MV_Unk_05, LVar3) + EVT_SUB(MV_Unk_05, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_802440C0) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(20) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) + EVT_SET(MV_Unk_05, 3600) + EVT_LOOP(60) + EVT_CALL(InterpPlayerYaw, MV_Unk_05, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADDF(LVar0, EVT_FLOAT(6.0)) + EVT_ADDF(LVar1, EVT_FLOAT(3.0)) + EVT_ADDF(LVar2, EVT_FLOAT(-29.0)) + EVT_DIVF(LVar0, EVT_FLOAT(1.09375)) + EVT_DIVF(LVar1, EVT_FLOAT(1.09375)) + EVT_DIVF(LVar2, EVT_FLOAT(1.09375)) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -25, 90, -330) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -25, 90, -330) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.296875)) + EVT_CALL(PlayerJump, -25, 90, -330, 60) + EVT_CALL(SetPlayerPos, -25, 90, -330) + EVT_CALL(SetCamTarget, CAM_DEFAULT, -25, 90, -330) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o78); + +FoliageDropList N(Bush1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 402, 20, 161 }, + .spawnMode = ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE, + .pickupFlag = GF_JAN09_Bush1_Coin, + }, + } +}; + +FoliageVectorList N(Bush1_Effects) = { + .count = 1, + .vectors = { + { 402.0f, 20.0f, 161.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush1) = { + .bush = &N(Bush1_BushModels), + .drops = &N(Bush1_Drops), + .vectors = &N(Bush1_Effects), +}; + +FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o110); + +FoliageVectorList N(Bush2_Effects) = { + .count = 1, + .vectors = { + { -153.0f, 20.0f, 475.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush2) = { + .bush = &N(Bush2_BushModels), + .vectors = &N(Bush2_Effects), +}; + +FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o116); + +FoliageVectorList N(Bush3_Effects) = { + .count = 1, + .vectors = { + { 147.0f, 20.0f, 489.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush3) = { + .bush = &N(Bush3_BushModels), + .vectors = &N(Bush3_Effects), +}; + +FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o117); + +FoliageVectorList N(Bush4_Effects) = { + .count = 1, + .vectors = { + { 193.0f, 20.0f, 473.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush4) = { + .bush = &N(Bush4_BushModels), + .vectors = &N(Bush4_Effects), +}; + +FoliageModelList N(Bush5_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o154); + +FoliageVectorList N(Bush5_Effects) = { + .count = 1, + .vectors = { + { -93.0f, 20.0f, 289.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush5) = { + .bush = &N(Bush5_BushModels), + .vectors = &N(Bush5_Effects), +}; + +FoliageModelList N(Bush6_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o155); + +FoliageDropList N(Bush6_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -34, 22, 317 }, + .spawnMode = ITEM_SPAWN_MODE_TOSS_SPAWN_ONCE, + .pickupFlag = GF_JAN09_Bush6_Coin, + }, + } +}; + +FoliageVectorList N(Bush6_Effects) = { + .count = 1, + .vectors = { + { -34.0f, 22.0f, 317.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush6) = { + .bush = &N(Bush6_BushModels), + .drops = &N(Bush6_Drops), + .vectors = &N(Bush6_Effects), +}; + +FoliageModelList N(Bush7_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o118); + +FoliageVectorList N(Bush7_Effects) = { + .count = 1, + .vectors = { + { 34.0f, 20.0f, 167.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush7) = { + .bush = &N(Bush7_BushModels), + .vectors = &N(Bush7_Effects), +}; + +FoliageModelList N(Bush8_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o119); + +FoliageVectorList N(Bush8_Effects) = { + .count = 1, + .vectors = { + { 95.0f, 20.0f, 184.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush8) = { + .bush = &N(Bush8_BushModels), + .vectors = &N(Bush8_Effects), +}; + +FoliageModelList N(Bush9_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o153); + +FoliageVectorList N(Bush9_Effects) = { + .count = 1, + .vectors = { + { 334.0f, 20.0f, 287.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush9) = { + .bush = &N(Bush9_BushModels), + .vectors = &N(Bush9_Effects), +}; + +FoliageModelList N(Bush10_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o121); + +FoliageVectorList N(Bush10_Effects) = { + .count = 1, + .vectors = { + { 388.0f, 20.0f, 279.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush10) = { + .bush = &N(Bush10_BushModels), + .vectors = &N(Bush10_Effects), +}; + +FoliageModelList N(Bush11_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o113); + +FoliageVectorList N(Bush11_Effects) = { + .count = 1, + .vectors = { + { 454.0f, 20.0f, 148.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush11) = { + .bush = &N(Bush11_BushModels), + .vectors = &N(Bush11_Effects), +}; + +FoliageModelList N(Bush12_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o115); + +FoliageVectorList N(Bush12_Effects) = { + .count = 1, + .vectors = { + { 359.0f, 20.0f, -127.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush12) = { + .bush = &N(Bush12_BushModels), + .vectors = &N(Bush12_Effects), +}; + +FoliageModelList N(Bush13_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o178); + +FoliageVectorList N(Bush13_Effects) = { + .count = 1, + .vectors = { + { -343.0f, 110.0f, -319.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush13) = { + .bush = &N(Bush13_BushModels), + .vectors = &N(Bush13_Effects), +}; + +FoliageModelList N(Bush14_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o177); + +FoliageVectorList N(Bush14_Effects) = { + .count = 1, + .vectors = { + { -286.0f, 112.0f, -381.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush14) = { + .bush = &N(Bush14_BushModels), + .vectors = &N(Bush14_Effects), +}; + +FoliageModelList N(Bush15_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o163); + +FoliageVectorList N(Bush15_Effects) = { + .count = 1, + .vectors = { + { -234.0f, 110.0f, -376.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush15) = { + .bush = &N(Bush15_BushModels), + .vectors = &N(Bush15_Effects), +}; + +FoliageModelList N(Bush16_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o164); + +FoliageVectorList N(Bush16_Effects) = { + .count = 1, + .vectors = { + { -57.0f, 110.0f, -438.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush16) = { + .bush = &N(Bush16_BushModels), + .vectors = &N(Bush16_Effects), +}; + +FoliageModelList N(Bush17_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o158); + +FoliageVectorList N(Bush17_Effects) = { + .count = 1, + .vectors = { + { 109.0f, 20.0f, -452.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush17) = { + .bush = &N(Bush17_BushModels), + .vectors = &N(Bush17_Effects), +}; + +FoliageModelList N(Bush18_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o159); + +FoliageVectorList N(Bush18_Effects) = { + .count = 1, + .vectors = { + { 159.0f, 20.0f, -485.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush18) = { + .bush = &N(Bush18_BushModels), + .vectors = &N(Bush18_Effects), +}; + +EvtScript N(EVS_SetupBushes) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, jan_09_ENTRY_3) + EVT_EXEC(N(EVS_ForceMoveCliffTopBushes)) + EVT_END_IF + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_MoveBush_RightShore)), TRIGGER_WALL_PRESS_A, COLLIDER_o84, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_MoveBush_CliffTop1)), TRIGGER_WALL_PRESS_A, COLLIDER_o82, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_MoveBush_CliffTop2)), TRIGGER_WALL_PRESS_A, COLLIDER_o88, 1, 0) + EVT_EXEC(N(D_80243FC4_B69A74)) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o78, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o228, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o229, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush4))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o230, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush5))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o231, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush6))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o232, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush7))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o233, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush8))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o234, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush9))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o235, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush10))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o236, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush11))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o237, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush12))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o238, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush13))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o239, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush14))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o240, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush15))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o241, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush16))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o242, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush17))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o243, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush18))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o244, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_09/jan_09_3_npc.c b/src/world/area_jan/jan_09/jan_09_3_npc.c new file mode 100644 index 0000000000..79a9278af0 --- /dev/null +++ b/src/world/area_jan/jan_09/jan_09_3_npc.c @@ -0,0 +1,51 @@ +#include "jan_09.h" + +#include "world/common/enemy/complete/MBush.inc.c" +#include "world/common/enemy/complete/SpearGuy_Wander.inc.c" + +StaticNpc N(NpcData_SpearGuy)[] = { + { + .id = NPC_SpearGuy, + .settings = &N(NpcSettings_SpearGuy_Wander), + .pos = { -200.0f, 90.0f, -330.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .drops = SPEAR_GUY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -200, 90, -330 }, + .wanderSize = { 20 }, + .detectShape = SHAPE_RECT, + .detectPos = { -182, 90, -302 }, + .detectSize = { 212, 100 }, + } + }, + .animations = SPEAR_GUY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, + }, + SPEAR_GUY_HITBOX(NPC_SpearGuy_Hitbox) +}; + +StaticNpc N(NpcData_MBush_01) = { + .id = NPC_MBush_01, + .pos = { 335.0f, 0.0f, -40.0f }, + .yaw = 90, + MBUSH_NPC_DATA +}; + +StaticNpc N(NpcData_MBush_02) = { + .id = NPC_MBush_02, + .pos = { 415.0f, 0.0f, -65.0f }, + .yaw = 90, + MBUSH_NPC_DATA +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_SpearGuy), BTL_JAN_FORMATION_03, BTL_JAN_STAGE_02), + NPC_GROUP(N(NpcData_MBush_01), BTL_JAN_FORMATION_0E, BTL_JAN_STAGE_02), + NPC_GROUP(N(NpcData_MBush_02), BTL_JAN_FORMATION_0E, BTL_JAN_STAGE_02), + {} +}; diff --git a/src/world/area_jan/jan_09/jan_09_4_trees.c b/src/world/area_jan/jan_09/jan_09_4_trees.c new file mode 100644 index 0000000000..05f385c2d6 --- /dev/null +++ b/src/world/area_jan/jan_09/jan_09_4_trees.c @@ -0,0 +1,111 @@ +#include "jan_09.h" + +#define NAME_SUFFIX _Trees +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o142, MODEL_o143, MODEL_o144, MODEL_o145, MODEL_o146); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o141); + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { -461.0f, 114.0f, -204.0f }, + { -376.0f, 114.0f, -214.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -421.0f, 0.0f, -234.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o136, MODEL_o137, MODEL_o138, MODEL_o139, MODEL_o140); +FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o135); + +FoliageDropList N(Tree2_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 50, 190, -420 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_JAN09_Tree2_Coin, + }, + } +}; + +FoliageVectorList N(Tree2_Effects) = { + .count = 2, + .vectors = { + { -26.0f, 204.0f, -429.0f }, + { 59.0f, 204.0f, -439.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .drops = &N(Tree2_Drops), + .vectors = &N(Tree2_Effects), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { 14.0f, 90.0f, -459.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree3_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o130, MODEL_o131, MODEL_o132, MODEL_o133, MODEL_o134); +FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o129); + +FoliageDropList N(Tree3_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_FRIGHT_JAR, + .pos = { 390, 100, -110 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_JAN09_Tree3_FrightJar, + }, + } +}; + +FoliageVectorList N(Tree3_Effects) = { + .count = 2, + .vectors = { + { 415.0f, 114.0f, -120.0f }, + { 500.0f, 114.0f, -130.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree3) = { + .leaves = &N(Tree3_LeafModels), + .trunk = &N(Tree3_TrunkModels), + .drops = &N(Tree3_Drops), + .vectors = &N(Tree3_Effects), +}; + +BombTrigger N(BombPos_Tree3) = { + .pos = { 455.0f, 0.0f, -150.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupTrees) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o218, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o219, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o220, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_09/jan_09_5_entity.c b/src/world/area_jan/jan_09/jan_09_5_entity.c new file mode 100644 index 0000000000..ca7fcd3635 --- /dev/null +++ b/src/world/area_jan/jan_09/jan_09_5_entity.c @@ -0,0 +1,9 @@ +#include "jan_09.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_SpinningFlower), 30, 0, -250, 0, -33, 90, -347, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_Munchlesia), 271, 0, 336, 0, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_10/B6C390.c b/src/world/area_jan/jan_10/B6C390.c deleted file mode 100644 index 4566180fc6..0000000000 --- a/src/world/area_jan/jan_10/B6C390.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "jan_10.h" - -static char* N(exit_str_0) = "jan_09"; -static char* N(exit_str_1) = ""; - -#include "world/common/atomic/TexturePan.inc.c" - diff --git a/src/world/area_jan/jan_10/B6C6A0.c b/src/world/area_jan/jan_10/B6C6A0.c deleted file mode 100644 index 66860c72ce..0000000000 --- a/src/world/area_jan/jan_10/B6C6A0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "jan_10.h" - -#include "world/common/enemy/ai/HoppingAI.inc.c" diff --git a/src/world/area_jan/jan_10/B6D4C0.c b/src/world/area_jan/jan_10/B6D4C0.c deleted file mode 100644 index d3771d00a9..0000000000 --- a/src/world/area_jan/jan_10/B6D4C0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "jan_10.h" - -#include "world/common/todo/UnkShadowFunc001.inc.c" diff --git a/src/world/area_jan/jan_10/B6D610.c b/src/world/area_jan/jan_10/B6D610.c deleted file mode 100644 index c1b94bda19..0000000000 --- a/src/world/area_jan/jan_10/B6D610.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "jan_10.h" - -#include "common/foliage.inc.c" - -ApiStatus func_802414BC_B6D84C(Evt* script, s32 isInitialCall) { - if (get_enemy_safe(1) == NULL) { - script->varTable[0] = FALSE; - } else { - script->varTable[0] = TRUE; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_jan/jan_10/B6D890.c b/src/world/area_jan/jan_10/B6D890.c deleted file mode 100644 index 76f841dc0d..0000000000 --- a/src/world/area_jan/jan_10/B6D890.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "jan_10.h" - -#define NAMESPACE dup_jan_10 -#include "common/foliage.inc.c" -#define NAMESPACE jan_10 diff --git a/src/world/area_jan/jan_10/jan_10.h b/src/world/area_jan/jan_10/jan_10.h index 99ef9f1c1f..b325b914c3 100644 --- a/src/world/area_jan/jan_10/jan_10.h +++ b/src/world/area_jan/jan_10/jan_10.h @@ -2,8 +2,28 @@ /// @brief Jade Jungle - Western Dead End #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_10_shape.h" +#include "mapfs/jan_10_hit.h" + +enum { + NPC_YoshiKid = 0, + NPC_JungleFuzzy = 1, +}; + +enum { + MF_KillLogShadow = MapFlag(10), +}; + #define NAMESPACE jan_10 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupLogs); +extern EvtScript N(EVS_SetupTrees); +extern EvtScript N(EVS_SetupBushes); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_jan/jan_10/jan_10_0_header.c b/src/world/area_jan/jan_10/jan_10_0_header.c new file mode 100644 index 0000000000..5250454d44 --- /dev/null +++ b/src/world/area_jan/jan_10/jan_10_0_header.c @@ -0,0 +1,13 @@ +#include "jan_10.h" + +EntryList N(Entrances) = { + [jan_10_ENTRY_0] { 380.0, -20.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_jan_10 }, +}; diff --git a/src/world/area_jan/jan_10/jan_10_1_music.c b/src/world/area_jan/jan_10/jan_10_1_music.c new file mode 100644 index 0000000000..e3630ff257 --- /dev/null +++ b/src/world/area_jan/jan_10/jan_10_1_music.c @@ -0,0 +1,8 @@ +#include "jan_10.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_JADE_JUNGLE, 0, 8) + EVT_CALL(ClearAmbientSounds, 250) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_10/jan_10_2_main.c b/src/world/area_jan/jan_10/jan_10_2_main.c new file mode 100644 index 0000000000..91682b6e05 --- /dev/null +++ b/src/world/area_jan/jan_10/jan_10_2_main.c @@ -0,0 +1,43 @@ +#include "jan_10.h" + +#include "world/common/atomic/TexturePan.inc.c" +#include "world/common/atomic/TexturePan.data.inc.c" + +EvtScript N(EVS_ExitWalk_jan_09_2) = EVT_EXIT_WALK(60, jan_10_ENTRY_0, "jan_09", jan_09_ENTRY_2); + +MAP_RODATA_PAD(1, exits); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_09_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_o100, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupLogs)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o20, SURFACE_TYPE_DOCK_WALL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o20, COLLIDER_FLAG_80000) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o1, SURFACE_TYPE_WATER) + EVT_EXEC(N(EVS_SetupTrees)) + EVT_EXEC(N(EVS_SetupBushes)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(MakeTransformGroup, MODEL_g11) + EVT_CALL(EnableTexPanning, MODEL_o28, TRUE) + EVT_THREAD + TEX_PAN_PARAMS_ID(TEX_PANNER_1) + TEX_PAN_PARAMS_STEP( -80, 140, 80, -100) + 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_jan/jan_10/jan_10_3_npc.c b/src/world/area_jan/jan_10/jan_10_3_npc.c new file mode 100644 index 0000000000..1971a1b9c3 --- /dev/null +++ b/src/world/area_jan/jan_10/jan_10_3_npc.c @@ -0,0 +1,146 @@ +#include "jan_10.h" + +#include "world/common/enemy/complete/JungleFuzzy_Wander.inc.c" +#include "world/common/npc/YoshiKid.inc.c" + +EvtScript N(EVS_NpcIdle_JungleFuzzy) = { + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 7, LVar0) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, FALSE) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Jungle_Anim09) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, -566, 100, 65) + EVT_CALL(PlaySoundWithVolume, SOUND_331, 110) + EVT_WAIT(20) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8, TRUE) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_JungleFuzzy_Wander))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_JungleFuzzy) = { + EVT_CALL(SetSelfVar, 7, FALSE) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_200000, 1) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_8, TRUE) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_JungleFuzzy))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_YoshiKid_CryForHelp) = { + EVT_SET(AF_JAN_02, FALSE) + EVT_LOOP(0) + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_1F0, 0) + EVT_WAIT(20) + EVT_IF_EQ(AF_JAN_02, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_YoshiKid) = { + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 0, 350, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_SET(AF_JAN_02, TRUE) + EVT_WAIT(15) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_EQ(LVar0, PARTNER_SUSHIE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_YoshiKid_Blue_SadTalk, ANIM_YoshiKid_Blue_SadIdle, 0, MSG_CH5_00B2) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_YoshiKid_Blue_SadTalk, ANIM_YoshiKid_Blue_SadIdle, 0, MSG_CH5_00B3) + EVT_END_IF + EVT_CALL(EndSpeech, NPC_SELF, ANIM_YoshiKid_Blue_Talk, ANIM_YoshiKid_Blue_Idle, 0) + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_YoshiKid_Blue_Run) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, -240, 10, 0) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_END_THREAD + EVT_SET(GF_JAN10_SavedYoshi, TRUE) + EVT_SET(LVar0, 0) + EVT_ADD(LVar0, GF_JAN05_SavedYoshi) + EVT_ADD(LVar0, GF_JAN07_SavedYoshi) + EVT_ADD(LVar0, GF_JAN08_SavedYoshi) + EVT_ADD(LVar0, GF_JAN10_SavedYoshi) + EVT_ADD(LVar0, GF_JAN11_SavedYoshi) + EVT_IF_EQ(LVar0, 5) + EVT_CALL(SetMusicTrack, 0, SONG_YOSHI_KIDS_FOUND, 0, 8) + EVT_SET(GB_StoryProgress, STORY_CH5_ALL_YOSHI_CHILDREN_RESCUED) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_ThumbsUp) + EVT_WAIT(120) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_ELSE + EVT_WAIT(30) + EVT_END_IF + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_YoshiKid) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_SUSHIE_JOINED_PARTY) + EVT_EXEC(N(EVS_YoshiKid_CryForHelp)) + EVT_IF_EQ(GF_JAN10_SavedYoshi, FALSE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_YoshiKid_Blue_Cry) + EVT_CALL(SetNpcYaw, NPC_SELF, 90) + EVT_CALL(SetNpcPos, NPC_SELF, -450, 0, 70) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_YoshiKid))) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_YoshiKid) = { + .id = NPC_YoshiKid, + .settings = &N(NpcSettings_YoshiKid), + .pos = { -260.0f, 0.0f, -220.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_YoshiKid), + .drops = NPC_NO_DROPS, + .animations = YOSHI_KID_BLUE_ANIMS, + .tattle = MSG_NpcTattle_BlueYoshiKid, +}; + +StaticNpc N(NpcData_JungleFuzzy) = { + .id = NPC_JungleFuzzy, + .settings = &N(NpcSettings_JungleFuzzy_Wander), + .pos = { 0.0f, 0.0f, 0.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_JungleFuzzy), + .drops = JUNGLE_FUZZY_DROPS, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { -460, 0, 70 }, + .wanderSize = { 50 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -460, 0, 70 }, + .detectSize = { 200 }, + } + }, + .animations = JUNGLE_FUZZY_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_YoshiKid)), + NPC_GROUP(N(NpcData_JungleFuzzy), BTL_JAN_FORMATION_0A, BTL_JAN_STAGE_03), + {} +}; diff --git a/src/world/area_jan/jan_10/jan_10_4_log.c b/src/world/area_jan/jan_10/jan_10_4_log.c new file mode 100644 index 0000000000..6d19af275d --- /dev/null +++ b/src/world/area_jan/jan_10/jan_10_4_log.c @@ -0,0 +1,154 @@ +#include "jan_10.h" +#include "effects.h" + +EvtScript N(EVS_SetupLogObjects) = { + EVT_IF_EQ(GF_JAN10_CreateLogBridge, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o23, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o79, FALSE) + EVT_CALL(EnableModel, MODEL_o76, FALSE) + EVT_CALL(TranslateGroup, MODEL_g24, 0, -165, 0) + EVT_CALL(TranslateGroup, MODEL_g23, 0, -165, 0) + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o11, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o22, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o23, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(EnableModel, MODEL_o79, TRUE) + EVT_CALL(EnableModel, MODEL_o76, TRUE) + EVT_CALL(TranslateGroup, MODEL_g24, 0, 10, 0) + EVT_CALL(TranslateGroup, MODEL_g23, 0, 10, 0) + EVT_CALL(RotateGroup, MODEL_g24, 90, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_g23, 90, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_g24, 90, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_g23, -90, 0, 1, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LogAnim_RiseUp) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_o11, SOUND_SMASH_GOOMNUT_TREE, 0) + EVT_CALL(MakeLerp, -165, -184, 5, EASING_QUARTIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g24, 0, LVar0, 0) + EVT_CALL(TranslateGroup, MODEL_g23, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +#include "world/common/todo/UpdateLogShadow.inc.c" + +EvtScript N(EVS_LogAnim_FallDown) = { + EVT_THREAD + EVT_WAIT(17) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(N(UpdateLogShadow), MODEL_o79, MF_KillLogShadow) + EVT_END_THREAD + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o11, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(MakeLerp, -184, 60, 30, EASING_QUADRATIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g24, 0, LVar0, 0) + EVT_CALL(TranslateGroup, MODEL_g23, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_WAIT(1) + EVT_CALL(MakeLerp, 60, 0, 30, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g24, 0, LVar0, 0) + EVT_CALL(TranslateGroup, MODEL_g23, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o11, SOUND_209D, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, 0, 0, 0, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 2, 3, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LogAnim_FallOver) = { + EVT_THREAD + EVT_WAIT(50) + EVT_SET(MF_KillLogShadow, TRUE) + EVT_END_THREAD + EVT_CALL(MakeLerp, 0, 90, 60, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g24, 0, 0, 0) + EVT_CALL(TranslateGroup, MODEL_g23, 0, 0, 0) + EVT_CALL(RotateGroup, MODEL_g24, LVar0, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_g23, LVar0, 0, 0, 1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 2, 3, 1) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_LogAnim_Split) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_o11, SOUND_209E, 0) + EVT_CALL(EnableModel, MODEL_o79, TRUE) + EVT_CALL(EnableModel, MODEL_o76, TRUE) + EVT_CALL(MakeLerp, 0, 90, 30, EASING_COS_FAST_OVERSHOOT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(LVar2, LVar0) + EVT_DIVF(LVar2, 9) + EVT_CALL(TranslateGroup, MODEL_g24, 0, LVar2, 0) + EVT_CALL(TranslateGroup, MODEL_g23, 0, LVar2, 0) + EVT_CALL(RotateGroup, MODEL_g24, 90, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_g23, 90, 0, 0, 1) + EVT_CALL(RotateGroup, MODEL_g24, LVar0, 0, 1, 0) + EVT_CALL(RotateGroup, MODEL_g23, LVar0, 0, -1, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Smash_BuriedLog) = { + EVT_SET(GF_JAN10_CreateLogBridge, TRUE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_EXEC_WAIT(N(EVS_LogAnim_RiseUp)) + EVT_WAIT(1) + EVT_EXEC_WAIT(N(EVS_LogAnim_FallDown)) + EVT_WAIT(1) + EVT_EXEC_WAIT(N(EVS_LogAnim_FallOver)) + EVT_WAIT(1) + EVT_EXEC_WAIT(N(EVS_LogAnim_Split)) + EVT_WAIT(1) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_EXEC(N(EVS_SetupLogObjects)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupLogs) = { + EVT_IF_EQ(GF_JAN10_CreateLogBridge, FALSE) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Smash_BuriedLog)), TRIGGER_WALL_HAMMER, COLLIDER_o11, 1, 0) + EVT_END_IF + EVT_EXEC(N(EVS_SetupLogObjects)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_10/jan_10_5_trees.c b/src/world/area_jan/jan_10/jan_10_5_trees.c new file mode 100644 index 0000000000..12029a0597 --- /dev/null +++ b/src/world/area_jan/jan_10/jan_10_5_trees.c @@ -0,0 +1,55 @@ +#include "jan_10.h" + +#define NAME_SUFFIX _Trees +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +API_CALLABLE(N(IsJungleFuzzyAlive)) { + if (get_enemy_safe(NPC_JungleFuzzy) == NULL) { + script->varTable[0] = FALSE; + } else { + script->varTable[0] = TRUE; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_OnShakeTree1) = { + EVT_WAIT(15) + EVT_CALL(N(IsJungleFuzzyAlive)) + EVT_IF_EQ(LVar0, TRUE) + EVT_CALL(SetNpcVar, NPC_JungleFuzzy, 7, 1) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o59, MODEL_o60, MODEL_o61, MODEL_o62, MODEL_o63); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o58); + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { -597.0f, 114.0f, 59.0f }, + { -512.0f, 114.0f, 49.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .vectors = &N(Tree1_Effects), + .callback = &N(EVS_OnShakeTree1), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -557.0f, 0.0f, 29.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupTrees) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o91, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_10/jan_10_6_bushes.c b/src/world/area_jan/jan_10/jan_10_6_bushes.c new file mode 100644 index 0000000000..de7a618263 --- /dev/null +++ b/src/world/area_jan/jan_10/jan_10_6_bushes.c @@ -0,0 +1,106 @@ +#include "jan_10.h" + +#define NAME_SUFFIX _Bushes +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o29); + +FoliageVectorList N(Bush1_Effects) = { + .count = 1, + .vectors = { + { -527.0f, 20.0f, 124.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush1) = { + .bush = &N(Bush1_BushModels), + .vectors = &N(Bush1_Effects), +}; + +FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o30); + +FoliageVectorList N(Bush2_Effects) = { + .count = 1, + .vectors = { + { -368.0f, 22.0f, 145.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush2) = { + .bush = &N(Bush2_BushModels), + .vectors = &N(Bush2_Effects), +}; + +FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o37); + +FoliageVectorList N(Bush3_Effects) = { + .count = 1, + .vectors = { + { -305.0f, 20.0f, -10.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush3) = { + .bush = &N(Bush3_BushModels), + .vectors = &N(Bush3_Effects), +}; + +FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o38); + +FoliageVectorList N(Bush4_Effects) = { + .count = 1, + .vectors = { + { -261.0f, 20.0f, -14.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush4) = { + .bush = &N(Bush4_BushModels), + .vectors = &N(Bush4_Effects), +}; + +FoliageModelList N(Bush5_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o33); + +FoliageVectorList N(Bush5_Effects) = { + .count = 1, + .vectors = { + { 35.0f, 22.0f, -70.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush5) = { + .bush = &N(Bush5_BushModels), + .vectors = &N(Bush5_Effects), +}; + +FoliageModelList N(Bush6_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o34); + +FoliageVectorList N(Bush6_Effects) = { + .count = 1, + .vectors = { + { 75.0f, 20.0f, -47.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush6) = { + .bush = &N(Bush6_BushModels), + .vectors = &N(Bush6_Effects), +}; + +EvtScript N(EVS_SetupBushes) = { + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o94, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o95, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o96, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush4))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o97, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush5))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o98, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush6))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o99, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_10/jan_10_7_entity.c b/src/world/area_jan/jan_10/jan_10_7_entity.c new file mode 100644 index 0000000000..25f8d7c96c --- /dev/null +++ b/src/world/area_jan/jan_10/jan_10_7_entity.c @@ -0,0 +1,8 @@ +#include "jan_10.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, -150, -60, 60, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_JAN10_Item_StarPiece) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_11/B70860.c b/src/world/area_jan/jan_11/B70860.c deleted file mode 100644 index fc5b8620e7..0000000000 --- a/src/world/area_jan/jan_11/B70860.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "jan_11.h" - -static char* N(exit_str_0) = "jan_09"; -static char* N(exit_str_1) = ""; - -#include "world/common/atomic/CreateDarkness.inc.c" - -#include "world/common/entity/Pipe.inc.c" - -#include "world/common/todo/CheckDripCollisionWithNPC.inc.c" diff --git a/src/world/area_jan/jan_11/B71010.c b/src/world/area_jan/jan_11/B71010.c deleted file mode 100644 index 7f9a453104..0000000000 --- a/src/world/area_jan/jan_11/B71010.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "jan_11.h" - -#include "world/common/todo/GetFloorCollider.inc.c" - -ApiStatus N(IsPartnerWatt)(Evt* script, s32 isInitialCall) { - if (gPartnerActionStatus.actingPartner == PARTNER_WATT) { - script->varTable[9] = TRUE; - } else { - script->varTable[9] = FALSE; - } - return ApiStatus_DONE2; -} diff --git a/src/world/area_jan/jan_11/jan_11.h b/src/world/area_jan/jan_11/jan_11.h index c7dd8bec14..67fe5f8916 100644 --- a/src/world/area_jan/jan_11/jan_11.h +++ b/src/world/area_jan/jan_11/jan_11.h @@ -2,8 +2,21 @@ /// @brief Jade Jungle - Root Cavern #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_11_shape.h" +#include "mapfs/jan_11_hit.h" + +#include "sprite/npc/YoshiKid.h" + +enum { + NPC_YoshiKid = 0, +}; + #define NAMESPACE jan_11 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_jan/jan_11/jan_11_0_header.c b/src/world/area_jan/jan_11/jan_11_0_header.c new file mode 100644 index 0000000000..e49c11385f --- /dev/null +++ b/src/world/area_jan/jan_11/jan_11_0_header.c @@ -0,0 +1,12 @@ +#include "jan_11.h" + +EntryList N(Entrances) = { + [jan_11_ENTRY_0] { -90.0, 0.0, 61.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .tattle = { MSG_MapTattle_jan_11 }, +}; diff --git a/src/world/area_jan/jan_11/jan_11_1_music.c b/src/world/area_jan/jan_11/jan_11_1_music.c new file mode 100644 index 0000000000..a915b4f89c --- /dev/null +++ b/src/world/area_jan/jan_11/jan_11_1_music.c @@ -0,0 +1,8 @@ +#include "jan_11.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(SetMusicTrack, 0, SONG_JADE_JUNGLE, 0, 6) + EVT_CALL(ClearAmbientSounds, 250) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_11/jan_11_2_main.c b/src/world/area_jan/jan_11/jan_11_2_main.c new file mode 100644 index 0000000000..01c73a761b --- /dev/null +++ b/src/world/area_jan/jan_11/jan_11_2_main.c @@ -0,0 +1,66 @@ +#include "jan_11.h" + +#include "world/common/atomic/CreateDarkness.inc.c" + +#include "world/common/entity/Pipe.inc.c" + +#define MODEL_sizuku MODEL_o140 //TODO parameterize all DripVolume includes +#include "world/area_tik/common/DripVolumes.inc.c" + +DripVolumeList N(DripVolumes) = { + .count = 2, + .volumes = { + { + .minPos = { -154, 100 }, + .maxPos = { 92, 36 }, + .startY = 200, + .endY = 0, + .duration = 60, + .density = 2, + }, + { + .minPos = { 212, 10 }, + .maxPos = { 53, 122 }, + .startY = 200, + .endY = 0, + .duration = 60, + .density = 2, + } + } +}; + +EvtScript N(EVS_SetupDrips) = { + EVT_SET(LVar0, EVT_PTR(N(DripVolumes))) + EVT_EXEC(N(EVS_CreateDripVolumes)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GotoMap_jan_09_3) = { + EVT_CALL(GotoMap, EVT_PTR("jan_09"), jan_09_ENTRY_3) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitPipe_jan_09_3) = EVT_EXIT_PIPE_HORIZONTAL(jan_11_ENTRY_0, COLLIDER_o10, N(EVS_GotoMap_jan_09_3)); + +EvtScript N(D_80241F38_B72798) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitPipe_jan_09_3)), TRIGGER_WALL_PUSH, COLLIDER_o10, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC(N(EVS_CreateDarkness)) + EVT_SET(LVar0, EVT_PTR(N(D_80241F38_B72798))) + EVT_EXEC(EnterWalk) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_EXEC_WAIT(N(EVS_SetupDrips)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_11/jan_11_3_npc.c b/src/world/area_jan/jan_11/jan_11_3_npc.c new file mode 100644 index 0000000000..68b7701480 --- /dev/null +++ b/src/world/area_jan/jan_11/jan_11_3_npc.c @@ -0,0 +1,138 @@ +#include "jan_11.h" + +#include "world/common/npc/YoshiKid.inc.c" + +EvtScript N(EVS_YoshiKid_CryForHelp) = { + EVT_SET(AF_JAN_02, FALSE) + EVT_LOOP(0) + EVT_CALL(PlaySoundAtNpc, NPC_YoshiKid, SOUND_1F0, 0) + EVT_WAIT(20) + EVT_IF_EQ(AF_JAN_02, TRUE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +#include "world/common/todo/GetFloorCollider.inc.c" + +API_CALLABLE(N(IsPartnerWatt)) { + if (gPartnerActionStatus.actingPartner == PARTNER_WATT) { + script->varTable[9] = TRUE; + } else { + script->varTable[9] = FALSE; + } + return ApiStatus_DONE2; +} + +EvtScript N(EVS_NpcIdle_YoshiKid) = { + EVT_LABEL(0) + EVT_WAIT(1) + EVT_CALL(N(GetFloorCollider), LVar0) + EVT_IF_NE(LVar0, 10) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(N(IsPartnerWatt)) + EVT_IF_EQ(LVar9, 0) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) + EVT_IF_LT(LVar2, 85) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(GetNpcPos, NPC_SELF, LVar4, LVar5, LVar6) + EVT_IF_LT(LVar1, LVar4) + EVT_SET(LVar1, LVar4) + EVT_ADD(LVar1, -50) + EVT_ELSE + EVT_SET(LVar1, LVar4) + EVT_ADD(LVar1, 30) + EVT_END_IF + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(1.0)) + EVT_CALL(PlayerMoveTo, LVar1, LVar3, 0) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_SUB(LVar4, LVar1) + EVT_DIV(LVar4, 2) + EVT_ADD(LVar1, LVar4) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), LVar4, 350, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) + EVT_SET(AF_JAN_02, TRUE) + EVT_WAIT(15) + EVT_CALL(NpcFacePlayer, NPC_SELF, 0) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_END_THREAD + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_YoshiKid_Green_SadTalk, ANIM_YoshiKid_Green_SadIdle, 0, MSG_CH5_00AE) + EVT_CALL(EndSpeech, NPC_SELF, ANIM_YoshiKid_Green_Talk, ANIM_YoshiKid_Green_Idle, 0) + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100 | NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_YoshiKid_Green_Run) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, -100, 50, 0) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_END_THREAD + EVT_SET(GF_JAN11_SavedYoshi, TRUE) + EVT_SET(LVar0, 0) + EVT_ADD(LVar0, GF_JAN05_SavedYoshi) + EVT_ADD(LVar0, GF_JAN07_SavedYoshi) + EVT_ADD(LVar0, GF_JAN08_SavedYoshi) + EVT_ADD(LVar0, GF_JAN10_SavedYoshi) + EVT_ADD(LVar0, GF_JAN11_SavedYoshi) + EVT_IF_EQ(LVar0, 5) + EVT_CALL(SetMusicTrack, 0, SONG_YOSHI_KIDS_FOUND, 0, 8) + EVT_SET(GB_StoryProgress, STORY_CH5_ALL_YOSHI_CHILDREN_RESCUED) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_ThumbsUp) + EVT_WAIT(120) + EVT_EXEC(N(EVS_SetupMusic)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_ELSE + EVT_WAIT(35) + EVT_END_IF + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_YoshiKid) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_YoshiKid_Green_Cry, ANIM_YoshiKid_Green_Cry, 0, MSG_CH5_00AD) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_YoshiKid) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_SUSHIE_JOINED_PARTY) + EVT_EXEC(N(EVS_YoshiKid_CryForHelp)) + EVT_IF_EQ(GF_JAN11_SavedYoshi, FALSE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_YoshiKid_Green_Cry) + EVT_CALL(SetNpcPos, NPC_SELF, 132, 85, 11) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_YoshiKid))) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_YoshiKid))) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_YoshiKid) = { + .id = NPC_YoshiKid, + .pos = { -450.0f, 0.0f, -160.0f }, + .yaw = 90, + .init = &N(EVS_NpcInit_YoshiKid), + .settings = &N(NpcSettings_YoshiKid), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = NPC_NO_DROPS, + .animations = YOSHI_KID_GREEN_ANIMS, + .tattle = MSG_NpcTattle_GreenYoshiKid, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_YoshiKid)), + {} +}; diff --git a/src/world/area_jan/jan_12/B730B0.c b/src/world/area_jan/jan_12/B730B0.c deleted file mode 100644 index 3aae93508f..0000000000 --- a/src/world/area_jan/jan_12/B730B0.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "jan_12.h" -#include "model.h" - -static char* N(exit_str_0) = "jan_13"; -static char* N(exit_str_1) = "jan_06"; - -#include "world/common/todo/PullVine.inc.c" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_jan/jan_12/B73570.c b/src/world/area_jan/jan_12/B73570.c deleted file mode 100644 index af3c32840a..0000000000 --- a/src/world/area_jan/jan_12/B73570.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "jan_12.h" - -#include "world/common/enemy/ai/SpearGuyAI.inc.c" diff --git a/src/world/area_jan/jan_12/jan_12.h b/src/world/area_jan/jan_12/jan_12.h index 4b23e4e120..a8ffad9da5 100644 --- a/src/world/area_jan/jan_12/jan_12.h +++ b/src/world/area_jan/jan_12/jan_12.h @@ -2,8 +2,28 @@ /// @brief Jade Jungle - Deep Jungle 1 #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_12_shape.h" +#include "mapfs/jan_12_hit.h" + +enum { + NPC_SpearGuy = 0, + NPC_SpearGuy_Hitbox = 1, +}; + +enum { + MV_BushOffsetL = MapVar(0), + MV_BushOffsetR = MapVar(1), + MV_PullVineCallback = MapVar(10), +}; + #define NAMESPACE jan_12 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupTrees); +extern EvtScript N(EVS_SetupVines); +extern EvtScript N(EVS_MakeEntities); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_jan/jan_12/jan_12_0_header.c b/src/world/area_jan/jan_12/jan_12_0_header.c new file mode 100644 index 0000000000..e0be28d582 --- /dev/null +++ b/src/world/area_jan/jan_12/jan_12_0_header.c @@ -0,0 +1,14 @@ +#include "jan_12.h" + +EntryList N(Entrances) = { + [jan_12_ENTRY_0] { -300.0, 0.0, 120.0, 0.0 }, + [jan_12_ENTRY_1] { 250.0, 0.0, -120.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_jan_12 }, +}; diff --git a/src/world/area_jan/jan_12/jan_12_1_main.c b/src/world/area_jan/jan_12/jan_12_1_main.c new file mode 100644 index 0000000000..7e0b02a6fa --- /dev/null +++ b/src/world/area_jan/jan_12/jan_12_1_main.c @@ -0,0 +1,29 @@ +#include "jan_12.h" + +EvtScript N(EVS_ExitWalk_jan_13_0) = EVT_EXIT_WALK(60, jan_12_ENTRY_1, "jan_13", jan_13_ENTRY_0); +EvtScript N(EVS_ExitWalk_jan_06_2) = EVT_EXIT_WALK(60, jan_12_ENTRY_0, "jan_06", jan_06_ENTRY_2); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_06_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_13_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupVines)) + EVT_EXEC(N(EVS_SetupTrees)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilits, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitn, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CALL(SetMusicTrack, 0, SONG_DEEP_JUNGLE, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_JUNGLE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_12/jan_12_2_vines.c b/src/world/area_jan/jan_12/jan_12_2_vines.c new file mode 100644 index 0000000000..b36548f990 --- /dev/null +++ b/src/world/area_jan/jan_12/jan_12_2_vines.c @@ -0,0 +1,58 @@ +#include "jan_12.h" + +#define PULL_VINE_CALLBACK_SCRIPT MV_PullVineCallback +#include "../common/PullVine.inc.c" + +#include "../common/MoveBush.inc.c" +#include "../common/MoveBushTemplates.h" + +EvtScript N(EVS_MoveBushes_Separate) = EVT_MOVE_BUSHES(COLLIDER_o12, + MODEL_o12, MODEL_o26, MV_BushOffsetL, MV_BushOffsetR); + +EvtScript N(EVS_Inspect_MoveBushes) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o12, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_MoveBushes_Separate)) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(MakeLerp, 0, 45, 30, EASING_CUBIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(MV_BushOffsetR, LVar0) + EVT_SETF(MV_BushOffsetL, MV_BushOffsetR) + EVT_MULF(MV_BushOffsetL, -1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnPullVine) = { + EVT_CALL(GetModelCenter, LVar9) + EVT_ADD(LVar2, 10) + EVT_CALL(MakeItemEntity, ITEM_EGG, LVar0, 100, LVar2, ITEM_SPAWN_MODE_FALL, GF_JAN12_PullVine_Egg2) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupVines) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_Inspect_MoveBushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o12, 1, 0) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, jan_12_ENTRY_1) + EVT_EXEC(N(EVS_Inspect_MoveBushes)) + EVT_END_IF + EVT_SET(MV_PullVineCallback, EVT_PTR(N(EVS_OnPullVine))) + EVT_SET(LVarF, MODEL_o47) + EVT_SET(LVarC, 0) + EVT_SET(LVarD, MODEL_o76) + EVT_SET(LVarE, MODEL_o77) + EVT_SET(LVar9, MODEL_o6) + EVT_SET(LVarA, MODEL_o62) + EVT_SET(LVarB, MODEL_o63) + EVT_SET(LVar5, 15) + EVT_EXEC(N(EVS_PullVine_Manage)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_12/jan_12_3_trees.c b/src/world/area_jan/jan_12/jan_12_3_trees.c new file mode 100644 index 0000000000..137a907824 --- /dev/null +++ b/src/world/area_jan/jan_12/jan_12_3_trees.c @@ -0,0 +1,73 @@ +#include "jan_12.h" + +#define NAME_SUFFIX _Trees +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o6, MODEL_o62, MODEL_o63); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o35); + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -245, 100, -85 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_JAN12_Tree1_Coin, + }, + } +}; + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { -254.0f, 144.0f, -81.0f }, + { -169.0f, 144.0f, -91.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .drops = &N(Tree1_Drops), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -214.0f, 30.0f, -111.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o65, MODEL_o66, MODEL_o67); +FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o64); + +FoliageVectorList N(Tree2_Effects) = { + .count = 2, + .vectors = { + { 320.0f, 114.0f, -65.0f }, + { 405.0f, 114.0f, -75.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .vectors = &N(Tree2_Effects), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { 360.0f, 0.0f, -95.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupTrees) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o96, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o97, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_12/jan_12_4_entity.c b/src/world/area_jan/jan_12/jan_12_4_entity.c new file mode 100644 index 0000000000..08fa805aec --- /dev/null +++ b/src/world/area_jan/jan_12/jan_12_4_entity.c @@ -0,0 +1,11 @@ +#include "jan_12.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_PinkFlower), 130, 0, -110, 170, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_BellbellPlant), -350, 30, -55, 25, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), -310, 90, -25, 0, ITEM_STONE_CAP, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_JAN12_HiddenItem_StoneCap) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_12/jan_12_5_npc.c b/src/world/area_jan/jan_12/jan_12_5_npc.c new file mode 100644 index 0000000000..87eb74b637 --- /dev/null +++ b/src/world/area_jan/jan_12/jan_12_5_npc.c @@ -0,0 +1,33 @@ +#include "jan_12.h" + +#include "world/common/enemy/complete/SpearGuy_Wander.inc.c" + +StaticNpc N(NpcData_SpearGuy)[] = { + { + .id = NPC_SpearGuy, + .pos = { 165.0f, 0.0f, 15.0f }, + .yaw = 270, + .territory = { + .wander = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .wanderShape = SHAPE_CYLINDER, + .centerPos = { 165, 0, 15 }, + .wanderSize = { 30 }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { 165, 0, 15 }, + .detectSize = { 150 }, + } + }, + .settings = &N(NpcSettings_SpearGuy_Wander), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .drops = SPEAR_GUY_DROPS, + .animations = SPEAR_GUY_ANIMS, + }, + SPEAR_GUY_HITBOX(NPC_SpearGuy_Hitbox) +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_SpearGuy), BTL_JAN_FORMATION_06, BTL_JAN_STAGE_06), + {} +}; diff --git a/src/world/area_jan/jan_13/B767B0.c b/src/world/area_jan/jan_13/B767B0.c deleted file mode 100644 index b60f7c171d..0000000000 --- a/src/world/area_jan/jan_13/B767B0.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "jan_13.h" - -static char* N(exit_str_0) = "jan_14"; -static char* N(exit_str_1) = "jan_12"; - -extern u16 D_80240850_B77000; - -void func_80240000_B767B0(void) { - f64 temp_f20 = ((sin_rad((f32) D_80240850_B77000 * 0.02) + 1.0f) * 0.3) + 0.6; - f64 temp_f21 = (sin_rad((f32) D_80240850_B77000 * 0.1) + 1.0f) * 0.1; - f32 scale = temp_f20 + temp_f21; - - guScale(&gDisplayContext->matrixStack[gMatrixListPos], (scale * 0.3) + 0.5, scale, (scale * 0.3) + 0.5); - gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); - D_80240850_B77000++; -} - -ApiStatus func_802401AC_B7695C(Evt* script, s32 isInitialCall) { - script->varTable[2] = EVT_FLOAT_TO_FIXED(script->varTable[1] / 100.0f); - script->varTable[3] = EVT_FLOAT_TO_FIXED(script->varTable[1] / 100.0f); - return ApiStatus_DONE2; -} - -ApiStatus func_80240214_B769C4(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (*args++ != 0) { - script->functionTemp[0] = evt_get_variable(script, *args++); - script->functionTemp[1] = evt_get_variable(script, *args++); - script->functionTemp[2] = evt_get_variable(script, *args++); - sfx_adjust_env_sound_pos(SOUND_4E, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); - } - return ApiStatus_DONE2; -} - -ApiStatus func_802402B8_B76A68(Evt* script, s32 isInitialCall) { - PlayerStatus* playerStatus = &gPlayerStatus; - s32 vt0 = script->varTable[0]; - s32 vt2 = script->varTable[2]; - - if (script->varTable[1] >= -99) { - f32 theta = (playerStatus->targetYaw / 180.0f) * 3.141592f; - - vt0 -= (s32) (sin_rad(theta) * 25.0f); - vt2 -= (s32) (-cos_rad(theta) * 25.0f); - } else { - vt2 += 25; - } - script->varTable[0] = vt0; - script->varTable[2] = vt2; - return ApiStatus_DONE2; -} - -#include "common/foliage.inc.c" - diff --git a/src/world/area_jan/jan_13/jan_13.h b/src/world/area_jan/jan_13/jan_13.h index 97dd9cd5e4..f02a6e3b5a 100644 --- a/src/world/area_jan/jan_13/jan_13.h +++ b/src/world/area_jan/jan_13/jan_13.h @@ -2,8 +2,24 @@ /// @brief Jade Jungle - Deep Jungle 2 (Block Puzzle) #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_13_shape.h" +#include "mapfs/jan_13_hit.h" + +enum { + MV_PuzzleProgress = MapVar(0), +}; + +enum { + MF_GeyserSoundPlaying = MapFlag(10), +}; + #define NAMESPACE jan_13 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupPuzzle); +extern EvtScript N(EVS_SetupTrees); +extern EvtScript N(EVS_MakeEntities); diff --git a/src/world/area_jan/jan_13/jan_13_0_header.c b/src/world/area_jan/jan_13/jan_13_0_header.c new file mode 100644 index 0000000000..02afbf4e31 --- /dev/null +++ b/src/world/area_jan/jan_13/jan_13_0_header.c @@ -0,0 +1,14 @@ +#include "jan_13.h" + +EntryList N(Entrances) = { + [jan_13_ENTRY_0] { -300.0, 0.0, 120.0, 0.0 }, + [jan_13_ENTRY_1] { 55.0, 0.0, -120.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_jan_13 }, +}; diff --git a/src/world/area_jan/jan_13/jan_13_1_main.c b/src/world/area_jan/jan_13/jan_13_1_main.c new file mode 100644 index 0000000000..aa014505ee --- /dev/null +++ b/src/world/area_jan/jan_13/jan_13_1_main.c @@ -0,0 +1,28 @@ +#include "jan_13.h" + +EvtScript N(EVS_ExitWalk_jan_14_0) = EVT_EXIT_WALK(60, jan_13_ENTRY_1, "jan_14", jan_14_ENTRY_0); +EvtScript N(EVS_ExitWalk_jan_12_1) = EVT_EXIT_WALK(60, jan_13_ENTRY_0, "jan_12", jan_12_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_12_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_14_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_EXEC(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupPuzzle)) + EVT_EXEC(N(EVS_SetupTrees)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilits, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitn, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CALL(SetMusicTrack, 0, SONG_DEEP_JUNGLE, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_JUNGLE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_13/jan_13_2_puzzle.c b/src/world/area_jan/jan_13/jan_13_2_puzzle.c new file mode 100644 index 0000000000..cfd2f4ee6a --- /dev/null +++ b/src/world/area_jan/jan_13/jan_13_2_puzzle.c @@ -0,0 +1,680 @@ +#include "jan_13.h" +#include "entity.h" +#include "effects.h" + +// geyser positions in grid coordinates +#define POS_0_I 28 +#define POS_0_J 6 +#define POS_1_I 25 +#define POS_1_J 4 +#define POS_2_I 21 +#define POS_2_J 8 +#define POS_3_I 4 +#define POS_3_J 4 +#define POS_4_I 14 +#define POS_4_J 6 + +u16 N(GeyserAnimPhase) = 0; + +void N(setup_gfx_geyser)(void) { + f64 temp_f20 = ((sin_rad((f32) N(GeyserAnimPhase) * 0.02) + 1.0f) * 0.3) + 0.6; + f64 temp_f21 = (sin_rad((f32) N(GeyserAnimPhase) * 0.1) + 1.0f) * 0.1; + f32 scale = temp_f20 + temp_f21; + + guScale(&gDisplayContext->matrixStack[gMatrixListPos], (scale * 0.3) + 0.5, scale, (scale * 0.3) + 0.5); + gSPMatrix(gMasterGfxPos++, &gDisplayContext->matrixStack[gMatrixListPos++], G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); + N(GeyserAnimPhase)++; +} + +API_CALLABLE(N(GetRatioFromPercent)) { + script->varTable[2] = EVT_FLOAT_TO_FIXED(script->varTable[1] / 100.0f); + script->varTable[3] = EVT_FLOAT_TO_FIXED(script->varTable[1] / 100.0f); + return ApiStatus_DONE2; +} + +API_CALLABLE(N(AdjustEnvSoundPosition)) { + Bytecode* args = script->ptrReadPos; + + if (*args++ != 0) { + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + sfx_adjust_env_sound_pos(SOUND_4E, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(GetPlayerPosAfterPush)) { + PlayerStatus* playerStatus = &gPlayerStatus; + s32 posX = script->varTable[0]; + s32 posZ = script->varTable[2]; + + if (script->varTable[1] > -100) { + f32 theta = (playerStatus->targetYaw / 180.0f) * 3.141592f; + + posX -= (s32) (sin_rad(theta) * 25.0f); + posZ -= (s32) (-cos_rad(theta) * 25.0f); + } else { + posZ += 25; + } + script->varTable[0] = posX; + script->varTable[2] = posZ; + return ApiStatus_DONE2; +} + +EvtScript N(EVS_ManageSmallGeyser) = { + EVT_SET(LVarA, LVar0) // geyser model + EVT_SET(LVarB, LVar1) // index in solution + EVT_SET(LVarD, LVar2) // central collider + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_LOOP(0) + // get percent delta + EVT_IF_EQ(LVarB, MV_PuzzleProgress) + EVT_ADD(LVar0, 10) + EVT_ELSE + EVT_ADD(LVar0, -10) + EVT_END_IF + // clamp delta to [-10, 10] + EVT_IF_LT(LVar0, -10) + EVT_SET(LVar0, -10) + EVT_END_IF + EVT_IF_GT(LVar0, 10) + EVT_SET(LVar0, 10) + EVT_END_IF + EVT_ADD(LVar1, LVar0) + // clamp percent to [0, 100] + EVT_IF_LT(LVar1, 0) + EVT_SET(LVar1, 0) + EVT_END_IF + EVT_IF_GT(LVar1, 100) + EVT_SET(LVar1, 100) + EVT_END_IF + // set geyser scale + EVT_CALL(N(GetRatioFromPercent)) + EVT_IF_EQ(LVar1, 0) + EVT_IF_NE(LVarD, 0) + EVT_END_IF + EVT_CALL(EnableModel, LVarA, FALSE) + EVT_ELSE + EVT_IF_NE(LVarD, 0) + EVT_END_IF + EVT_CALL(EnableModel, LVarA, TRUE) + EVT_CALL(ScaleModel, LVarA, LVar3, LVar2, LVar3) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(SetLargeGeyserScale) = { + EVT_CALL(N(GetRatioFromPercent)) + EVT_IF_LT(LVar3, EVT_FLOAT(1.0)) + EVT_SETF(LVar4, LVar3) + EVT_ELSE + EVT_SETF(LVar4, EVT_FLOAT(1.0)) + EVT_END_IF + EVT_CALL(ScaleModel, LVarA, LVar4, LVar2, LVar3) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ManageLargeGeyser) = { + EVT_SET(LVarA, LVar0) // geyser model + EVT_SET(LVarB, LVar1) // index in solution + EVT_SET(LVarD, LVar2) // central collider + EVT_SET(LVar0, 0) + EVT_SET(LVar1, 0) + EVT_IF_EQ(GF_JAN13_SolvedBlockPuzzle, TRUE) + EVT_GOTO(10) + EVT_END_IF + EVT_LOOP(0) + EVT_IF_EQ(MV_PuzzleProgress, 5) + EVT_IF_EQ(AB_JAN_2, 1) + EVT_ADD(LVar0, 10) + EVT_ELSE + EVT_ADD(LVar0, -10) + EVT_END_IF + EVT_ELSE + EVT_ADD(LVar0, -10) + EVT_END_IF + EVT_IF_LT(LVar0, -10) + EVT_SET(LVar0, -10) + EVT_END_IF + EVT_IF_GT(LVar0, 10) + EVT_SET(LVar0, 10) + EVT_END_IF + EVT_ADD(LVar1, LVar0) + EVT_IF_LT(LVar1, 50) + EVT_SET(LVar1, 50) + EVT_END_IF + EVT_IF_GT(LVar1, 70) + EVT_SET(LVar1, 70) + EVT_END_IF + EVT_IF_EQ(LVar1, 0) + EVT_CALL(EnableModel, LVarA, FALSE) + EVT_WAIT(1) + EVT_ELSE + EVT_CALL(EnableModel, LVarA, TRUE) + EVT_EXEC_WAIT(N(SetLargeGeyserScale)) + EVT_END_IF + EVT_IF_EQ(AB_JAN_2, 2) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_SET(LVar0, 10) + EVT_LOOP(0) + EVT_IF_EQ(MV_PuzzleProgress, 5) + EVT_ADD(LVar1, LVar0) + EVT_IF_GT(LVar1, 300) + EVT_SET(LVar1, 300) + EVT_END_IF + EVT_EXEC_WAIT(N(SetLargeGeyserScale)) + EVT_ELSE + EVT_WAIT(1) + EVT_END_IF + EVT_IF_NE(GF_JAN13_SolvedBlockPuzzle, FALSE) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_SET(LVar0, -7) + EVT_LOOP(28) + EVT_ADD(LVar1, LVar0) + EVT_EXEC_WAIT(N(SetLargeGeyserScale)) + EVT_END_LOOP + EVT_LABEL(10) + EVT_IF_EQ(MV_PuzzleProgress, 5) + EVT_ADD(LVar0, 10) + EVT_ELSE + EVT_ADD(LVar0, -10) + EVT_END_IF + EVT_IF_LT(LVar0, -10) + EVT_SET(LVar0, -10) + EVT_END_IF + EVT_IF_GT(LVar0, 10) + EVT_SET(LVar0, 10) + EVT_END_IF + EVT_ADD(LVar1, LVar0) + EVT_IF_LT(LVar1, 0) + EVT_SET(LVar1, 0) + EVT_END_IF + EVT_IF_GT(LVar1, 100) + EVT_SET(LVar1, 100) + EVT_END_IF + EVT_IF_EQ(LVar1, 0) + EVT_CALL(EnableModel, LVarA, FALSE) + EVT_WAIT(1) + EVT_ELSE + EVT_CALL(EnableModel, LVarA, TRUE) + EVT_EXEC_WAIT(N(SetLargeGeyserScale)) + EVT_END_IF + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +Vec3i N(GeyserSoundPositions)[] = { + { -400 + POS_0_I * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2), 0, -150 + POS_0_J * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2) }, + { -400 + POS_1_I * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2), 0, -150 + POS_1_J * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2) }, + { -400 + POS_2_I * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2), 0, -150 + POS_2_J * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2) }, + { -400 + POS_3_I * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2), 0, -150 + POS_3_J * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2) }, + { -400 + POS_4_I * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2), 0, -150 + POS_4_J * BLOCK_GRID_SIZE + (BLOCK_GRID_SIZE / 2) }, + { 37, 0, -138 }, +}; + +EvtScript N(EVS_ManageGeyserSounds) = { + EVT_IF_NE(AB_JAN13_LastPuzzleProgress, MV_PuzzleProgress) + EVT_SET(AB_JAN13_LastPuzzleProgress, MV_PuzzleProgress) + EVT_SET(MF_GeyserSoundPlaying, FALSE) + EVT_CALL(StopSound, SOUND_8000001C) + EVT_CALL(StopSound, SOUND_8000001D) + EVT_IF_EQ(MV_PuzzleProgress, 5) + EVT_IF_EQ(GF_JAN13_SolvedBlockPuzzle, FALSE) + EVT_RETURN + EVT_END_IF + EVT_ELSE + EVT_IF_EQ(MV_PuzzleProgress, 6) + EVT_RETURN + EVT_END_IF + EVT_END_IF + EVT_CALL(PlaySound, SOUND_8000001C) + EVT_SET(MF_GeyserSoundPlaying, TRUE) + EVT_SET(LVar0, MV_PuzzleProgress) + EVT_ADD(LVar0, 1) + EVT_USE_BUF(EVT_PTR(N(GeyserSoundPositions))) + EVT_LOOP(LVar0) + EVT_BUF_READ3(LVar1, LVar2, LVar3) + EVT_END_LOOP + EVT_CALL(N(AdjustEnvSoundPosition), MF_GeyserSoundPlaying, LVar1, LVar2, LVar3) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BoulderTremble) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_o33, SOUND_191, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.5)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ManagePuzzle) = { + EVT_SET(LocalFlag(0), FALSE) + EVT_SET(AB_JAN_2, 0) + EVT_SET(AB_JAN13_LastPuzzleProgress, -1) + EVT_EXEC(N(EVS_ManageGeyserSounds)) + EVT_LABEL(0) + EVT_IF_EQ(GF_JAN13_SolvedBlockPuzzle, TRUE) + EVT_IF_EQ(LocalFlag(0), FALSE) + EVT_CALL(EnableModel, MODEL_o33, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o33, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetPushBlock, 0, 15, 0, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 16, 0, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 17, 0, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 18, 0, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 19, 0, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 15, 1, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 16, 1, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 17, 1, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 18, 1, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 19, 1, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 15, 2, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 16, 2, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 17, 2, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 18, 2, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 19, 2, PUSH_GRID_EMPTY) + EVT_SET(LocalFlag(0), TRUE) + EVT_END_IF + EVT_END_IF + EVT_CALL(GetPushBlock, 0, POS_0_I, POS_0_J, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_SET(MV_PuzzleProgress, 0) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(GetPushBlock, 0, POS_1_I, POS_1_J, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_SET(MV_PuzzleProgress, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(GetPushBlock, 0, POS_2_I, POS_2_J, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_SET(MV_PuzzleProgress, 2) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(GetPushBlock, 0, POS_3_I, POS_3_J, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_SET(MV_PuzzleProgress, 3) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(GetPushBlock, 0, POS_4_I, POS_4_J, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_SET(MV_PuzzleProgress, 4) + EVT_GOTO(1) + EVT_END_IF + EVT_IF_EQ(GF_JAN13_SolvedBlockPuzzle, FALSE) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetPushBlock, 0, 15, 0, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 16, 0, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 17, 0, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 18, 0, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 19, 0, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 15, 1, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 16, 1, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 17, 1, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 18, 1, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 19, 1, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 15, 2, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 16, 2, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 17, 2, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 18, 2, PUSH_GRID_EMPTY) + EVT_CALL(SetPushBlock, 0, 19, 2, PUSH_GRID_EMPTY) + EVT_SET(MV_PuzzleProgress, 5) + EVT_WAIT(30) + EVT_LOOP(2) + EVT_EXEC(N(EVS_BoulderTremble)) + EVT_CALL(RotateModel, MODEL_o33, 3, 0, EVT_FLOAT(0.2), 1) + EVT_WAIT(8) + EVT_CALL(RotateModel, MODEL_o33, -3, 0, EVT_FLOAT(0.2), 1) + EVT_WAIT(8) + EVT_END_LOOP + EVT_THREAD + EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) + EVT_CALL(GetModelCenter, MODEL_o33) + EVT_CALL(FacePlayerTowardPoint, LVar0, LVar2, 4) + EVT_CALL(GetPlayerPos, LVar3, LVar1, LVar2) + EVT_SET(LVar4, LVar0) + EVT_SET(LVar5, LVar0) + EVT_SUB(LVar4, 120) + EVT_ADD(LVar5, 120) + EVT_SWITCH(LVar3) + EVT_CASE_RANGE(LVar4, LVar5) + EVT_ADD(LVar0, LVar3) + EVT_DIV(LVar0, 2) + EVT_END_SWITCH + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_LOOP(3) + EVT_EXEC(N(EVS_BoulderTremble)) + EVT_CALL(RotateModel, MODEL_o33, 5, 0, EVT_FLOAT(0.2), 1) + EVT_WAIT(5) + EVT_CALL(RotateModel, MODEL_o33, -5, 0, EVT_FLOAT(0.2), 1) + EVT_WAIT(5) + EVT_END_LOOP + EVT_LOOP(7) + EVT_EXEC(N(EVS_BoulderTremble)) + EVT_CALL(RotateModel, MODEL_o33, 7, 0, EVT_FLOAT(0.2), 1) + EVT_WAIT(3) + EVT_CALL(RotateModel, MODEL_o33, -7, 0, EVT_FLOAT(0.2), 1) + EVT_WAIT(3) + EVT_END_LOOP + EVT_LOOP(8) + EVT_CALL(RandInt, 2, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 8, 0, -82, 0) + EVT_CASE_EQ(1) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 38, 0, -62, 0) + EVT_CASE_EQ(2) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 78, 0, -77, 0) + EVT_END_SWITCH + EVT_EXEC(N(EVS_BoulderTremble)) + EVT_CALL(RotateModel, MODEL_o33, 10, 0, EVT_FLOAT(0.2), 1) + EVT_WAIT(3) + EVT_CALL(RotateModel, MODEL_o33, -10, 0, EVT_FLOAT(0.2), 1) + EVT_WAIT(3) + EVT_END_LOOP + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 15, EVT_FLOAT(0.4)) + EVT_END_THREAD + EVT_CALL(PlaySoundAt, SOUND_8000001D, 0, 37, 0, -138) + EVT_SET(AB_JAN_2, 1) + EVT_THREAD + EVT_LOOP(200) + EVT_CALL(RotateModel, MODEL_o33, 10, 0, EVT_FLOAT(0.2), 1) + EVT_WAIT(3) + EVT_CALL(RotateModel, MODEL_o33, -10, 0, EVT_FLOAT(0.2), 1) + EVT_WAIT(3) + EVT_END_LOOP + EVT_END_THREAD + EVT_SET(LVar0, 0) + EVT_LOOP(18) + EVT_ADD(LVar0, 3) + EVT_CALL(TranslateModel, MODEL_o33, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(60) + EVT_CALL(TranslateModel, MODEL_o33, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_SET(AB_JAN_2, 2) + EVT_LOOP(25) + EVT_ADD(LVar0, 8) + EVT_CALL(TranslateModel, MODEL_o33, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_SET(LVar0, 200) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, 0) + EVT_LOOP(60) + EVT_ADD(LVar1, 1) + EVT_SUB(LVar0, LVar1) + EVT_ADD(LVar2, 10) + EVT_ADD(LVar2, -10) + EVT_CALL(TranslateModel, MODEL_o33, -200, LVar0, -500) + EVT_CALL(RotateModel, MODEL_o33, LVar2, -1, EVT_FLOAT(0.1), EVT_FLOAT(0.1)) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(EnableModel, MODEL_o33, FALSE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o33, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(GF_JAN13_SolvedBlockPuzzle, TRUE) + EVT_SET(LocalFlag(0), TRUE) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_ELSE + EVT_CALL(GetPushBlock, 0, 17, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_SET(MV_PuzzleProgress, 5) + EVT_GOTO(1) + EVT_END_IF + EVT_END_IF + EVT_SET(MV_PuzzleProgress, 6) + EVT_LABEL(1) + EVT_EXEC(N(EVS_ManageGeyserSounds)) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ManageGeyserPlayerPhysics) = { + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(GetGridIndexFromPos, 0, LVar0, LVar1, LVar2, LVar3, LVar4) + EVT_SET(LVar5, 0) + EVT_IF_EQ(MV_PuzzleProgress, 0) + EVT_IF_EQ(LVar3, POS_0_I) + EVT_IF_EQ(LVar4, POS_0_J) + EVT_SET(LVar5, 1) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(MV_PuzzleProgress, 1) + EVT_IF_EQ(LVar3, POS_1_I) + EVT_IF_EQ(LVar4, POS_1_J) + EVT_SET(LVar5, 1) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(MV_PuzzleProgress, 2) + EVT_IF_EQ(LVar3, POS_2_I) + EVT_IF_EQ(LVar4, POS_2_J) + EVT_SET(LVar5, 1) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(MV_PuzzleProgress, 3) + EVT_IF_EQ(LVar3, POS_3_I) + EVT_IF_EQ(LVar4, POS_3_J) + EVT_SET(LVar5, 1) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(MV_PuzzleProgress, 4) + EVT_IF_EQ(LVar3, POS_4_I) + EVT_IF_EQ(LVar4, POS_4_J) + EVT_SET(LVar5, 1) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(MV_PuzzleProgress, 5) + EVT_IF_EQ(LVar3, 17) + EVT_IF_EQ(LVar4, 0) + EVT_SET(LVar5, 1) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(MV_PuzzleProgress, 5) + EVT_IF_EQ(LVar3, 16) + EVT_IF_EQ(LVar4, 0) + EVT_SET(LVar5, 1) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(MV_PuzzleProgress, 5) + EVT_IF_EQ(LVar3, 18) + EVT_IF_EQ(LVar4, 0) + EVT_SET(LVar5, 1) + EVT_END_IF + EVT_END_IF + EVT_END_IF + EVT_IF_EQ(MV_PuzzleProgress, 5) + EVT_IF_EQ(LVar3, 19) + EVT_IF_EQ(LVar4, 0) + EVT_SET(LVar5, 1) + EVT_END_IF + EVT_END_IF + EVT_END_IF + // player is standing in a geyser + EVT_IF_EQ(LVar5, 1) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(N(GetPlayerPosAfterPush)) + EVT_CALL(InterruptUsePartner) + EVT_LOOP(10) + EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) + EVT_IF_LT(LVar4, 40) + EVT_ADDF(LVar4, 6) + EVT_END_IF + EVT_MULF(LVar3, 10) + EVT_MULF(LVar5, 10) + EVT_ADDF(LVar3, LVar0) + EVT_ADDF(LVar5, LVar2) + EVT_DIVF(LVar3, 11) + EVT_DIVF(LVar5, 11) + EVT_CALL(SetPlayerPos, LVar3, LVar4, LVar5) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002E) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupPuzzle) = { + EVT_CALL(CreatePushBlockGrid, 0, 32, 12, -400, 0, -150, 0) + EVT_CALL(SetPushBlock, 0, 7, 5, PUSH_GRID_BLOCK) + EVT_CALL(SetPushBlock, 0, 13, 9, PUSH_GRID_BLOCK) + EVT_CALL(SetPushBlock, 0, 16, 5, PUSH_GRID_BLOCK) + EVT_CALL(SetPushBlock, 0, 21, 2, PUSH_GRID_BLOCK) + EVT_CALL(SetPushBlock, 0, 22, 4, PUSH_GRID_BLOCK) + EVT_CALL(SetPushBlock, 0, 26, 6, PUSH_GRID_BLOCK) + EVT_CALL(SetPushBlock, 0, 27, 7, PUSH_GRID_BLOCK) + EVT_CALL(SetPushBlock, 0, 15, 0, PUSH_GRID_OBSTRUCTION) + EVT_CALL(SetPushBlock, 0, 16, 0, PUSH_GRID_OBSTRUCTION) + EVT_CALL(SetPushBlock, 0, 17, 0, PUSH_GRID_OBSTRUCTION) + EVT_CALL(SetPushBlock, 0, 18, 0, PUSH_GRID_OBSTRUCTION) + EVT_CALL(SetPushBlock, 0, 19, 0, PUSH_GRID_OBSTRUCTION) + EVT_CALL(SetPushBlock, 0, 15, 1, PUSH_GRID_OBSTRUCTION) + EVT_CALL(SetPushBlock, 0, 16, 1, PUSH_GRID_OBSTRUCTION) + EVT_CALL(SetPushBlock, 0, 17, 1, PUSH_GRID_OBSTRUCTION) + EVT_CALL(SetPushBlock, 0, 18, 1, PUSH_GRID_OBSTRUCTION) + EVT_CALL(SetPushBlock, 0, 19, 1, PUSH_GRID_OBSTRUCTION) + EVT_CALL(SetPushBlock, 0, 15, 2, PUSH_GRID_OBSTRUCTION) + EVT_CALL(SetPushBlock, 0, 16, 2, PUSH_GRID_OBSTRUCTION) + EVT_CALL(SetPushBlock, 0, 17, 2, PUSH_GRID_OBSTRUCTION) + EVT_CALL(SetPushBlock, 0, 18, 2, PUSH_GRID_OBSTRUCTION) + EVT_CALL(SetPushBlock, 0, 19, 2, PUSH_GRID_OBSTRUCTION) + // obstruct row 0 + EVT_SET(LVar0, 0) + EVT_LOOP(32) + EVT_CALL(SetPushBlock, 0, LVar0, 0, PUSH_GRID_OBSTRUCTION) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + // obstruct row 1 from 0 to 15 + EVT_SET(LVar0, 0) + EVT_LOOP(15) + EVT_CALL(SetPushBlock, 0, LVar0, 1, PUSH_GRID_OBSTRUCTION) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + // obstruct row 1 from 0 to 32 + EVT_SET(LVar0, 20) + EVT_LOOP(12) + EVT_CALL(SetPushBlock, 0, LVar0, 1, PUSH_GRID_OBSTRUCTION) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + // obstruct row 2 from 0 to 3 + EVT_SET(LVar0, 0) + EVT_LOOP(3) + EVT_CALL(SetPushBlock, 0, LVar0, 2, PUSH_GRID_OBSTRUCTION) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + // obstruct row 2 from 10 to 14 + EVT_SET(LVar0, 10) + EVT_LOOP(4) + EVT_CALL(SetPushBlock, 0, LVar0, 2, PUSH_GRID_OBSTRUCTION) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + // obstruct row 2 from 26 to 32 + EVT_SET(LVar0, 26) + EVT_LOOP(6) + EVT_CALL(SetPushBlock, 0, LVar0, 2, PUSH_GRID_OBSTRUCTION) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + // obstruct row 3 from 0 to 2 + EVT_SET(LVar0, 0) + EVT_LOOP(2) + EVT_CALL(SetPushBlock, 0, LVar0, 3, PUSH_GRID_OBSTRUCTION) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + // obstruct row 3 from 10 to 14 + EVT_SET(LVar0, 10) + EVT_LOOP(4) + EVT_CALL(SetPushBlock, 0, LVar0, 3, PUSH_GRID_OBSTRUCTION) + EVT_ADD(LVar0, 1) + EVT_END_LOOP + EVT_EXEC(N(EVS_ManagePuzzle)) + EVT_SET(LVar0, MODEL_o72) + EVT_SET(LVar1, 0) + EVT_SET(LVar2, COLLIDER_o50) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar2, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_ManageSmallGeyser)) + EVT_SET(LVar0, MODEL_o73) + EVT_SET(LVar1, 1) + EVT_SET(LVar2, COLLIDER_o51) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar2, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_ManageSmallGeyser)) + EVT_SET(LVar0, MODEL_o74) + EVT_SET(LVar1, 2) + EVT_SET(LVar2, COLLIDER_o52) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar2, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_ManageSmallGeyser)) + EVT_SET(LVar0, MODEL_o75) + EVT_SET(LVar1, 3) + EVT_SET(LVar2, COLLIDER_o53) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar2, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_ManageSmallGeyser)) + EVT_SET(LVar0, MODEL_o76) + EVT_SET(LVar1, 4) + EVT_SET(LVar2, COLLIDER_o49) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar2, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_ManageSmallGeyser)) + EVT_SET(LVar0, MODEL_o71) + EVT_SET(LVar1, 5) + EVT_SET(LVar2, COLLIDER_o76) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVar2, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(EVS_ManageLargeGeyser)) + EVT_EXEC(N(EVS_ManageGeyserPlayerPhysics)) + EVT_CALL(EnableTexPanning, MODEL_o72, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o73, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o74, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o75, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o76, TRUE) + EVT_CALL(EnableTexPanning, MODEL_o71, TRUE) + EVT_CALL(SetModelCustomGfx, MODEL_o72, CUSTOM_GFX_0, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelCustomGfx, MODEL_o73, CUSTOM_GFX_0, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelCustomGfx, MODEL_o74, CUSTOM_GFX_0, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelCustomGfx, MODEL_o75, CUSTOM_GFX_0, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelCustomGfx, MODEL_o76, CUSTOM_GFX_0, FOG_MODE_UNCHANGED) + EVT_CALL(SetModelCustomGfx, MODEL_o71, CUSTOM_GFX_0, FOG_MODE_UNCHANGED) + EVT_CALL(SetCustomGfxBuilders, CUSTOM_GFX_0, EVT_PTR(N(setup_gfx_geyser)), NULL) + EVT_SET(LVar0, 0) + EVT_LOOP(0) + EVT_SUB(LVar0, 2000) + EVT_IF_LT(LVar0, -0x10000) + EVT_ADD(LVar0, 0x10000) + EVT_END_IF + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, 0, 0, LVar0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_13/jan_13_3_trees.c b/src/world/area_jan/jan_13/jan_13_3_trees.c new file mode 100644 index 0000000000..b7eca78e5d --- /dev/null +++ b/src/world/area_jan/jan_13/jan_13_3_trees.c @@ -0,0 +1,73 @@ +#include "jan_13.h" + +#define NAME_SUFFIX _Trees +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o54, MODEL_o55, MODEL_o56); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o53); + +FoliageDropList N(Tree1_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { -335, 100, -55 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_JAN13_Tree1_Coin, + }, + } +}; + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { -388.0f, 114.0f, -77.0f }, + { -303.0f, 114.0f, -87.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .drops = &N(Tree1_Drops), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -348.0f, 0.0f, -107.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o50, MODEL_o51, MODEL_o52); +FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o49); + +FoliageVectorList N(Tree2_Effects) = { + .count = 2, + .vectors = { + { 264.0f, 114.0f, -81.0f }, + { 349.0f, 114.0f, -91.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .vectors = &N(Tree2_Effects), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { 304.0f, 0.0f, -111.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupTrees) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o113, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o110, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_13/jan_13_4_entity.c b/src/world/area_jan/jan_13/jan_13_4_entity.c new file mode 100644 index 0000000000..7189febdfc --- /dev/null +++ b/src/world/area_jan/jan_13/jan_13_4_entity.c @@ -0,0 +1,11 @@ +#include "jan_13.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_PinkFlower), -169, 0, -115, 10, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenYellowBlock), -185, 85, -35, 0, ITEM_VOLT_SHROOM, MAKE_ENTITY_END) + EVT_CALL(AssignBlockFlag, GF_JAN13_HiddenItem_VoltShroom) + EVT_CALL(UseDynamicShadow, TRUE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_14/B7A050.c b/src/world/area_jan/jan_14/B7A050.c deleted file mode 100644 index 07369e9e66..0000000000 --- a/src/world/area_jan/jan_14/B7A050.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "jan_14.h" - -static char* N(exit_str_0) = "jan_15"; -static char* N(exit_str_1) = "jan_13"; - -#include "world/common/todo/PullVine.inc.c" - -#include "common/foliage.inc.c" diff --git a/src/world/area_jan/jan_14/B7A510.c b/src/world/area_jan/jan_14/B7A510.c deleted file mode 100644 index e3bde47ac9..0000000000 --- a/src/world/area_jan/jan_14/B7A510.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "jan_14.h" - -#include "world/common/enemy/ai/HoppingAI.inc.c" diff --git a/src/world/area_jan/jan_14/jan_14.h b/src/world/area_jan/jan_14/jan_14.h index 929447e8b1..98aa3922d1 100644 --- a/src/world/area_jan/jan_14/jan_14.h +++ b/src/world/area_jan/jan_14/jan_14.h @@ -2,8 +2,27 @@ /// @brief Jade Jungle - Deep Jungle 3 #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_14_shape.h" +#include "mapfs/jan_14_hit.h" + +enum { + NPC_JungleFuzzy_01 = 0, + NPC_JungleFuzzy_02 = 1, +}; + +enum { + MV_BushOffsetL = MapVar(0), + MV_BushOffsetR = MapVar(1), + MV_PullVineCallback = MapVar(10), +}; + #define NAMESPACE jan_14 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupVines); +extern EvtScript N(EVS_SetupTrees); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_jan/jan_14/jan_14_0_header.c b/src/world/area_jan/jan_14/jan_14_0_header.c new file mode 100644 index 0000000000..64a9eb7fc8 --- /dev/null +++ b/src/world/area_jan/jan_14/jan_14_0_header.c @@ -0,0 +1,14 @@ +#include "jan_14.h" + +EntryList N(Entrances) = { + [jan_14_ENTRY_0] { -250.0, 0.0, 120.0, 0.0 }, + [jan_14_ENTRY_1] { 250.0, 0.0, -120.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_jan_14 }, +}; diff --git a/src/world/area_jan/jan_14/jan_14_1_main.c b/src/world/area_jan/jan_14/jan_14_1_main.c new file mode 100644 index 0000000000..691032465f --- /dev/null +++ b/src/world/area_jan/jan_14/jan_14_1_main.c @@ -0,0 +1,28 @@ +#include "jan_14.h" + +EvtScript N(EVS_ExitWalk_jan_15_0) = EVT_EXIT_WALK(60, jan_14_ENTRY_1, "jan_15", jan_15_ENTRY_0); +EvtScript N(EVS_ExitWalk_jan_13_1) = EVT_EXIT_WALK(60, jan_14_ENTRY_0, "jan_13", jan_13_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_13_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_15_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC(N(EVS_SetupVines)) + EVT_EXEC(N(EVS_SetupTrees)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilits, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitn, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CALL(SetMusicTrack, 0, SONG_DEEP_JUNGLE, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_JUNGLE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_14/jan_14_2_vines.c b/src/world/area_jan/jan_14/jan_14_2_vines.c new file mode 100644 index 0000000000..faa95117c7 --- /dev/null +++ b/src/world/area_jan/jan_14/jan_14_2_vines.c @@ -0,0 +1,126 @@ +#include "jan_14.h" + +enum { + VINE_IDX_0 = 0, + VINE_IDX_1 = 1, + VINE_IDX_2 = 2, + VINE_IDX_3 = 3, + VINE_IDX_4 = 4, + VINE_IDX_5 = 5, +}; + +#define PULL_VINE_CALLBACK_SCRIPT MV_PullVineCallback +#include "../common/PullVine.inc.c" + +#include "../common/MoveBush.inc.c" +#include "../common/MoveBushTemplates.h" + +EvtScript N(EVS_MoveBushes_Separate) = EVT_MOVE_BUSHES(COLLIDER_o12, + MODEL_o40, MODEL_o54, MV_BushOffsetL, MV_BushOffsetR); + +EvtScript N(EVS_MoveBushes) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o12, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(MakeLerp, 0, 45, 30, EASING_CUBIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(MV_BushOffsetR, LVar0) + EVT_SETF(MV_BushOffsetL, MV_BushOffsetR) + EVT_MULF(MV_BushOffsetR, EVT_FLOAT(1.5)) + EVT_MULF(MV_BushOffsetL, -1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_OnPullVine) = { + EVT_SWITCH(LVarC) + EVT_CASE_EQ(VINE_IDX_1) + EVT_EXEC(N(EVS_MoveBushes_Separate)) + EVT_EXEC(N(EVS_MoveBushes)) + EVT_CASE_EQ(VINE_IDX_2) + EVT_CALL(GetModelCenter, LVar9) + EVT_ADD(LVar0, -20) + EVT_ADD(LVar2, 15) + EVT_CALL(SetNpcPos, NPC_JungleFuzzy_01, LVar0, 100, LVar2) + EVT_CALL(SetNpcFlagBits, NPC_JungleFuzzy_01, NPC_FLAG_GRAVITY | NPC_FLAG_8000, TRUE) + EVT_CASE_EQ(VINE_IDX_3) + EVT_CALL(GetModelCenter, LVar9) + EVT_ADD(LVar2, 15) + EVT_CALL(MakeItemEntity, ITEM_FIRE_FLOWER, LVar0, 100, LVar2, ITEM_SPAWN_MODE_FALL, GF_JAN14_PullVine_FireFlower) + EVT_CASE_EQ(VINE_IDX_4) + EVT_CALL(GetModelCenter, LVar9) + EVT_ADD(LVar0, -20) + EVT_ADD(LVar2, 15) + EVT_CALL(SetNpcPos, NPC_JungleFuzzy_02, LVar0, 100, LVar2) + EVT_CALL(SetNpcFlagBits, NPC_JungleFuzzy_02, NPC_FLAG_GRAVITY | NPC_FLAG_8000, TRUE) + EVT_CASE_EQ(VINE_IDX_5) + EVT_CALL(GetModelCenter, LVar9) + EVT_ADD(LVar2, 15) + EVT_CALL(MakeItemEntity, ITEM_MUSHROOM, LVar0, 100, LVar2, ITEM_SPAWN_MODE_FALL, GF_JAN14_PullVine_Mushroom) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupVines) = { + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o10, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o78, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o79, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o76, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o80, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_NE(LVar0, jan_14_ENTRY_1) + EVT_SET(LVarC, VINE_IDX_1) + EVT_ELSE + EVT_SET(LVarC, VINE_IDX_0) + EVT_EXEC(N(EVS_MoveBushes_Separate)) + EVT_EXEC(N(EVS_MoveBushes)) + EVT_END_IF + EVT_SET(LVarF, MODEL_o28) + EVT_SET(MV_PullVineCallback, EVT_PTR(N(EVS_OnPullVine))) + EVT_SET(LVarD, MODEL_o8) + EVT_SET(LVarE, MODEL_o9) + EVT_SET(LVar9, MODEL_o57) + EVT_SET(LVarA, MODEL_o58) + EVT_SET(LVarB, MODEL_o59) + EVT_SET(LVar5, 0) + EVT_EXEC(N(EVS_PullVine_Manage)) + EVT_SET(LVarC, VINE_IDX_2) + EVT_SET(LVarD, MODEL_o78) + EVT_SET(LVarE, MODEL_o79) + EVT_SET(LVar9, MODEL_o61) + EVT_SET(LVarA, MODEL_o62) + EVT_SET(LVarB, MODEL_o63) + EVT_SET(LVar5, 15) + EVT_EXEC(N(EVS_PullVine_Manage)) + EVT_SET(LVarC, VINE_IDX_3) + EVT_SET(LVarD, MODEL_o77) + EVT_SET(LVarE, MODEL_o76) + EVT_SET(LVar9, MODEL_o65) + EVT_SET(LVarA, MODEL_o67) + EVT_SET(LVarB, MODEL_o2) + EVT_SET(LVar5, 15) + EVT_EXEC(N(EVS_PullVine_Manage)) + EVT_SET(LVarC, VINE_IDX_4) + EVT_SET(LVarD, MODEL_o81) + EVT_SET(LVarE, MODEL_o80) + EVT_SET(LVar9, MODEL_o69) + EVT_SET(LVarA, MODEL_o70) + EVT_SET(LVarB, MODEL_o71) + EVT_SET(LVar5, 15) + EVT_EXEC(N(EVS_PullVine_Manage)) + EVT_SET(LVarC, VINE_IDX_5) + EVT_SET(LVarD, MODEL_o82) + EVT_SET(LVarE, MODEL_o83) + EVT_SET(LVar9, MODEL_o75) + EVT_SET(LVarA, MODEL_o73) + EVT_SET(LVarB, MODEL_o2) + EVT_SET(LVar5, 15) + EVT_EXEC(N(EVS_PullVine_Manage)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_14/jan_14_3_trees.c b/src/world/area_jan/jan_14/jan_14_3_trees.c new file mode 100644 index 0000000000..86b8b8b5e4 --- /dev/null +++ b/src/world/area_jan/jan_14/jan_14_3_trees.c @@ -0,0 +1,135 @@ +#include "jan_14.h" + +#define NAME_SUFFIX _Trees +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o61, MODEL_o62, MODEL_o63); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o60); + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { -388.0f, 114.0f, -77.0f }, + { -303.0f, 114.0f, -87.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -348.0f, 0.0f, -107.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o65, MODEL_o67); +FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o64); + +FoliageVectorList N(Tree2_Effects) = { + .count = 2, + .vectors = { + { -234.0f, 114.0f, 19.0f }, + { -149.0f, 114.0f, 9.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .vectors = &N(Tree2_Effects), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { -194.0f, 0.0f, -11.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree3_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o69, MODEL_o70, MODEL_o71); +FoliageModelList N(Tree3_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o68); + +FoliageVectorList N(Tree3_Effects) = { + .count = 2, + .vectors = { + { -54.0f, 114.0f, -61.0f }, + { 31.0f, 114.0f, -71.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree3) = { + .leaves = &N(Tree3_LeafModels), + .trunk = &N(Tree3_TrunkModels), + .vectors = &N(Tree3_Effects), +}; + +BombTrigger N(BombPos_Tree3) = { + .pos = { 14.0f, 0.0f, -91.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree4_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o57, MODEL_o58, MODEL_o59); +FoliageModelList N(Tree4_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o56); + +FoliageVectorList N(Tree4_Effects) = { + .count = 2, + .vectors = { + { 364.0f, 114.0f, -61.0f }, + { 449.0f, 114.0f, -71.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree4) = { + .leaves = &N(Tree4_LeafModels), + .trunk = &N(Tree4_TrunkModels), + .vectors = &N(Tree4_Effects), +}; + +BombTrigger N(BombPos_Tree4) = { + .pos = { 404.0f, 0.0f, -91.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree5_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o73, MODEL_o75); +FoliageModelList N(Tree5_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o72); + +FoliageVectorList N(Tree5_Effects) = { + .count = 2, + .vectors = { + { 471.0f, 114.0f, 23.0f }, + { 556.0f, 114.0f, 13.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree5) = { + .leaves = &N(Tree5_LeafModels), + .trunk = &N(Tree5_TrunkModels), + .vectors = &N(Tree5_Effects), +}; + +BombTrigger N(BombPos_Tree5) = { + .pos = { 511.0f, 0.0f, -7.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupTrees) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o117, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o103, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o118, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree3)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree4))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o119, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree4)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree5))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o120, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree5)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_14/jan_14_4_npc.c b/src/world/area_jan/jan_14/jan_14_4_npc.c new file mode 100644 index 0000000000..099508bb91 --- /dev/null +++ b/src/world/area_jan/jan_14/jan_14_4_npc.c @@ -0,0 +1,69 @@ +#include "jan_14.h" + +#include "world/common/enemy/complete/JungleFuzzy.h" + +// uses base fuzzy includes instead of JungleFuzzy! +#include "world/common/enemy/complete/Fuzzy_Wander.inc.c" +#include "world/common/enemy/complete/Fuzzy.inc.c" + +EvtScript N(EVS_NpcIdle_JungleFuzzy) = { + EVT_LABEL(0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar1, 40) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_WAIT(45) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_Fuzzy_Wander))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_Unused) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_JungleFuzzy) = { + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_JungleFuzzy))) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_JungleFuzzy_01) = { + .id = NPC_JungleFuzzy_01, + .settings = &N(NpcSettings_Fuzzy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_JungleFuzzy), + .drops = JUNGLE_FUZZY_DROPS, + .animations = JUNGLE_FUZZY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, +}; + +StaticNpc N(NpcData_JungleFuzzy_02) = { + .id = NPC_JungleFuzzy_02, + .settings = &N(NpcSettings_Fuzzy), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .init = &N(EVS_NpcInit_JungleFuzzy), + .drops = JUNGLE_FUZZY_DROPS, + .animations = JUNGLE_FUZZY_ANIMS, + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_JungleFuzzy_01), BTL_JAN_FORMATION_0A, BTL_JAN_STAGE_04), + NPC_GROUP(N(NpcData_JungleFuzzy_02), BTL_JAN_FORMATION_0B, BTL_JAN_STAGE_04), + {} +}; diff --git a/src/world/area_jan/jan_15/B7D920.c b/src/world/area_jan/jan_15/B7D920.c deleted file mode 100644 index f6d02c5fb5..0000000000 --- a/src/world/area_jan/jan_15/B7D920.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "jan_15.h" - -static char* N(exit_str_0) = "jan_16"; -static char* N(exit_str_1) = "jan_14"; - -#include "world/common/todo/HeartPlant_SpawnHeart.inc.c" diff --git a/src/world/area_jan/jan_15/B7D9E0.c b/src/world/area_jan/jan_15/B7D9E0.c deleted file mode 100644 index 65e78bcf2b..0000000000 --- a/src/world/area_jan/jan_15/B7D9E0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "jan_15.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_jan/jan_15/jan_15.h b/src/world/area_jan/jan_15/jan_15.h index 077191ceef..cafda9c4d3 100644 --- a/src/world/area_jan/jan_15/jan_15.h +++ b/src/world/area_jan/jan_15/jan_15.h @@ -2,8 +2,27 @@ /// @brief Jade Jungle - Deep Jungle 4 (Ambush) #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_15_shape.h" +#include "mapfs/jan_15_hit.h" + +#include "sprite/npc/LargePiranha.h" + +enum { + NPC_PutridPiranha_01 = 0, + NPC_PutridPiranha_02 = 1, + NPC_PutridPiranha_03 = 2, + NPC_HeartPlant_01 = 3, + NPC_HeartPlant_02 = 4, +}; + #define NAMESPACE jan_15 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupTrees); +extern EvtScript N(EVS_MakeEntities); + +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_jan/jan_15/jan_15_0_header.c b/src/world/area_jan/jan_15/jan_15_0_header.c new file mode 100644 index 0000000000..c2db71c9ea --- /dev/null +++ b/src/world/area_jan/jan_15/jan_15_0_header.c @@ -0,0 +1,14 @@ +#include "jan_15.h" + +EntryList N(Entrances) = { + [jan_15_ENTRY_0] { -300.0, 0.0, 120.0, 0.0 }, + [jan_15_ENTRY_1] { 380.0, 0.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_jan_15 }, +}; diff --git a/src/world/area_jan/jan_15/jan_15_1_main.c b/src/world/area_jan/jan_15/jan_15_1_main.c new file mode 100644 index 0000000000..2155c590c3 --- /dev/null +++ b/src/world/area_jan/jan_15/jan_15_1_main.c @@ -0,0 +1,41 @@ +#include "jan_15.h" + +EvtScript N(EVS_ExitWalk_jan_16) = { + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(UseExitHeading, 60, jan_15_ENTRY_1) + EVT_EXEC(ExitWalk) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_RAFAELS_TREE) + EVT_CALL(GotoMap, EVT_PTR("jan_16"), jan_16_ENTRY_3) + EVT_ELSE + EVT_CALL(GotoMap, EVT_PTR("jan_16"), jan_16_ENTRY_0) + EVT_END_IF + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ExitWalk_jan_14_1) = EVT_EXIT_WALK(60, jan_15_ENTRY_0, "jan_14", jan_14_ENTRY_1); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_14_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilis, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_16)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupTrees)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilits, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_CALL(SetMusicTrack, 0, SONG_DEEP_JUNGLE, 0, 8) + EVT_CALL(PlayAmbientSounds, AMBIENT_JUNGLE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_15/jan_15_2_npc.c b/src/world/area_jan/jan_15/jan_15_2_npc.c new file mode 100644 index 0000000000..3515221935 --- /dev/null +++ b/src/world/area_jan/jan_15/jan_15_2_npc.c @@ -0,0 +1,235 @@ +#include "jan_15.h" + +#include "world/common/enemy/complete/PutridPiranhaSentinel.inc.c" +#include "world/common/enemy/complete/HeartPlant.inc.c" + +EvtScript N(EVS_PutridPiranhas_IdleChomping) = { + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_CALL(RandInt, 5, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim01) + EVT_WAIT(15) + EVT_ELSE + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim05) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_LargePiranha_Putrid_Anim06) + EVT_WAIT(5) + EVT_END_IF + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_CALL(RandInt, 5, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim01) + EVT_WAIT(15) + EVT_ELSE + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim05) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim06) + EVT_WAIT(5) + EVT_END_IF + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_LOOP(0) + EVT_CALL(RandInt, 5, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_03, ANIM_LargePiranha_Putrid_Anim01) + EVT_WAIT(15) + EVT_ELSE + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_03, ANIM_LargePiranha_Putrid_Anim05) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_03, ANIM_LargePiranha_Putrid_Anim06) + EVT_WAIT(5) + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_PutridPiranha) = { + EVT_IF_EQ(GF_JAN15_EncounteredMiniboss, FALSE) + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 34) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00BB, 320, 60) + EVT_SET(GF_JAN15_EncounteredMiniboss, TRUE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_EXEC_GET_TID(N(EVS_PutridPiranhas_IdleChomping), LVar9) + EVT_CALL(AwaitPlayerApproach, 400, -10, 135) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_KILL_THREAD(LVar9) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim01) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim01) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_03, ANIM_LargePiranha_Putrid_Anim01) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_03, ANIM_LargePiranha_Putrid_Anim04) + EVT_SET(LVar0, 0) + EVT_LOOP(15) + EVT_ADD(LVar0, 24) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_03, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_03, SOUND_3B1, 0) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_03, ANIM_LargePiranha_Putrid_Anim01) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim04) + EVT_SET(LVar0, 0) + EVT_LOOP(15) + EVT_ADD(LVar0, 24) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_01, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B1, 0) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim01) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim04) + EVT_SET(LVar0, 0) + EVT_LOOP(15) + EVT_ADD(LVar0, 24) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_02, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_02, SOUND_20B1, 0) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim01) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim04) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim04) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_03, ANIM_LargePiranha_Putrid_Anim04) + EVT_SET(LVar0, 0) + EVT_LOOP(12) + EVT_ADD(LVar0, 30) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_01, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_02, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_03, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B2, 0) + EVT_SET(LVar0, 0) + EVT_LOOP(12) + EVT_ADD(LVar0, 30) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_01, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_02, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_03, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B2, 0) + EVT_SET(LVar0, 0) + EVT_LOOP(12) + EVT_ADD(LVar0, 30) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_01, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_02, 0, LVar0, 0) + EVT_CALL(SetNpcRotation, NPC_PutridPiranha_03, 0, LVar0, 0) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B2, 0) + EVT_LOOP(3) + EVT_WAIT(5) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_20B3, 0) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim05) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim05) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_03, ANIM_LargePiranha_Putrid_Anim05) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_01, ANIM_LargePiranha_Putrid_Anim06) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_02, ANIM_LargePiranha_Putrid_Anim06) + EVT_CALL(SetNpcAnimation, NPC_PutridPiranha_03, ANIM_LargePiranha_Putrid_Anim06) + EVT_CALL(PlaySoundAtNpc, NPC_PutridPiranha_01, SOUND_3B2, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(StartBossBattle, SONG_SPECIAL_BATTLE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_PutridPiranha) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_SET(GB_StoryProgress, STORY_CH5_DEFEATED_PIRANHAS_MINIBOSS) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_PutridPiranha) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH5_DEFEATED_PIRANHAS_MINIBOSS) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_PutridPiranha))) + EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_PutridPiranha))) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_PutridPiranha_01, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_PutridPiranha_02, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_PutridPiranha_03, NPC_DISPOSE_LOCATION) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Piranhas)[] = { + { + .id = NPC_PutridPiranha_01, + .settings = &N(NpcSettings_PutridPiranhaSentinel), + .pos = { 365.0f, 0.0f, -45.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .init = &N(EVS_NpcInit_PutridPiranha), + .drops = PIRANHA_SENTINEL_DROPS, + .animations = PIRANHA_SENTINEL_ANIMS, + }, + { + .id = NPC_PutridPiranha_02, + .settings = &N(NpcSettings_PutridPiranhaSentinel), + .pos = { 325.0f, 0.0f, 0.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = PIRANHA_SENTINEL_DROPS, + .animations = PIRANHA_SENTINEL_ANIMS, + }, + { + .id = NPC_PutridPiranha_03, + .settings = &N(NpcSettings_PutridPiranhaSentinel), + .pos = { 375.0f, 0.0f, 45.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_800 | ENEMY_FLAG_40000, + .drops = PIRANHA_SENTINEL_DROPS, + .animations = PIRANHA_SENTINEL_ANIMS, + }, +}; + +StaticNpc N(NpcData_HeartPlant_01) = { + .id = NPC_HeartPlant_01, + .settings = &N(NpcSettings_HeartPlant), + .pos = { -183.0f, 0.0f, 47.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .drops = NPC_NO_DROPS, + .animations = HEART_PLANT_ANIMS, + .tattle = MSG_NpcTattle_HeartPlant, +}; + +StaticNpc N(NpcData_HeartPlant_02) = { + .id = NPC_HeartPlant_02, + .settings = &N(NpcSettings_HeartPlant), + .pos = { -124.0f, 0.0f, 20.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, + .drops = NPC_NO_DROPS, + .animations = HEART_PLANT_ANIMS, + .tattle = MSG_NpcTattle_HeartPlant, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Piranhas), BTL_JAN2_FORMATION_03, BTL_JAN2_STAGE_04), + NPC_GROUP(N(NpcData_HeartPlant_01)), + NPC_GROUP(N(NpcData_HeartPlant_02)), + {} +}; diff --git a/src/world/area_jan/jan_15/jan_15_3_trees.c b/src/world/area_jan/jan_15/jan_15_3_trees.c new file mode 100644 index 0000000000..ed695d8227 --- /dev/null +++ b/src/world/area_jan/jan_15/jan_15_3_trees.c @@ -0,0 +1,73 @@ +#include "jan_15.h" + +#define NAME_SUFFIX _Trees +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o73, MODEL_o74, MODEL_o75); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o72); + +FoliageVectorList N(Tree1_Effects) = { + .count = 2, + .vectors = { + { -134.0f, 114.0f, -72.0f }, + { -49.0f, 114.0f, -82.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -94.0f, 0.0f, -102.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o65, MODEL_o66, MODEL_o67); +FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o64); + +FoliageDropList N(Tree2_Drops) = { + .count = 1, + .drops = { + { + .itemID = ITEM_COIN, + .pos = { 170, 100, -80 }, + .spawnMode = ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + .pickupFlag = GF_JAN15_Tree2_Coin, + }, + } +}; + +FoliageVectorList N(Tree2_Effects) = { + .count = 2, + .vectors = { + { 164.0f, 114.0f, -71.0f }, + { 249.0f, 114.0f, -81.0f }, + } +}; + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), + .drops = &N(Tree2_Drops), + .vectors = &N(Tree2_Effects), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { 204.0f, 0.0f, -101.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupTrees) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o97, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o98, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_15/jan_15_4_entity.c b/src/world/area_jan/jan_15/jan_15_4_entity.c new file mode 100644 index 0000000000..81e4f20e61 --- /dev/null +++ b/src/world/area_jan/jan_15/jan_15_4_entity.c @@ -0,0 +1,10 @@ +#include "jan_15.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_PinkFlower), 385, 0, -75, 10, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_HiddenPanel), 0, 0, 0, 0, MODEL_o87, MAKE_ENTITY_END) + EVT_CALL(AssignPanelFlag, GF_JAN15_HiddenPanel) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_16/B80000.c b/src/world/area_jan/jan_16/B80000.c deleted file mode 100644 index 59c12bba94..0000000000 --- a/src/world/area_jan/jan_16/B80000.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "jan_16.h" - -static char* N(exit_str_0) = "jan_15"; -static char* N(exit_str_1) = "jan_22"; -static char* N(exit_str_2) = "jan_17"; -static char* N(exit_str_3) = ""; - -#include "world/common/atomic/UnkFunc27.inc.c" diff --git a/src/world/area_jan/jan_16/B80300.c b/src/world/area_jan/jan_16/B80300.c deleted file mode 100644 index 8fa60fd49a..0000000000 --- a/src/world/area_jan/jan_16/B80300.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "jan_16.h" - -#include "common/foliage.inc.c" - diff --git a/src/world/area_jan/jan_16/jan_16.h b/src/world/area_jan/jan_16/jan_16.h index 9102c34bba..cc597606a4 100644 --- a/src/world/area_jan/jan_16/jan_16.h +++ b/src/world/area_jan/jan_16/jan_16.h @@ -2,8 +2,35 @@ /// @brief Jade Jungle - Base of Great Tree #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_16_shape.h" +#include "mapfs/jan_16_hit.h" + +#include "sprite/npc/Raven.h" +#include "sprite/npc/RaphaelRaven.h" + +enum { + NPC_RaphaelRaven = 0, + NPC_Raven_01 = 1, + NPC_Raven_02 = 2, + NPC_Raven_03 = 3, + NPC_Raven_04 = 4, + NPC_Raven_05 = 5, +}; + +enum { + MV_Unk_0A = MapVar(10), +}; + #define NAMESPACE jan_16 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SetupBushes); +extern EvtScript N(D_802412D4_B812D4); +extern EvtScript N(EVS_MakeEntities); + +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_jan/jan_16/jan_16_0_header.c b/src/world/area_jan/jan_16/jan_16_0_header.c new file mode 100644 index 0000000000..15068c0e95 --- /dev/null +++ b/src/world/area_jan/jan_16/jan_16_0_header.c @@ -0,0 +1,17 @@ +#include "jan_16.h" + +EntryList N(Entrances) = { + [jan_16_ENTRY_0] { -480.0, 0.0, 0.0, 90.0 }, + [jan_16_ENTRY_1] { 480.0, 0.0, 0.0, 270.0 }, + [jan_16_ENTRY_2] { -247.0, 0.0, 0.0, 225.0 }, + [jan_16_ENTRY_3] { -390.0, 0.0, 20.0, 100.0 }, + [jan_16_ENTRY_4] { 35.0, 600.0, 330.0, 180.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_jan_16 }, +}; diff --git a/src/world/area_jan/jan_16/jan_16_1_music.c b/src/world/area_jan/jan_16/jan_16_1_music.c new file mode 100644 index 0000000000..f28e9f49ac --- /dev/null +++ b/src/world/area_jan/jan_16/jan_16_1_music.c @@ -0,0 +1,20 @@ +#include "jan_16.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetEntryID, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(jan_16_ENTRY_0) + EVT_CALL(SetMusicTrack, 0, SONG_RAPHAEL_RAVEN, 0, 8) + EVT_SET(AF_JAN_03, FALSE) + EVT_CASE_EQ(jan_16_ENTRY_3) + EVT_CALL(SetMusicTrack, 0, SONG_RAPHAEL_RAVEN, 1, 8) + EVT_SET(AF_JAN_03, TRUE) + EVT_CASE_DEFAULT + EVT_IF_EQ(AF_JAN_03, FALSE) + EVT_CALL(SetMusicTrack, 0, SONG_RAPHAEL_RAVEN, 0, 8) + EVT_END_IF + EVT_END_SWITCH + EVT_CALL(PlayAmbientSounds, AMBIENT_JUNGLE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_16/jan_16_2_main.c b/src/world/area_jan/jan_16/jan_16_2_main.c new file mode 100644 index 0000000000..9c0c373fa5 --- /dev/null +++ b/src/world/area_jan/jan_16/jan_16_2_main.c @@ -0,0 +1,150 @@ +#include "jan_16.h" +#include "effects.h" + +EvtScript N(EVS_ExitWalk_jan_15_1) = EVT_EXIT_WALK(60, jan_16_ENTRY_0, "jan_15", jan_15_ENTRY_1); +EvtScript N(EVS_ExitWalk_jan_22_1) = EVT_EXIT_WALK(60, jan_16_ENTRY_1, "jan_22", jan_22_ENTRY_1); +EvtScript N(EVS_ExitWalk_jan_17_0) = EVT_EXIT_WALK(60, jan_16_ENTRY_2, "jan_17", jan_17_ENTRY_0); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_15_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_22_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_17_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_o83, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SpawnButterflies) = { + EVT_IF_NE(GB_StoryProgress, STORY_CH5_RAFAEL_LEFT_NEST) + EVT_PLAY_EFFECT(EFFECT_BUTTERFLIES, 5, -310, 10, 0) + EVT_PLAY_EFFECT(EFFECT_BUTTERFLIES, 5, -210, 10, 240) + EVT_PLAY_EFFECT(EFFECT_BUTTERFLIES, 5, 330, 10, 260) + EVT_END_IF + EVT_PLAY_EFFECT(EFFECT_BUTTERFLIES, 5, -300, 10, 270) + EVT_PLAY_EFFECT(EFFECT_BUTTERFLIES, 5, -80, 10, 390) + EVT_PLAY_EFFECT(EFFECT_BUTTERFLIES, 5, 430, 10, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_AnimateFallBreakingBranch) = { + EVT_SET(LVarF, 0) + EVT_LOOP(0) + EVT_SETF(LVar0, MV_Unk_0A) + EVT_SETF(LVar1, MV_Unk_0A) + EVT_MULF(LVar0, EVT_FLOAT(-0.02)) + EVT_MULF(LVar1, EVT_FLOAT(0.04)) + EVT_ADDF(LVar0, 1) + EVT_ADDF(LVar1, 1) + EVT_CALL(ScaleGroup, MODEL_g47, LVar0, LVar1, 1) + EVT_ADD(LVarF, 1) + EVT_IF_GE(LVarF, 600) + EVT_SET(LVarF, 0) + EVT_END_IF + EVT_SETF(LVar0, LVarA) + EVT_MULF(LVar0, EVT_FLOAT(-0.046875)) + EVT_ADDF(MV_Unk_0A, LVar0) + EVT_MULF(MV_Unk_0A, EVT_FLOAT(0.84375)) + EVT_ADDF(LVarA, MV_Unk_0A) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_EnterFalling) = { + EVT_EXEC(N(EVS_AnimateFallBreakingBranch)) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 35, 100, 330) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 35, 100, 330) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(GetPartnerInUse, LVar0) + EVT_IF_NE(LVar0, PARTNER_NONE) + EVT_CALL(InterruptUsePartner) + EVT_END_IF + EVT_WAIT(15) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 35, 0, 330) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.8)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_THREAD + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetPlayerPos, 35, 600, 340) + EVT_CALL(MakeLerp, 600, 130, 15, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetPlayerPos, 35, LVar0, 340) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, 35, 120, 340, 100) + EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, 55, 120, 330, 100) + EVT_ADDF(MV_Unk_0A, EVT_FLOAT(-7.5)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 190, 350) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.2)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_THREAD + EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0)) + EVT_CALL(PlaySoundAtPlayer, SOUND_SHAKE_TREE, 0) + EVT_CALL(PlayerJump, -35, 0, 385, 30) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_END_THREAD + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, 0) + EVT_CALL(NpcJump0, NPC_PARTNER, 35, 130, 330, 15) + EVT_THREAD + EVT_LOOP(3) + EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, 35, 120, 340, 100) + EVT_PLAY_EFFECT(EFFECT_DROP_LEAVES, 0, 55, 120, 340, 100) + EVT_WAIT(5) + EVT_END_LOOP + EVT_END_THREAD + EVT_ADDF(MV_Unk_0A, EVT_FLOAT(-7.5)) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -35, 0, 385) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.8)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(2.0)) + EVT_CALL(NpcJump0, NPC_PARTNER, -10, 0, 395, 20) + EVT_CALL(EnablePartnerAI) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +#include "world/common/atomic/UnkFunc27.inc.c" + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_ALT_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(D_802412D4_B812D4)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, jan_16_ENTRY_4) + EVT_EXEC(N(EVS_EnterFalling)) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_ELSE + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_SetupMusic)) + EVT_EXEC(N(EVS_SetupBushes)) + EVT_EXEC(N(EVS_SpawnButterflies)) + EVT_CALL(N(UnkFunc27), 0, -1, 3) + EVT_CALL(N(UnkFunc27), 2, 0, 3) + EVT_CALL(N(UnkFunc26), 3, 255, 255, 255, 0, 0, 25, 0, 0, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_16/jan_16_3_npc.c b/src/world/area_jan/jan_16/jan_16_3_npc.c new file mode 100644 index 0000000000..09a83a3c3f --- /dev/null +++ b/src/world/area_jan/jan_16/jan_16_3_npc.c @@ -0,0 +1,418 @@ +#include "jan_16.h" +#include "effects.h" + +EvtScript N(EVS_NpcAuxAI_RaphaelRaven) = { + EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(1.5), EVT_FLOAT(1.5), EVT_FLOAT(1.5)) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_RaphaelRaven) = { + .height = 98, + .radius = 80, + .level = 99, + .otherAI = &N(EVS_NpcAuxAI_RaphaelRaven), +}; + +NpcSettings N(NpcSettings_Raven) = { + .height = 26, + .radius = 24, + .level = 99, +}; + +EvtScript N(D_802412D4_B812D4) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_REACHED_RAFAELS_TREE) + EVT_CALL(EnableGroup, MODEL_g38, FALSE) + EVT_CALL(EnableGroup, MODEL_g54, FALSE) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_CALL(SetCamType, CAM_DEFAULT, 1, FALSE) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -269, 94, -8) + EVT_CALL(SetPanTarget, CAM_DEFAULT, -269, 94, -8) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 1000) + EVT_CALL(SetCamPitch, CAM_DEFAULT, 20, 0) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -410, -85) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamPitch, CAM_DEFAULT, -13, 1) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.45)) + EVT_CALL(SetCamPosA, CAM_DEFAULT, -207, -85) + EVT_CALL(PanToTarget, CAM_DEFAULT, EVT_FLOAT(0.8), 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(30) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_SET(GB_StoryProgress, STORY_CH5_REACHED_RAFAELS_TREE) + EVT_END_IF + EVT_CALL(EnableGroup, MODEL_g38, TRUE) + EVT_CALL(EnableGroup, MODEL_g54, TRUE) + EVT_CALL(EnableGroup, MODEL_g39, FALSE) + EVT_CALL(EnableGroup, MODEL_g56, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Raven) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_00E3) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Raven) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH5_RAFAEL_LEFT_NEST) + EVT_GOTO(20) + EVT_CASE_RANGE(STORY_CH5_RAFAEL_LEFT_NEST, STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Raven))) + EVT_CALL(GetSelfNpcID, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_CALL(SetNpcPos, NPC_Raven_01, -450, 0, 26) + EVT_CALL(SetNpcPos, NPC_Raven_02, -430, 0, 4) + EVT_CALL(SetNpcPos, NPC_Raven_03, -410, 0, -18) + EVT_CALL(SetNpcPos, NPC_Raven_04, -390, 0, -40) + EVT_CALL(SetNpcPos, NPC_Raven_05, -411, 93, -16) + EVT_END_IF + EVT_CASE_GT(STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_LABEL(20) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o113, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_RaphaelRaven) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o130, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Idle) + EVT_CALL(NpcFacePlayer, NPC_SELF, 4) + EVT_WAIT(5) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(4.5), LVar0, LVar1, LVar2, 450, EVT_FLOAT(20.0), EVT_FLOAT(-9.5)) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 0) + EVT_WAIT(10) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_WAIT(20) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Jump) + EVT_WAIT(8) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Fall) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeetAngry) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeetAngry, ANIM_RaphaelRaven_TalkNoFeetAngry, 5, MSG_CH5_00E1) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_IdleNoFeet) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Idle) + EVT_END_THREAD + EVT_CALL(SetNpcJumpscale, NPC_SELF, 2) + EVT_CALL(NpcJump1, NPC_SELF, LVar0, LVar1, LVar2, 30) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_18A, 0) + EVT_THREAD + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 50, EVT_FLOAT(1.0)) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_END_THREAD + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_THREAD + EVT_WAIT(20) + EVT_LOOP(10) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 115, 0, 355, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 205, 0, 475, 0) + EVT_WAIT(2) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 190, 0, 445, 0) + EVT_WAIT(2) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 140, 0, 380, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 170, 0, 400, 0) + EVT_WAIT(2) + EVT_END_LOOP + EVT_END_THREAD + EVT_LOOP(15) + EVT_CALL(ScaleGroup, MODEL_g40, 1, EVT_FLOAT(1.05), 1) + EVT_WAIT(2) + EVT_CALL(ScaleGroup, MODEL_g40, 1, EVT_FLOAT(0.95), 1) + EVT_WAIT(2) + EVT_END_LOOP + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(MakeLerp, 0, 100, 100, EASING_QUADRATIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(TranslateGroup, MODEL_g40, 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_SET(LVar0, 1) + EVT_LOOP(6) + EVT_SWITCH(LVar0) + EVT_CASE_RANGE(1, 4) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o97, SOUND_18C, 0) + EVT_CASE_EQ(5) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o97, SOUND_18D, 0) + EVT_CASE_EQ(6) + EVT_CALL(PlaySoundAtCollider, COLLIDER_o97, SOUND_18E, 0) + EVT_END_SWITCH + EVT_ADD(LVar0, 1) + EVT_WAIT(20) + EVT_END_LOOP + EVT_END_THREAD + EVT_SETF(LVar2, EVT_FLOAT(1.0)) + EVT_SETF(LVar3, EVT_FLOAT(0.25)) + EVT_LOOP(5) + EVT_LOOP(10) + EVT_ADDF(LVar2, LVar3) + EVT_CALL(ScaleGroup, MODEL_g40, 1, LVar2, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 123, 0, 352, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 193, 0, 450, 0) + EVT_LOOP(10) + EVT_SUBF(LVar2, LVar3) + EVT_CALL(ScaleGroup, MODEL_g40, 1, LVar2, 1) + EVT_WAIT(1) + EVT_END_LOOP + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 115, 0, 355, 0) + EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 1, 205, 0, 475, 0) + EVT_SUBF(LVar3, EVT_FLOAT(0.05)) + EVT_END_LOOP + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o97, COLLIDER_FLAGS_UPPER_MASK) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_Talk, ANIM_RaphaelRaven_Idle, 0, MSG_CH5_00E2) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Walk) + EVT_CALL(SetNpcSpeed, NPC_RaphaelRaven, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 340, 270, 0) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, 0, -1000, 0) + EVT_CALL(ResetCam, CAM_DEFAULT, 5) + EVT_SET(GB_StoryProgress, STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_RaphaelRaven) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_RAFAEL_LEFT_NEST) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, 85, 0, 410) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_RaphaelRaven))) + EVT_RETURN + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o130, COLLIDER_FLAGS_UPPER_MASK) + EVT_IF_GE(GB_StoryProgress, STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o97, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(TranslateGroup, MODEL_g40, 0, 100, 0) + EVT_END_IF + EVT_END_IF + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_RaphaelRaven)[] = { + { + .id = NPC_RaphaelRaven, + .settings = &N(NpcSettings_RaphaelRaven), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_RaphaelRaven), + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_RaphaelRaven_Idle, + .walk = ANIM_RaphaelRaven_Idle, + .run = ANIM_RaphaelRaven_Idle, + .chase = ANIM_RaphaelRaven_Idle, + .anim_4 = ANIM_RaphaelRaven_Idle, + .anim_5 = ANIM_RaphaelRaven_Idle, + .death = ANIM_RaphaelRaven_Idle, + .hit = ANIM_RaphaelRaven_Idle, + .anim_8 = ANIM_RaphaelRaven_Idle, + .anim_9 = ANIM_RaphaelRaven_Idle, + .anim_A = ANIM_RaphaelRaven_Idle, + .anim_B = ANIM_RaphaelRaven_Idle, + .anim_C = ANIM_RaphaelRaven_Idle, + .anim_D = ANIM_RaphaelRaven_Idle, + .anim_E = ANIM_RaphaelRaven_Idle, + .anim_F = ANIM_RaphaelRaven_Idle, + }, + .tattle = MSG_NpcTattle_RaphaelRaven, + }, + { + .id = NPC_Raven_01, + .settings = &N(NpcSettings_Raven), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .init = &N(EVS_NpcInit_Raven), + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Raven_Idle, + .walk = ANIM_Raven_Idle, + .run = ANIM_Raven_Idle, + .chase = ANIM_Raven_Idle, + .anim_4 = ANIM_Raven_Idle, + .anim_5 = ANIM_Raven_Idle, + .death = ANIM_Raven_Idle, + .hit = ANIM_Raven_Idle, + .anim_8 = ANIM_Raven_Idle, + .anim_9 = ANIM_Raven_Idle, + .anim_A = ANIM_Raven_Idle, + .anim_B = ANIM_Raven_Idle, + .anim_C = ANIM_Raven_Idle, + .anim_D = ANIM_Raven_Idle, + .anim_E = ANIM_Raven_Idle, + .anim_F = ANIM_Raven_Idle, + }, + .tattle = MSG_NpcTattle_RavenA, + }, + { + .id = NPC_Raven_02, + .settings = &N(NpcSettings_Raven), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .init = &N(EVS_NpcInit_Raven), + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Raven_Idle, + .walk = ANIM_Raven_Idle, + .run = ANIM_Raven_Idle, + .chase = ANIM_Raven_Idle, + .anim_4 = ANIM_Raven_Idle, + .anim_5 = ANIM_Raven_Idle, + .death = ANIM_Raven_Idle, + .hit = ANIM_Raven_Idle, + .anim_8 = ANIM_Raven_Idle, + .anim_9 = ANIM_Raven_Idle, + .anim_A = ANIM_Raven_Idle, + .anim_B = ANIM_Raven_Idle, + .anim_C = ANIM_Raven_Idle, + .anim_D = ANIM_Raven_Idle, + .anim_E = ANIM_Raven_Idle, + .anim_F = ANIM_Raven_Idle, + }, + .tattle = MSG_NpcTattle_RavenB, + }, + { + .id = NPC_Raven_03, + .settings = &N(NpcSettings_Raven), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .init = &N(EVS_NpcInit_Raven), + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Raven_Idle, + .walk = ANIM_Raven_Idle, + .run = ANIM_Raven_Idle, + .chase = ANIM_Raven_Idle, + .anim_4 = ANIM_Raven_Idle, + .anim_5 = ANIM_Raven_Idle, + .death = ANIM_Raven_Idle, + .hit = ANIM_Raven_Idle, + .anim_8 = ANIM_Raven_Idle, + .anim_9 = ANIM_Raven_Idle, + .anim_A = ANIM_Raven_Idle, + .anim_B = ANIM_Raven_Idle, + .anim_C = ANIM_Raven_Idle, + .anim_D = ANIM_Raven_Idle, + .anim_E = ANIM_Raven_Idle, + .anim_F = ANIM_Raven_Idle, + }, + .tattle = MSG_NpcTattle_RavenC, + }, + { + .id = NPC_Raven_04, + .settings = &N(NpcSettings_Raven), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .init = &N(EVS_NpcInit_Raven), + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Raven_Idle, + .walk = ANIM_Raven_Idle, + .run = ANIM_Raven_Idle, + .chase = ANIM_Raven_Idle, + .anim_4 = ANIM_Raven_Idle, + .anim_5 = ANIM_Raven_Idle, + .death = ANIM_Raven_Idle, + .hit = ANIM_Raven_Idle, + .anim_8 = ANIM_Raven_Idle, + .anim_9 = ANIM_Raven_Idle, + .anim_A = ANIM_Raven_Idle, + .anim_B = ANIM_Raven_Idle, + .anim_C = ANIM_Raven_Idle, + .anim_D = ANIM_Raven_Idle, + .anim_E = ANIM_Raven_Idle, + .anim_F = ANIM_Raven_Idle, + }, + .tattle = MSG_NpcTattle_RavenD, + }, + { + .id = NPC_Raven_05, + .settings = &N(NpcSettings_Raven), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .init = &N(EVS_NpcInit_Raven), + .drops = { + .dropFlags = NPC_DROP_FLAG_80, + .heartDrops = NO_DROPS, + .flowerDrops = NO_DROPS, + }, + .animations = { + .idle = ANIM_Raven_Idle, + .walk = ANIM_Raven_Idle, + .run = ANIM_Raven_Idle, + .chase = ANIM_Raven_Idle, + .anim_4 = ANIM_Raven_Idle, + .anim_5 = ANIM_Raven_Idle, + .death = ANIM_Raven_Idle, + .hit = ANIM_Raven_Idle, + .anim_8 = ANIM_Raven_Idle, + .anim_9 = ANIM_Raven_Idle, + .anim_A = ANIM_Raven_Idle, + .anim_B = ANIM_Raven_Idle, + .anim_C = ANIM_Raven_Idle, + .anim_D = ANIM_Raven_Idle, + .anim_E = ANIM_Raven_Idle, + .anim_F = ANIM_Raven_Idle, + }, + .tattle = MSG_NpcTattle_RavenE, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_RaphaelRaven)), + {} +}; diff --git a/src/world/area_jan/jan_16/jan_16_4_entity.c b/src/world/area_jan/jan_16/jan_16_4_entity.c new file mode 100644 index 0000000000..3cdcd8486b --- /dev/null +++ b/src/world/area_jan/jan_16/jan_16_4_entity.c @@ -0,0 +1,9 @@ +#include "jan_16.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_CALL(MakeEntity, EVT_PTR(Entity_PinkFlower), -112, 0, 210, 0, MAKE_ENTITY_END) + EVT_CALL(MakeEntity, EVT_PTR(Entity_PinkFlower), -453, 0, 188, 170, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_16/jan_16_5_bushes.c b/src/world/area_jan/jan_16/jan_16_5_bushes.c new file mode 100644 index 0000000000..d0bcc8f78b --- /dev/null +++ b/src/world/area_jan/jan_16/jan_16_5_bushes.c @@ -0,0 +1,74 @@ +#include "jan_16.h" + +#define NAME_SUFFIX _Bushes +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o63); + +FoliageVectorList N(Bush1_Effects) = { + .count = 1, + .vectors = { + { -273.0f, 17.0f, 390.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush1) = { + .bush = &N(Bush1_BushModels), + .vectors = &N(Bush1_Effects), +}; + +FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o109); + +FoliageVectorList N(Bush2_Effects) = { + .count = 1, + .vectors = { + { 181.0f, 16.0f, 222.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush2) = { + .bush = &N(Bush2_BushModels), + .vectors = &N(Bush2_Effects), +}; + +FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o110); + +FoliageVectorList N(Bush3_Effects) = { + .count = 1, + .vectors = { + { 308.0f, 17.0f, 223.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush3) = { + .bush = &N(Bush3_BushModels), + .vectors = &N(Bush3_Effects), +}; + +FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o111); + +FoliageVectorList N(Bush4_Effects) = { + .count = 1, + .vectors = { + { 461.0f, 19.0f, -59.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush4) = { + .bush = &N(Bush4_BushModels), + .vectors = &N(Bush4_Effects), +}; + +EvtScript N(EVS_SetupBushes) = { + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o126, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o127, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o128, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush4))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o129, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c deleted file mode 100644 index 1e0afe91c0..0000000000 --- a/src/world/area_jan/jan_22/B84180.c +++ /dev/null @@ -1,26 +0,0 @@ -#include "jan_22.h" - -static char* N(exit_str_0) = "jan_03"; -static char* N(exit_str_1) = "jan_16"; -static char* N(exit_str_2) = "kzn_01"; -static char* N(exit_str_3) = ""; - -#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" - -#include "world/common/todo/StashVars.inc.c" - -#include "world/common/todo/GetItemName.inc.c" - -#include "world/common/todo/SetCamera0Flag1000.inc.c" - -#include "world/common/todo/UnsetCamera0Flag1000.inc.c" - -ApiStatus PostChapter5StatUpdate(Evt* script, s32 isInitialCall) { - PlayerData* playerData = &gPlayerData; - - set_max_SP(5); - playerData->curHP = playerData->curMaxHP; - playerData->curFP = playerData->curMaxFP; - sync_status_menu(); - return ApiStatus_DONE2; -} diff --git a/src/world/area_jan/jan_22/B851A0.c b/src/world/area_jan/jan_22/B851A0.c deleted file mode 100644 index 5fa758f7ca..0000000000 --- a/src/world/area_jan/jan_22/B851A0.c +++ /dev/null @@ -1,72 +0,0 @@ -#include "jan_22.h" - -ApiStatus func_80241020_B851A0(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (*args++ != 0) { - script->functionTemp[0] = evt_get_variable(script, *args++); - script->functionTemp[1] = evt_get_variable(script, *args++); - script->functionTemp[2] = evt_get_variable(script, *args++); - sfx_adjust_env_sound_pos(SOUND_168, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); - } - return ApiStatus_DONE2; -} - -ApiStatus func_802410C4_B85244(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (*args++ != 0) { - script->functionTemp[0] = evt_get_variable(script, *args++); - script->functionTemp[1] = evt_get_variable(script, *args++); - script->functionTemp[2] = evt_get_variable(script, *args++); - sfx_adjust_env_sound_pos(SOUND_185, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); - } - return ApiStatus_DONE2; -} - -ApiStatus func_80241168_B852E8(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 mode = evt_get_variable(script, *args++); - f32* array = (f32*) script->array[0]; - - f32 dx = array[3] - array[0]; - f32 dy = array[4] - array[1]; - f32 dz = array[5] - array[2]; - - script->varTable[5] = (dx / 1000.0f) * script->varTable[0]; - script->varTable[6] = (dy / 1000.0f) * script->varTable[0]; - script->varTable[7] = (dz / 1000.0f) * script->varTable[0]; - - if (mode == 0) { - Npc* partner = get_npc_safe(-4); - gPlayerStatus.position.x = (script->varTable[2] + script->varTable[5]); - gPlayerStatus.position.y = (script->varTable[3] + script->varTable[6]); - gPlayerStatus.position.z = (script->varTable[4] + script->varTable[7]); - gPlayerStatus.targetYaw = atan2(array[0], array[2], array[3], array[5]); - partner->pos.x = gPlayerStatus.position.x; - partner->pos.y = gPlayerStatus.position.y - 10.0f; - partner->pos.z = gPlayerStatus.position.z - 5.0f; - } - return ApiStatus_DONE2; -} - -ApiStatus func_802412E0_B85460(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 posA = evt_get_variable(script, *args++); - s32 ax1 = posA - 17; - s32 ax2 = posA + 17; - s32 posB = evt_get_variable(script, *args++); - s32 bx1 = posB - 17; - s32 bx2 = posB + 17; - - script->varTable[8] = -1; - if (((gPlayerStatus.position.x < ax1) || (ax2 < gPlayerStatus.position.x)) - && ((gPlayerStatus.position.x < bx1) || (bx2 < gPlayerStatus.position.x))) { - script->varTable[8] = gGameStatusPtr->pressedButtons[0] & BUTTON_A; - } - return ApiStatus_DONE2; -} - -#include "common/foliage.inc.c" - -#include "world/common/todo/PullVineSub.inc.c" diff --git a/src/world/area_jan/jan_22/B858A0.c b/src/world/area_jan/jan_22/B858A0.c deleted file mode 100644 index aef4024a45..0000000000 --- a/src/world/area_jan/jan_22/B858A0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "jan_22.h" - -#define NAMESPACE dup_jan_22 -#include "common/foliage.inc.c" -#define NAMESPACE jan_22 diff --git a/src/world/area_jan/jan_22/jan_22.h b/src/world/area_jan/jan_22/jan_22.h index cc42aee437..d9d05e0bf0 100644 --- a/src/world/area_jan/jan_22/jan_22.h +++ b/src/world/area_jan/jan_22/jan_22.h @@ -2,8 +2,58 @@ /// @brief Jade Jungle - Path to the Volcano #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_22_shape.h" +#include "mapfs/jan_22_hit.h" + +#include "sprite/npc/Raven.h" +#include "sprite/npc/RaphaelRaven.h" +#include "sprite/npc/Kolorado.h" +#include "sprite/npc/SpearGuy.h" +#include "sprite/npc/WorldMisstar.h" + +enum { + NPC_Kolorado_01 = 0, + NPC_Kolorado_02 = 1, + NPC_ZiplineDummy1 = 2, + NPC_ZiplineDummy2 = 3, + NPC_SpearGuy = 4, + NPC_RaphaelRaven = 5, + NPC_Raven_01 = 6, + NPC_Raven_02 = 7, + NPC_Raven_03 = 8, + NPC_Raven_04 = 9, + NPC_Raven_05 = 10, + NPC_Misstar = 11, +}; + +enum { + MV_BushOffsetL = MapVar(0), + MV_BushOffsetR = MapVar(1), +}; + +enum { + MF_RidingZipline1 = MapFlag(10), + MF_RidingZipline2 = MapFlag(11), +}; + #define NAMESPACE jan_22 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern EvtScript N(EVS_SyncZiplineDummyNPC1); +extern EvtScript N(EVS_SyncZiplineDummyNPC2); +extern EvtScript N(EVS_SeparateBushesImmediately); +extern EvtScript N(EVS_Scene_RaphaelComingThrough); +extern EvtScript N(EVS_SetupZiplines); +extern EvtScript N(EVS_SetupBasketElevator); +extern EvtScript N(EVS_SetupTrees); +extern EvtScript N(EVS_SetupBushes); +extern EvtScript N(EVS_MoveBushes); +extern EvtScript N(EVS_MakeEntities); + +extern NpcGroupList(N(DefaultNPCs)); +extern NpcGroupList(N(RavenNPCs)); diff --git a/src/world/area_jan/jan_22/jan_22_0_header.c b/src/world/area_jan/jan_22/jan_22_0_header.c new file mode 100644 index 0000000000..fe72199445 --- /dev/null +++ b/src/world/area_jan/jan_22/jan_22_0_header.c @@ -0,0 +1,16 @@ +#include "jan_22.h" + +EntryList N(Entrances) = { + [jan_22_ENTRY_0] { -480.0, 0.0, 0.0, 90.0 }, + [jan_22_ENTRY_1] { -190.0, 0.0, -130.0, 180.0 }, + [jan_22_ENTRY_2] { 1200.0, 90.0, 0.0, 270.0 }, + [jan_22_ENTRY_3] { 1200.0, 90.0, 0.0, 270.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_jan_22 }, +}; diff --git a/src/world/area_jan/jan_22/jan_22_1_music.c b/src/world/area_jan/jan_22/jan_22_1_music.c new file mode 100644 index 0000000000..ff511e3b1c --- /dev/null +++ b/src/world/area_jan/jan_22/jan_22_1_music.c @@ -0,0 +1,40 @@ +#include "jan_22.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(GetEntryID, LVar0) + EVT_IF_EQ(LVar0, jan_22_ENTRY_3) + EVT_CALL(SetMusicTrack, 0, SONG_STAR_SPIRIT_THEME, 1, 8) + EVT_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_IF_GE(GB_StoryProgress, STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetMusicTrack, 0, SONG_DEEP_JUNGLE, 0, 8) + EVT_END_THREAD + EVT_ELSE + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_RANGE(STORY_CH5_RAFAEL_MOVED_ROOT, STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_IF_NE(LVar0, jan_22_ENTRY_1) + EVT_CALL(SetMusicTrack, 0, SONG_RAPHAEL_RAVEN, 0, 8) + EVT_SET(AF_JAN_03, FALSE) + EVT_END_IF + EVT_THREAD + EVT_LOOP(0) + EVT_WAIT(1) + EVT_IF_GE(GB_StoryProgress, STORY_CH5_ZIP_LINE_READY) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetMusicTrack, 0, SONG_DEEP_JUNGLE, 0, 8) + EVT_SET(AF_JAN_03, FALSE) + EVT_END_THREAD + EVT_CASE_DEFAULT + EVT_CALL(SetMusicTrack, 0, SONG_DEEP_JUNGLE, 0, 8) + EVT_END_SWITCH + EVT_END_IF + EVT_CALL(PlayAmbientSounds, AMBIENT_JUNGLE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_22/jan_22_2_main.c b/src/world/area_jan/jan_22/jan_22_2_main.c new file mode 100644 index 0000000000..7698543f1c --- /dev/null +++ b/src/world/area_jan/jan_22/jan_22_2_main.c @@ -0,0 +1,149 @@ +#include "jan_22.h" + +EvtScript N(EVS_ExitWalk_jan_03_2) = EVT_EXIT_WALK(60, jan_22_ENTRY_0, "jan_03", jan_03_ENTRY_2); +EvtScript N(EVS_ExitWalk_jan_16_1) = EVT_EXIT_WALK(60, jan_22_ENTRY_1, "jan_16", jan_16_ENTRY_1); +EvtScript N(EVS_ExitWalk_kzn_01_0) = EVT_EXIT_WALK(60, jan_22_ENTRY_2, "kzn_01", kzn_01_ENTRY_0); + +MAP_RODATA_PAD(1, exits); + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_03_2)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_16_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilin, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_kzn_01_0)), TRIGGER_FLOOR_ABOVE, COLLIDER_deilie, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_LavaFalls) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTexPanner, MODEL_o262, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o269, TEX_PANNER_1) + EVT_CALL(SetTexPanner, MODEL_o261, TEX_PANNER_1) + EVT_SET(LVar0, 0) + EVT_LABEL(10) + EVT_CALL(SetTexPanOffset, TEX_PANNER_1, TEX_PANNER_MAIN, 0, LVar0) + EVT_SUB(LVar0, 300) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_LavaSpread) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTexPanner, MODEL_o275, TEX_PANNER_2) + EVT_CALL(SetTexPanner, MODEL_o274, TEX_PANNER_2) + EVT_SET(LVar0, 0) + EVT_LABEL(10) + EVT_CALL(SetTexPanOffset, TEX_PANNER_2, TEX_PANNER_MAIN, 0, LVar0) + EVT_SUB(LVar0, 300) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_LavaFlow) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTexPanner, MODEL_o263, TEX_PANNER_3) + EVT_CALL(SetTexPanner, MODEL_o271, TEX_PANNER_3) + EVT_SET(LVar0, 0) + EVT_LABEL(10) + EVT_CALL(SetTexPanOffset, TEX_PANNER_3, TEX_PANNER_MAIN, 0, LVar0) + EVT_SUB(LVar0, 170) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_TexPan_LavaGather) = { + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTexPanner, MODEL_o267, TEX_PANNER_4) + EVT_CALL(SetTexPanner, MODEL_o272, TEX_PANNER_4) + EVT_SET(LVar0, 0) + EVT_LABEL(10) + EVT_CALL(SetTexPanOffset, TEX_PANNER_4, TEX_PANNER_MAIN, 0, LVar0) + EVT_ADD(LVar0, 300) + EVT_WAIT(1) + EVT_GOTO(10) + EVT_RETURN + EVT_END +}; + +LavaReset N(SafeFloorColliders)[] = { + { .colliderID = COLLIDER_o170, .pos = { 750.0, 0.0, 50.0 }}, + { .colliderID = COLLIDER_o70, .pos = { 750.0, 0.0, 50.0 }}, + { .colliderID = COLLIDER_o119, .pos = { 960.0, 0.0, 50.0 }}, + { .colliderID = COLLIDER_o276, .pos = { 960.0, 0.0, 50.0 }}, + { .colliderID = -1 } +}; + +EvtScript N(D_8024202C_B861AC) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH5_ZIP_LINE_READY) + EVT_CALL(SetGroupEnabled, MODEL_g39, 0) + EVT_CALL(SetGroupEnabled, MODEL_g52, 0) + EVT_CALL(SetGroupEnabled, MODEL_g58, 0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g29, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g39, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_g86, COLLIDER_FLAGS_UPPER_MASK) + EVT_END_IF + EVT_IF_GE(GB_StoryProgress, STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o149, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC_WAIT(N(EVS_SeparateBushesImmediately)) + EVT_END_IF + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_THREAD + EVT_EXEC(N(EVS_Scene_RaphaelComingThrough)) + EVT_WAIT(200) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_END_THREAD + EVT_CASE_EQ(STORY_CH5_BEGAN_PEACH_MISSION) + EVT_EXEC(N(EVS_BindExitTriggers)) + EVT_CASE_DEFAULT + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_WAIT(1) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_DEFAULT() + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o304, COLLIDER_FLAGS_UPPER_MASK) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CASE_EQ(STORY_CH5_BEGAN_PEACH_MISSION) + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CASE_DEFAULT + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(RavenNPCs))) + EVT_END_SWITCH + EVT_EXEC_WAIT(N(EVS_MakeEntities)) + EVT_EXEC(N(EVS_SetupZiplines)) + EVT_EXEC(N(EVS_SetupBasketElevator)) + EVT_EXEC(N(EVS_SetupTrees)) + EVT_EXEC(N(EVS_SetupBushes)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_SURFACE, COLLIDER_o294, SURFACE_TYPE_LAVA) + EVT_THREAD + EVT_CALL(ResetFromLava, EVT_PTR(N(SafeFloorColliders))) + EVT_END_THREAD + EVT_EXEC(N(EVS_TexPan_LavaFalls)) + EVT_EXEC(N(EVS_TexPan_LavaSpread)) + EVT_EXEC(N(EVS_TexPan_LavaFlow)) + EVT_EXEC(N(EVS_TexPan_LavaGather)) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitw, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilite, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitn, COLLIDER_FLAGS_UPPER_MASK) + EVT_EXEC(N(D_8024202C_B861AC)) + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_BEGAN_PEACH_MISSION) + EVT_WAIT(65) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_22/jan_22_3_npc.c b/src/world/area_jan/jan_22/jan_22_3_npc.c new file mode 100644 index 0000000000..6a8843de06 --- /dev/null +++ b/src/world/area_jan/jan_22/jan_22_3_npc.c @@ -0,0 +1,1578 @@ +#include "jan_22.h" + +#include "world/common/npc/Kolorado.inc.c" +#include "world/common/enemy/complete/SpearGuy_Patrol.inc.c" +#include "world/common/npc/RaphaelRaven.inc.c" +#include "world/common/npc/Raven.inc.c" +#include "world/common/npc/StarSpirit.inc.c" +#include "world/common/npc/Dummy.inc.c" + +#include "world/common/complete/GiveReward.inc.c" + +#include "world/common/todo/SetCamera0Flag1000.inc.c" +#include "world/common/todo/UnsetCamera0Flag1000.inc.c" + +enum { + RAVEN_SCENE_AWAITING_COMMAND = 0, + RAVEN_SCENE_LEAP_INTO_ACTION = 10, + RAVEN_SCENE_CONSTRUCTION_WORK = 11, + RAVEN_SCENE_FINISH_WORK = 20, + RAVEN_SCENE_LOWERED_BASKET = 22, + RAVEN_SCENE_HEADNG_OUT = 25, +}; + +API_CALLABLE(N(UpgradeStarPowerCh5)) { + PlayerData* playerData = &gPlayerData; + + set_max_SP(5); + playerData->curHP = playerData->curMaxHP; + playerData->curFP = playerData->curMaxFP; + sync_status_menu(); + return ApiStatus_DONE2; +} + +EvtScript N(EVS_TetherCamToBasketPlayer) = { + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_UseBasketElevator) = { + EVT_CALL(GetPartnerInUse, LVar9) + EVT_IF_EQ(LVar9, PARTNER_KOOPER) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar9, PARTNER_BOMBETTE) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar9, PARTNER_LAKILESTER) + EVT_RETURN + EVT_END_IF + EVT_CALL(IsPlayerOnValidFloor, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(IsPlayerWithin, 200, 0, 25, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_WAIT(7) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) + EVT_CALL(GetPartnerInUse, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_ADD(LVar5, -5) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.5)) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar3, LVar4, LVar5, 10) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) + EVT_END_IF + EVT_EXEC_GET_TID(N(EVS_TetherCamToBasketPlayer), LVar7) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_186, 0) + EVT_CALL(MakeLerp, 0, 170, 60, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(LVar6, LVar4) + EVT_ADD(LVar6, LVar0) + EVT_CALL(SetPlayerPos, LVar3, LVar6, LVar5) + EVT_CALL(GetPartnerInUse, LVar8) + EVT_IF_EQ(LVar8, PARTNER_NONE) + EVT_ADD(LVar6, 5) + EVT_ADD(LVar5, -5) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar3, LVar6, LVar5) + EVT_ADD(LVar6, -5) + EVT_ADD(LVar5, 5) + EVT_END_IF + EVT_SETF(LVar2, EVT_FLOAT(200.0)) + EVT_SUBF(LVar2, LVar0) + EVT_DIVF(LVar2, EVT_FLOAT(200.0)) + EVT_CALL(ScaleModel, MODEL_o147, 1, LVar2, 1) + EVT_CALL(TranslateModel, MODEL_o146, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o124, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVar7) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_WAIT(5) + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_186, 0) + EVT_CALL(MakeLerp, 170, 0, 60, EASING_CUBIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar2, EVT_FLOAT(200.0)) + EVT_SUBF(LVar2, LVar0) + EVT_DIVF(LVar2, EVT_FLOAT(200.0)) + EVT_CALL(ScaleModel, MODEL_o147, 1, LVar2, 1) + EVT_CALL(TranslateModel, MODEL_o146, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o124, 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(SetPlayerJumpscale, EVT_FLOAT(1.0)) + EVT_CALL(PlayerJump, 270, 205, 15, 20) + EVT_CALL(HidePlayerShadow, FALSE) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, 285, 15, 0) + EVT_END_THREAD + EVT_CALL(PartnerIsFlying, LVar0) + EVT_IF_EQ(LVar0, TRUE) + EVT_WAIT(10) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.0)) + EVT_CALL(NpcJump0, NPC_PARTNER, 260, 205, 15, 15) + EVT_END_IF + EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_WAIT(5) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupBasketElevator) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_UseBasketElevator)), TRIGGER_FLOOR_TOUCH, COLLIDER_o124, 1, 0) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_ZIP_LINE_READY) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o124, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ScaleModel, MODEL_o147, 1, EVT_FLOAT(0.15625), 1) + EVT_CALL(TranslateModel, MODEL_o146, 0, 178, 0) + EVT_CALL(TranslateModel, MODEL_o124, 0, 178, 0) + EVT_ELSE + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o124, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ScaleModel, MODEL_o147, 1, 1, 1) + EVT_CALL(TranslateModel, MODEL_o146, 0, 0, 0) + EVT_CALL(TranslateModel, MODEL_o124, 0, 0, 0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_GatherRavensNearRaphael) = { + EVT_CALL(SetNpcPos, NPC_Raven_01, 177, 0, -10) + EVT_CALL(SetNpcPos, NPC_Raven_02, 127, 0, 5) + EVT_CALL(SetNpcPos, NPC_Raven_03, 152, 0, 0) + EVT_CALL(SetNpcPos, NPC_Raven_04, 102, 0, 0) + EVT_CALL(SetNpcPos, NPC_Raven_05, 77, 0, -10) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Ravens_LeapIntoTree) = { + EVT_CHILD_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_2A6, 0) + EVT_CALL(SetNpcFlagBits, NPC_Raven_02, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Flail) + EVT_CALL(NpcJump0, NPC_Raven_02, 271, 325, -17, 30) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_WAIT(3) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_2A7, 0) + EVT_CALL(SetNpcFlagBits, NPC_Raven_05, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Flail) + EVT_CALL(NpcJump0, NPC_Raven_05, 400, 215, -23, 30) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_WAIT(6) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_01, SOUND_2A6, 0) + EVT_CALL(SetNpcFlagBits, NPC_Raven_01, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Flail) + EVT_CALL(NpcJump0, NPC_Raven_01, 208, 335, -17, 30) + EVT_END_CHILD_THREAD + EVT_CHILD_THREAD + EVT_WAIT(9) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_2A7, 0) + EVT_CALL(SetNpcFlagBits, NPC_Raven_03, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Flail) + EVT_CALL(NpcJump0, NPC_Raven_03, 327, 200, -8, 30) + EVT_END_CHILD_THREAD + EVT_WAIT(30) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_2A6, 0) + EVT_CALL(SetNpcFlagBits, NPC_Raven_04, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Flail) + EVT_CALL(NpcJump0, NPC_Raven_04, 222, 284, -13, 15) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_RaphaelRaven) = { + EVT_CALL(GetNpcPos, NPC_RaphaelRaven, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(N(SetCamera0Flag1000)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(SetNpcFlagBits, NPC_RaphaelRaven, NPC_FLAG_100, TRUE) + EVT_CALL(NpcFacePlayer, NPC_SELF, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_Talk, ANIM_RaphaelRaven_Idle, 0, MSG_CH5_00C7) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_Talk, ANIM_RaphaelRaven_Idle, 0, MSG_CH5_00C8) + EVT_CALL(SetNpcVar, NPC_Raven_01, 0, RAVEN_SCENE_LEAP_INTO_ACTION) + EVT_CALL(BindNpcInteract, NPC_SELF, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_RaphaelRaven) = { + EVT_LABEL(0) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_RaphaelRaven))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_RaphaelRaven) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_RaphaelRaven))) + EVT_CASE_EQ(STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_CALL(SetNpcPos, NPC_SELF, 125, 0, -40) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_RaphaelRaven))) + EVT_CASE_DEFAULT + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Raven) = { + EVT_IF_EQ(GF_JAN22_Met_Raven, FALSE) + EVT_CALL(SpeakToPlayer, NPC_Raven_01, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_00D2) + EVT_SET(GF_JAN22_Met_Raven, TRUE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_Raven_01, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_00D3) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Raven_HopAndWalkAway) = { + EVT_WAIT(45) + EVT_CALL(NpcJump0, LVar0, 30, 0, -15, 10) + EVT_CALL(SetNpcAnimation, LVar0, ANIM_Raven_Walk) + EVT_CALL(SetNpcSpeed, LVar0, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, LVar0, -120, 0, 0) + EVT_CALL(SetNpcPos, LVar0, NPC_DISPOSE_LOCATION) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BuildingEffects) = { + EVT_CALL(PlaySoundAt, SOUND_8000001E, 0, 270, 130, 0) + EVT_LOOP(0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(1.0)) + EVT_WAIT(30) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 8, EVT_FLOAT(1.0)) + EVT_CALL(RandInt, 4, LVar0) + EVT_ADD(LVar0, 1) + EVT_PLAY_EFFECT(EFFECT_DAMAGE_STARS, 3, 290, 155, 0, 240, 0, 0, LVar0) + EVT_WAIT(10) + EVT_PLAY_EFFECT(EFFECT_DAMAGE_STARS, 3, 275, 150, 0, 240, 0, 0, 3) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(1.0)) + EVT_WAIT(4) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 2, EVT_FLOAT(1.0)) + EVT_WAIT(4) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_ManageRavens) = { + EVT_LABEL(0) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o304, COLLIDER_FLAGS_UPPER_MASK) + EVT_LABEL(1) + EVT_CALL(NpcFacePlayer, NPC_Raven_01, 0) + EVT_CALL(NpcFacePlayer, NPC_Raven_02, 0) + EVT_CALL(NpcFacePlayer, NPC_Raven_03, 0) + EVT_CALL(NpcFacePlayer, NPC_Raven_04, 0) + EVT_CALL(NpcFacePlayer, NPC_Raven_05, 0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, RAVEN_SCENE_AWAITING_COMMAND) + EVT_WAIT(1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o304, COLLIDER_FLAGS_UPPER_MASK) + EVT_LABEL(2) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(RAVEN_SCENE_LEAP_INTO_ACTION) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(InterpNpcYaw, NPC_Raven_01, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_Raven_02, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_Raven_03, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_Raven_04, 90, 0) + EVT_CALL(InterpNpcYaw, NPC_Raven_05, 90, 0) + EVT_WAIT(10) + EVT_EXEC_GET_TID(N(EVS_Ravens_LeapIntoTree), LVar9) + EVT_WAIT(40) + EVT_KILL_THREAD(LVar9) + EVT_WAIT(10) + EVT_CALL(SetNpcPos, NPC_Raven_01, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_Raven_02, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_Raven_03, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_Raven_04, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_Raven_05, NPC_DISPOSE_LOCATION) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 300, 250, 150) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 300, 250, 150) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + // repeat the action with a time delay across the sudden camera cut + EVT_EXEC(N(EVS_GatherRavensNearRaphael)) + EVT_WAIT(10) + EVT_EXEC_WAIT(N(EVS_Ravens_LeapIntoTree)) + EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Walk) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Walk) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Walk) + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Walk) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_SMASH_GOOMNUT_TREE, 0) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(1.0)) + EVT_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Raven_01, EVT_FLOAT(3.0)) + EVT_CALL(GetNpcPos, NPC_Raven_01, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Raven_01, LVar0, LVar1, LVar2, 5) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcJumpscale, NPC_Raven_02, EVT_FLOAT(3.0)) + EVT_CALL(GetNpcPos, NPC_Raven_02, LVar0, LVar1, LVar2) + EVT_CALL(NpcJump0, NPC_Raven_02, LVar0, LVar1, LVar2, 5) + EVT_CALL(InterpNpcYaw, NPC_Raven_02, 270, 0) + EVT_END_THREAD + EVT_WAIT(3) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_20C, 0) + EVT_CALL(SetNpcRotation, NPC_Raven_04, 0, 0, 180) + EVT_CALL(SetNpcFlagBits, NPC_Raven_04, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(InterpNpcYaw, NPC_Raven_03, 270, 0) + EVT_CALL(InterpNpcYaw, NPC_Raven_05, 270, 0) + EVT_CALL(SetNpcYaw, NPC_RaphaelRaven, 90) + EVT_CALL(GetNpcPos, NPC_RaphaelRaven, LVar0, LVar1, LVar2) + EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) + EVT_ADD(LVar2, 80) + EVT_CALL(SetPlayerPos, 145, 0, LVar2) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(SetNpcPos, NPC_PARTNER, 115, 0, LVar2) + EVT_CALL(SetNpcYaw, NPC_PARTNER, 90) + EVT_WAIT(80) + EVT_CALL(SetNpcRotation, NPC_Raven_04, 0, 0, 0) + EVT_CALL(SetSelfVar, 0, RAVEN_SCENE_CONSTRUCTION_WORK) + EVT_CASE_EQ(RAVEN_SCENE_CONSTRUCTION_WORK) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 165, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 165, 0, 0) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(20) + EVT_CALL(SetNpcFlagBits, NPC_Raven_04, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(NpcMoveTo, NPC_Raven_04, 260, -20, 0) + EVT_CALL(SetNpcRotation, NPC_Raven_04, 0, 0, 90) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Walk) + EVT_CALL(NpcJump0, NPC_Raven_04, 300, 300, -14, 20) + EVT_CALL(SetNpcRotation, NPC_Raven_04, 0, 0, 0) + EVT_EXEC_GET_TID(N(EVS_BuildingEffects), LVarA) + EVT_WAIT(30) + EVT_CALL(SpeakToPlayer, NPC_RaphaelRaven, ANIM_RaphaelRaven_Talk, ANIM_RaphaelRaven_Idle, 0, MSG_CH5_00CA) + EVT_WAIT(50) + EVT_CALL(SetNpcVar, NPC_Kolorado_02, 0, 10) + EVT_WAIT(140) + EVT_LABEL(11) + EVT_CALL(GetNpcVar, NPC_Kolorado_02, 0, LVar0) + EVT_IF_NE(LVar0, 0) + EVT_WAIT(1) + EVT_GOTO(11) + EVT_END_IF + EVT_WAIT(40) + EVT_CALL(StopSound, SOUND_8000001E) + EVT_KILL_THREAD(LVarA) + EVT_CALL(SetSelfVar, 0, RAVEN_SCENE_FINISH_WORK) + EVT_CASE_EQ(RAVEN_SCENE_FINISH_WORK) + EVT_WAIT(20) + EVT_CALL(SetGroupEnabled, MODEL_g39, 1) + EVT_CALL(SetGroupEnabled, MODEL_g52, 1) + EVT_CALL(SetGroupEnabled, MODEL_g58, 1) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_g29, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_g39, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_g86, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Idle) + EVT_CALL(SetNpcPos, NPC_Raven_01, 255, 205, -25) + EVT_CALL(SetNpcPos, NPC_Raven_02, 200, 185, 0) + EVT_CALL(SetNpcPos, NPC_Raven_03, 338, 212, -20) + EVT_CALL(SetNpcPos, NPC_Raven_04, 267, 314, -12) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_2A6, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 60) + EVT_CALL(NpcJump0, NPC_Raven_05, LVar0, 0, 40, 20) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Raven_05, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_00CC) + EVT_WAIT(15) + EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Idle) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Idle) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Idle) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Idle) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 300, 250, 150) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 300, 250, 150) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(15) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_2A6, 0) + EVT_CALL(SetNpcPos, NPC_Raven_05, 350, 0, 100) + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Flail) + EVT_CALL(NpcJump0, NPC_Raven_05, 400, 215, -23, 20) + EVT_CALL(SpeakToPlayer, NPC_Raven_05, ANIM_Raven_Talk, ANIM_Raven_Idle, 0, MSG_CH5_00CD) + EVT_THREAD + EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_186, 0) + EVT_CALL(MakeLerp, 170, 0, 60, EASING_CUBIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(LVar3, LVar0) + EVT_ADD(LVar3, 9) + EVT_CALL(SetNpcPos, NPC_Raven_02, 200, LVar3, 0) + EVT_SETF(LVar2, EVT_FLOAT(200.0)) + EVT_SUBF(LVar2, LVar0) + EVT_DIVF(LVar2, EVT_FLOAT(200.0)) + EVT_CALL(ScaleModel, MODEL_o147, 1, LVar2, 1) + EVT_CALL(TranslateModel, MODEL_o146, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o124, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetSelfVar, 0, RAVEN_SCENE_LOWERED_BASKET) + EVT_END_THREAD + EVT_WAIT(20) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 165, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 165, 0, 0) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_RaphaelRaven, ANIM_RaphaelRaven_Talk, ANIM_RaphaelRaven_Idle, 0, MSG_CH5_00CE) + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, RAVEN_SCENE_LOWERED_BASKET) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_2A6, 0) + EVT_CALL(NpcJump0, NPC_Raven_05, 150, 0, 20, 15) + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Walk) + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_Raven_05, 65, 25, 30) + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Idle) + EVT_CALL(InterpNpcYaw, NPC_Raven_05, 90, 0) + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_2A7, 0) + EVT_CALL(NpcJump0, NPC_Raven_04, 150, 0, 20, 15) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Walk) + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_Raven_04, 80, -10, 25) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Idle) + EVT_CALL(InterpNpcYaw, NPC_Raven_04, 90, 0) + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_2A6, 0) + EVT_CALL(NpcJump0, NPC_Raven_03, 150, 0, 20, 15) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Walk) + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_Raven_03, 95, 25, 20) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Idle) + EVT_CALL(InterpNpcYaw, NPC_Raven_03, 90, 0) + EVT_END_THREAD + EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_2A7, 0) + EVT_CALL(NpcJump0, NPC_Raven_02, 150, 0, 20, 15) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Walk) + EVT_CALL(NpcMoveTo, NPC_Raven_02, 110, -10, 15) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Idle) + EVT_CALL(InterpNpcYaw, NPC_Raven_02, 90, 0) + EVT_CALL(SetNpcVar, NPC_Kolorado_02, 0, 20) + EVT_CALL(SetSelfVar, 0, RAVEN_SCENE_HEADNG_OUT) + EVT_CASE_EQ(RAVEN_SCENE_HEADNG_OUT) + EVT_CALL(GetNpcVar, NPC_Kolorado_02, 0, LVar0) + EVT_IF_EQ(LVar0, -1) + EVT_CALL(SpeakToPlayer, NPC_RaphaelRaven, ANIM_RaphaelRaven_Talk, ANIM_RaphaelRaven_Idle, 0, MSG_CH5_00D0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 350) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(10.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_GIVE_KEY_REWARD(ITEM_ULTRA_STONE) + EVT_WAIT(20) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(20.0), EVT_FLOAT(-11.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(SpeakToPlayer, NPC_RaphaelRaven, ANIM_RaphaelRaven_Talk, ANIM_RaphaelRaven_Idle, 0, MSG_CH5_00D1) + EVT_SET(LVar0, NPC_Raven_02) + EVT_EXEC(N(EVS_Raven_HopAndWalkAway)) + EVT_THREAD + EVT_WAIT(10) + EVT_SET(LVar0, NPC_Raven_03) + EVT_EXEC(N(EVS_Raven_HopAndWalkAway)) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(20) + EVT_SET(LVar0, NPC_Raven_04) + EVT_EXEC(N(EVS_Raven_HopAndWalkAway)) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(30) + EVT_SET(LVar0, NPC_Raven_05) + EVT_EXEC(N(EVS_Raven_HopAndWalkAway)) + EVT_END_THREAD + EVT_CALL(SetNpcAnimation, NPC_RaphaelRaven, ANIM_RaphaelRaven_Walk) + EVT_CALL(SetNpcSpeed, NPC_RaphaelRaven, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_RaphaelRaven, -120, 0, 0) + EVT_CALL(SetNpcPos, NPC_RaphaelRaven, NPC_DISPOSE_LOCATION) + EVT_WAIT(40) + EVT_CALL(BindNpcInteract, NPC_Raven_01, EVT_PTR(N(EVS_NpcInteract_Raven))) + EVT_CALL(SetNpcFlagBits, NPC_Raven_01, NPC_FLAG_100, FALSE) + EVT_CALL(N(UnsetCamera0Flag1000)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_SET(GB_StoryProgress, STORY_CH5_ZIP_LINE_READY) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END_IF + EVT_END_SWITCH + EVT_WAIT(1) + EVT_GOTO(2) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Raven) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_EQ(STORY_CH5_RAFAEL_MOVED_ROOT) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_ManageRavens))) + EVT_CASE_EQ(STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_ManageRavens))) + EVT_EXEC(N(EVS_GatherRavensNearRaphael)) + EVT_CASE_RANGE(STORY_CH5_ZIP_LINE_READY, STORY_CH5_OPENED_ESCAPE_ROUTE) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Raven))) + EVT_CALL(SetNpcPos, NPC_Raven_01, 260, 205, -25) + EVT_CALL(SetNpcFlagBits, NPC_Raven_01, NPC_FLAG_100, FALSE) + EVT_GOTO(30) + EVT_CASE_DEFAULT + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o346, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(RemoveNpc, NPC_Raven_01) + EVT_LABEL(30) + EVT_CALL(RemoveNpc, NPC_Raven_02) + EVT_CALL(RemoveNpc, NPC_Raven_03) + EVT_CALL(RemoveNpc, NPC_Raven_04) + EVT_CALL(RemoveNpc, NPC_Raven_05) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +Vec3f N(RaphaelWalkPath)[] = { + { -190.0, 0.0, -200.0 }, + { -185.0, 0.0, -95.0 }, + { -180.0, 0.0, 10.0 }, +}; + +EvtScript N(EVS_Scene_RaphaelComingThrough) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcPos, NPC_RaphaelRaven, -200, 0, -170) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_CALL(SetPlayerPos, -190, 0, -200) + EVT_CALL(SetNpcPos, NPC_PARTNER, -190, 0, -210) + EVT_EXEC_WAIT(N(EVS_MoveBushes)) + EVT_CALL(SetNpcAnimation, NPC_RaphaelRaven, ANIM_RaphaelRaven_Walk) + EVT_CALL(SetNpcSpeed, NPC_RaphaelRaven, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_RaphaelRaven, -180, -30, 0) + EVT_THREAD + EVT_CALL(NpcMoveTo, NPC_RaphaelRaven, 125, -40, 0) + EVT_CALL(SetNpcAnimation, NPC_RaphaelRaven, ANIM_RaphaelRaven_Idle) + EVT_CALL(SetNpcFlagBits, NPC_RaphaelRaven, NPC_FLAG_100, FALSE) + EVT_CALL(InterpNpcYaw, NPC_RaphaelRaven, 270, 0) + EVT_END_THREAD + EVT_WAIT(15) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_Running) + EVT_CALL(LoadPath, 45, EVT_PTR(N(RaphaelWalkPath)), ARRAY_COUNT(N(RaphaelWalkPath)), EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_THREAD + EVT_CALL(SetNpcPos, NPC_Raven_01, -200, 0, -190) + EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Walk) + EVT_CALL(SetNpcSpeed, NPC_Raven_01, EVT_FLOAT(6.0)) + EVT_CALL(NpcMoveTo, NPC_Raven_01, -150, -10, 0) + EVT_CALL(NpcMoveTo, NPC_Raven_01, 177, -10, 0) + EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(SetNpcPos, NPC_Raven_02, -200, 0, -230) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Walk) + EVT_CALL(SetNpcSpeed, NPC_Raven_02, EVT_FLOAT(6.0)) + EVT_CALL(NpcMoveTo, NPC_Raven_02, -150, -10, 0) + EVT_CALL(NpcMoveTo, NPC_Raven_02, 152, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(SetNpcPos, NPC_Raven_03, -200, 0, -230) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Walk) + EVT_CALL(SetNpcSpeed, NPC_Raven_03, EVT_FLOAT(6.0)) + EVT_CALL(NpcMoveTo, NPC_Raven_03, -150, -10, 0) + EVT_CALL(NpcMoveTo, NPC_Raven_03, 127, 5, 0) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Idle) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(45) + EVT_CALL(SetNpcPos, NPC_Raven_04, -200, 0, -230) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Walk) + EVT_CALL(SetNpcSpeed, NPC_Raven_04, EVT_FLOAT(6.0)) + EVT_CALL(NpcMoveTo, NPC_Raven_04, -150, -10, 0) + EVT_CALL(NpcMoveTo, NPC_Raven_04, 102, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Idle) + EVT_END_THREAD + EVT_WAIT(60) + EVT_CALL(SetNpcPos, NPC_Raven_05, -200, 0, -230) + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Walk) + EVT_CALL(SetNpcSpeed, NPC_Raven_05, EVT_FLOAT(6.0)) + EVT_CALL(NpcMoveTo, NPC_Raven_05, -150, -10, 0) + EVT_CALL(NpcMoveTo, NPC_Raven_05, 77, -10, 0) + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Idle) + EVT_SET(GB_StoryProgress, STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(D_8024511C_B8929C) = { + EVT_CHILD_THREAD + EVT_LOOP(0) + EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 150) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Run) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, 60, 0) + EVT_CALL(SetSelfVar, 0, 3) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Kolorado_HeldCaptive) = { + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, -440) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00BC, 320, 60) + EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 25, EMOTER_PLAYER, 0, 0, 0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 25, EMOTER_NPC, 0, 0, 0, 0) + EVT_WAIT(25) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, 150) + EVT_CALL(GetPartnerInUse, LVar0) + EVT_IF_NE(LVar0, PARTNER_NONE) + EVT_CALL(InterruptUsePartner) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(func_802D2C14, 1) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(RemoveNpc, NPC_SpearGuy) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00C0, 0, 60) + EVT_CALL(InterpPlayerYaw, 270, 4) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SET(LVar3, LVar0) + EVT_ADD(LVar3, -50) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar3, LVar2, 0) + 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(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-7.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(N(SetCamera0Flag1000)) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_00C1) + EVT_CALL(SetSelfVar, 0, 2) + EVT_CALL(func_802D2C14, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_CASE_EQ(1) + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(func_802D2C14, 1) + EVT_WAIT(10) + EVT_IF_EQ(GF_JAN01_SavedKolorado, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Shout, ANIM_Kolorado_Idle, 0, MSG_CH5_00BE) + EVT_ELSE + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Shout, ANIM_Kolorado_Idle, 0, MSG_CH5_00BF) + EVT_END_IF + EVT_CALL(SetSelfVar, 0, 2) + EVT_CALL(func_802D2C14, 0) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_SET_GROUP(EVT_GROUP_0B) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CASE_EQ(2) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar0, 70) + EVT_SET(LVar0, 70) + EVT_ELSE + EVT_SET(LVar0, 300) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Run) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(4.5)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, 60, 0) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_SET(GB_StoryProgress, STORY_CH5_KOLORADO_ESCAPED_SPEAR_GUYS) + EVT_END_THREAD + EVT_EXEC_GET_TID(N(D_8024511C_B8929C), LVar9) + EVT_WAIT(35) + EVT_CALL(N(UnsetCamera0Flag1000)) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_KILL_THREAD(LVar9) + EVT_CALL(SetSelfVar, 0, 3) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CASE_EQ(3) + EVT_END_SWITCH + EVT_IF_LT(GB_StoryProgress, STORY_CH5_KOLORADO_ESCAPED_SPEAR_GUYS) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Kolorado_Before) = { + EVT_LABEL(0) + EVT_IF_NE(GB_StoryProgress, STORY_CH5_YOSHI_CHILDREN_ARE_MISSING) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_LABEL(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, 85) + EVT_WAIT(1) + EVT_GOTO(1) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00C5, 0, 60) + EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_Kolorado_01, EMOTE_EXCLAMATION, 0, 20, FALSE, 0, 0, 0, 0) + EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) + EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_WAIT(20) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_LABEL(2) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_GT(LVar0, -250) + EVT_WAIT(1) + EVT_GOTO(2) + EVT_END_IF + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_00C6) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Run) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, -470, 0, 0) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_Kolorado_After) = { + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(10) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcPos, NPC_SELF, -100, 0, 60) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar0, 60) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Walk) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, LVar0, 60, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) + EVT_CALL(SpeakToPlayer, NPC_Kolorado_02, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_00CB) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CASE_EQ(20) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_00CF) + EVT_THREAD + EVT_LABEL(20) + EVT_CALL(PlayerFaceNpc, NPC_Kolorado_02, FALSE) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 20) + EVT_WAIT(1) + EVT_GOTO(20) + EVT_END_IF + EVT_END_THREAD + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Walk) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 190, 60, 0) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.5)) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_32C, 0) + EVT_CALL(NpcJump0, NPC_SELF, 200, 0, 0, 20) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) + EVT_CALL(SetSelfVar, 0, 21) + EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_186, 0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) + EVT_CALL(MakeLerp, 0, 170, 60, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SET(LVar6, LVar4) + EVT_ADD(LVar6, LVar0) + EVT_CALL(SetNpcPos, NPC_SELF, LVar3, LVar6, LVar5) + EVT_SETF(LVar2, EVT_FLOAT(200.0)) + EVT_SUBF(LVar2, LVar0) + EVT_DIVF(LVar2, EVT_FLOAT(200.0)) + EVT_CALL(ScaleModel, MODEL_o147, 1, LVar2, 1) + EVT_CALL(TranslateModel, MODEL_o146, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o124, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_WAIT(40) + EVT_CALL(PlaySoundAtModel, MODEL_o123, SOUND_186, 0) + EVT_CALL(MakeLerp, 170, 0, 60, EASING_CUBIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(LVar2, EVT_FLOAT(200.0)) + EVT_SUBF(LVar2, LVar0) + EVT_DIVF(LVar2, EVT_FLOAT(200.0)) + EVT_CALL(ScaleModel, MODEL_o147, 1, LVar2, 1) + EVT_CALL(TranslateModel, MODEL_o146, 0, LVar0, 0) + EVT_CALL(TranslateModel, MODEL_o124, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetSelfVar, 0, -1) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_SWITCH + EVT_IF_NE(LVar0, -1) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_Kolorado_Before) = { + EVT_CALL(GetAngleToPlayer, NPC_SELF, LVar0) + EVT_IF_LT(LVar0, 180) + EVT_SET(LVar1, 27) + EVT_ELSE + EVT_SET(LVar1, -27) + EVT_END_IF + EVT_CALL(GetNpcPos, NPC_SELF, LVar2, LVar3, LVar4) + EVT_CALL(GetPlayerPos, LVarA, LVarB, LVarC) + EVT_SUB(LVarA, LVar2) + EVT_IF_LT(LVarA, 0) + EVT_MUL(LVarA, -1) + EVT_END_IF + EVT_IF_LT(LVarA, 20) + EVT_ADD(LVar2, LVar1) + EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) + EVT_CALL(PlayerMoveTo, LVar2, LVar4, 0) + EVT_CALL(PlayerFaceNpc, NPC_Kolorado_02, 3) + EVT_END_IF + EVT_WAIT(15) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_00C2) + EVT_CALL(InterpPlayerYaw, 90, 3) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 3) + EVT_CALL(SetMusicTrack, 0, SONG_MT_LAVALAVA, 1, 8) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 0, 200, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-11.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(40) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 5, MSG_CH5_00C3) + EVT_WAIT(10) + EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, 300, 15, EVT_FLOAT(-6.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_00C4) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(5.0)) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Run) + EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) + EVT_CALL(NpcMoveTo, NPC_SELF, 500, 0, 0) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(SetNpcPos, NPC_SELF, -300, 0, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 4) + EVT_SET(GB_StoryProgress, STORY_CH5_YOSHI_CHILDREN_ARE_MISSING) + EVT_EXEC_WAIT(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcHit_Kolorado_HeldCaptive) = { + EVT_CALL(GetOwnerEncounterTrigger, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_HAMMER) + EVT_SET(LVar1, 1) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_JUMP) + EVT_SET(LVar1, 1) + EVT_CASE_EQ(ENCOUNTER_TRIGGER_PARTNER) + EVT_SET(LVar1, 1) + EVT_CASE_DEFAULT + EVT_SET(LVar1, 0) + EVT_END_SWITCH + EVT_IF_NE(LVar1, 0) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_WAIT(5) + EVT_SET(AF_JAN_0A, TRUE) + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_SpearGuy, ANIM_SpearGuy_Anim0D) + EVT_CALL(NpcFacePlayer, NPC_SELF, 0) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Shout, ANIM_Kolorado_Yell, 0, MSG_CH5_00BD) + EVT_SET(AF_JAN_0A, FALSE) + EVT_CALL(SetNpcAnimation, NPC_SpearGuy, ANIM_SpearGuy_Anim10) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Kolorado_HeldCaptive) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_KOLORADO_ESCAPED_SPEAR_GUYS) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Fallen) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Kolorado_HeldCaptive))) + EVT_CALL(BindNpcHit, NPC_SELF, EVT_PTR(N(EVS_NpcHit_Kolorado_HeldCaptive))) + EVT_ELSE + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Kolorado_WaitingToExplore) = { + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH5_YOSHI_CHILDREN_ARE_MISSING) + EVT_CALL(SetNpcPos, NPC_SELF, 750, 0, 30) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Kolorado_Before))) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Kolorado_Before))) + EVT_CASE_RANGE(STORY_CH5_RAFAEL_MOVED_ROOT, STORY_CH5_RAFAEL_WAITING_FOR_MARIO) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Kolorado_After))) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CASE_DEFAULT + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SyncZiplineDummyNPC1) = { + EVT_LOOP(0) + EVT_CALL(GetModelCenter, MODEL_o112) + EVT_CALL(SetNpcPos, NPC_ZiplineDummy1, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SyncZiplineDummyNPC2) = { + EVT_LOOP(0) + EVT_CALL(GetModelCenter, MODEL_o131) + EVT_CALL(SetNpcPos, NPC_ZiplineDummy2, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_ZiplineDummy) = { + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_2, TRUE) + EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(0.3), 1, EVT_FLOAT(0.3)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcIdle_SpearGuy) = { + EVT_CHILD_THREAD + EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar1, LVar2) + EVT_SET(LVar4, LVar3) + EVT_ADD(LVar3, -200) + EVT_ADD(LVar4, 200) + EVT_LOOP(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SWITCH(LVar0) + EVT_CASE_RANGE(LVar3, LVar4) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 0) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_10000000, 0) + EVT_CASE_DEFAULT + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_IGNORE_TOUCH, 1) + EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_10000000, 1) + EVT_END_SWITCH + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_SET(AF_JAN_0A, FALSE) + EVT_SET(LVar9, 0) + EVT_SET(LVar8, 2) + EVT_LOOP(0) + EVT_IF_EQ(LVar9, 0) + EVT_THREAD + EVT_WAIT(40) + EVT_CALL(ShowSweat, 0, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_END_THREAD + EVT_CALL(ShowSweat, 0, 1, 45, 1, 0, 0, 0, 0, 20) + EVT_SET(LVar9, 3) + EVT_ELSE + EVT_SUB(LVar9, 1) + EVT_END_IF + EVT_CALL(InterpNpcYaw, NPC_Kolorado_01, 270, 2) + EVT_WAIT(2) + EVT_LABEL(1) + EVT_IF_EQ(AF_JAN_0A, FALSE) + EVT_CALL(InterpNpcYaw, NPC_Kolorado_01, 90, 2) + EVT_IF_EQ(LVar8, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Kolorado_01, SOUND_HIT_PLAYER_NORMAL, 0) + EVT_SET(LVar8, 2) + EVT_END_IF + EVT_SUB(LVar8, 1) + EVT_ELSE + EVT_SET(LVar8, 2) + EVT_WAIT(1) + EVT_GOTO(1) + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_SpearGuy) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcYaw, NPC_Kolorado_01, 90) + EVT_CALL(SetNpcAnimation, NPC_Kolorado_01, ANIM_Kolorado_Idle) + EVT_THREAD + EVT_WAIT(30) + EVT_CALL(GetNpcPos, NPC_Kolorado_01, LVar3, LVar1, LVar2) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SET(LVar4, LVar0) + EVT_IF_LT(LVar3, LVar0) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_ADD(LVar4, -30) + EVT_ELSE + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_ADD(LVar4, 30) + EVT_END_IF + EVT_ADD(LVar0, LVar4) + EVT_DIV(LVar0, 2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 300) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-7.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) + EVT_CALL(N(SetCamera0Flag1000)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SetNpcFlagBits, NPC_Kolorado_01, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Kolorado_01, ANIM_Kolorado_Run) + EVT_CALL(SetNpcSpeed, NPC_Kolorado_01, EVT_FLOAT(2.5)) + EVT_CALL(NpcMoveTo, NPC_Kolorado_01, LVar4, LVar2, 0) + EVT_CALL(SetNpcAnimation, NPC_Kolorado_01, ANIM_Kolorado_Idle) + EVT_CALL(NpcFacePlayer, NPC_Kolorado_01, 0) + EVT_CALL(SetNpcVar, NPC_Kolorado_01, 0, 1) + EVT_END_THREAD + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_LOST) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_SpearGuy) = { + EVT_IF_LT(GB_StoryProgress, STORY_CH5_KOLORADO_ESCAPED_SPEAR_GUYS) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_SpearGuy_Anim10) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_SpearGuy))) + EVT_CALL(BindNpcDefeat, NPC_SELF, EVT_PTR(N(EVS_NpcDefeat_SpearGuy))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Misstar_Bobbing) = { + EVT_LOOP(0) + EVT_LOOP(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_SUB(LVar1, 1) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 1) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Misstar_CarryingParty) = { + EVT_SET(AF_JAN22_MisstarReleasedParty, FALSE) + EVT_SET(AF_JAN22_MisstarReleasedKolorado, FALSE) + EVT_LABEL(0) + EVT_CALL(GetNpcPos, NPC_Misstar, LVar4, LVar2, LVar3) + EVT_ADD(LVar4, 10) + EVT_SUB(LVar3, 5) + EVT_CALL(SetNpcPos, NPC_Kolorado_02, LVar4, LVar2, LVar3) + EVT_IF_EQ(AF_JAN22_MisstarReleasedParty, FALSE) + EVT_SUB(LVar4, 20) + EVT_ADD(LVar3, 10) + EVT_CALL(SetPlayerPos, LVar4, LVar2, LVar3) + EVT_ADD(LVar2, 20) + EVT_ADD(LVar3, -5) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar4, LVar2, LVar3) + EVT_END_IF + EVT_IF_EQ(AF_JAN22_MisstarReleasedKolorado, FALSE) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_PartnerFaceMisstar) = { + EVT_LABEL(0) + EVT_CALL(PlayerFaceNpc, NPC_Misstar, TRUE) + EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Misstar, 1) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +Vec3f N(MisstarDescentPath)[] = { + { 990.0, 210.0, -120.0 }, + { 925.0, 115.0, -80.0 }, + { 860.0, 65.0, -40.0 }, + { 725.0, 10.0, 0.0 }, +}; + +EvtScript N(EVS_Scene_Misstar) = { + EVT_CALL(WaitForPlayerInputEnabled) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_EXEC(N(EVS_Misstar_CarryingParty)) + EVT_WAIT(30) + EVT_CALL(LoadPath, 45, EVT_PTR(N(MisstarDescentPath)), ARRAY_COUNT(N(MisstarDescentPath)), EASING_LINEAR) + EVT_LABEL(0) + EVT_CALL(GetNextPathPos) + EVT_CALL(SetNpcPos, NPC_SELF, LVar1, LVar2, LVar3) + EVT_WAIT(1) + EVT_IF_EQ(LVar0, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.4)) + EVT_SET(AF_JAN22_MisstarReleasedParty, TRUE) + EVT_CALL(NpcJump0, NPC_SELF, 625, 20, 0, 25) + EVT_THREAD + EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(1.0)) + EVT_CALL(NpcMoveTo, NPC_PARTNER, 700, 0, 0) + EVT_END_THREAD + EVT_SET(AF_JAN22_MisstarReleasedKolorado, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_Kolorado_02, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(NpcJump0, NPC_SELF, 675, 40, 0, 20) + EVT_EXEC_GET_TID(N(EVS_Misstar_Bobbing), LVar9) + EVT_WAIT(20) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 325) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-11.5)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(SpeakToPlayer, NPC_Kolorado_02, ANIM_Kolorado_TalkSad, ANIM_Kolorado_IdleSad, 0, MSG_CH5_00D4) + EVT_CALL(NpcFaceNpc, NPC_SELF, NPC_Kolorado_02, 1) + EVT_WAIT(10) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldMisstar_TalkAngry, ANIM_WorldMisstar_IdleAngry, 517, MSG_CH5_00D5) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_Idle) + EVT_LOOP(0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar3, LVar2) + EVT_IF_EQ(LVar3, LVar1) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(EndSpeech, NPC_SELF, ANIM_WorldMisstar_Talk, ANIM_WorldMisstar_Idle, 517) + EVT_WAIT(10) + EVT_CALL(InterpNpcYaw, NPC_Kolorado_02, 270, 1) + EVT_WAIT(15) + EVT_CALL(SpeakToPlayer, NPC_Kolorado_02, ANIM_Kolorado_TalkSad, ANIM_Kolorado_IdleSad, 5, MSG_CH5_00D6) + EVT_WAIT(10) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 30) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, 0, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(InterpNpcYaw, NPC_Kolorado_02, 90, 10) + EVT_EXEC_GET_TID(N(EVS_PartnerFaceMisstar), LVar8) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(0.5)) + EVT_CALL(NpcJump0, NPC_SELF, 760, 35, 0, 20) + EVT_KILL_THREAD(LVar8) + EVT_WAIT(5) + EVT_CALL(NpcFacePlayer, NPC_SELF, 4) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldMisstar_Talk, ANIM_WorldMisstar_Idle, 512, MSG_CH5_00D7) + EVT_CALL(MakeLerp, 0, 360, 10, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_KILL_THREAD(LVar9) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_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_PLAY_EFFECT(EFFECT_SPARKLES, 3, LVar0, LVar1, LVar2, 20) + EVT_WAIT(6) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 1, LVar0, LVar3, LVar2, 20) + EVT_WAIT(6) + EVT_END_LOOP + EVT_WAIT(20) + EVT_CALL(PlaySoundAtPlayer, SOUND_188, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar1, 20) + EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) + EVT_WAIT(30) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_Idle) + EVT_EXEC_GET_TID(N(EVS_Misstar_Bobbing), LVar9) + EVT_CALL(N(UpgradeStarPowerCh5)) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0195, 160, 40) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldMisstar_Talk, ANIM_WorldMisstar_Idle, 512, MSG_CH5_00D8) + EVT_WAIT(10) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_40000, TRUE) + EVT_THREAD + EVT_LOOP(25) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_PLAY_EFFECT(EFFECT_SPARKLES, 4, LVar0, LVar1, LVar2, 20) + EVT_WAIT(4) + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_SET(LVar2, 0) + EVT_SET(LVar3, 5 * 360) + EVT_CALL(MakeLerp, LVar2, LVar3, 100, EASING_CUBIC_IN) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_CALL(SetNpcRotation, NPC_SELF, 0, LVar0, 0) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetNpcPos, NPC_SELF, 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_SELF, LVar2, LVar0, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(15) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2045, 0) + EVT_END_THREAD + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_WAIT(90) + EVT_CALL(ResetCam, CAM_DEFAULT, 3) + EVT_WAIT(20) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_KILL_THREAD(LVar9) + EVT_SET(GB_StoryProgress, STORY_CH5_STAR_SPRIT_DEPARTED) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_Kolorado_02, ANIM_Kolorado_TalkSad, ANIM_Kolorado_IdleSad, 0, MSG_CH5_00D9) + EVT_WAIT(5) + EVT_CALL(InterpNpcYaw, NPC_Kolorado_02, 270, 4) + EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_WalkSad) + EVT_CALL(SetNpcSpeed, NPC_Kolorado_02, EVT_FLOAT(1.0)) + EVT_CALL(NpcMoveTo, NPC_Kolorado_02, 530, 0, 0) + EVT_CALL(SetNpcFlagBits, NPC_Kolorado_02, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcPos, NPC_Kolorado_02, NPC_DISPOSE_LOCATION) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Misstar) = { + EVT_IF_EQ(GB_StoryProgress, STORY_CH5_BEGAN_PEACH_MISSION) + EVT_CALL(SetPlayerPos, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_Kolorado_02, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(InterpPlayerYaw, 270, 0) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) + EVT_CALL(InterpNpcYaw, NPC_SELF, 270, 0) + EVT_CALL(SetNpcAnimation, NPC_Kolorado_02, ANIM_Kolorado_IdleSad) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 700, 0, 0) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 700, 0, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 500) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_Scene_Misstar))) + EVT_ELSE + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_IF + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Kolorado)[] = { + { + .id = NPC_Kolorado_01, + .settings = &N(NpcSettings_Kolorado), + .pos = { -100.0f, 0.0f, 10.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_100000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_20000000, + .init = &N(EVS_NpcInit_Kolorado_HeldCaptive), + .drops = NPC_NO_DROPS, + .animations = KOLORADO_ANIMS, + .tattle = MSG_NpcTattle_Kolorado, + }, + { + .id = NPC_Kolorado_02, + .settings = &N(NpcSettings_Kolorado), + .pos = { -100.0f, 0.0f, 10.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_Kolorado_WaitingToExplore), + .drops = NPC_NO_DROPS, + .animations = KOLORADO_ANIMS, + .tattle = MSG_NpcTattle_Kolorado, + }, + { + .id = NPC_ZiplineDummy1, + .settings = &N(NpcSettings_Dummy), + .pos = { -100.0f, 0.0f, 10.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .init = &N(EVS_NpcInit_ZiplineDummy), + .drops = NPC_NO_DROPS, + .animations = KOLORADO_ANIMS, + .tattle = MSG_NpcTattle_Kolorado, + }, + { + .id = NPC_ZiplineDummy2, + .settings = &N(NpcSettings_Dummy), + .pos = { -100.0f, 0.0f, 10.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, + .init = &N(EVS_NpcInit_ZiplineDummy), + .drops = NPC_NO_DROPS, + .animations = KOLORADO_ANIMS, + .tattle = MSG_NpcTattle_Kolorado, + }, +}; + +StaticNpc N(NpcData_SpearGuy) = { + .id = NPC_SpearGuy, + .pos = { -70.0f, 0.0f, 10.0f }, + .yaw = 270, + .territory = { + .patrol = { + .isFlying = TRUE, + .moveSpeedOverride = NO_OVERRIDE_MOVEMENT_SPEED, + .numPoints = 3, + .points = { + { 368, 0, 190 }, + { 411, 0, 190 }, + { 396, 0, 239 }, + }, + .detectShape = SHAPE_CYLINDER, + .detectPos = { -70, 0, 10 }, + .detectSize = { 100 }, + } + }, + .settings = &N(NpcSettings_SpearGuy_Patrol), + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .init = &N(EVS_NpcInit_SpearGuy), + .drops = NPC_NO_DROPS, + .animations = SPEAR_GUY_ANIMS, +}; + +StaticNpc N(NpcData_RaphaelRaven)[] = { + { + .id = NPC_RaphaelRaven, + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .settings = &N(NpcSettings_RaphaelRaven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_RaphaelRaven), + .drops = NPC_NO_DROPS, + .animations = RAPHAEL_RAVEN_ANIMS, + .tattle = MSG_NpcTattle_RaphaelRaven, + }, + { + .id = NPC_Raven_01, + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .settings = &N(NpcSettings_Raven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .init = &N(EVS_NpcInit_Raven), + .drops = NPC_NO_DROPS, + .animations = RAVEN_ANIMS, + .tattle = MSG_NpcTattle_RavenA, + }, + { + .id = NPC_Raven_02, + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .settings = &N(NpcSettings_Raven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NPC_NO_DROPS, + .animations = RAVEN_ANIMS, + }, + { + .id = NPC_Raven_03, + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .settings = &N(NpcSettings_Raven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NPC_NO_DROPS, + .animations = RAVEN_ANIMS, + .tattle = MSG_NpcTattle_RavenC, + }, + { + .id = NPC_Raven_04, + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .settings = &N(NpcSettings_Raven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NPC_NO_DROPS, + .animations = RAVEN_ANIMS, + .tattle = MSG_NpcTattle_RavenD, + }, + { + .id = NPC_Raven_05, + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .settings = &N(NpcSettings_Raven), + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .drops = NPC_NO_DROPS, + .animations = RAVEN_ANIMS, + .tattle = MSG_NpcTattle_RavenE, + }, +}; + +StaticNpc N(NpcData_Misstar) = { + .id = NPC_Misstar, + .settings = &N(NpcSettings_StarSpirit), + .pos = { 1075.0f, 120.0f, 130.0f }, + .yaw = 90, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_400000, + .init = &N(EVS_NpcInit_Misstar), + .drops = NPC_NO_DROPS, + .animations = MISSTAR_ANIMS, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Kolorado)), + NPC_GROUP(N(NpcData_SpearGuy), BTL_JAN_FORMATION_00, BTL_JAN_STAGE_07), + NPC_GROUP(N(NpcData_Misstar)), + {} +}; + +NpcGroupList N(RavenNPCs) = { + NPC_GROUP(N(NpcData_Kolorado)), + NPC_GROUP(N(NpcData_RaphaelRaven)), + {} +}; diff --git a/src/world/area_jan/jan_22/jan_22_4_entity.c b/src/world/area_jan/jan_22/jan_22_4_entity.c new file mode 100644 index 0000000000..19d7ac46ef --- /dev/null +++ b/src/world/area_jan/jan_22/jan_22_4_entity.c @@ -0,0 +1,17 @@ +#include "jan_22.h" +#include "entity.h" + +EvtScript N(EVS_MakeEntities) = { + EVT_THREAD + EVT_LABEL(0) + EVT_IF_LT(GB_StoryProgress, STORY_CH5_ZIP_LINE_READY) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), 1075, 150, -50, 0, MAKE_ENTITY_END) + EVT_END_THREAD + EVT_CALL(MakeItemEntity, ITEM_JAMMIN_JELLY, 340, 0, -75, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_JAN22_Item_JamminJelly) + EVT_CALL(MakeEntity, EVT_PTR(Entity_PinkFlower), -107, 0, -97, -15, MAKE_ENTITY_END) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_22/jan_22_5_zipline.c b/src/world/area_jan/jan_22/jan_22_5_zipline.c new file mode 100644 index 0000000000..3ecf3ad927 --- /dev/null +++ b/src/world/area_jan/jan_22/jan_22_5_zipline.c @@ -0,0 +1,229 @@ +#include "jan_22.h" + +API_CALLABLE(N(Zipline_AdjustMoveDownSound)) { + Bytecode* args = script->ptrReadPos; + + if (*args++ != 0) { + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + sfx_adjust_env_sound_pos(SOUND_168, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(Zipline_AdjustMoveUpSound)) { + Bytecode* args = script->ptrReadPos; + + if (*args++ != 0) { + script->functionTemp[0] = evt_get_variable(script, *args++); + script->functionTemp[1] = evt_get_variable(script, *args++); + script->functionTemp[2] = evt_get_variable(script, *args++); + sfx_adjust_env_sound_pos(SOUND_185, SOUND_SPACE_MODE_0, script->functionTemp[0], script->functionTemp[1], script->functionTemp[2]); + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(Zipline_UpdatePlayerPos)) { + Bytecode* args = script->ptrReadPos; + s32 mode = evt_get_variable(script, *args++); + f32* array = (f32*) script->array[0]; + + f32 dx = array[3] - array[0]; + f32 dy = array[4] - array[1]; + f32 dz = array[5] - array[2]; + + script->varTable[5] = (dx / 1000.0f) * script->varTable[0]; + script->varTable[6] = (dy / 1000.0f) * script->varTable[0]; + script->varTable[7] = (dz / 1000.0f) * script->varTable[0]; + + if (mode == 0) { + Npc* partner = get_npc_safe(NPC_PARTNER); + gPlayerStatus.position.x = (script->varTable[2] + script->varTable[5]); + gPlayerStatus.position.y = (script->varTable[3] + script->varTable[6]); + gPlayerStatus.position.z = (script->varTable[4] + script->varTable[7]); + gPlayerStatus.targetYaw = atan2(array[0], array[2], array[3], array[5]); + partner->pos.x = gPlayerStatus.position.x; + partner->pos.y = gPlayerStatus.position.y - 10.0f; + partner->pos.z = gPlayerStatus.position.z - 5.0f; + } + return ApiStatus_DONE2; +} + +API_CALLABLE(N(Zipline_CheckInputForJumpOff)) { + Bytecode* args = script->ptrReadPos; + s32 posA = evt_get_variable(script, *args++); + s32 ax1 = posA - 17; + s32 ax2 = posA + 17; + s32 posB = evt_get_variable(script, *args++); + s32 bx1 = posB - 17; + s32 bx2 = posB + 17; + + script->varTable[8] = -1; + if (((gPlayerStatus.position.x < ax1) || (ax2 < gPlayerStatus.position.x)) + && ((gPlayerStatus.position.x < bx1) || (bx2 < gPlayerStatus.position.x))) { + script->varTable[8] = gGameStatusPtr->pressedButtons[0] & BUTTON_A; + } + return ApiStatus_DONE2; +} + +Vec3f N(Zipline_Endpoints1)[] = { + { 507.0, 407.0, -35.0 }, + { 950.0, 307.0, -35.0 }, +}; + +Vec3f N(Zipline_Endpoints2)[] = { + { 972.0, 247.0, 65.0 }, + { 530.0, 164.0, 65.0 }, +}; + +EvtScript N(EVS_Zipline_TetherCameraToPlayer) = { + EVT_LABEL(0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetCamTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_RideZipline) = { + EVT_CALL(GetPartnerInUse, LVar9) + EVT_IF_EQ(LVar9, PARTNER_KOOPER) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(LVar9, PARTNER_BOMBETTE) + EVT_RETURN + EVT_END_IF + EVT_USE_ARRAY(LVar0) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o339, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o276, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(SetPlayerActionState, ACTION_STATE_JUMP) + EVT_WAIT(1) + EVT_EXEC_GET_TID(N(EVS_Zipline_TetherCameraToPlayer), LVar9) + EVT_THREAD + EVT_WAIT(7) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_100, TRUE) + EVT_SET(LVar0, ArrayVar(4)) + EVT_SUB(LVar0, 10) + EVT_SET(LVar1, ArrayVar(5)) + EVT_ADD(LVar1, -5) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(0.5)) + EVT_CALL(NpcJump0, NPC_PARTNER, ArrayVar(3), LVar0, LVar1, 8) + EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) + EVT_END_THREAD + EVT_CALL(SetPlayerJumpscale, 0) + EVT_CALL(PlayerJump, ArrayVar(3), ArrayVar(4), ArrayVar(5), 7) + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000D) + EVT_WAIT(10) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_CALL(PlaySound, SOUND_80000019) + EVT_CHILD_THREAD + EVT_SET(MF_RidingZipline1, TRUE) + EVT_SET(LVar0, ArrayVar(6)) + EVT_SET(AB_JAN22_ZiplineNpc1, ArrayVar(6)) + EVT_LOOP(0) + EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(Zipline_AdjustMoveDownSound), MF_RidingZipline1, LVar1, LVar2, LVar3) + EVT_IF_NE(AB_JAN22_ZiplineNpc1, LVar0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_CALL(MakeLerp, 0, 1000, 70, EASING_QUADRATIC_IN) + EVT_LABEL(0) + EVT_CALL(UpdateLerp) + EVT_CALL(N(Zipline_UpdatePlayerPos), 0) + EVT_CALL(TranslateModel, ArrayVar(1), LVar5, LVar6, LVar7) + EVT_CALL(TranslateModel, ArrayVar(2), LVar5, LVar6, LVar7) + EVT_WAIT(1) + EVT_CALL(N(Zipline_CheckInputForJumpOff), ArrayVar(7), ArrayVar(8)) + EVT_IF_EQ(LVar8, BUTTON_A) + EVT_GOTO(10) + EVT_END_IF + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_2087) + EVT_LABEL(10) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_SCRIPTED_FALL, TRUE) + EVT_SET(MF_RidingZipline1, FALSE) + EVT_CALL(StopSound, SOUND_80000019) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o339, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o339, COLLIDER_FLAG_IGNORE_SHELL) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_o276, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_IGNORE_WORLD_COLLISION, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_KILL_THREAD(LVar9) + EVT_WAIT(20) + EVT_CALL(PlaySound, SOUND_8000001A) + EVT_CHILD_THREAD + EVT_SET(MF_RidingZipline2, TRUE) + EVT_SET(LVar0, ArrayVar(6)) + EVT_SET(AB_JAN22_ZiplineNpc2, ArrayVar(6)) + EVT_LOOP(0) + EVT_CALL(GetNpcPos, LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(Zipline_AdjustMoveUpSound), MF_RidingZipline2, LVar1, LVar2, LVar3) + EVT_IF_NE(AB_JAN22_ZiplineNpc2, LVar0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_CHILD_THREAD + EVT_SET(LVar2, LVar0) + EVT_DIV(LVar2, 10) + EVT_CALL(MakeLerp, LVar0, 0, LVar2, EASING_LINEAR) + EVT_LABEL(1) + EVT_CALL(UpdateLerp) + EVT_CALL(N(Zipline_UpdatePlayerPos), 1) + EVT_CALL(TranslateModel, ArrayVar(1), LVar5, LVar6, LVar7) + EVT_CALL(TranslateModel, ArrayVar(2), LVar5, LVar6, LVar7) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF + EVT_SET(MF_RidingZipline2, FALSE) + EVT_CALL(StopSound, SOUND_8000001A) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SetupZiplines) = { + EVT_MALLOC_ARRAY(9, LVar0) + EVT_USE_ARRAY(LVar0) + EVT_SET(ArrayVar(0), EVT_PTR(N(Zipline_Endpoints1))) + EVT_SET(ArrayVar(1), MODEL_o112) + EVT_SET(ArrayVar(2), MODEL_o113) + EVT_SET(ArrayVar(3), 507) + EVT_SET(ArrayVar(4), 285) + EVT_SET(ArrayVar(5), -26) + EVT_SET(ArrayVar(6), NPC_ZiplineDummy1) + EVT_SET(ArrayVar(7), 795) + EVT_SET(ArrayVar(8), 940) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_RideZipline)), TRIGGER_FLOOR_PRESS_A, COLLIDER_o170, 1, 0) + EVT_EXEC(N(EVS_SyncZiplineDummyNPC1)) + EVT_MALLOC_ARRAY(9, LVar0) + EVT_USE_ARRAY(LVar0) + EVT_SET(ArrayVar(0), EVT_PTR(N(Zipline_Endpoints2))) + EVT_SET(ArrayVar(1), MODEL_o131) + EVT_SET(ArrayVar(2), MODEL_o132) + EVT_SET(ArrayVar(3), 974) + EVT_SET(ArrayVar(4), 135) + EVT_SET(ArrayVar(5), 74) + EVT_SET(ArrayVar(6), NPC_ZiplineDummy2) + EVT_SET(ArrayVar(7), 800) + EVT_SET(ArrayVar(8), 930) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_RideZipline)), TRIGGER_FLOOR_PRESS_A, COLLIDER_o119, 1, 0) + EVT_EXEC(N(EVS_SyncZiplineDummyNPC2)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_22/jan_22_6_bushes.c b/src/world/area_jan/jan_22/jan_22_6_bushes.c new file mode 100644 index 0000000000..7a0a31afed --- /dev/null +++ b/src/world/area_jan/jan_22/jan_22_6_bushes.c @@ -0,0 +1,168 @@ +#include "jan_22.h" +#include "model.h" + +#define NAME_SUFFIX _Bushes +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +#include "../common/MoveBush.inc.c" + +EvtScript N(EVS_MoveBushes_Separate) = { + EVT_CALL(PlaySoundAtCollider, COLLIDER_o149, SOUND_209F, 0) + EVT_SET(LVar0, MV_BushOffsetL) + EVT_SET(LVar1, MV_BushOffsetR) + EVT_SET(LVar6, 0) + EVT_SET(LVar7, 0) + EVT_LOOP(60) + EVT_SETF(LVar2, MV_BushOffsetL) + EVT_SETF(LVar3, MV_BushOffsetR) + EVT_SUBF(LVar2, LVar0) + EVT_SUBF(LVar3, LVar1) + EVT_SETF(LVar4, LVar2) + EVT_SETF(LVar5, LVar3) + EVT_MULF(LVar4, EVT_FLOAT(0.09375)) + EVT_MULF(LVar5, EVT_FLOAT(0.09375)) + EVT_MULF(LVar6, EVT_FLOAT(0.8)) + EVT_MULF(LVar7, EVT_FLOAT(0.8)) + EVT_ADDF(LVar6, LVar4) + EVT_ADDF(LVar7, LVar5) + EVT_ADDF(LVar0, LVar6) + EVT_ADDF(LVar1, LVar7) + EVT_CALL(TranslateModel, MODEL_o143, MV_BushOffsetL, 0, 0) + EVT_CALL(TranslateModel, MODEL_o144, MV_BushOffsetR, 0, 0) + EVT_CALL(N(MoveBush_AnimateShearing), 29, LVar6) + EVT_CALL(N(MoveBush_AnimateShearing), 31, LVar7) + EVT_WAIT(1) + EVT_END_LOOP + // script is equivalent to MoveBushTemplates.h, except for this additional line: + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o149, COLLIDER_FLAGS_UPPER_MASK) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_SeparateBushesImmediately) = { + EVT_CALL(TranslateModel, MODEL_o143, -45, 0, 0) + EVT_CALL(TranslateModel, MODEL_o144, 45, 0, 0) + EVT_CALL(N(MoveBush_AnimateShearing), 29, 0) + EVT_CALL(N(MoveBush_AnimateShearing), 31, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_MoveBushes) = { + EVT_EXEC(N(EVS_MoveBushes_Separate)) + EVT_CALL(MakeLerp, 0, 45, 30, EASING_CUBIC_OUT) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_SETF(MV_BushOffsetR, LVar0) + EVT_SETF(MV_BushOffsetL, MV_BushOffsetR) + EVT_MULF(MV_BushOffsetL, -1) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_RETURN + EVT_END +}; + +FoliageModelList N(Bush1_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o337); + +FoliageVectorList N(Bush1_Effects) = { + .count = 1, + .vectors = { + { -453.0f, 15.0f, 90.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush1) = { + .bush = &N(Bush1_BushModels), + .vectors = &N(Bush1_Effects), +}; + +FoliageModelList N(Bush2_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o338); + +FoliageVectorList N(Bush2_Effects) = { + .count = 1, + .vectors = { + { -292.0f, 16.0f, 135.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush2) = { + .bush = &N(Bush2_BushModels), + .vectors = &N(Bush2_Effects), +}; + +FoliageModelList N(Bush3_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o339); + +FoliageVectorList N(Bush3_Effects) = { + .count = 1, + .vectors = { + { -180.0f, 15.0f, 120.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush3) = { + .bush = &N(Bush3_BushModels), + .vectors = &N(Bush3_Effects), +}; + +FoliageModelList N(Bush4_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o349); + +FoliageVectorList N(Bush4_Effects) = { + .count = 1, + .vectors = { + { 456.0f, 16.0f, 135.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush4) = { + .bush = &N(Bush4_BushModels), + .vectors = &N(Bush4_Effects), +}; + +FoliageModelList N(Bush5_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o350); + +FoliageVectorList N(Bush5_Effects) = { + .count = 1, + .vectors = { + { 658.0f, 15.0f, 110.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush5) = { + .bush = &N(Bush5_BushModels), + .vectors = &N(Bush5_Effects), +}; + +FoliageModelList N(Bush6_BushModels) = FOLIAGE_MODEL_LIST(MODEL_o351); + +FoliageVectorList N(Bush6_Effects) = { + .count = 1, + .vectors = { + { 710.0f, 15.0f, -30.0f }, + } +}; + +SearchBushConfig N(SearchBush_Bush6) = { + .bush = &N(Bush6_BushModels), + .vectors = &N(Bush6_Effects), +}; + +EvtScript N(EVS_SetupBushes) = { + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o314, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o315, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush3))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o316, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush4))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o326, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush5))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o327, 1, 0) + EVT_SET(LVar0, EVT_PTR(N(SearchBush_Bush6))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_SearchBush_Bushes)), TRIGGER_WALL_PRESS_A, COLLIDER_o328, 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_22/jan_22_7_trees.c b/src/world/area_jan/jan_22/jan_22_7_trees.c new file mode 100644 index 0000000000..970d594bfc --- /dev/null +++ b/src/world/area_jan/jan_22/jan_22_7_trees.c @@ -0,0 +1,58 @@ +#include "jan_22.h" + +#define NAME_SUFFIX _Trees +#include "common/foliage.inc.c" +#define NAME_SUFFIX + +FoliageModelList N(Tree1_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o133); +FoliageModelList N(Tree1_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o134); + +FoliageVectorList N(Tree1_Effects) = { + .count = 1, + .vectors = { + { 343.0f, 410.0f, 100.0f }, + } +}; + +//@bug last part of a FoliageDropList +s32 N(InvalidTreepDrop)[] = { + -30, + ITEM_SPAWN_MODE_FALL_SPAWN_ONCE, + GF_JAN_30, + 0, +}; + +ShakeTreeConfig N(ShakeTree_Tree1) = { + .leaves = &N(Tree1_LeafModels), + .trunk = &N(Tree1_TrunkModels), + .vectors = &N(Tree1_Effects), +}; + +BombTrigger N(BombPos_Tree1) = { + .pos = { -385.0f, 0.0f, -39.0f }, + .radius = 0.0f +}; + +FoliageModelList N(Tree2_LeafModels) = FOLIAGE_MODEL_LIST(MODEL_o93); +FoliageModelList N(Tree2_TrunkModels) = FOLIAGE_MODEL_LIST(MODEL_o78); + +ShakeTreeConfig N(ShakeTree_Tree2) = { + .leaves = &N(Tree2_LeafModels), + .trunk = &N(Tree2_TrunkModels), +}; + +BombTrigger N(BombPos_Tree2) = { + .pos = { -328.0f, 0.0f, -123.0f }, + .radius = 0.0f +}; + +EvtScript N(EVS_SetupTrees) = { + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree1))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o286, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree1)), 1, 0) + EVT_SET(LVar0, EVT_PTR(N(ShakeTree_Tree2))) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_WALL_HAMMER, COLLIDER_o287, 1, 0) + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ShakeTree_Trees)), TRIGGER_POINT_BOMB, EVT_PTR(N(BombPos_Tree2)), 1, 0) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_23/B8FCD0.c b/src/world/area_jan/jan_23/B8FCD0.c deleted file mode 100644 index cc87a0a6c0..0000000000 --- a/src/world/area_jan/jan_23/B8FCD0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "jan_23.h" - -static char* N(exit_str_0) = "jan_19"; -static char* N(exit_str_1) = "jan_16"; diff --git a/src/world/area_jan/jan_23/jan_23.h b/src/world/area_jan/jan_23/jan_23.h index 50e300fc58..d347e331b4 100644 --- a/src/world/area_jan/jan_23/jan_23.h +++ b/src/world/area_jan/jan_23/jan_23.h @@ -2,8 +2,35 @@ /// @brief Jade Jungle - Great Treetop Roost #include "common.h" -#include "../jan.h" #include "message_ids.h" #include "map.h" +#include "../jan.h" +#include "mapfs/jan_23_shape.h" +#include "mapfs/jan_23_hit.h" + +#include "sprite/npc/RaphaelRaven.h" +#include "sprite/npc/Raven.h" + +enum { + NPC_RaphaelRaven = 0, + NPC_Raven_01 = 1, + NPC_Raven_02 = 2, + NPC_Raven_03 = 3, + NPC_Raven_04 = 4, + NPC_Raven_05 = 5, +}; + +enum { + MV_Unk_05 = MapVar(5), +}; + +enum { + MF_Unk_00 = MapFlag(0), +}; + #define NAMESPACE jan_23 + +extern EvtScript N(EVS_Main); +extern EvtScript N(EVS_SetupMusic); +extern NpcGroupList N(DefaultNPCs); diff --git a/src/world/area_jan/jan_23/jan_23_0_header.c b/src/world/area_jan/jan_23/jan_23_0_header.c new file mode 100644 index 0000000000..001c4352de --- /dev/null +++ b/src/world/area_jan/jan_23/jan_23_0_header.c @@ -0,0 +1,13 @@ +#include "jan_23.h" + +EntryList N(Entrances) = { + [jan_23_ENTRY_0] { 230.0, 160.0, 106.0, 90.0 }, +}; + +MapSettings N(settings) = { + .main = &N(EVS_Main), + .entryList = &N(Entrances), + .entryCount = ENTRY_COUNT(N(Entrances)), + .background = &gBackgroundImage, + .tattle = { MSG_MapTattle_jan_23 }, +}; diff --git a/src/world/area_jan/jan_23/jan_23_1_music.c b/src/world/area_jan/jan_23/jan_23_1_music.c new file mode 100644 index 0000000000..7ac62582ac --- /dev/null +++ b/src/world/area_jan/jan_23/jan_23_1_music.c @@ -0,0 +1,7 @@ +#include "jan_23.h" + +EvtScript N(EVS_SetupMusic) = { + EVT_CALL(PlayAmbientSounds, AMBIENT_JUNGLE) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_23/jan_23_2_main.c b/src/world/area_jan/jan_23/jan_23_2_main.c new file mode 100644 index 0000000000..b3aec21265 --- /dev/null +++ b/src/world/area_jan/jan_23/jan_23_2_main.c @@ -0,0 +1,108 @@ +#include "jan_23.h" + +EvtScript N(EVS_ExitWalk_jan_19_1) = EVT_EXIT_WALK(60, jan_23_ENTRY_0, "jan_19", jan_19_ENTRY_1); + +EvtScript N(EVS_ExitFall_jan_16_4) = { + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar1, 110) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(DisablePlayerInput, TRUE) + EVT_SETF(MV_Unk_05, 0) + EVT_CALL(GetPartnerInUse, LVar0) + EVT_IF_NE(LVar0, 8) + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_GRAVITY, FALSE) + EVT_IF_EQ(LVar0, 0) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(3.0)) + EVT_CALL(NpcJump0, NPC_PARTNER, LVar2, LVar3, LVar4, 15) + EVT_ELSE + EVT_WAIT(10) + EVT_END_IF + EVT_CALL(GetNpcPos, NPC_PARTNER, LVar2, LVar3, LVar4) + EVT_CALL(MakeLerp, LVar3, -500, 15, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_ADD(LVar4, 2) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar2, LVar0, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_END_THREAD + EVT_THREAD + EVT_CALL(GetPlayerActionState, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(ACTION_STATE_SPIN_JUMP) + EVT_GOTO(11) + EVT_CASE_EQ(ACTION_STATE_TORNADO_JUMP) + EVT_LABEL(11) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, 250, 100) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, -100, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_SET(MV_Unk_05, -1) + EVT_CASE_DEFAULT + EVT_WAIT(10) + EVT_END_SWITCH + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) + EVT_CALL(MakeLerp, LVar3, -500, 15, EASING_LINEAR) + EVT_LOOP(0) + EVT_CALL(UpdateLerp) + EVT_ADD(LVar4, 2) + EVT_CALL(SetPlayerPos, LVar2, LVar0, LVar4) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 0) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) + EVT_END_THREAD + EVT_END_IF + EVT_LOOP(0) + EVT_WAIT(1) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_IF_LT(LVar1, -100) + EVT_BREAK_LOOP + EVT_END_IF + EVT_END_LOOP + EVT_IF_EQ(MV_Unk_05, 0) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, 250, 100) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_END_IF + EVT_WAIT(30) + EVT_CALL(GotoMap, EVT_PTR("jan_16"), jan_16_ENTRY_4) + EVT_WAIT(100) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_BindExitTriggers) = { + EVT_BIND_TRIGGER(EVT_PTR(N(EVS_ExitWalk_jan_19_1)), TRIGGER_FLOOR_ABOVE, COLLIDER_deiliw, 1, 0) + EVT_EXEC(N(EVS_ExitFall_jan_16_4)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Main) = { + EVT_SET(GB_WorldLocation, LOCATION_JADE_JUNGLE) + EVT_CALL(SetSpriteShading, SHADING_NONE) + EVT_SETUP_CAMERA_NO_LEAD() + EVT_CALL(MakeNpcs, FALSE, EVT_PTR(N(DefaultNPCs))) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_deilitw, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, EVT_PTR(N(EVS_BindExitTriggers))) + EVT_EXEC(EnterWalk) + EVT_EXEC_WAIT(N(EVS_SetupMusic)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/area_jan/jan_23/jan_23_3_npc.c b/src/world/area_jan/jan_23/jan_23_3_npc.c new file mode 100644 index 0000000000..65804ab973 --- /dev/null +++ b/src/world/area_jan/jan_23/jan_23_3_npc.c @@ -0,0 +1,662 @@ +#include "jan_23.h" + +#include "world/common/npc/RaphaelRaven.inc.c" +#include "world/common/npc/Raven.inc.c" + +EvtScript N(EVS_Ravens_Converse) = { + EVT_LOOP(4) + EVT_CALL(SetNpcAnimation, NPC_RaphaelRaven, ANIM_RaphaelRaven_TalkNoFeet) + EVT_CALL(InterpNpcYaw, NPC_Raven_01, 90, 1) + EVT_CALL(InterpNpcYaw, NPC_Raven_02, 270, 1) + EVT_CALL(InterpNpcYaw, NPC_Raven_03, 0, 4) + EVT_CALL(InterpNpcYaw, NPC_Raven_04, 90, 1) + EVT_CALL(InterpNpcYaw, NPC_Raven_05, 270, 1) + EVT_WAIT(20) + EVT_CALL(SetNpcAnimation, NPC_RaphaelRaven, ANIM_RaphaelRaven_IdleNoFeet) + EVT_CALL(InterpNpcYaw, NPC_Raven_01, 270, 2) + EVT_CALL(InterpNpcYaw, NPC_Raven_02, 90, 1) + EVT_CALL(InterpNpcYaw, NPC_Raven_03, 0, 1) + EVT_CALL(InterpNpcYaw, NPC_Raven_04, 270, 4) + EVT_CALL(InterpNpcYaw, NPC_Raven_05, 90, 1) + EVT_WAIT(20) + EVT_END_LOOP + EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Idle) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Idle) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Idle) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Idle) + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Idle) + EVT_CALL(InterpNpcYaw, NPC_Raven_01, 0, 1) + EVT_CALL(InterpNpcYaw, NPC_Raven_02, 0, 1) + EVT_CALL(InterpNpcYaw, NPC_Raven_03, 0, 1) + EVT_CALL(InterpNpcYaw, NPC_Raven_04, 0, 1) + EVT_CALL(InterpNpcYaw, NPC_Raven_05, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Raven1_Descend) = { + EVT_CALL(SetNpcRotationPivot, NPC_Raven_01, 50) + EVT_LOOP(2) + EVT_SET(LVar3, -30) + EVT_LOOP(20) + EVT_CALL(SetNpcRotation, NPC_Raven_01, 0, 0, LVar3) + EVT_ADD(LVar3, 3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(20) + EVT_CALL(SetNpcRotation, NPC_Raven_01, 0, 0, LVar3) + EVT_ADD(LVar3, -3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_LOOP + EVT_LOOP(10) + EVT_CALL(SetNpcRotation, NPC_Raven_01, 0, 0, LVar3) + EVT_ADD(LVar3, 3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcRotationPivot, NPC_Raven_01, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Raven2_Descend) = { + EVT_CALL(SetNpcRotationPivot, NPC_Raven_02, 60) + EVT_LOOP(2) + EVT_SET(LVar3, -30) + EVT_LOOP(20) + EVT_CALL(SetNpcRotation, NPC_Raven_02, 0, 0, LVar3) + EVT_ADD(LVar3, 3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(20) + EVT_CALL(SetNpcRotation, NPC_Raven_02, 0, 0, LVar3) + EVT_ADD(LVar3, -3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_LOOP + EVT_LOOP(10) + EVT_CALL(SetNpcRotation, NPC_Raven_02, 0, 0, LVar3) + EVT_ADD(LVar3, 3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcRotationPivot, NPC_Raven_02, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Raven3_Descend) = { + EVT_CALL(SetNpcRotationPivot, NPC_Raven_03, 50) + EVT_LOOP(2) + EVT_SET(LVar3, -30) + EVT_LOOP(20) + EVT_CALL(SetNpcRotation, NPC_Raven_03, 0, 0, LVar3) + EVT_ADD(LVar3, 3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(20) + EVT_CALL(SetNpcRotation, NPC_Raven_03, 0, 0, LVar3) + EVT_ADD(LVar3, -3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_LOOP + EVT_LOOP(10) + EVT_CALL(SetNpcRotation, NPC_Raven_03, 0, 0, LVar3) + EVT_ADD(LVar3, 3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcRotationPivot, NPC_Raven_03, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Raven4_Descend) = { + EVT_CALL(SetNpcRotationPivot, NPC_Raven_04, 60) + EVT_LOOP(2) + EVT_SET(LVar3, -30) + EVT_LOOP(20) + EVT_CALL(SetNpcRotation, NPC_Raven_04, 0, 0, LVar3) + EVT_ADD(LVar3, 3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(20) + EVT_CALL(SetNpcRotation, NPC_Raven_04, 0, 0, LVar3) + EVT_ADD(LVar3, -3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_LOOP + EVT_LOOP(10) + EVT_CALL(SetNpcRotation, NPC_Raven_04, 0, 0, LVar3) + EVT_ADD(LVar3, 3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcRotationPivot, NPC_Raven_04, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Raven5_Descend) = { + EVT_CALL(SetNpcRotationPivot, NPC_Raven_05, 50) + EVT_LOOP(2) + EVT_SET(LVar3, -30) + EVT_LOOP(20) + EVT_CALL(SetNpcRotation, NPC_Raven_05, 0, 0, LVar3) + EVT_ADD(LVar3, 3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_LOOP(20) + EVT_CALL(SetNpcRotation, NPC_Raven_05, 0, 0, LVar3) + EVT_ADD(LVar3, -3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_LOOP + EVT_LOOP(10) + EVT_CALL(SetNpcRotation, NPC_Raven_05, 0, 0, LVar3) + EVT_ADD(LVar3, 3) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(SetNpcRotationPivot, NPC_Raven_05, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Raven1_MoveToMeetingPos) = { + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Walk) + EVT_CALL(SetNpcSpeed, NPC_Raven_01, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Raven_01, 540, 85, 0) + EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Idle) + EVT_CALL(InterpNpcYaw, NPC_Raven_01, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Raven2_MoveToMeetingPos) = { + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Walk) + EVT_CALL(SetNpcSpeed, NPC_Raven_02, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Raven_02, 560, 132, 0) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Idle) + EVT_CALL(InterpNpcYaw, NPC_Raven_02, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Raven3_MoveToMeetingPos) = { + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Walk) + EVT_CALL(SetNpcSpeed, NPC_Raven_03, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Raven_03, 590, 105, 0) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Idle) + EVT_CALL(InterpNpcYaw, NPC_Raven_03, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Raven4_MoveToMeetingPos) = { + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Walk) + EVT_CALL(SetNpcSpeed, NPC_Raven_04, EVT_FLOAT(3.0)) + EVT_CALL(NpcMoveTo, NPC_Raven_04, 615, 122, 0) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Idle) + EVT_CALL(InterpNpcYaw, NPC_Raven_04, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Raven5_Sweat) = { + EVT_LABEL(0) + EVT_CALL(ShowSweat, NPC_Raven_05, 1, -45, 1, 0, 0, 0, 0, 20) + EVT_WAIT(8) + EVT_GOTO(0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Raven5_MoveToMeetingPos) = { + EVT_WAIT(10) + EVT_EXEC_GET_TID(N(EVS_Raven5_Sweat), LVar9) + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Walk) + EVT_CALL(SetNpcSpeed, NPC_Raven_05, EVT_FLOAT(4.0)) + EVT_CALL(NpcMoveTo, NPC_Raven_05, 645, 78, 0) + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Idle) + EVT_CALL(InterpNpcYaw, NPC_Raven_05, 0, 1) + EVT_WAIT(15) + EVT_KILL_THREAD(LVar9) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 460) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-9.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(10) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeet, ANIM_RaphaelRaven_IdleNoFeet, 0, MSG_CH5_00DA) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_WAIT(5) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_WAIT(35) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeet, ANIM_RaphaelRaven_IdleNoFeet, 5, MSG_CH5_00DB) + EVT_WAIT(20) + EVT_THREAD + EVT_SET(MF_Unk_00, FALSE) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeetAngry, ANIM_RaphaelRaven_TalkNoFeetAngry, 5, MSG_CH5_00DC) + EVT_SET(MF_Unk_00, TRUE) + EVT_END_THREAD + EVT_CALL(SetMotionBlurParams, 0, 0, 0, 320, 240, 128, 10) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeetAngry) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(12.0)) + EVT_LOOP(5) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_386, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 310) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_387, 0) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 460) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_END_LOOP + EVT_CALL(SetMotionBlurParams, 0, 0, 0, 320, 240, 0, 10) + EVT_LABEL(2) + EVT_IF_EQ(MF_Unk_00, FALSE) + EVT_WAIT(1) + EVT_GOTO(2) + EVT_END_IF + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_IdleNoFeet) + EVT_WAIT(15) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 30) + EVT_ADD(LVar1, 0) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 580) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 1) + EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Flail) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Flail) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Flail) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Flail) + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Flail) + EVT_CALL(SetNpcPos, NPC_Raven_01, 800, 450, -20) + EVT_CALL(SetNpcPos, NPC_Raven_02, 820, 452, 0) + EVT_CALL(SetNpcPos, NPC_Raven_03, 840, 452, 27) + EVT_CALL(SetNpcPos, NPC_Raven_04, 830, 452, 56) + EVT_CALL(SetNpcPos, NPC_Raven_05, 795, 455, 20) + EVT_CALL(EnableNpcShadow, NPC_Raven_01, FALSE) + EVT_CALL(EnableNpcShadow, NPC_Raven_02, FALSE) + EVT_CALL(EnableNpcShadow, NPC_Raven_03, FALSE) + EVT_CALL(EnableNpcShadow, NPC_Raven_04, FALSE) + EVT_CALL(EnableNpcShadow, NPC_Raven_05, FALSE) + EVT_THREAD + EVT_EXEC(N(EVS_Raven1_Descend)) + EVT_CALL(SetNpcJumpscale, NPC_Raven_01, 0) + EVT_CALL(GetNpcPos, NPC_Raven_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -120) + EVT_ADD(LVar1, -250) + EVT_ADD(LVar2, 63) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_01, SOUND_20C, 0) + EVT_CALL(NpcJump0, NPC_Raven_01, LVar0, LVar1, LVar2, 100) + EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Idle) + EVT_CALL(EnableNpcShadow, NPC_Raven_01, TRUE) + EVT_EXEC_WAIT(N(EVS_Raven1_MoveToMeetingPos)) + EVT_END_THREAD + EVT_WAIT(20) + EVT_THREAD + EVT_EXEC(N(EVS_Raven2_Descend)) + EVT_CALL(SetNpcJumpscale, NPC_Raven_02, 0) + EVT_CALL(GetNpcPos, NPC_Raven_02, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -120) + EVT_ADD(LVar1, -250) + EVT_ADD(LVar2, 63) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_20D, 0) + EVT_CALL(NpcJump0, NPC_Raven_02, LVar0, LVar1, LVar2, 100) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Idle) + EVT_CALL(EnableNpcShadow, NPC_Raven_02, TRUE) + EVT_EXEC_WAIT(N(EVS_Raven2_MoveToMeetingPos)) + EVT_END_THREAD + EVT_WAIT(20) + EVT_THREAD + EVT_CALL(InterpPlayerYaw, 90, 1) + EVT_WAIT(20) + EVT_SET(LVar3, 625) + EVT_SET(LVar5, 220) + EVT_CALL(PlayerMoveTo, LVar3, LVar5, 30) + EVT_CALL(InterpPlayerYaw, 10, 4) + EVT_END_THREAD + EVT_THREAD + EVT_EXEC(N(EVS_Raven3_Descend)) + EVT_CALL(SetNpcJumpscale, NPC_Raven_03, 0) + EVT_CALL(GetNpcPos, NPC_Raven_03, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -100) + EVT_ADD(LVar1, -250) + EVT_ADD(LVar2, 50) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_20E, 0) + EVT_CALL(NpcJump0, NPC_Raven_03, LVar0, LVar1, LVar2, 90) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Idle) + EVT_CALL(EnableNpcShadow, NPC_Raven_03, TRUE) + EVT_EXEC_WAIT(N(EVS_Raven3_MoveToMeetingPos)) + EVT_END_THREAD + EVT_WAIT(40) + EVT_THREAD + EVT_EXEC(N(EVS_Raven4_Descend)) + EVT_CALL(SetNpcJumpscale, NPC_Raven_04, 0) + EVT_CALL(GetNpcPos, NPC_Raven_04, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -100) + EVT_ADD(LVar1, -250) + EVT_ADD(LVar2, 60) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_20C, 0) + EVT_CALL(NpcJump0, NPC_Raven_04, LVar0, LVar1, LVar2, 100) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Idle) + EVT_CALL(EnableNpcShadow, NPC_Raven_04, TRUE) + EVT_EXEC_WAIT(N(EVS_Raven4_MoveToMeetingPos)) + EVT_END_THREAD + EVT_WAIT(20) + EVT_EXEC(N(EVS_Raven5_Descend)) + EVT_CALL(SetNpcJumpscale, NPC_Raven_05, 0) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_20D, 0) + EVT_CALL(NpcJump0, NPC_Raven_05, 737, 200, 65, 100) + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Idle) + EVT_CALL(EnableNpcShadow, NPC_Raven_05, TRUE) + EVT_EXEC_WAIT(N(EVS_Raven5_MoveToMeetingPos)) + EVT_WAIT(20) + EVT_CALL(InterpPlayerYaw, 350, 4) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeet, ANIM_RaphaelRaven_IdleNoFeet, 5, MSG_CH5_00DD) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeet, ANIM_RaphaelRaven_IdleNoFeet, 5, MSG_CH5_00DE) + EVT_EXEC_WAIT(N(EVS_Ravens_Converse)) + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeet, ANIM_RaphaelRaven_IdleNoFeet, 5, MSG_CH5_00DF) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) + EVT_CALL(SetPanTarget, CAM_DEFAULT, 535, 200, 215) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.5)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_WAIT(20) + EVT_THREAD + EVT_WAIT(20) + EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) + EVT_WAIT(15) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_20C, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Walk) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -70) + EVT_ADD(LVar1, -7) + EVT_ADD(LVar2, 175) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Idle) + EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.5)) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Walk) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -100) + EVT_ADD(LVar1, -300) + EVT_ADD(LVar2, 175) + EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 30) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_Idle) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_GRAVITY, FALSE) + EVT_END_THREAD + EVT_WAIT(40) + EVT_THREAD + EVT_WAIT(35) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_01, SOUND_20D, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_Raven_01, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Walk) + EVT_CALL(GetNpcPos, NPC_Raven_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -40) + EVT_ADD(LVar2, 154) + EVT_CALL(NpcMoveTo, NPC_Raven_01, LVar0, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Idle) + EVT_CALL(SetNpcJumpscale, NPC_Raven_01, EVT_FLOAT(1.5)) + EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Walk) + EVT_CALL(GetNpcPos, NPC_Raven_01, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -20) + EVT_ADD(LVar1, -300) + EVT_ADD(LVar2, 154) + EVT_CALL(NpcJump0, NPC_Raven_01, LVar0, LVar1, LVar2, 30) + EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Idle) + EVT_CALL(SetNpcPos, NPC_Raven_01, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcFlagBits, NPC_Raven_01, NPC_FLAG_GRAVITY, FALSE) + EVT_END_THREAD + EVT_WAIT(20) + EVT_THREAD + EVT_WAIT(35) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_02, SOUND_20E, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_Raven_02, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Walk) + EVT_CALL(GetNpcPos, NPC_Raven_02, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -55) + EVT_ADD(LVar2, 110) + EVT_CALL(NpcMoveTo, NPC_Raven_02, LVar0, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Idle) + EVT_CALL(SetNpcJumpscale, NPC_Raven_02, EVT_FLOAT(1.5)) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Walk) + EVT_CALL(GetNpcPos, NPC_Raven_02, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -40) + EVT_ADD(LVar1, -300) + EVT_ADD(LVar2, 110) + EVT_CALL(NpcJump0, NPC_Raven_02, LVar0, LVar1, LVar2, 30) + EVT_CALL(SetNpcAnimation, NPC_Raven_02, ANIM_Raven_Idle) + EVT_CALL(SetNpcPos, NPC_Raven_02, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcFlagBits, NPC_Raven_02, NPC_FLAG_GRAVITY, FALSE) + EVT_END_THREAD + EVT_WAIT(20) + EVT_THREAD + EVT_WAIT(35) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_03, SOUND_20C, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_Raven_03, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Walk) + EVT_CALL(GetNpcPos, NPC_Raven_03, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -75) + EVT_ADD(LVar2, 134) + EVT_CALL(NpcMoveTo, NPC_Raven_03, LVar0, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Idle) + EVT_CALL(SetNpcJumpscale, NPC_Raven_03, EVT_FLOAT(1.5)) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Walk) + EVT_CALL(GetNpcPos, NPC_Raven_03, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -70) + EVT_ADD(LVar1, -300) + EVT_ADD(LVar2, 134) + EVT_CALL(NpcJump0, NPC_Raven_03, LVar0, LVar1, LVar2, 30) + EVT_CALL(SetNpcAnimation, NPC_Raven_03, ANIM_Raven_Idle) + EVT_CALL(SetNpcPos, NPC_Raven_03, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcFlagBits, NPC_Raven_03, NPC_FLAG_GRAVITY, FALSE) + EVT_END_THREAD + EVT_WAIT(20) + EVT_THREAD + EVT_WAIT(35) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_04, SOUND_20D, 0) + EVT_END_THREAD + EVT_THREAD + EVT_CALL(SetNpcFlagBits, NPC_Raven_04, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Walk) + EVT_CALL(GetNpcPos, NPC_Raven_04, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -110) + EVT_ADD(LVar2, 115) + EVT_CALL(NpcMoveTo, NPC_Raven_04, LVar0, LVar2, 20) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Idle) + EVT_CALL(SetNpcJumpscale, NPC_Raven_04, EVT_FLOAT(1.5)) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Walk) + EVT_CALL(GetNpcPos, NPC_Raven_04, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -110) + EVT_ADD(LVar1, -300) + EVT_ADD(LVar2, 115) + EVT_CALL(NpcJump0, NPC_Raven_04, LVar0, LVar1, LVar2, 30) + EVT_CALL(SetNpcAnimation, NPC_Raven_04, ANIM_Raven_Idle) + EVT_CALL(SetNpcPos, NPC_Raven_04, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcFlagBits, NPC_Raven_04, NPC_FLAG_GRAVITY, FALSE) + EVT_END_THREAD + EVT_WAIT(10) + EVT_THREAD + EVT_WAIT(45) + EVT_CALL(PlaySoundAtNpc, NPC_Raven_05, SOUND_20E, 0) + EVT_END_THREAD + EVT_CALL(SetNpcFlagBits, NPC_Raven_05, NPC_FLAG_GRAVITY, TRUE) + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Walk) + EVT_CALL(GetNpcPos, NPC_Raven_05, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -100) + EVT_ADD(LVar2, 161) + EVT_CALL(NpcMoveTo, NPC_Raven_05, LVar0, LVar2, 30) + EVT_THREAD + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Idle) + EVT_CALL(SetNpcJumpscale, NPC_Raven_05, EVT_FLOAT(1.5)) + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Walk) + EVT_CALL(GetNpcPos, NPC_Raven_05, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, -70) + EVT_ADD(LVar1, -500) + EVT_ADD(LVar2, 161) + EVT_CALL(NpcJump0, NPC_Raven_05, LVar0, LVar1, LVar2, 35) + EVT_CALL(SetNpcAnimation, NPC_Raven_05, ANIM_Raven_Idle) + EVT_CALL(SetNpcPos, NPC_Raven_05, NPC_DISPOSE_LOCATION) + EVT_CALL(SetNpcFlagBits, NPC_Raven_05, NPC_FLAG_GRAVITY, FALSE) + EVT_END_THREAD + EVT_CALL(SetPanTarget, CAM_DEFAULT, 550, -150, 400) + EVT_CALL(SetCamDistance, CAM_DEFAULT, 580) + EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(16.0), EVT_FLOAT(-4.0)) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.8)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) + EVT_WAIT(15) + EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(2.0)) + EVT_SET(GB_StoryProgress, STORY_CH5_RAFAEL_LEFT_NEST) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_RaphaelRaven_After) = { + EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeet, ANIM_RaphaelRaven_IdleNoFeet, 0, MSG_CH5_00E0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_RaphaelRaven) = { + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_RaphaelRaven_IdleNoFeet) + EVT_SWITCH(GB_StoryProgress) + EVT_CASE_LT(STORY_CH5_RAFAEL_LEFT_NEST) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_RaphaelRaven_Before))) + EVT_CASE_GE(STORY_CH5_ZIP_LINE_READY) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_RaphaelRaven_After))) + EVT_CASE_DEFAULT + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Raven_01) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Raven_02) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Raven_03) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Raven_04) = { + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInit_Raven_05) = { + EVT_RETURN + EVT_END +}; + +StaticNpc N(NpcData_Ravens)[] = { + { + .id = NPC_RaphaelRaven, + .settings = &N(NpcSettings_RaphaelRaven), + .pos = { 590.0f, 210.0f, 0.0f }, + .yaw = 270, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_GRAVITY, + .init = &N(EVS_NpcInit_RaphaelRaven), + .drops = NPC_NO_DROPS, + .animations = RAPHAEL_RAVEN_ANIMS, + .tattle = MSG_NpcTattle_RaphaelRaven, + }, + { + .id = NPC_Raven_01, + .settings = &N(NpcSettings_Raven), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .init = &N(EVS_NpcInit_Raven_01), + .drops = NPC_NO_DROPS, + .animations = RAVEN_ANIMS, + .tattle = MSG_NpcTattle_RavenA, + }, + { + .id = NPC_Raven_02, + .settings = &N(NpcSettings_Raven), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .init = &N(EVS_NpcInit_Raven_02), + .drops = NPC_NO_DROPS, + .animations = RAVEN_ANIMS, + }, + { + .id = NPC_Raven_03, + .settings = &N(NpcSettings_Raven), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .init = &N(EVS_NpcInit_Raven_03), + .drops = NPC_NO_DROPS, + .animations = RAVEN_ANIMS, + .tattle = MSG_NpcTattle_RavenC, + }, + { + .id = NPC_Raven_04, + .settings = &N(NpcSettings_Raven), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .init = &N(EVS_NpcInit_Raven_04), + .drops = NPC_NO_DROPS, + .animations = RAVEN_ANIMS, + .tattle = MSG_NpcTattle_RavenD, + }, + { + .id = NPC_Raven_05, + .settings = &N(NpcSettings_Raven), + .pos = { NPC_DISPOSE_LOCATION }, + .yaw = 270, + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400, + .init = &N(EVS_NpcInit_Raven_05), + .drops = NPC_NO_DROPS, + .animations = RAVEN_ANIMS, + .tattle = MSG_NpcTattle_RavenE, + }, +}; + +NpcGroupList N(DefaultNPCs) = { + NPC_GROUP(N(NpcData_Ravens)), + {} +}; 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 946db3566c..c599b1ce96 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 @@ -17,7 +17,6 @@ MapSettings N(settings) = { }; #include "world/common/atomic/CreateDarkness.inc.c" -#include "world/common/atomic/CreateDarkness.data.inc.c" EvtScript N(EVS_ExitWalk_kgr_02_0) = EVT_EXIT_WALK(60, kgr_01_ENTRY_1, "kgr_02", kgr_02_ENTRY_0); EvtScript N(EVS_ExitWalk_mac_05_3) = EVT_EXIT_WALK(60, kgr_01_ENTRY_0, "mac_05", mac_05_ENTRY_3); 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 1626bba49f..c5a6942aac 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 @@ -18,7 +18,6 @@ MapSettings N(settings) = { }; #include "world/common/atomic/CreateDarkness.inc.c" -#include "world/common/atomic/CreateDarkness.data.inc.c" EvtScript N(EVS_ExitWalk_kgr_01_1) = EVT_EXIT_WALK(60, kgr_02_ENTRY_0, "kgr_01", kgr_01_ENTRY_1); diff --git a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c index ee20be31f9..26f576b062 100644 --- a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c +++ b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c @@ -550,7 +550,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_WAIT(25) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_LeanOver) EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Goombaria, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Goombaria, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Stand) EVT_CALL(SpeakToPlayer, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Stand, 5, MSG_CH0_0004) diff --git a/src/world/area_kmr/kmr_02/kmr_02_2_main.c b/src/world/area_kmr/kmr_02/kmr_02_2_main.c index e08f1136f7..d050781cae 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_2_main.c +++ b/src/world/area_kmr/kmr_02/kmr_02_2_main.c @@ -1,7 +1,6 @@ #include "kmr_02.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #define NAME_SUFFIX _Main #include "world/common/npc/GoombaFamily_Wander.inc.c" diff --git a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c index 98e0414aad..d0f1803d01 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c +++ b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c @@ -2110,10 +2110,10 @@ EvtScript N(EVS_NpcIdle_Eldstar_Epilogue) = { EVT_WAIT(10) EVT_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Goombaria, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Goombaria, EMOTE_EXCLAMATION, 0, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Goombaria, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Goombario, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Goombario, EMOTE_EXCLAMATION, 0, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Goombario, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(10) EVT_CALL(InterpNpcYaw, NPC_Goombario, 90, 0) EVT_CALL(InterpNpcYaw, NPC_Goombaria, 90, 0) diff --git a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c index 9ee6592d92..6fec18488f 100644 --- a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c +++ b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c @@ -64,7 +64,7 @@ EvtScript N(EVS_NpcAI_Goompa) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetNpcAux, NPC_Goompa, 0) EVT_CALL(PlaySoundAtNpc, NPC_Goompa, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Goompa, EMOTE_EXCLAMATION, 45, 15, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Goompa, EMOTE_EXCLAMATION, 45, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(10) diff --git a/src/world/area_kmr/kmr_05/kmr_05_3_npc.c b/src/world/area_kmr/kmr_05/kmr_05_3_npc.c index 7c00d3dd59..3c933cec6b 100644 --- a/src/world/area_kmr/kmr_05/kmr_05_3_npc.c +++ b/src/world/area_kmr/kmr_05/kmr_05_3_npc.c @@ -53,7 +53,7 @@ EvtScript N(EVS_NpcIdle_SpikedGoomba) = { EVT_GOTO(10) EVT_END_IF EVT_CALL(SetNpcAux, NPC_SELF, 0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, -30, 12, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, -30, 12, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(5.0)) EVT_CALL(NpcJump0, NPC_SELF, 685, 100, -35, 0) diff --git a/src/world/area_kmr/kmr_10/kmr_10_4_entity.c b/src/world/area_kmr/kmr_10/kmr_10_4_entity.c index e29d173ef0..842c1ce6f0 100644 --- a/src/world/area_kmr/kmr_10/kmr_10_4_entity.c +++ b/src/world/area_kmr/kmr_10/kmr_10_4_entity.c @@ -1,7 +1,7 @@ #include "kmr_10.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" #include "world/common/util/PlaySpringReboundAnimation.inc.c" diff --git a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c index d271050d12..4502d2b84b 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c +++ b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c @@ -60,7 +60,7 @@ EvtScript N(EVS_KootFavorCheck_Luigi) = { EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_0105) EVT_WAIT(10) - EVT_SET(LVar0, ITEM_KOOT_MERLUVLEE_AUTOGRAPH) + EVT_SET(LVar0, ITEM_KOOT_LUIGIS_AUTOGRAPH) EVT_SET(LVar1, 1) EVT_EXEC_WAIT(N(GiveItemReward)) EVT_CALL(AddKeyItem, LVar0) @@ -122,7 +122,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkSit, ANIM_Luigi_IdleSit, 5, MSG_CH0_00DB) EVT_WAIT(20) EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, -30, 40, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, -30, 40, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25) EVT_THREAD EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 495, 30, -115) @@ -137,7 +137,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_GRAVITY, TRUE) EVT_CALL(SetNpcFlagBits, NPC_Luigi_1, NPC_FLAG_8, FALSE) EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_EXCLAMATION, -30, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_EXCLAMATION, -30, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Jump) EVT_CALL(GetNpcPos, NPC_Luigi_1, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Luigi_1, LVar0, LVar1, LVar2, 10) @@ -187,7 +187,7 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_StillBack) EVT_WAIT(30) EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, -30, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, -30, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Idle) EVT_CALL(SetNpcAnimation, NPC_Luigi_1, ANIM_Luigi_Run) @@ -200,10 +200,10 @@ EvtScript N(EVS_Scene_LuigiWaitingAround) = { EVT_WAIT(45) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 219, 0) EVT_END_THREAD - EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_ELLIPSIS, 20, 85, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_ELLIPSIS, 20, 85, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_QUESTION, -20, 70, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_QUESTION, -20, 70, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(110) EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 5, MSG_CH0_00DE) EVT_CALL(GetCurrentPartnerID, LVar0) @@ -422,7 +422,7 @@ EvtScript N(EVS_NpcIdle_Luigi_ReadingMail) = { EVT_SET(GF_KMR20_CaughtLuigiReadingLetter, TRUE) EVT_WAIT(20) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, -30, 15, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, -30, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Idle) EVT_WAIT(10) diff --git a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c index 8d08c411f8..ceef22c854 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c +++ b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c @@ -3,7 +3,6 @@ #define NAME_SUFFIX _Intro #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "common/foliage.inc.c" #define NAME_SUFFIX diff --git a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c index ad5bba3385..56f032910f 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c +++ b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c @@ -3,7 +3,6 @@ #define NAME_SUFFIX _Epilogue #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #define NAME_SUFFIX API_CALLABLE(N(func_80242030_8EDE50)) { @@ -225,7 +224,7 @@ EvtScript N(EVS_Scene_EpilogueGetLetter) = { EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Luigi_0, EMOTE_QUESTION, 0, 20, FALSE, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkSit, ANIM_Luigi_IdleSit, 0, MSG_Outro_0021) EVT_WAIT(10) diff --git a/src/world/area_kmr/kmr_20/kmr_20_2_main.c b/src/world/area_kmr/kmr_20/kmr_20_2_main.c index fa33659509..050569fa15 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_2_main.c +++ b/src/world/area_kmr/kmr_20/kmr_20_2_main.c @@ -1,7 +1,6 @@ #include "kmr_20.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" API_CALLABLE(N(func_80240310_8EC130)){ set_map_transition_effect(TRANSITION_4); diff --git a/src/world/area_kpa/kpa_01/kpa_01_2_main.c b/src/world/area_kpa/kpa_01/kpa_01_2_main.c index 0475262835..46ea783692 100644 --- a/src/world/area_kpa/kpa_01/kpa_01_2_main.c +++ b/src/world/area_kpa/kpa_01/kpa_01_2_main.c @@ -2,14 +2,6 @@ #include "world/common/atomic/CreateDarkness.inc.c" -EvtScript N(EVS_SetupDarkness) = { - EVT_THREAD - EVT_CALL(N(DarkRoomUpdate)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - EvtScript N(EVS_ExitDoor_kpa_14_1) = { EVT_SET_GROUP(EVT_GROUP_1B) EVT_CALL(DisablePlayerInput, TRUE) @@ -58,7 +50,7 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_DEFAULT() EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) - EVT_EXEC(N(EVS_SetupDarkness)) + EVT_EXEC(N(EVS_CreateDarkness)) EVT_EXEC(N(EVS_EnterMap)) EVT_WAIT(1) EVT_EXEC(N(EVS_SetupMusic)) diff --git a/src/world/area_kpa/kpa_03/kpa_03_2_main.c b/src/world/area_kpa/kpa_03/kpa_03_2_main.c index 3cbab04548..b9b11e16ed 100644 --- a/src/world/area_kpa/kpa_03/kpa_03_2_main.c +++ b/src/world/area_kpa/kpa_03/kpa_03_2_main.c @@ -2,14 +2,6 @@ #include "world/common/atomic/CreateDarkness.inc.c" -EvtScript N(EVS_SetupDarkness) = { - EVT_THREAD - EVT_CALL(N(DarkRoomUpdate)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - EvtScript N(EVS_ExitWalk_kpa_01_1) = EVT_EXIT_WALK(60, kpa_03_ENTRY_0, "kpa_01", kpa_01_ENTRY_1); EvtScript N(EVS_ExitWalk_kpa_04_0) = EVT_EXIT_WALK(60, kpa_03_ENTRY_1, "kpa_04", kpa_04_ENTRY_0); @@ -33,7 +25,7 @@ EvtScript N(EVS_Main) = { EVT_SETUP_CAMERA_DEFAULT() EVT_CALL(MakeNpcs, TRUE, EVT_PTR(N(DefaultNPCs))) EVT_EXEC_WAIT(N(EVS_MakeEntities)) - EVT_EXEC(N(EVS_SetupDarkness)) + EVT_EXEC(N(EVS_CreateDarkness)) EVT_EXEC(N(EVS_EnterMap)) EVT_WAIT(1) EVT_EXEC(N(EVS_SetupMusic)) diff --git a/src/world/area_kpa/kpa_15/kpa_15_3_entity.c b/src/world/area_kpa/kpa_15/kpa_15_3_entity.c index 212118b6d7..ab0981a531 100644 --- a/src/world/area_kpa/kpa_15/kpa_15_3_entity.c +++ b/src/world/area_kpa/kpa_15/kpa_15_3_entity.c @@ -1,7 +1,7 @@ #include "kpa_15.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_CastleKey) = EVT_OPEN_CHEST_KEY(ITEM_BOWSER_CASTLE_KEY, GF_KPA15_Chest_CastleKey2); diff --git a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c index 3452aeac7d..1d3967db95 100644 --- a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c +++ b/src/world/area_kpa/kpa_16/kpa_16_4_npc.c @@ -161,9 +161,9 @@ EvtScript N(EVS_NpcIdle_Guards) = { EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_01, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_02, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(PlaySoundAtNpc, NPC_Koopatrol_03, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Koopatrol_01, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) - EVT_CALL(ShowEmote, NPC_Koopatrol_02, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) - EVT_CALL(ShowEmote, NPC_Koopatrol_03, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Koopatrol_01, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Koopatrol_02, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Koopatrol_03, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(InterpNpcYaw, NPC_Koopatrol_01, 90, 0) EVT_CALL(InterpNpcYaw, NPC_Koopatrol_02, 90, 0) diff --git a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c index 23493e2675..fbc3b8eb99 100644 --- a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c +++ b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c @@ -50,7 +50,7 @@ EvtScript N(EVS_NpcAI_Duplighost_Flee) = { EVT_END_LOOP EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 5) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Duplighost_Anim04) @@ -405,7 +405,7 @@ StaticNpc N(NpcData_Imposter)[] = { .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost), .drops = { .dropFlags = NPC_DROP_FLAG_80, diff --git a/src/world/area_kpa/kpa_96/kpa_96_3_npc.c b/src/world/area_kpa/kpa_96/kpa_96_3_npc.c index e451da56cd..0ed1cc1ee0 100644 --- a/src/world/area_kpa/kpa_96/kpa_96_3_npc.c +++ b/src/world/area_kpa/kpa_96/kpa_96_3_npc.c @@ -145,7 +145,7 @@ StaticNpc N(NpcData_SpikedGoomba) = { .settings = &N(NpcSettings_SpikedGoomba), .pos = { -122.0f, 0.0f, 163.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_SpikedGoomba), .drops = NPC_NO_DROPS, .animations = { 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 293f330bd6..76ccb81dad 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,15 +1,8 @@ #include "kzn_03.h" #include "world/common/enemy/complete/SpikeTop.inc.c" - #include "world/common/enemy/complete/PutridPiranha.inc.c" - -NpcSettings N(NpcSettings_ZiplineDummy) = { - .height = 24, - .radius = 24, - .level = 99, -}; - +#include "world/common/npc/Dummy.inc.c" #include "world/common/npc/Kolorado.inc.c" #include "world/common/complete/LetterDelivery.inc.c" @@ -178,7 +171,7 @@ StaticNpc N(NpcData_PassiveNPCs)[] = { }, { .id = NPC_ZiplineDummy1, - .settings = &N(NpcSettings_ZiplineDummy), + .settings = &N(NpcSettings_Dummy), .pos = { 392.0f, 470.0f, 218.0f }, .yaw = 90, .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, @@ -189,7 +182,7 @@ StaticNpc N(NpcData_PassiveNPCs)[] = { }, { .id = NPC_ZiplineDummy2, - .settings = &N(NpcSettings_ZiplineDummy), + .settings = &N(NpcSettings_Dummy), .pos = { 392.0f, 470.0f, 218.0f }, .yaw = 90, .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_200 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000, diff --git a/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c b/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c index 72daeaf531..065213f8c4 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c +++ b/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c @@ -124,20 +124,20 @@ EvtScript N(EVS_RideZipline) = { EVT_END_CHILD_THREAD EVT_CALL(MakeLerp, 0, 1000, 70, EASING_QUADRATIC_IN) EVT_LABEL(0) - EVT_CALL(UpdateLerp) - EVT_CALL(N(Zipline_UpdatePlayerPos), 0) - EVT_CALL(TranslateModel, ArrayVar(1), LVar5, LVar6, LVar7) - EVT_CALL(TranslateModel, ArrayVar(2), LVar5, LVar6, LVar7) - EVT_WAIT(1) - EVT_CALL(N(Zipline_CheckInputForJumpOff)) - EVT_IF_EQ(LVar8, BUTTON_A) - EVT_GOTO(10) - EVT_END_IF - EVT_IF_EQ(LVar1, 1) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(PlaySound, SOUND_2087) - EVT_LABEL(10) + EVT_CALL(UpdateLerp) + EVT_CALL(N(Zipline_UpdatePlayerPos), 0) + EVT_CALL(TranslateModel, ArrayVar(1), LVar5, LVar6, LVar7) + EVT_CALL(TranslateModel, ArrayVar(2), LVar5, LVar6, LVar7) + EVT_WAIT(1) + EVT_CALL(N(Zipline_CheckInputForJumpOff)) + EVT_IF_EQ(LVar8, BUTTON_A) + EVT_GOTO(10) + EVT_END_IF + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(PlaySound, SOUND_2087) + EVT_LABEL(10) EVT_CALL(SetPlayerFlagBits, PS_FLAG_SCRIPTED_FALL, TRUE) EVT_SET(MF_RidingZipline1, FALSE) EVT_CALL(StopSound, SOUND_80000019) @@ -165,14 +165,14 @@ EvtScript N(EVS_RideZipline) = { EVT_DIV(LVar2, 10) EVT_CALL(MakeLerp, LVar0, 0, LVar2, EASING_LINEAR) EVT_LABEL(1) - EVT_CALL(UpdateLerp) - EVT_CALL(N(Zipline_UpdatePlayerPos), 1) - EVT_CALL(TranslateModel, ArrayVar(1), LVar5, LVar6, LVar7) - EVT_CALL(TranslateModel, ArrayVar(2), LVar5, LVar6, LVar7) - EVT_WAIT(1) - EVT_IF_EQ(LVar1, 1) - EVT_GOTO(1) - EVT_END_IF + EVT_CALL(UpdateLerp) + EVT_CALL(N(Zipline_UpdatePlayerPos), 1) + EVT_CALL(TranslateModel, ArrayVar(1), LVar5, LVar6, LVar7) + EVT_CALL(TranslateModel, ArrayVar(2), LVar5, LVar6, LVar7) + EVT_WAIT(1) + EVT_IF_EQ(LVar1, 1) + EVT_GOTO(1) + EVT_END_IF EVT_SET(MF_RidingZipline2, FALSE) EVT_CALL(StopSound, SOUND_8000001A) EVT_RETURN 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 8dc8157be2..4292f7b913 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 @@ -4,7 +4,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_KZN04_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_MAKE_SUPER_BLOCK(530, 560, 25, 0) diff --git a/src/world/area_kzn/kzn_08/kzn_08_2_entity.c b/src/world/area_kzn/kzn_08/kzn_08_2_entity.c index ff930a9142..6bf2c219b3 100644 --- a/src/world/area_kzn/kzn_08/kzn_08_2_entity.c +++ b/src/world/area_kzn/kzn_08/kzn_08_2_entity.c @@ -1,7 +1,7 @@ #include "kzn_08.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_DizzyStomp) = EVT_OPEN_CHEST_BADGE(ITEM_DIZZY_STOMP, GF_KZN08_Chest_DizzyStomp); 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 122dddfdb5..88cbafc404 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 @@ -4,7 +4,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_KZN09_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_MAKE_SUPER_BLOCK(130, 480, -75, 0) 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 980817d51d..a598749f35 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 @@ -73,7 +73,7 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { EVT_CALL(InterpNpcYaw, NPC_SELF, 90, 3) EVT_WAIT(5) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25) EVT_CALL(SetSelfVar, 0, 2) EVT_THREAD diff --git a/src/world/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/area_kzn/kzn_20/kzn_20_3_npc.c index ea29d5308d..935a7915e7 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_3_npc.c +++ b/src/world/area_kzn/kzn_20/kzn_20_3_npc.c @@ -227,7 +227,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 5, MSG_CH5_010B) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.5)) @@ -367,7 +367,7 @@ API_CALLABLE(N(GetFloorCollider)) { return ApiStatus_DONE2; } -EvtScript N(EVS_NpcIdle_Misstar) = { +EvtScript N(EVS_Scene_Misstar) = { EVT_IF_EQ(AF_KZN20_MisstarFlightDone, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, -120, 70, 45) EVT_WAIT(30) @@ -447,7 +447,7 @@ EvtScript N(EVS_NpcIdle_Misstar) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 145, -10, 0) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(SetNpcRotation, NPC_SELF, 0, -30, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_Back) @@ -516,7 +516,7 @@ EvtScript N(EVS_NpcInteract_Misstar) = { EvtScript N(EVS_NpcInit_Misstar) = { EVT_IF_EQ(GB_StoryProgress, STORY_CH5_MT_LAVA_LAVA_ERUPTING) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_IdleAngry) - EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Misstar))) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_Scene_Misstar))) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Misstar))) EVT_ELSE EVT_CALL(RemoveNpc, NPC_SELF) diff --git a/src/world/area_kzn/kzn_22/kzn_22_4_npc.c b/src/world/area_kzn/kzn_22/kzn_22_4_npc.c index 7ab826ffa9..92b6540f30 100644 --- a/src/world/area_kzn/kzn_22/kzn_22_4_npc.c +++ b/src/world/area_kzn/kzn_22/kzn_22_4_npc.c @@ -164,7 +164,7 @@ EvtScript N(EVS_SetCharacterPositions) = { EVT_END }; -EvtScript N(EVS_NpcIdle_Misstar) = { +EvtScript N(EVS_Scene_Misstar) = { EVT_LOOP(0) EVT_WAIT(1) EVT_IF_NE(AF_KZN23_MessageClosed, FALSE) @@ -257,7 +257,7 @@ EvtScript N(EVS_NpcInit_Misstar) = { EVT_SET(AF_KZN23_GrabbedKolorado, FALSE) EVT_SET(AF_KZN23_GrabbedPlayer, FALSE) EVT_SET(AF_KZN22_FlewAway, FALSE) - EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Misstar))) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_Scene_Misstar))) EVT_RETURN EVT_END }; diff --git a/src/world/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/area_kzn/kzn_23/kzn_23_3_npc.c index 385681b2e2..c82a8b2e96 100644 --- a/src/world/area_kzn/kzn_23/kzn_23_3_npc.c +++ b/src/world/area_kzn/kzn_23/kzn_23_3_npc.c @@ -198,7 +198,7 @@ EvtScript N(EVS_SpawnPyroclasts) = { EVT_END }; -EvtScript N(EVS_NpcIdle_Misstar) = { +EvtScript N(EVS_Scene_Misstar) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) @@ -270,7 +270,7 @@ EvtScript N(EVS_NpcIdle_Misstar) = { EvtScript N(EVS_NpcInit_Misstar) = { EVT_CALL(SetNpcPos, NPC_SELF, 0, -100, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_IdleAngry) - EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Misstar))) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_Scene_Misstar))) EVT_RETURN EVT_END }; diff --git a/src/world/area_mac/mac_00/mac_00_10_shared_npc.c b/src/world/area_mac/mac_00/mac_00_10_shared_npc.c index 9b01f70c27..aafa7c0706 100644 --- a/src/world/area_mac/mac_00/mac_00_10_shared_npc.c +++ b/src/world/area_mac/mac_00/mac_00_10_shared_npc.c @@ -578,7 +578,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { -150.0f, 0.0f, -275.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Toad_04), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -589,7 +589,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Wander_Shared), .pos = { 219.0f, 0.0f, -45.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Toad_05), .drops = TOAD_DROPS, .territory = { @@ -617,7 +617,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Patrol_Shared), .pos = { -290.0f, 0.0f, -120.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Toad_06), .drops = TOAD_DROPS, .territory = { @@ -642,7 +642,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { -40.0f, 0.0f, 61.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_FickleLover), .drops = TOAD_DROPS, .animations = TOAD_BLUE_ANIMS, @@ -653,7 +653,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { -15.0f, 0.0f, 60.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShamelessLover), .drops = TOADETTE_DROPS, .animations = TOADETTE_PINK_ANIMS, @@ -664,7 +664,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { 426.0f, 20.0f, 268.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_KrisT), .drops = TOADETTE_DROPS, .animations = TOADETTE_GREEN_ANIMS, @@ -675,7 +675,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { 381.0f, 20.0f, 326.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_MissT), .drops = TOADETTE_DROPS, .animations = TOADETTE_ORANGE_ANIMS, @@ -686,7 +686,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { 476.0f, 20.0f, 326.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_FelissaT), .drops = TOADETTE_DROPS, .animations = TOADETTE_PURPLE_ANIMS, @@ -697,7 +697,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { 424.0f, 20.0f, -85.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_DojoSpectator), .drops = TOAD_DROPS, .animations = TOAD_BLUE_ANIMS, @@ -708,7 +708,7 @@ StaticNpc N(NpcData_SharedTownsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary_Shared), .pos = { 373.0f, 0.0f, 22.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_DojoFan), .drops = TOAD_DROPS, .animations = TOAD_YELLOW_ANIMS, diff --git a/src/world/area_mac/mac_00/mac_00_11_intro_npc.c b/src/world/area_mac/mac_00/mac_00_11_intro_npc.c index 447cd6a554..af0fc420a2 100644 --- a/src/world/area_mac/mac_00/mac_00_11_intro_npc.c +++ b/src/world/area_mac/mac_00/mac_00_11_intro_npc.c @@ -49,7 +49,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { -150.0f, 0.0f, -275.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_GateGuardian, @@ -59,7 +59,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Wander_Intro), .pos = { 219.0f, 0.0f, -45.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .drops = TOAD_DROPS, .territory = { .patrol = { @@ -86,7 +86,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { 424.0f, 20.0f, -85.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .drops = TOAD_DROPS, .animations = TOAD_BLUE_ANIMS, .tattle = MSG_NpcTattle_MAC_DojoSpectator, @@ -96,7 +96,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { 310.0f, 115.0f, -390.0f }, .yaw = 45, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Chan_Intro), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -114,7 +114,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { 330.0f, 115.0f, -410.0f }, .yaw = 45, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Lee_Intro), .drops = { .dropFlags = NPC_DROP_FLAG_80, diff --git a/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c b/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c index 40d98ead19..3d52707adc 100644 --- a/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c +++ b/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c @@ -184,7 +184,7 @@ StaticNpc N(NpcData_GoombaFamilypa_Epilogue)[] = { .settings = &N(NpcSettings_GoombaFamily_Epilogue), .pos = { 70.0f, 0.0f, -30.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Goompapa_Epilogue), .drops = GOOMPAPA_DROPS, .animations = GOOMPAPA_ANIMS, @@ -196,7 +196,7 @@ StaticNpc N(NpcData_GoombaFamilypa_Epilogue)[] = { .settings = &N(NpcSettings_GoombaFamily_Epilogue), .pos = { 40.0f, 0.0f, 20.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Goomama_Epilogue), .drops = GOOMAMA_DROPS, .animations = GOOMAMA_ANIMS, @@ -208,7 +208,7 @@ StaticNpc N(NpcData_GoombaFamilypa_Epilogue)[] = { .settings = &N(NpcSettings_GoombaFamily_Epilogue), .pos = { 20.0f, 0.0f, -35.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Gooma_Epilogue), .drops = GOOMA_DROPS, .animations = GOOMA_ANIMS, @@ -237,7 +237,7 @@ StaticNpc N(NpcData_ChuckQuizmo_Epilogue)[] = { .settings = &N(NpcSettings_Luigi_Epilogue), .pos = { 545.0f, 20.0f, 150.0f }, .yaw = 30, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ChuckQuizmo_Epilogue), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -270,7 +270,7 @@ StaticNpc N(NpcData_ChuckQuizmo_Epilogue)[] = { .settings = &N(NpcSettings_Toad_Stationary_Epilogue), .pos = { 500.0f, 20.0f, -130.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_VannaT_Epilogue), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -406,7 +406,7 @@ StaticNpc N(NpcData_Toad_01_Epilogue)[] = { .settings = &N(NpcSettings_Toad_Stationary_Epilogue), .pos = { 430.0f, 20.0f, -373.0f }, .yaw = 223, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Toad_01_Epilogue), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -428,7 +428,7 @@ StaticNpc N(NpcData_Toad_01_Epilogue)[] = { .settings = &N(NpcSettings_Toad_Stationary_Epilogue), .pos = { 410.0f, 20.0f, -320.0f }, .yaw = 43, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_HarryT_Epilogue), .drops = { .dropFlags = NPC_DROP_FLAG_80, diff --git a/src/world/area_mac/mac_00/mac_00_2_main.c b/src/world/area_mac/mac_00/mac_00_2_main.c index f2c6a38af7..9032b89071 100644 --- a/src/world/area_mac/mac_00/mac_00_2_main.c +++ b/src/world/area_mac/mac_00/mac_00_2_main.c @@ -1,7 +1,6 @@ #include "mac_00.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_mac/mac_00/mac_00_5_npc.c b/src/world/area_mac/mac_00/mac_00_5_npc.c index 8ecf7a41b6..4ed7d8b309 100644 --- a/src/world/area_mac/mac_00/mac_00_5_npc.c +++ b/src/world/area_mac/mac_00/mac_00_5_npc.c @@ -224,7 +224,7 @@ StaticNpc N(NpcData_RussT) = { .settings = &N(NpcSettings_RussT), .pos = { -66.0f, 20.0f, -532.0f }, .yaw = 119, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_RussT), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -258,7 +258,7 @@ StaticNpc N(NpcData_Toad_01)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 430.0f, 20.0f, -373.0f }, .yaw = 223, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Toad_01), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -279,7 +279,7 @@ StaticNpc N(NpcData_Toad_01)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 223, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Toad_02), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -398,7 +398,7 @@ StaticNpc N(NpcData_Quizmo_Unused) = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 545.0f, 20.0f, 150.0f }, .yaw = 30, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_00 }}, .drops = QUIZMO_DROPS, @@ -412,7 +412,7 @@ StaticNpc N(NpcData_Waterfront_Family)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -496.0f, 20.0f, 218.0f }, .yaw = 133, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_WaterfrontDad), .drops = TOAD_DROPS, .animations = TOAD_GREEN_ANIMS, @@ -423,7 +423,7 @@ StaticNpc N(NpcData_Waterfront_Family)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -566.0f, 20.0f, 267.0f }, .yaw = 133, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_WaterfrontMom), .drops = TOADETTE_DROPS, .animations = TOADETTE_ORANGE_ANIMS, @@ -434,7 +434,7 @@ StaticNpc N(NpcData_Waterfront_Family)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -508.0f, 20.0f, 324.0f }, .yaw = 313, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_WaterfrontKid1), .drops = TOAD_KID_DROPS, .animations = TOAD_KID_GREEN_ANIMS, @@ -445,7 +445,7 @@ StaticNpc N(NpcData_Waterfront_Family)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -480.0f, 20.0f, 329.0f }, .yaw = 313, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_WaterfrontKid2), .drops = TOAD_KID_DROPS, .animations = TOAD_KID_GREEN_ANIMS, @@ -458,7 +458,7 @@ StaticNpc N(NpcData_PrizeToad) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -112.0f, 0.0f, -62.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_TradingToad), .drops = TOAD_DROPS, .animations = { diff --git a/src/world/area_mac/mac_01/mac_01_10_intro_npc.c b/src/world/area_mac/mac_01/mac_01_10_intro_npc.c index a45535bfde..54ef8e8723 100644 --- a/src/world/area_mac/mac_01/mac_01_10_intro_npc.c +++ b/src/world/area_mac/mac_01/mac_01_10_intro_npc.c @@ -21,7 +21,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { -94.0f, 0.0f, -117.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, .tattle = MSG_NpcTattle_MAC_RunsHisMouth, @@ -31,7 +31,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { 40.0f, 0.0f, -300.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .drops = TOAD_DROPS, .territory = { .patrol = { @@ -55,7 +55,7 @@ StaticNpc N(NpcData_IntroNPCs)[] = { .settings = &N(NpcSettings_Toad_Stationary_Intro), .pos = { -380.0f, 20.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .drops = TOAD_DROPS, .animations = TOAD_GREEN_ANIMS, .tattle = MSG_NpcTattle_MAC_SeeksTheSouth, diff --git a/src/world/area_mac/mac_01/mac_01_11_epilogue_npc.c b/src/world/area_mac/mac_01/mac_01_11_epilogue_npc.c index d48e0c84f8..cc14013183 100644 --- a/src/world/area_mac/mac_01/mac_01_11_epilogue_npc.c +++ b/src/world/area_mac/mac_01/mac_01_11_epilogue_npc.c @@ -201,7 +201,7 @@ StaticNpc N(NpcData_Koopas)[] = { .settings = &N(NpcSettings_Kolorado), .pos = { 60.0f, 0.0f, -120.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -212,7 +212,7 @@ StaticNpc N(NpcData_Koopas)[] = { .settings = &N(NpcSettings_KoloradoWife), .pos = { 100.0f, 0.0f, -110.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_KoloradoWife), .drops = KOLORADO_WIFE_DROPS, .animations = KOLORADO_WIFE_ANIMS, @@ -223,7 +223,7 @@ StaticNpc N(NpcData_Koopas)[] = { .settings = &N(NpcSettings_KoopaKoot), .pos = { -330.0f, 0.0f, 330.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_KoopaKoot), .drops = KOOPA_KOOT_DROPS, .animations = KOOPA_KOOT_ANIMS, @@ -234,7 +234,7 @@ StaticNpc N(NpcData_Koopas)[] = { .settings = &N(NpcSettings_Koopa), .pos = { 300.0f, 20.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Koopa), .drops = KOOPA_DROPS, .animations = KOOPA_ANIMS, @@ -245,7 +245,7 @@ StaticNpc N(NpcData_Koopas)[] = { .settings = &N(NpcSettings_Bobomb), .pos = { 252.0f, 20.0f, -100.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bobomb), .drops = BOBOMB_DROPS, .animations = BOBOMB_BLUE_ANIMS, @@ -266,7 +266,7 @@ StaticNpc N(NpcData_RowfAndRhuff)[] = { .settings = &N(NpcSettings_Dummy), .pos = { -213.0f, -54.0f, 256.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Rowf), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -284,7 +284,7 @@ StaticNpc N(NpcData_RowfAndRhuff)[] = { .settings = &N(NpcSettings_Dummy), .pos = { -250.0f, 0.0f, 263.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Rhuff), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -352,7 +352,7 @@ StaticNpc N(NpcData_Artists)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 260.0f, 20.0f, 560.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Chanterelle), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -385,7 +385,7 @@ StaticNpc N(NpcData_Artists)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 230.0f, 20.0f, 500.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Poet), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -418,7 +418,7 @@ StaticNpc N(NpcData_Artists)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 300.0f, 20.0f, 500.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Composer), .drops = { .dropFlags = NPC_DROP_FLAG_80, diff --git a/src/world/area_mac/mac_01/mac_01_9_npc.c b/src/world/area_mac/mac_01/mac_01_9_npc.c index 8d9a54bb17..44dea57177 100644 --- a/src/world/area_mac/mac_01/mac_01_9_npc.c +++ b/src/world/area_mac/mac_01/mac_01_9_npc.c @@ -1051,7 +1051,7 @@ StaticNpc N(NpcData_Merlon) = { .settings = &N(NpcSettings_Merlon), .pos = { -337.0f, 20.0f, -360.0f }, .yaw = 30, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Merlon), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -1070,7 +1070,7 @@ StaticNpc N(NpcData_DarkToads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 505.0f, 0.0f, 5.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_DarkToad_01), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -1087,7 +1087,7 @@ StaticNpc N(NpcData_DarkToads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 530.0f, 0.0f, -35.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_DarkToad_02), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -1104,7 +1104,7 @@ StaticNpc N(NpcData_DarkToads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 540.0f, 0.0f, 0.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_DarkToad_02), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -1121,7 +1121,7 @@ StaticNpc N(NpcData_DarkToads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 550.0f, 0.0f, 35.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_DarkToad_02), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -2123,7 +2123,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -94.0f, 0.0f, -117.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_04), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -2135,7 +2135,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { -145.0f, 0.0f, -25.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_05), .drops = TOAD_DROPS, .territory = { @@ -2159,7 +2159,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Patrol), .pos = { 40.0f, 0.0f, -300.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_06), .drops = TOAD_DROPS, .territory = { @@ -2185,7 +2185,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Patrol), .pos = { -440.0f, 0.0f, -20.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_07), .drops = TOAD_DROPS, .territory = { @@ -2211,7 +2211,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Patrol), .pos = { 400.0f, 20.0f, 260.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_08), .drops = TOAD_DROPS, .territory = { @@ -2237,7 +2237,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -380.0f, 20.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_09), .drops = TOAD_DROPS, .animations = TOAD_GREEN_ANIMS, @@ -2249,7 +2249,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 488.0f, 20.0f, -174.0f }, .yaw = 30, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadHouseKeeper), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -2261,7 +2261,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Bubulb), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bubulb), .drops = BUBULB_DROPS, .animations = BUBULB_PINK_ANIMS, @@ -2273,7 +2273,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 150.0f, 20.0f, 485.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_MinhT), .drops = TOAD_DROPS, .animations = { @@ -2286,7 +2286,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 312.0f, 30.0f, -438.0f }, .yaw = 300, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000, .init = &N(EVS_NpcInit_Postmaster), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -2305,7 +2305,7 @@ StaticNpc N(NpcData_Parakarry) = { .settings = &N(NpcSettings_Parakarry), .pos = { 145.0f, 20.0f, -472.0f }, .yaw = 120, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Parakarry), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -2346,7 +2346,7 @@ StaticNpc N(NpcData_Twink) = { .settings = &N(NpcSettings_Twink), .pos = { -350.0f, 20.0f, -100.0f }, .yaw = 274, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Twink), .drops = TWINK_DROPS, .animations = TWINK_ANIMS, @@ -2408,7 +2408,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { 520.0f, 0.0f, -25.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -2421,7 +2421,7 @@ StaticNpc N(NpcData_ChuckQuizmo) = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -440.0f, 20.0f, -140.0f }, .yaw = 30, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_01 }}, .drops = QUIZMO_DROPS, diff --git a/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c b/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c index f2e18403f2..06a891b268 100644 --- a/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c +++ b/src/world/area_mac/mac_01/npc/rowf_and_rhuff.inc.c @@ -316,7 +316,7 @@ EvtScript N(EVS_NpcIdle_Rowf) = { EVT_END_IF EVT_END_THREAD EVT_WAIT(15) - EVT_CALL(ShowEmote, NPC_Rhuff, EMOTE_SHOCK, -45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Rhuff, EMOTE_SHOCK, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(SetNpcAnimation, NPC_Rhuff, ANIM_Rowf_Still) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Rowf, ANIM_Rowf_Still) @@ -724,7 +724,7 @@ StaticNpc N(NpcData_RowfAndRhuff)[] = { .settings = &N(NpcSettings_Rowf), .pos = { -213.0f, -54.0f, 256.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Rowf), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -742,7 +742,7 @@ StaticNpc N(NpcData_RowfAndRhuff)[] = { .settings = &N(NpcSettings_Rhuff), .pos = { -250.0f, 0.0f, 263.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Rhuff), .drops = { .dropFlags = NPC_DROP_FLAG_80, diff --git a/src/world/area_mac/mac_02/mac_02_2_main.c b/src/world/area_mac/mac_02/mac_02_2_main.c index 6a82c77dd0..723d0aeef6 100644 --- a/src/world/area_mac/mac_02/mac_02_2_main.c +++ b/src/world/area_mac/mac_02/mac_02_2_main.c @@ -1,7 +1,6 @@ #include "mac_02.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_mac/mac_02/mac_02_6_npc.c b/src/world/area_mac/mac_02/mac_02_6_npc.c index ffefda83be..77e8c2c050 100644 --- a/src/world/area_mac/mac_02/mac_02_6_npc.c +++ b/src/world/area_mac/mac_02/mac_02_6_npc.c @@ -58,7 +58,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -217.0f, 20.0f, -434.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_TayceT), .drops = TOAD_DROPS, .animations = { @@ -72,7 +72,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 389.0f, 0.0f, -90.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_FiceT), .drops = TOAD_DROPS, .animations = { @@ -97,7 +97,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { 40.0f, 0.0f, -60.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_01), .drops = TOAD_DROPS, .territory = { @@ -120,7 +120,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -26.0f, 0.0f, -220.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_CookingApprentice), .drops = TOADETTE_DROPS, .animations = TOADETTE_PURPLE_ANIMS, @@ -131,7 +131,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -350.0f, 20.0f, -140.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_02), .drops = TOAD_DROPS, .animations = TOAD_GREEN_ANIMS, @@ -142,7 +142,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { 180.0f, 20.0f, -435.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadKid), .drops = TOAD_KID_DROPS, .territory = { @@ -165,7 +165,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { -160.0f, 0.0f, 25.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_03), .drops = TOAD_DROPS, .territory = { @@ -188,7 +188,7 @@ StaticNpc N(NpcData_TayceT)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -80.0f, 0.0f, 300.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_04), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -205,7 +205,7 @@ StaticNpc N(NpcData_Bootler) = { .settings = &N(NpcSettings_Bootler), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Bootler), .drops = BOOTLER_DROPS, .animations = BOOTLER_ANIMS, diff --git a/src/world/area_mac/mac_03/mac_03_2_main.c b/src/world/area_mac/mac_03/mac_03_2_main.c index 9a4f75c01e..fc55004ead 100644 --- a/src/world/area_mac/mac_03/mac_03_2_main.c +++ b/src/world/area_mac/mac_03/mac_03_2_main.c @@ -1,7 +1,6 @@ #include "mac_03.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" EvtScript N(EVS_ExitWalk_mac_02_3) = EVT_EXIT_WALK(60, mac_03_ENTRY_0, "mac_02", mac_02_ENTRY_3); diff --git a/src/world/area_mac/mac_03/mac_03_4_npc.c b/src/world/area_mac/mac_03/mac_03_4_npc.c index 0fbe31024c..5f880a5b45 100644 --- a/src/world/area_mac/mac_03/mac_03_4_npc.c +++ b/src/world/area_mac/mac_03/mac_03_4_npc.c @@ -611,7 +611,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_TrainToad), .pos = { -370.0f, 20.0f, 90.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_TrainToad_01), .drops = TRAIN_CONDUCTOR_DROPS, .animations = TRAIN_TOAD_WHITE_ANIMS, @@ -622,7 +622,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_TrainToad), .pos = { -424.0f, 74.0f, 2.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .drops = TRAIN_CONDUCTOR_DROPS, .animations = TRAIN_CONDUCTOR_ANIMS, .tattle = MSG_NpcTattle_MAC_StationMaster, @@ -632,7 +632,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -232.0f, 10.0f, 74.0f }, .yaw = 75, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_01), .drops = TOAD_DROPS, .animations = TOAD_BLUE_ANIMS, @@ -643,7 +643,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 85.0f, 0.0f, 235.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ThreeSisters_01), .drops = TOADETTE_DROPS, .animations = TOADETTE_PURPLE_ANIMS, @@ -654,7 +654,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -255.0f, 20.0f, 400.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_02), .drops = TOAD_DROPS, .animations = TOAD_GREEN_ANIMS, @@ -665,7 +665,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_ToadKid_Wander), .pos = { 260.0f, 20.0f, 410.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadKid_01), .drops = TOAD_KID_DROPS, .territory = { @@ -688,7 +688,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_ToadKid_Wander), .pos = { 320.0f, 20.0f, 410.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadKid_02), .drops = TOAD_KID_DROPS, .territory = { @@ -711,7 +711,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 220.0f, 20.0f, -160.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toad_03), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, diff --git a/src/world/area_mac/mac_04/mac_04_6_npc.c b/src/world/area_mac/mac_04/mac_04_6_npc.c index b05012a7e9..399b3ed91e 100644 --- a/src/world/area_mac/mac_04/mac_04_6_npc.c +++ b/src/world/area_mac/mac_04/mac_04_6_npc.c @@ -175,7 +175,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_ChetRippo), .pos = { 410.0f, 20.0f, -200.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_ChetRippo), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -192,7 +192,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 310.0f, 20.0f, -430.0f }, .yaw = 230, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_HarryT), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -213,7 +213,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -80.0f, 20.0f, -100.0f }, .yaw = 133, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_NewResident1), .drops = TOADETTE_DROPS, .animations = TOADETTE_GREEN_ANIMS, @@ -224,7 +224,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -133.0f, 20.0f, -82.0f }, .yaw = 133, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_NewResident2), .drops = TOADETTE_DROPS, .animations = TOADETTE_PURPLE_ANIMS, @@ -235,7 +235,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Wander), .pos = { 48.0f, 0.0f, 153.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_01), .drops = TOAD_DROPS, .territory = { @@ -258,7 +258,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -239.0f, 20.0f, 105.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_02), .drops = TOAD_DROPS, .animations = TOAD_BLUE_ANIMS, @@ -269,7 +269,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 254.0f, 20.0f, 436.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadKid_01), .drops = TOAD_KID_DROPS, .animations = TOAD_KID_RED_ANIMS, @@ -280,7 +280,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 304.0f, 20.0f, 410.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadKid_02), .drops = TOAD_KID_DROPS, .animations = TOAD_KID_YELLOW_ANIMS, @@ -291,7 +291,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 345.0f, 20.0f, 438.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadKid_03), .drops = TOAD_KID_DROPS, .animations = TOAD_KID_GREEN_ANIMS, @@ -302,7 +302,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -274.0f, 0.0f, 400.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toadette_03), .drops = TOADETTE_DROPS, .animations = TOADETTE_ORANGE_ANIMS, @@ -313,7 +313,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 500.0f, 20.0f, -160.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_03), .drops = TOAD_DROPS, .animations = TOAD_GREEN_ANIMS, @@ -324,7 +324,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -110.0f, 0.0f, 568.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_GossipTrio1), .drops = TOAD_DROPS, .animations = TOAD_GREEN_ANIMS, @@ -335,7 +335,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -114.0f, 0.0f, 498.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_GossipTrio2), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, @@ -346,7 +346,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -52.0f, 0.0f, 525.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_GossipTrio3), .drops = TOAD_DROPS, .animations = TOAD_YELLOW_ANIMS, @@ -367,7 +367,7 @@ StaticNpc N(NpcData_Chapter4)[] = { .settings = &N(NpcSettings_Twink), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_TwinkStartCh4), .drops = TWINK_DROPS, .animations = TWINK_ANIMS, @@ -442,7 +442,7 @@ StaticNpc N(NpcData_PostChapter4)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { -486.0f, 20.0f, 259.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Muskular), .drops = MUSKULAR_DROPS, .animations = MUSKULAR_ANIMS, @@ -452,7 +452,7 @@ StaticNpc N(NpcData_PostChapter4)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_TwinkEndCh4), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -469,7 +469,7 @@ StaticNpc N(NpcData_GoombaFamily)[] = { .settings = &N(NpcSettings_GoombaFamily), .pos = { -126.0f, 0.0f, 329.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Goomama), .drops = GOOMAMA_DROPS, .animations = GOOMAMA_ANIMS, @@ -480,7 +480,7 @@ StaticNpc N(NpcData_GoombaFamily)[] = { .settings = &N(NpcSettings_GoombaFamily), .pos = { -117.0f, 0.0f, 305.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Goombaria), .drops = GOOMBARIA_DROPS, .animations = GOOMBARIA_ANIMS, @@ -493,7 +493,7 @@ StaticNpc N(NpcData_ChuckQuizmo) = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 57.0f, 20.0f, -114.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_04 }}, .drops = QUIZMO_DROPS, diff --git a/src/world/area_mac/mac_04/mac_04_7_wish_scene.c b/src/world/area_mac/mac_04/mac_04_7_wish_scene.c index 8c7b8323d9..ab4dc75739 100644 --- a/src/world/area_mac/mac_04/mac_04_7_wish_scene.c +++ b/src/world/area_mac/mac_04/mac_04_7_wish_scene.c @@ -41,7 +41,7 @@ StaticNpc N(NpcData_WishSceneToads)[] = { .settings = &N(NpcSettings_Toad_Stationary_Wish), .pos = { 350.0f, 0.0f, -20.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_WishingToadKid), .drops = TOAD_KID_DROPS, .animations = TOAD_KID_RED_ANIMS, diff --git a/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c b/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c index 7f377c4ae4..9c90617141 100644 --- a/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c +++ b/src/world/area_mac/mac_04/npc_toybox_shyguy.inc.c @@ -104,7 +104,7 @@ EvtScript N(D_802483B8_84AF88) = { EvtScript N(D_80248624_84B1F4) = { EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_203E, SOUND_SPACE_MODE_0) EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_ShyGuy_01, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_ShyGuy_01, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_ShyGuy_01, ANIM_ShyGuy_Pink_Anim11, ANIM_ShyGuy_Pink_Anim01, 0, MSG_MAC_Housing_00B2) EVT_CALL(InterpNpcYaw, NPC_ShyGuy_01, 180, 10) diff --git a/src/world/area_mac/mac_05/mac_05_4_npc.c b/src/world/area_mac/mac_05/mac_05_4_npc.c index 52277c6c37..27204e5d2e 100644 --- a/src/world/area_mac/mac_05/mac_05_4_npc.c +++ b/src/world/area_mac/mac_05/mac_05_4_npc.c @@ -1248,7 +1248,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_CALL(PlaySoundAtPlayer, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Whale, EMOTE_EXCLAMATION, 0, 30, FALSE, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_END_THREAD EVT_CALL(ShowMessageAtScreenPos, MSG_MAC_Port_00B4, 160, 40) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -100, -10, 490) @@ -2076,7 +2076,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Kolorado), .drops = KOLORADO_DROPS, .animations = KOLORADO_ANIMS, @@ -2088,7 +2088,7 @@ StaticNpc N(NpcData_Fishmael) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 370.0f, -10.0f, -115.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Fishmael), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -2115,7 +2115,7 @@ StaticNpc N(NpcData_Fuzzipede) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 320.0f, -10.0f, -115.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Fuzzipede), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -2220,7 +2220,7 @@ StaticNpc N(NpcData_Toad_04)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 320.0f, 0.0f, -300.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_04), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -2252,7 +2252,7 @@ StaticNpc N(NpcData_Toad_04)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -330.0f, -10.0f, -90.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_05), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -2284,7 +2284,7 @@ StaticNpc N(NpcData_Toad_04)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -50.0f, 0.0f, -400.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_06), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -2316,7 +2316,7 @@ StaticNpc N(NpcData_Toad_04)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 200.0f, 0.0f, -220.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_07), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -2365,7 +2365,7 @@ StaticNpc N(NpcData_Bartender)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -85.0f, 0.0f, -520.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Bartender), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -2397,7 +2397,7 @@ StaticNpc N(NpcData_Bartender)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 30.0f, 0.0f, -570.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad_02), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -2429,7 +2429,7 @@ StaticNpc N(NpcData_Bartender)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 208.0f, 0.0f, -530.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Chanterelle), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -2461,7 +2461,7 @@ StaticNpc N(NpcData_Bartender)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 158.0f, 0.0f, -555.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ArtistToad), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -2493,7 +2493,7 @@ StaticNpc N(NpcData_Bartender)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 92.0f, 0.0f, -500.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_TradeEventToad), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -2527,7 +2527,7 @@ StaticNpc N(NpcData_ChuckQuizmo) = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 472.0f, 0.0f, -230.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_4000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_MAC, QUIZ_COUNT_MAC, QUIZ_MAP_MAC_05 }}, .drops = { diff --git a/src/world/area_mac/mac_06/mac_06_3_npc.c b/src/world/area_mac/mac_06/mac_06_3_npc.c index e1797071df..b74fabe875 100644 --- a/src/world/area_mac/mac_06/mac_06_3_npc.c +++ b/src/world/area_mac/mac_06/mac_06_3_npc.c @@ -546,7 +546,7 @@ StaticNpc N(NpcData_Kolorado) = { .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Kolorado), .drops = { .dropFlags = NPC_DROP_FLAG_80, 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 b523b7dee4..68f2f32bf1 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 @@ -7,7 +7,6 @@ EvtScript N(D_80241850_E0FFF0) = { }; #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" EvtScript N(EVS_GotoMap_ToadTown) = { EVT_CALL(GotoMap, EVT_PTR("mac_03"), mac_03_ENTRY_2) diff --git a/src/world/area_mim/mim_11/mim_11_2_main.c b/src/world/area_mim/mim_11/mim_11_2_main.c index 82a865830e..205cab5b5a 100644 --- a/src/world/area_mim/mim_11/mim_11_2_main.c +++ b/src/world/area_mim/mim_11/mim_11_2_main.c @@ -1,7 +1,6 @@ #include "mim_11.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_nok/nok_01/nok_01_4_npc.c b/src/world/area_nok/nok_01/nok_01_4_npc.c index b08625a264..e89a946f62 100644 --- a/src/world/area_nok/nok_01/nok_01_4_npc.c +++ b/src/world/area_nok/nok_01/nok_01_4_npc.c @@ -736,7 +736,7 @@ StaticNpc N(NpcData_Shared)[] = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 356.0f, 0.0f, 166.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_NOK, QUIZ_COUNT_NOK, QUIZ_MAP_NOK_01 }}, .drops = NPC_NO_DROPS, diff --git a/src/world/area_nok/nok_01/npcs_crisis.inc.c b/src/world/area_nok/nok_01/npcs_crisis.inc.c index 32f7ab475f..7e812655e8 100644 --- a/src/world/area_nok/nok_01/npcs_crisis.inc.c +++ b/src/world/area_nok/nok_01/npcs_crisis.inc.c @@ -269,7 +269,7 @@ EvtScript N(EVS_NpcIdle_Koover_Crisis) = { EVT_SUB(LVar0, 5) EVT_ADD(LVar1, 35) EVT_CALL(PlaySoundAtNpc, NPC_Koover, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_Koover, EMOTE_EXCLAMATION, 0, 20, 2, LVar0, LVar1, LVar2, 0) + EVT_CALL(ShowEmote, NPC_Koover, EMOTE_EXCLAMATION, 0, 20, EMOTER_POS, LVar0, LVar1, LVar2, 0) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_Koover, ANIM_Koopa_Run) EVT_CALL(GetPlayerPos, LVarA, LVarB, LVarC) diff --git a/src/world/area_nok/nok_02/nok_02_2_main.c b/src/world/area_nok/nok_02/nok_02_2_main.c index 24d3306e40..519a8d088d 100644 --- a/src/world/area_nok/nok_02/nok_02_2_main.c +++ b/src/world/area_nok/nok_02/nok_02_2_main.c @@ -1,7 +1,6 @@ #include "nok_02.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #define NAME_SUFFIX _Unused #include "world/common/complete/GiveReward.inc.c" diff --git a/src/world/area_nok/nok_02/nok_02_6_npc.c b/src/world/area_nok/nok_02/nok_02_6_npc.c index cb134afac5..25cb3faf09 100644 --- a/src/world/area_nok/nok_02/nok_02_6_npc.c +++ b/src/world/area_nok/nok_02/nok_02_6_npc.c @@ -625,7 +625,7 @@ StaticNpc N(NpcData_Crisis)[] = { .settings = &N(NpcSettings_Koopa_Wander), .pos = { -109.0f, 0.0f, 191.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Koopa_01_Crisis), .drops = NPC_NO_DROPS, .territory = { @@ -668,7 +668,7 @@ StaticNpc N(NpcData_Crisis)[] = { .settings = &N(NpcSettings_KoopaWithoutShell_Patrol), .pos = { 192.0f, 0.0f, 152.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Koopa_02_Crisis), .drops = NPC_NO_DROPS, .territory = { @@ -703,7 +703,7 @@ StaticNpc N(NpcData_Crisis)[] = { .settings = &N(NpcSettings_Koopa), .pos = { 20.0f, 0.0f, -145.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kooper), .drops = NPC_NO_DROPS, .animations = KOOPER_ANIMS, @@ -759,7 +759,7 @@ StaticNpc N(NpcData_Normal)[] = { .settings = &N(NpcSettings_Koopa_Wander), .pos = { -109.0f, 0.0f, 191.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Koopa_01_Normal), .drops = NPC_NO_DROPS, .territory = { @@ -782,7 +782,7 @@ StaticNpc N(NpcData_Normal)[] = { .settings = &N(NpcSettings_Koopa_Wander), .pos = { 200.0f, 0.0f, 117.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Koopa_02_Normal), .drops = NPC_NO_DROPS, .territory = { @@ -838,7 +838,7 @@ StaticNpc N(NpcData_Normal)[] = { .settings = &N(NpcSettings_Kolorado), .pos = { -240.0f, 0.0f, -70.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Kolorado), .drops = NPC_NO_DROPS, .animations = KOLORADO_ANIMS, @@ -863,7 +863,7 @@ StaticNpc N(NpcData_Shared)[] = { .settings = &N(NpcSettings_KoopaKoot), .pos = { 330.0f, 0.0f, -100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_KoopaKoot), .drops = NPC_NO_DROPS, .animations = KOOPA_KOOT_ANIMS, @@ -874,7 +874,7 @@ StaticNpc N(NpcData_Shared)[] = { .settings = &N(NpcSettings_KoloradoWife), .pos = { -328.0f, 0.0f, -180.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_KoloradoWife), .drops = NPC_NO_DROPS, .animations = KOLORADO_WIFE_ANIMS, @@ -885,7 +885,7 @@ StaticNpc N(NpcData_Shared)[] = { .settings = &N(NpcSettings_Koopa), .pos = { -307.0f, 0.0f, 97.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Koopa_03), .drops = NPC_NO_DROPS, .animations = KOOPA_ANIMS, @@ -896,7 +896,7 @@ StaticNpc N(NpcData_Shared)[] = { .settings = &N(NpcSettings_KoopaWithoutShell_Patrol), .pos = { 285.0f, 0.0f, 223.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Koopa_04), .drops = NPC_NO_DROPS, .territory = { @@ -924,7 +924,7 @@ StaticNpc N(NpcData_Epilogue)[] = { .settings = &N(NpcSettings_Koopa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Koopa_Epilogue), .drops = NPC_NO_DROPS, .animations = { @@ -951,7 +951,7 @@ StaticNpc N(NpcData_Epilogue)[] = { .settings = &N(NpcSettings_Koopa), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Bombette_Epilogue), .drops = NPC_NO_DROPS, .animations = { @@ -978,7 +978,7 @@ StaticNpc N(NpcData_Epilogue)[] = { .settings = &N(NpcSettings_Koopa), .pos = { -328.0f, 0.0f, -180.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_KoloradoWife_Epilogue), .drops = NPC_NO_DROPS, .animations = KOLORADO_WIFE_ANIMS, @@ -991,7 +991,7 @@ StaticNpc N(NpcData_ChuckQuizmo) = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 300.0f, 0.0f, 330.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_NOK, QUIZ_COUNT_NOK, QUIZ_MAP_NOK_02 }}, .drops = NPC_NO_DROPS, diff --git a/src/world/area_nok/nok_02/nok_02_8_koot_favors.c b/src/world/area_nok/nok_02/nok_02_8_koot_favors.c index 92f6db5bdd..8a96fabfb6 100644 --- a/src/world/area_nok/nok_02/nok_02_8_koot_favors.c +++ b/src/world/area_nok/nok_02/nok_02_8_koot_favors.c @@ -61,7 +61,7 @@ KootFavor N(KootFavorData)[] = { .unlockedFlag = GF_NOK02_KootFavor04_Unlocked, .gaveUpFlag = GF_NOK02_KootFavor04_GaveUp, .completeFlag = GF_NOK02_KootFavor04_Complete, - .requiredItem = ITEM_KOOT_MERLUVLEE_AUTOGRAPH, + .requiredItem = ITEM_KOOT_LUIGIS_AUTOGRAPH, }, [KOOT_FAVOR_CH3_1] { .requestMsg = MSG_KootFavor_000F, @@ -88,7 +88,7 @@ KootFavor N(KootFavorData)[] = { .unlockedFlag = GF_NOK02_KootFavor07_Unlocked, .gaveUpFlag = GF_NOK02_KootFavor07_GaveUp, .completeFlag = GF_NOK02_KootFavor07_Complete, - .requiredItem = ITEM_KOOT_LUIGI_AUTOGRAPH, + .requiredItem = ITEM_KOOT_MERLUVLEES_AUTOGRAPH, }, [KOOT_FAVOR_CH4_1] { .requestMsg = MSG_KootFavor_0018, diff --git a/src/world/area_nok/nok_04/nok_04_5_partner.c b/src/world/area_nok/nok_04/nok_04_5_new_partner.c similarity index 100% rename from src/world/area_nok/nok_04/nok_04_5_partner.c rename to src/world/area_nok/nok_04/nok_04_5_new_partner.c diff --git a/src/world/area_nok/nok_15/nok_15_2_main.c b/src/world/area_nok/nok_15/nok_15_2_main.c index 75b56052d6..437562e8f7 100644 --- a/src/world/area_nok/nok_15/nok_15_2_main.c +++ b/src/world/area_nok/nok_15/nok_15_2_main.c @@ -2,7 +2,6 @@ #include "effects.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" EvtScript N(EVS_ExitWalk_nok_14_1) = EVT_EXIT_WALK_NOK(60, nok_15_ENTRY_0, "nok_14", nok_14_ENTRY_1); EvtScript N(EVS_ExitWalk_trd_00_0) = EVT_EXIT_WALK_NOK(60, nok_15_ENTRY_1, "trd_00", trd_00_ENTRY_0); diff --git a/src/world/area_obk/obk_07/obk_07_3_entity.c b/src/world/area_obk/obk_07/obk_07_3_entity.c index 368bde22ec..b402ae8d1c 100644 --- a/src/world/area_obk/obk_07/obk_07_3_entity.c +++ b/src/world/area_obk/obk_07/obk_07_3_entity.c @@ -1,7 +1,7 @@ #include "obk_07.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_BooWeight) = { EVT_SET(LVarA, ITEM_BOO_WEIGHT) diff --git a/src/world/area_omo/omo_04/omo_04_4_entity.c b/src/world/area_omo/omo_04/omo_04_4_entity.c index d46291db09..3b52782fd6 100644 --- a/src/world/area_omo/omo_04/omo_04_4_entity.c +++ b/src/world/area_omo/omo_04/omo_04_4_entity.c @@ -1,7 +1,7 @@ #include "omo_04.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_StoreroomKey) = { EVT_SET(LVarA, ITEM_STOREROOM_KEY) diff --git a/src/world/area_omo/omo_04/omo_04_6_scenes.c b/src/world/area_omo/omo_04/omo_04_6_scenes.c index 34e6658d74..7513657240 100644 --- a/src/world/area_omo/omo_04/omo_04_6_scenes.c +++ b/src/world/area_omo/omo_04/omo_04_6_scenes.c @@ -233,7 +233,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_WAIT(90) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(5) EVT_END_IF EVT_CALL(GotoMap, EVT_PTR("omo_04"), omo_04_ENTRY_0) diff --git a/src/world/area_omo/omo_06/omo_06_6_entity.c b/src/world/area_omo/omo_06/omo_06_6_entity.c index 1bb74d1b41..b8895b90ee 100644 --- a/src/world/area_omo/omo_06/omo_06_6_entity.c +++ b/src/world/area_omo/omo_06/omo_06_6_entity.c @@ -1,7 +1,7 @@ #include "omo_06.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_Mailbag) = { EVT_SET(LVarA, ITEM_MAILBAG) diff --git a/src/world/area_omo/omo_07/omo_07_5_entity.c b/src/world/area_omo/omo_07/omo_07_5_entity.c index 8e096fefab..89112e1c1f 100644 --- a/src/world/area_omo/omo_07/omo_07_5_entity.c +++ b/src/world/area_omo/omo_07/omo_07_5_entity.c @@ -1,7 +1,7 @@ #include "omo_07.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_FryingPan) = { EVT_SET(LVarA, ITEM_FRYING_PAN) diff --git a/src/world/area_omo/omo_07/omo_07_6_scenes.c b/src/world/area_omo/omo_07/omo_07_6_scenes.c index 4ae1b7de62..870898cd5f 100644 --- a/src/world/area_omo/omo_07/omo_07_6_scenes.c +++ b/src/world/area_omo/omo_07/omo_07_6_scenes.c @@ -108,7 +108,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_WAIT(5) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(5) EVT_END_IF EVT_CALL(GotoMap, EVT_PTR("omo_07"), omo_07_ENTRY_0) diff --git a/src/world/area_omo/omo_09/omo_09_6_entity.c b/src/world/area_omo/omo_09/omo_09_6_entity.c index 95d41f6aee..8da67d94f6 100644 --- a/src/world/area_omo/omo_09/omo_09_6_entity.c +++ b/src/world/area_omo/omo_09/omo_09_6_entity.c @@ -1,7 +1,7 @@ #include "omo_09.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_Dictionary) = { EVT_SET(LVarA, ITEM_DICTIONARY) diff --git a/src/world/area_omo/omo_09/omo_09_8_scenes.c b/src/world/area_omo/omo_09/omo_09_8_scenes.c index 52cf87e7c7..c5cd1bf4f6 100644 --- a/src/world/area_omo/omo_09/omo_09_8_scenes.c +++ b/src/world/area_omo/omo_09/omo_09_8_scenes.c @@ -108,7 +108,7 @@ EvtScript N(EVS_Scene_KammySetAmbush) = { EVT_WAIT(5) EVT_IF_NE(AB_OMO_CurrentPeachChoice, 2) EVT_CALL(PlaySoundAtNpc, MV_AmbushID, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, MV_AmbushID, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(5) EVT_END_IF EVT_CALL(GotoMap, EVT_PTR("omo_09"), omo_09_ENTRY_0) diff --git a/src/world/area_omo/omo_11/omo_11_4_entity.c b/src/world/area_omo/omo_11/omo_11_4_entity.c index 5af291e11b..8eb1b59ffd 100644 --- a/src/world/area_omo/omo_11/omo_11_4_entity.c +++ b/src/world/area_omo/omo_11/omo_11_4_entity.c @@ -4,7 +4,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_OMO11_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_MAKE_SUPER_BLOCK(-115, 270, -120, 0) diff --git a/src/world/area_omo/omo_12/omo_12_3_npc.c b/src/world/area_omo/omo_12/omo_12_3_npc.c index 95644e5431..29b919bd73 100644 --- a/src/world/area_omo/omo_12/omo_12_3_npc.c +++ b/src/world/area_omo/omo_12/omo_12_3_npc.c @@ -15,14 +15,6 @@ NpcSettings N(NpcSettings_Watt) = { #include "world/common/atomic/CreateDarkness.inc.c" -EvtScript N(EVS_SetupDarkness) = { - EVT_THREAD - EVT_CALL(N(DarkRoomUpdate)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - #include "world/common/todo/SetCamera0Flag1000.inc.c" #include "world/common/todo/UnsetCamera0Flag1000.inc.c" @@ -105,7 +97,7 @@ EvtScript N(EVS_SetupLightSource) = { EVT_SET(AB_OMO12_LightPowerMod, 102) EVT_EXEC(N(EVS_ManageLanternLight)) EVT_CASE_GE(STORY_CH4_WATT_JOINED_PARTY) - EVT_EXEC_WAIT(N(EVS_SetupDarkness)) + EVT_EXEC_WAIT(N(EVS_CreateDarkness)) EVT_END_SWITCH EVT_RETURN EVT_END @@ -314,7 +306,7 @@ EvtScript N(EVS_Scene_ReleaseWatt) = { EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_Watt, ANIM_WorldWatt_Idle) EVT_CALL(PlaySoundAtNpc, NPC_Watt, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Watt, EMOTE_EXCLAMATION, 0, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Watt, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(40) EVT_CALL(SpeakToPlayer, NPC_Watt, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0, MSG_CH4_0059) EVT_CALL(SetPlayerAnimation, ANIM_Mario_80011) @@ -400,7 +392,7 @@ EvtScript N(EVS_Scene_ReleaseWatt) = { EVT_WAIT(30) EVT_CALL(CloseMessage) EVT_WAIT(10) - EVT_EXEC_WAIT(N(EVS_SetupDarkness)) + EVT_EXEC_WAIT(N(EVS_CreateDarkness)) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0, MSG_CH4_005B) EVT_CALL(EnablePartnerAI) @@ -648,7 +640,7 @@ StaticNpc N(NpcData_Watt) = { .settings = &N(NpcSettings_Watt), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Watt), .initVarCount = 1, .initVar = { .value = 0 }, @@ -679,7 +671,7 @@ StaticNpc N(NpcData_LanternTop) = { .settings = &N(NpcSettings_Watt), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_LanternTop), .initVarCount = 1, .initVar = { .value = 0 }, diff --git a/src/world/area_omo/omo_12/omo_12_4_partner.c b/src/world/area_omo/omo_12/omo_12_4_new_partner.c similarity index 100% rename from src/world/area_omo/omo_12/omo_12_4_partner.c rename to src/world/area_omo/omo_12/omo_12_4_new_partner.c diff --git a/src/world/area_omo/omo_13/omo_13_4_npc.c b/src/world/area_omo/omo_13/omo_13_4_npc.c index 5f4d28861e..e264dae3ad 100644 --- a/src/world/area_omo/omo_13/omo_13_4_npc.c +++ b/src/world/area_omo/omo_13/omo_13_4_npc.c @@ -52,7 +52,7 @@ EvtScript N(EVS_NpcInteract_AntiGuy) = { EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_004A) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(EndSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0) EVT_WAIT(15) diff --git a/src/world/area_omo/omo_13/omo_13_5_entity.c b/src/world/area_omo/omo_13/omo_13_5_entity.c index e8ea04a4f6..aab7130055 100644 --- a/src/world/area_omo/omo_13/omo_13_5_entity.c +++ b/src/world/area_omo/omo_13/omo_13_5_entity.c @@ -1,7 +1,7 @@ #include "omo_13.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_PowerPlus) = EVT_OPEN_CHEST_BADGE(ITEM_POWER_PLUS_B, GF_OMO13_Chest_PowerPlusB); diff --git a/src/world/area_omo/omo_14/omo_14_2_main.c b/src/world/area_omo/omo_14/omo_14_2_main.c index bb8193db64..2661ff337f 100644 --- a/src/world/area_omo/omo_14/omo_14_2_main.c +++ b/src/world/area_omo/omo_14/omo_14_2_main.c @@ -2,14 +2,6 @@ #include "world/common/atomic/CreateDarkness.inc.c" -EvtScript N(EVS_SetupDarkness) = { - EVT_THREAD - EVT_CALL(N(DarkRoomUpdate)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; - EvtScript N(EVS_ExitWalk_omo_02_1) = EVT_EXIT_WALK(60, omo_14_ENTRY_0, "omo_02", omo_02_ENTRY_1); EvtScript N(EVS_ExitWalk_omo_15_0) = EVT_EXIT_WALK(60, omo_14_ENTRY_1, "omo_15", omo_15_ENTRY_0); @@ -29,7 +21,7 @@ EvtScript N(EVS_Main) = { EVT_IF_LT(GB_StoryProgress, STORY_CH4_OPENED_GENERAL_GUY_ROOM) EVT_CALL(PlaySoundAtNpc, NPC_ShyGuy_01, SOUND_8000004C, SOUND_SPACE_MODE_0) EVT_END_IF - EVT_EXEC(N(EVS_SetupDarkness)) + EVT_EXEC(N(EVS_CreateDarkness)) EVT_IF_GE(GB_StoryProgress, STORY_CH4_OPENED_GENERAL_GUY_ROOM) EVT_CALL(EnableModel, MODEL_o823, FALSE) EVT_CALL(EnableModel, MODEL_o828, FALSE) diff --git a/src/world/area_osr/osr_00/osr_00_4_npc_epilogue.c b/src/world/area_osr/osr_00/osr_00_4_npc_epilogue.c index a496ae6c17..0a0a161dd0 100644 --- a/src/world/area_osr/osr_00/osr_00_4_npc_epilogue.c +++ b/src/world/area_osr/osr_00/osr_00_4_npc_epilogue.c @@ -222,7 +222,7 @@ StaticNpc N(NpcData_Yoshis)[] = { .settings = &N(NpcSettings_Yoshi), .pos = { 70.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_LeaderYoshi), .drops = YOSHI_DROPS, .animations = YOSHI_LEADER_ANIMS, @@ -234,7 +234,7 @@ StaticNpc N(NpcData_Yoshis)[] = { .settings = &N(NpcSettings_Yoshi), .pos = { 70.0f, 0.0f, 400.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Yoshi), .drops = YOSHI_DROPS, .animations = YOSHI_GREEN_ANIMS, @@ -246,9 +246,9 @@ StaticNpc N(NpcData_Yoshis)[] = { .settings = &N(NpcSettings_YoshiKid), .pos = { 160.0f, 0.0f, 540.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_YoshiKid), - .drops = YOSHI_KID_DROPS, + .drops = NPC_NO_DROPS, .animations = YOSHI_KID_GREEN_ANIMS, .extraAnimations = N(ExtraAnims_YoshiKid), .tattle = MSG_NpcTattle_GreenYoshiKid, @@ -282,7 +282,7 @@ StaticNpc N(NpcData_Penguins)[] = { .settings = &N(NpcSettings_Penguin), .pos = { 150.0f, 0.0f, 105.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_MayorPenguin), .drops = PENGUIN_DROPS, .animations = MAYOR_PENGUIN_ANIMS, @@ -294,7 +294,7 @@ StaticNpc N(NpcData_Penguins)[] = { .settings = &N(NpcSettings_Penguin), .pos = { 200.0f, 0.0f, 105.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_MayorPenguinWife), .drops = PENGUIN_DROPS, .animations = MAYOR_PENGUIN_WIFE_ANIMS, @@ -345,7 +345,7 @@ StaticNpc N(NpcData_Mousers)[] = { .settings = &N(NpcSettings_Mouser), .pos = { -60.0f, 0.0f, -20.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Moustafa), .drops = MOUSER_DROPS, .animations = MOUSTAFA_ANIMS, @@ -357,7 +357,7 @@ StaticNpc N(NpcData_Mousers)[] = { .settings = &N(NpcSettings_Mouser), .pos = { -100.0f, 0.0f, -50.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Mouser), .drops = MOUSER_DROPS, .animations = MOUSER_PURPLE_ANIMS, @@ -378,7 +378,7 @@ StaticNpc N(NpcData_Boos)[] = { .settings = &N(NpcSettings_Boo), .pos = { 270.0f, 20.0f, 175.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Boo_01), .drops = BOO_DROPS, .animations = NORMAL_BOO_ANIMS, @@ -389,7 +389,7 @@ StaticNpc N(NpcData_Boos)[] = { .settings = &N(NpcSettings_Boo), .pos = { 320.0f, 20.0f, 200.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .init = &N(EVS_NpcInit_Boo_02), .drops = BOO_DROPS, .animations = GUSTY_BOO_ANIMS, @@ -417,7 +417,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -25.0f, 0.0f, 200.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_Toad), .drops = TOAD_DROPS, .animations = TOAD_BLUE_ANIMS, @@ -428,7 +428,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -50.0f, 0.0f, -200.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadGuard_01), .drops = TOAD_DROPS, .animations = TOAD_GUARD_RED_ANIMS, @@ -439,7 +439,7 @@ StaticNpc N(NpcData_Toads)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 560.0f, 20.0f, 100.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .init = &N(EVS_NpcInit_ToadGuard_02), .drops = TOAD_DROPS, .animations = TOAD_GUARD_YELLOW_ANIMS, diff --git a/src/world/area_osr/osr_01/osr_01_3_npc.c b/src/world/area_osr/osr_01/osr_01_3_npc.c index f6988ef5c0..93a065180d 100644 --- a/src/world/area_osr/osr_01/osr_01_3_npc.c +++ b/src/world/area_osr/osr_01/osr_01_3_npc.c @@ -104,7 +104,7 @@ StaticNpc N(NpcData_Toad) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 25.0f, 0.0f, 130.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_Toad), .drops = TOAD_DROPS, .animations = TOAD_RED_ANIMS, diff --git a/src/world/area_pra/pra_01/pra_01_3_npc.c b/src/world/area_pra/pra_01/pra_01_3_npc.c index 75444db8f5..90f74b29fe 100644 --- a/src/world/area_pra/pra_01/pra_01_3_npc.c +++ b/src/world/area_pra/pra_01/pra_01_3_npc.c @@ -182,7 +182,7 @@ StaticNpc N(NpcData_Kalmar) = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kalmar), .drops = NPC_NO_DROPS, .animations = KALMAR_ANIMS, diff --git a/src/world/area_pra/pra_05/pra_05_3_entity.c b/src/world/area_pra/pra_05/pra_05_3_entity.c index d0041dd224..aed93bd7fe 100644 --- a/src/world/area_pra/pra_05/pra_05_3_entity.c +++ b/src/world/area_pra/pra_05/pra_05_3_entity.c @@ -1,7 +1,7 @@ #include "pra_05.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_BlueKey) = EVT_OPEN_CHEST_KEY(ITEM_BLUE_KEY, GF_PRA05_Chest_BlueKey); diff --git a/src/world/area_pra/pra_09/pra_09_3_npc.c b/src/world/area_pra/pra_09/pra_09_3_npc.c index 73c267d6f5..0ae5a83e52 100644 --- a/src/world/area_pra/pra_09/pra_09_3_npc.c +++ b/src/world/area_pra/pra_09/pra_09_3_npc.c @@ -762,7 +762,7 @@ StaticNpc N(NpcData_InteractableBombettes)[] = { .settings = &N(NpcSettings_Bombette), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Bombette_01), .drops = NPC_NO_DROPS, .animations = BOMBETTE_ANIMS, @@ -772,7 +772,7 @@ StaticNpc N(NpcData_InteractableBombettes)[] = { .settings = &N(NpcSettings_Bombette), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Bombette_02), .drops = NPC_NO_DROPS, .animations = BOMBETTE_ANIMS, @@ -782,7 +782,7 @@ StaticNpc N(NpcData_InteractableBombettes)[] = { .settings = &N(NpcSettings_Bombette), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Bombette_03), .drops = NPC_NO_DROPS, .animations = BOMBETTE_ANIMS, @@ -792,7 +792,7 @@ StaticNpc N(NpcData_InteractableBombettes)[] = { .settings = &N(NpcSettings_Bombette), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Bombette_04), .drops = NPC_NO_DROPS, .animations = BOMBETTE_ANIMS, @@ -802,7 +802,7 @@ StaticNpc N(NpcData_InteractableBombettes)[] = { .settings = &N(NpcSettings_Bombette), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_Bombette_05), .drops = NPC_NO_DROPS, .animations = BOMBETTE_ANIMS, diff --git a/src/world/area_pra/pra_11/pra_11_3_entity.c b/src/world/area_pra/pra_11/pra_11_3_entity.c index 930177cf9e..8ce35ab7ac 100644 --- a/src/world/area_pra/pra_11/pra_11_3_entity.c +++ b/src/world/area_pra/pra_11/pra_11_3_entity.c @@ -1,7 +1,7 @@ #include "pra_11.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_RedKey) = EVT_OPEN_CHEST_KEY(ITEM_RED_KEY, GF_PRA11_Chest_RedKey); diff --git a/src/world/area_pra/pra_12/pra_12_3_entity.c b/src/world/area_pra/pra_12/pra_12_3_entity.c index dfe889c940..f26cbb9237 100644 --- a/src/world/area_pra/pra_12/pra_12_3_entity.c +++ b/src/world/area_pra/pra_12/pra_12_3_entity.c @@ -1,7 +1,7 @@ #include "pra_12.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_PDownDUp) = EVT_OPEN_CHEST_BADGE(ITEM_P_DOWN_D_UP, GF_PRA12_Chest_PDownDUp); diff --git a/src/world/area_pra/pra_13/pra_13_3_npc.c b/src/world/area_pra/pra_13/pra_13_3_npc.c index f10b67435f..451082db2a 100644 --- a/src/world/area_pra/pra_13/pra_13_3_npc.c +++ b/src/world/area_pra/pra_13/pra_13_3_npc.c @@ -246,7 +246,7 @@ StaticNpc N(NpcData_Imposters)[] = { .settings = &N(NpcSettings_Player), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost_01), .drops = NPC_NO_DROPS, .animations = DUPLIGHOST_ANIMS, @@ -256,7 +256,7 @@ StaticNpc N(NpcData_Imposters)[] = { .settings = &N(NpcSettings_Player), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost_02), .drops = NPC_NO_DROPS, .animations = DUPLIGHOST_ANIMS, diff --git a/src/world/area_pra/pra_14/pra_14_3_entity.c b/src/world/area_pra/pra_14/pra_14_3_entity.c index e1db35e783..716882f221 100644 --- a/src/world/area_pra/pra_14/pra_14_3_entity.c +++ b/src/world/area_pra/pra_14/pra_14_3_entity.c @@ -1,7 +1,7 @@ #include "pra_14.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_CALL(MakeEntity, EVT_PTR(Entity_MulticoinBlock), 445, 60, 80, 0, MAKE_ENTITY_END) diff --git a/src/world/area_pra/pra_19/pra_19_3_npc.c b/src/world/area_pra/pra_19/pra_19_3_npc.c index d1a6d64f2b..508979e679 100644 --- a/src/world/area_pra/pra_19/pra_19_3_npc.c +++ b/src/world/area_pra/pra_19/pra_19_3_npc.c @@ -1044,7 +1044,7 @@ StaticNpc N(NpcData_Imposters)[] = { .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_FakeKooper), .drops = NPC_NO_DROPS, .animations = { @@ -1071,7 +1071,7 @@ StaticNpc N(NpcData_Imposters)[] = { .settings = &N(NpcSettings_Goompa), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_FakeGoompa), .drops = NPC_NO_DROPS, .animations = { @@ -1099,7 +1099,7 @@ StaticNpc N(NpcData_Imposters)[] = { .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_FakeLuigi), .drops = NPC_NO_DROPS, .animations = LUIGI_ANIMS, @@ -1110,7 +1110,7 @@ StaticNpc N(NpcData_Imposters)[] = { .settings = &N(NpcSettings_KoopaKoot), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_FakeKoopaKoot), .drops = NPC_NO_DROPS, .animations = { @@ -1138,7 +1138,7 @@ StaticNpc N(NpcData_Imposters)[] = { .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_100000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP, .init = &N(EVS_NpcInit_FakeKolorado), .drops = NPC_NO_DROPS, .animations = KOLORADO_ANIMS, diff --git a/src/world/area_pra/pra_27/pra_27_3_entity.c b/src/world/area_pra/pra_27/pra_27_3_entity.c index d40d194f93..62763d319f 100644 --- a/src/world/area_pra/pra_27/pra_27_3_entity.c +++ b/src/world/area_pra/pra_27/pra_27_3_entity.c @@ -1,7 +1,7 @@ #include "pra_27.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_PalaceKey) = EVT_OPEN_CHEST_KEY(ITEM_CRYSTAL_PALACE_KEY, GF_PRA27_Chest_PalaceKey); diff --git a/src/world/area_pra/pra_28/pra_28_3_entity.c b/src/world/area_pra/pra_28/pra_28_3_entity.c index 5268ca1cf2..a14f47cfd0 100644 --- a/src/world/area_pra/pra_28/pra_28_3_entity.c +++ b/src/world/area_pra/pra_28/pra_28_3_entity.c @@ -1,7 +1,7 @@ #include "pra_28.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_PUpDDown) = EVT_OPEN_CHEST_BADGE(ITEM_P_UP_D_DOWN, GF_PRA28_Chest_PUpDDown); diff --git a/src/world/area_pra/pra_31/pra_31_2_npc.c b/src/world/area_pra/pra_31/pra_31_2_npc.c index f31930eefc..c27453b0ee 100644 --- a/src/world/area_pra/pra_31/pra_31_2_npc.c +++ b/src/world/area_pra/pra_31/pra_31_2_npc.c @@ -172,7 +172,7 @@ StaticNpc N(NpcData_AlbinoDinos)[] = { .settings = &N(NpcSettings_AlbinoDino), .pos = { 190.0f, -10.0f, 165.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_AlbinoDino_01), .drops = NPC_NO_DROPS, .animations = ALBINO_DINO_ANIMS, @@ -183,7 +183,7 @@ StaticNpc N(NpcData_AlbinoDinos)[] = { .settings = &N(NpcSettings_AlbinoDino), .pos = { 300.0f, -10.0f, 89.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_AlbinoDino_02), .drops = NPC_NO_DROPS, .animations = ALBINO_DINO_ANIMS, @@ -194,7 +194,7 @@ StaticNpc N(NpcData_AlbinoDinos)[] = { .settings = &N(NpcSettings_AlbinoDino), .pos = { 452.0f, -10.0f, 139.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_AlbinoDino_03), .drops = NPC_NO_DROPS, .animations = ALBINO_DINO_ANIMS, diff --git a/src/world/area_pra/pra_32/pra_32_3_npc.c b/src/world/area_pra/pra_32/pra_32_3_npc.c index acc4975b75..5a4cf1dd3d 100644 --- a/src/world/area_pra/pra_32/pra_32_3_npc.c +++ b/src/world/area_pra/pra_32/pra_32_3_npc.c @@ -261,7 +261,7 @@ StaticNpc N(NpcData_CrystalKing_01)[] = { .settings = &N(NpcSettings_StarSpirit), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kalmar), .drops = NPC_NO_DROPS, .animations = KALMAR_ANIMS, diff --git a/src/world/area_pra/pra_35/pra_35_4_entity.c b/src/world/area_pra/pra_35/pra_35_4_entity.c index c994b320c3..edc3e748a8 100644 --- a/src/world/area_pra/pra_35/pra_35_4_entity.c +++ b/src/world/area_pra/pra_35/pra_35_4_entity.c @@ -1,7 +1,7 @@ #include "pra_35.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_TripleDip) = EVT_OPEN_CHEST_BADGE(ITEM_TRIPLE_DIP, GF_PRA35_Chest_TripleDip); diff --git a/src/world/area_sam/sam_01/sam_01_4_npc.c b/src/world/area_sam/sam_01/sam_01_4_npc.c index 668e27eda1..40f6d3d477 100644 --- a/src/world/area_sam/sam_01/sam_01_4_npc.c +++ b/src/world/area_sam/sam_01/sam_01_4_npc.c @@ -665,7 +665,7 @@ StaticNpc N(NpcData_MayorPenguin)[] = { .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_PenguinPatrol), .drops = NPC_NO_DROPS, .animations = PENGUIN_PATROL_ANIMS, @@ -676,7 +676,7 @@ StaticNpc N(NpcData_MayorPenguin)[] = { .settings = &N(NpcSettings_Penguin), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Herringway), .drops = NPC_NO_DROPS, .animations = HERRINGWAY_ANIMS, @@ -770,7 +770,7 @@ StaticNpc N(NpcData_Penguin_05)[] = { .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_05), .drops = NPC_NO_DROPS, .animations = PENGUIN_ANIMS, @@ -781,7 +781,7 @@ StaticNpc N(NpcData_Penguin_05)[] = { .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_06), .drops = NPC_NO_DROPS, .animations = PENGUIN_ANIMS, @@ -792,7 +792,7 @@ StaticNpc N(NpcData_Penguin_05)[] = { .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_07), .drops = NPC_NO_DROPS, .animations = PENGUIN_ANIMS, @@ -803,7 +803,7 @@ StaticNpc N(NpcData_Penguin_05)[] = { .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_08), .drops = NPC_NO_DROPS, .animations = PENGUIN_ANIMS, @@ -816,7 +816,7 @@ StaticNpc N(NpcData_Penguin_09) = { .settings = &N(NpcSettings_Penguin), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_09), .drops = NPC_NO_DROPS, .animations = PENGUIN_ANIMS, @@ -827,7 +827,7 @@ StaticNpc N(NpcData_ChuckQuizmo) = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 230.0f, 0.0f, 150.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_SAM, QUIZ_COUNT_SAM, QUIZ_MAP_SAM_01 }}, .drops = NPC_NO_DROPS, diff --git a/src/world/area_sam/sam_01/sam_01_5_scenes.c b/src/world/area_sam/sam_01/sam_01_5_scenes.c index 594a8fe34b..169be0fda7 100644 --- a/src/world/area_sam/sam_01/sam_01_5_scenes.c +++ b/src/world/area_sam/sam_01/sam_01_5_scenes.c @@ -117,7 +117,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = { EVT_CALL(NpcMoveTo, NPC_MayorPenguinWife, -255, -185, 0) EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Idle) EVT_CALL(PlaySoundAtNpc, NPC_MayorPenguinWife, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_MayorPenguinWife, EMOTE_EXCLAMATION, 0, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_MayorPenguinWife, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Walk) EVT_CALL(SetNpcSpeed, NPC_MayorPenguinWife, EVT_FLOAT(0.5)) diff --git a/src/world/area_sam/sam_01/sam_01_6_entity.c b/src/world/area_sam/sam_01/sam_01_6_entity.c index f8c15f64ab..669f29e2f9 100644 --- a/src/world/area_sam/sam_01/sam_01_6_entity.c +++ b/src/world/area_sam/sam_01/sam_01_6_entity.c @@ -2,7 +2,7 @@ #include "entity.h" #define NAME_SUFFIX _Entity -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_AttackFXE) = EVT_OPEN_CHEST_BADGE(ITEM_ATTACK_FX_E, GF_SAM01_Chest_AttackFXE); #define NAME_SUFFIX diff --git a/src/world/area_sam/sam_02/sam_02_2_main.c b/src/world/area_sam/sam_02/sam_02_2_main.c index 71bbf3f6d9..5de17c159a 100644 --- a/src/world/area_sam/sam_02/sam_02_2_main.c +++ b/src/world/area_sam/sam_02/sam_02_2_main.c @@ -1,7 +1,6 @@ #include "sam_02.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_sam/sam_02/sam_02_4_npc.c b/src/world/area_sam/sam_02/sam_02_4_npc.c index d74121a3cc..45ed65bd7a 100644 --- a/src/world/area_sam/sam_02/sam_02_4_npc.c +++ b/src/world/area_sam/sam_02/sam_02_4_npc.c @@ -374,7 +374,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Penguin), .pos = { 35.0f, 0.0f, -365.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_ShopOwner), .drops = NPC_NO_DROPS, .animations = PENGUIN_ANIMS, @@ -385,7 +385,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_ShiverToad), .pos = { 329.0f, 0.0f, -167.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShiverToad), .drops = NPC_NO_DROPS, .animations = SHIVER_TOAD_RED_ANIMS, @@ -516,7 +516,7 @@ StaticNpc N(NpcData_ChuckQuizmo) = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { -230.0f, 0.0f, 160.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_SAM, QUIZ_COUNT_SAM, QUIZ_MAP_SAM_02 }}, .drops = NPC_NO_DROPS, diff --git a/src/world/area_sam/sam_04/sam_04_4_npc.c b/src/world/area_sam/sam_04/sam_04_4_npc.c index 8eac400073..404834673f 100644 --- a/src/world/area_sam/sam_04/sam_04_4_npc.c +++ b/src/world/area_sam/sam_04/sam_04_4_npc.c @@ -225,7 +225,7 @@ StaticNpc N(NpcData_Snowmen)[] = { .settings = &N(NpcSettings_Snowman), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Snowman_01), .drops = NPC_NO_DROPS, .animations = PENGUIN_ANIMS, @@ -236,7 +236,7 @@ StaticNpc N(NpcData_Snowmen)[] = { .settings = &N(NpcSettings_Snowman), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Snowman_02), .drops = NPC_NO_DROPS, .animations = PENGUIN_ANIMS, @@ -247,7 +247,7 @@ StaticNpc N(NpcData_Snowmen)[] = { .settings = &N(NpcSettings_Snowman), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Snowman_03), .drops = NPC_NO_DROPS, .animations = PENGUIN_ANIMS, @@ -258,7 +258,7 @@ StaticNpc N(NpcData_Snowmen)[] = { .settings = &N(NpcSettings_Snowman), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Snowman_04), .drops = NPC_NO_DROPS, .animations = PENGUIN_ANIMS, @@ -269,7 +269,7 @@ StaticNpc N(NpcData_Snowmen)[] = { .settings = &N(NpcSettings_Snowman), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Snowman_05), .drops = NPC_NO_DROPS, .animations = PENGUIN_ANIMS, @@ -280,7 +280,7 @@ StaticNpc N(NpcData_Snowmen)[] = { .settings = &N(NpcSettings_Snowman), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Snowman_06), .drops = NPC_NO_DROPS, .animations = PENGUIN_ANIMS, diff --git a/src/world/area_sam/sam_06/sam_06_4_npc.c b/src/world/area_sam/sam_06/sam_06_4_npc.c index cdb62b20ca..6ae54d52cd 100644 --- a/src/world/area_sam/sam_06/sam_06_4_npc.c +++ b/src/world/area_sam/sam_06/sam_06_4_npc.c @@ -893,7 +893,7 @@ StaticNpc N(NpcData_Merle)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 0.0f, 90.0f, -300.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Merle), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -925,7 +925,7 @@ StaticNpc N(NpcData_Merle)[] = { .settings = &N(NpcSettings_ShiverToad_Stationary), .pos = { -376.0f, 60.0f, 112.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShiverToad_01), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -957,7 +957,7 @@ StaticNpc N(NpcData_Merle)[] = { .settings = &N(NpcSettings_ShiverToad_Wander), .pos = { 208.0f, 80.0f, 150.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShiverToad_02), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -1001,7 +1001,7 @@ StaticNpc N(NpcData_Merle)[] = { .settings = &N(NpcSettings_ShiverToad_Stationary), .pos = { 127.0f, 0.0f, 445.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShiverToad_03), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -1033,7 +1033,7 @@ StaticNpc N(NpcData_Merle)[] = { .settings = &N(NpcSettings_Ninji_Wander), .pos = { -99.0f, 90.0f, -90.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Ninji_01), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -1077,7 +1077,7 @@ StaticNpc N(NpcData_Merle)[] = { .settings = &N(NpcSettings_Ninji_Wander), .pos = { -48.0f, 0.0f, 400.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Ninji_02), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -1121,7 +1121,7 @@ StaticNpc N(NpcData_Merle)[] = { .settings = &N(NpcSettings_Ninji_Stationary), .pos = { 239.0f, 50.0f, 315.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Ninji_03), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -1153,7 +1153,7 @@ StaticNpc N(NpcData_Merle)[] = { .settings = &N(NpcSettings_Ninji_Stationary), .pos = { 390.0f, 80.0f, 50.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Ninji_04), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -1185,7 +1185,7 @@ StaticNpc N(NpcData_Merle)[] = { .settings = &N(NpcSettings_StarKid_Wander), .pos = { -166.0f, 10.0f, 390.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_StarKid_01), .drops = STAR_KID_DROPS, .territory = { @@ -1208,7 +1208,7 @@ StaticNpc N(NpcData_Merle)[] = { .settings = &N(NpcSettings_StarKid), .pos = { 3.0f, 60.0f, 137.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_StarKid_02), .drops = STAR_KID_DROPS, .animations = STAR_KID_ANIMS, @@ -1219,7 +1219,7 @@ StaticNpc N(NpcData_Merle)[] = { .settings = &N(NpcSettings_StarKid), .pos = { 120.0f, 100.0f, -210.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_StarKid_03), .drops = STAR_KID_DROPS, .animations = STAR_KID_ANIMS, @@ -1230,7 +1230,7 @@ StaticNpc N(NpcData_Merle)[] = { .settings = &N(NpcSettings_StarKid), .pos = { 369.0f, 90.0f, 9.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_StarKid_04), .drops = STAR_KID_DROPS, .animations = STAR_KID_ANIMS, @@ -1241,7 +1241,7 @@ StaticNpc N(NpcData_Merle)[] = { .settings = &N(NpcSettings_StarKid), .pos = { 405.0f, 90.0f, -19.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_StarKid_05), .drops = STAR_KID_DROPS, .animations = STAR_KID_ANIMS, @@ -1252,7 +1252,7 @@ StaticNpc N(NpcData_Merle)[] = { .settings = &N(NpcSettings_StarKid), .pos = { 364.0f, 90.0f, -47.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_StarKid_06), .drops = STAR_KID_DROPS, .animations = STAR_KID_ANIMS, @@ -1263,7 +1263,7 @@ StaticNpc N(NpcData_Merle)[] = { .settings = &N(NpcSettings_ShiverToad_Stationary), .pos = { -274.0f, 60.0f, -28.0f }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_ShiverToad_04), .drops = { .dropFlags = NPC_DROP_FLAG_80, diff --git a/src/world/area_sam/sam_08/sam_08_3_entity.c b/src/world/area_sam/sam_08/sam_08_3_entity.c index 58e411b0b1..b99e15e557 100644 --- a/src/world/area_sam/sam_08/sam_08_3_entity.c +++ b/src/world/area_sam/sam_08/sam_08_3_entity.c @@ -4,7 +4,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_SAM08_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_MAKE_SUPER_BLOCK(-800, 210, -130, 0) diff --git a/src/world/area_sam/sam_08/sam_08_4_npc.c b/src/world/area_sam/sam_08/sam_08_4_npc.c index 379101621a..7ef628fe1b 100644 --- a/src/world/area_sam/sam_08/sam_08_4_npc.c +++ b/src/world/area_sam/sam_08/sam_08_4_npc.c @@ -129,7 +129,7 @@ StaticNpc N(NpcData_Ambush)[] = { .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_TrueKooperA), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -160,7 +160,7 @@ StaticNpc N(NpcData_Ambush)[] = { .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_RealKooperA), .drops = { .dropFlags = NPC_DROP_FLAG_80, @@ -191,7 +191,7 @@ StaticNpc N(NpcData_Ambush)[] = { .settings = &N(NpcSettings_Duplighost), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_40000 | ENEMY_FLAG_400000 | ENEMY_FLAG_NO_DROPS, .init = &N(EVS_NpcInit_Duplighost), .drops = { .dropFlags = NPC_DROP_FLAG_80, diff --git a/src/world/area_sam/sam_08/sam_08_5_scenes.c b/src/world/area_sam/sam_08/sam_08_5_scenes.c index 4419bc5865..491259b0d5 100644 --- a/src/world/area_sam/sam_08/sam_08_5_scenes.c +++ b/src/world/area_sam/sam_08/sam_08_5_scenes.c @@ -94,19 +94,19 @@ EvtScript N(EVS_Scene_ImposterAppears) = { EVT_CALL(InterpNpcYaw, NPC_Kooper_02A, 90, 0) EVT_WAIT(15) EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_263, 0) - EVT_CALL(ShowEmote, NPC_Kooper_02A, EMOTE_QUESTION, 45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Kooper_02A, EMOTE_QUESTION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_263, 0) - EVT_CALL(ShowEmote, NPC_Kooper_01A, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Kooper_01A, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) EVT_CALL(ShowEmote, NPC_Kooper_01A, EMOTE_QUESTION, -45, 20, FALSE, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_263, 0) - EVT_CALL(ShowEmote, NPC_Kooper_02A, EMOTE_QUESTION, 45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Kooper_02A, EMOTE_QUESTION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(PlaySoundAtNpc, NPC_Kooper_01A, SOUND_263, 0) - EVT_CALL(ShowEmote, NPC_Kooper_01A, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Kooper_01A, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(SpeakToPlayer, NPC_Kooper_01A, ANIM_WorldKooper_Idle, ANIM_WorldKooper_Idle, 5, MSG_CH7_011F) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Kooper_01A, ANIM_WorldKooper_Jump) diff --git a/src/world/area_sam/sam_11/sam_11_5_npc.c b/src/world/area_sam/sam_11/sam_11_5_npc.c index b7fbb3e9da..48f8178884 100644 --- a/src/world/area_sam/sam_11/sam_11_5_npc.c +++ b/src/world/area_sam/sam_11/sam_11_5_npc.c @@ -558,7 +558,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 180, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_PenguinSentry), .drops = NPC_NO_DROPS, .animations = PENGUIN_ANIMS, @@ -569,7 +569,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Penguin), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Herringway), .drops = NPC_NO_DROPS, .animations = HERRINGWAY_ANIMS, @@ -580,7 +580,7 @@ StaticNpc N(NpcData_Townsfolk)[] = { .settings = &N(NpcSettings_Penguin), .pos = { 200.0f, 0.0f, -110.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Penguin_04), .drops = NPC_NO_DROPS, .animations = PENGUIN_ANIMS, @@ -726,7 +726,7 @@ StaticNpc N(NpcData_Tourists)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -400.0f, 0.0f, 230.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toadette_01), .drops = NPC_NO_DROPS, .animations = TOADETTE_PINK_ANIMS, @@ -737,7 +737,7 @@ StaticNpc N(NpcData_Tourists)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -350.0f, 0.0f, 230.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toadette_02), .drops = NPC_NO_DROPS, .animations = TOADETTE_PINK_ANIMS, @@ -748,7 +748,7 @@ StaticNpc N(NpcData_Tourists)[] = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { -375.0f, 0.0f, 220.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Toadette_03), .drops = NPC_NO_DROPS, .animations = TOADETTE_PINK_ANIMS, @@ -987,7 +987,7 @@ StaticNpc N(NpcData_Epilogue)[] = { .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Kolorado), .drops = NPC_NO_DROPS, .animations = KOLORADO_ANIMS, @@ -997,7 +997,7 @@ StaticNpc N(NpcData_Epilogue)[] = { .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Archeologist_01), .drops = NPC_NO_DROPS, .animations = ARCHEOLOGIST_ANIMS, @@ -1007,7 +1007,7 @@ StaticNpc N(NpcData_Epilogue)[] = { .settings = &N(NpcSettings_Kolorado), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Archeologist_01), .drops = NPC_NO_DROPS, .animations = ARCHEOLOGIST_ANIMS, @@ -1017,7 +1017,7 @@ StaticNpc N(NpcData_Epilogue)[] = { .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Archeologist_01), .drops = NPC_NO_DROPS, .animations = { @@ -1044,7 +1044,7 @@ StaticNpc N(NpcData_Epilogue)[] = { .settings = &N(NpcSettings_Kooper), .pos = { NPC_DISPOSE_LOCATION }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_200000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_Archeologist_01), .drops = NPC_NO_DROPS, .animations = { @@ -1073,7 +1073,7 @@ StaticNpc N(NpcData_ChuckQuizmo) = { .settings = &N(NpcSettings_ChuckQuizmo), .pos = { 0.0f, 0.0f, -150.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000, .initVarCount = 1, .initVar = { .bytes = { 0, QUIZ_AREA_SAM, QUIZ_COUNT_SAM, QUIZ_MAP_SAM_11 }}, .drops = NPC_NO_DROPS, diff --git a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c index 19c92693eb..f91a9720ce 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c +++ b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c @@ -267,7 +267,7 @@ StaticNpc N(NpcData_TradingToad) = { .settings = &N(NpcSettings_Toad_Stationary), .pos = { 0.0f, 2.0f, 150.0f }, .yaw = 90, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_10000 | ENEMY_FLAG_100000, .init = &N(EVS_NpcInit_TradingToad), .drops = { .dropFlags = NPC_DROP_FLAG_80, 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 index 1b290f1e06..ce184a4e67 100644 --- a/src/world/area_sbk/sbk_56/sbk_56_2_entity.c +++ b/src/world/area_sbk/sbk_56/sbk_56_2_entity.c @@ -5,7 +5,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_SBK56_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_CALL(MakeEntity, EVT_PTR(Entity_HeartBlock), 300, 60, 0, 0, MAKE_ENTITY_END) diff --git a/src/world/area_tik/tik_01/tik_01_2_main.c b/src/world/area_tik/tik_01/tik_01_2_main.c index 11875c9493..addfdaf01c 100644 --- a/src/world/area_tik/tik_01/tik_01_2_main.c +++ b/src/world/area_tik/tik_01/tik_01_2_main.c @@ -4,7 +4,6 @@ #include "world/common/atomic/TexturePan.data.inc.c" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" EvtScript N(EVS_ExitWalk_tik_06_0) = EVT_EXIT_WALK(60, tik_01_ENTRY_0, "tik_06", tik_06_ENTRY_0); diff --git a/src/world/area_tik/tik_02/tik_02_3_entity.c b/src/world/area_tik/tik_02/tik_02_3_entity.c index deab3bbf8c..87892c62fd 100644 --- a/src/world/area_tik/tik_02/tik_02_3_entity.c +++ b/src/world/area_tik/tik_02/tik_02_3_entity.c @@ -1,7 +1,7 @@ #include "tik_02.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest) = EVT_OPEN_CHEST_BADGE(ITEM_SHRINK_STOMP, GF_TIK02_Chest_ShrinkStomp); diff --git a/src/world/area_tik/tik_03/tik_03_2_main.c b/src/world/area_tik/tik_03/tik_03_2_main.c index 5854b57d4a..87c53b9bc6 100644 --- a/src/world/area_tik/tik_03/tik_03_2_main.c +++ b/src/world/area_tik/tik_03/tik_03_2_main.c @@ -1,7 +1,6 @@ #include "tik_03.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_tik/tik_04/tik_04_2_main.c b/src/world/area_tik/tik_04/tik_04_2_main.c index ee97fa65a9..92709dedc2 100644 --- a/src/world/area_tik/tik_04/tik_04_2_main.c +++ b/src/world/area_tik/tik_04/tik_04_2_main.c @@ -4,7 +4,6 @@ #include "world/common/atomic/TexturePan.data.inc.c" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" EvtScript N(EVS_ExitWalk_tik_05_0) = EVT_EXIT_WALK(60, tik_04_ENTRY_0, "tik_05", tik_05_ENTRY_0); EvtScript N(EVS_ExitWalk_tik_07_0) = EVT_EXIT_WALK(60, tik_04_ENTRY_1, "tik_07", tik_07_ENTRY_0); diff --git a/src/world/area_tik/tik_05/tik_05_4_entity.c b/src/world/area_tik/tik_05/tik_05_4_entity.c index 2a6bc6e4ac..9ba632caf2 100644 --- a/src/world/area_tik/tik_05/tik_05_4_entity.c +++ b/src/world/area_tik/tik_05/tik_05_4_entity.c @@ -1,7 +1,7 @@ #include "tik_05.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" extern s16 Entity_ScriptSpring_AnimLaunch[]; diff --git a/src/world/area_tik/tik_06/tik_06_2_main.c b/src/world/area_tik/tik_06/tik_06_2_main.c index 6f4cf332fb..31b4e97724 100644 --- a/src/world/area_tik/tik_06/tik_06_2_main.c +++ b/src/world/area_tik/tik_06/tik_06_2_main.c @@ -1,7 +1,6 @@ #include "tik_06.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_tik/tik_07/tik_07_2_main.c b/src/world/area_tik/tik_07/tik_07_2_main.c index 14b1fcb371..1baa6fe739 100644 --- a/src/world/area_tik/tik_07/tik_07_2_main.c +++ b/src/world/area_tik/tik_07/tik_07_2_main.c @@ -1,7 +1,6 @@ #include "tik_07.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" EvtScript N(EVS_ExitWalk_tik_04_1) = EVT_EXIT_WALK(60, tik_07_ENTRY_0, "tik_04", tik_04_ENTRY_1); diff --git a/src/world/area_tik/tik_07/tik_07_3_entity.c b/src/world/area_tik/tik_07/tik_07_3_entity.c index 590f198666..ea65891f08 100644 --- a/src/world/area_tik/tik_07/tik_07_3_entity.c +++ b/src/world/area_tik/tik_07/tik_07_3_entity.c @@ -4,7 +4,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_TIK07_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_CALL(MakeItemEntity, ITEM_STAR_PIECE, 306, 90, -104, ITEM_SPAWN_MODE_FIXED_NEVER_VANISH, GF_TIK07_Item_StarPiece) diff --git a/src/world/area_tik/tik_08/tik_08_2_main.c b/src/world/area_tik/tik_08/tik_08_2_main.c index c03d7463bc..c67a7ff998 100644 --- a/src/world/area_tik/tik_08/tik_08_2_main.c +++ b/src/world/area_tik/tik_08/tik_08_2_main.c @@ -1,7 +1,6 @@ #include "tik_08.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_tik/tik_09/tik_09_2_main.c b/src/world/area_tik/tik_09/tik_09_2_main.c index 6b27e2d58f..4554e3e6d8 100644 --- a/src/world/area_tik/tik_09/tik_09_2_main.c +++ b/src/world/area_tik/tik_09/tik_09_2_main.c @@ -1,7 +1,6 @@ #include "tik_09.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_tik/tik_10/tik_10_4_entity.c b/src/world/area_tik/tik_10/tik_10_4_entity.c index 996264be9b..652f20e38c 100644 --- a/src/world/area_tik/tik_10/tik_10_4_entity.c +++ b/src/world/area_tik/tik_10/tik_10_4_entity.c @@ -4,7 +4,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_TIK10_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_MAKE_SUPER_BLOCK(-140, 160, -40, 0) diff --git a/src/world/area_tik/tik_12/tik_12_2_main.c b/src/world/area_tik/tik_12/tik_12_2_main.c index 102401fb10..08b6ea8fed 100644 --- a/src/world/area_tik/tik_12/tik_12_2_main.c +++ b/src/world/area_tik/tik_12/tik_12_2_main.c @@ -1,7 +1,6 @@ #include "tik_12.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_tik/tik_12/tik_12_4_entity.c b/src/world/area_tik/tik_12/tik_12_4_entity.c index 113c5b51e2..f7d1420fd4 100644 --- a/src/world/area_tik/tik_12/tik_12_4_entity.c +++ b/src/world/area_tik/tik_12/tik_12_4_entity.c @@ -2,7 +2,7 @@ #include "entity.h" // begin incomplete Chest include -//#include "world/common/atomic/Chest.inc.c" +//#include "world/common/entity/Chest.inc.c" #include "world/common/todo/StashVars.inc.c" #include "world/common/todo/GetItemName.inc.c" @@ -29,7 +29,6 @@ MAP_RODATA_PAD(1,unk); #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_TIK02_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_SmashBlockA) = { EVT_SET(GF_TIK12_Hammer3BlockA, TRUE) diff --git a/src/world/area_tik/tik_14/tik_14_2_main.c b/src/world/area_tik/tik_14/tik_14_2_main.c index acb53ccafd..b58437249f 100644 --- a/src/world/area_tik/tik_14/tik_14_2_main.c +++ b/src/world/area_tik/tik_14/tik_14_2_main.c @@ -1,7 +1,6 @@ #include "tik_14.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_tik/tik_15/tik_15_2_main.c b/src/world/area_tik/tik_15/tik_15_2_main.c index 4546d465c8..f38933d3eb 100644 --- a/src/world/area_tik/tik_15/tik_15_2_main.c +++ b/src/world/area_tik/tik_15/tik_15_2_main.c @@ -1,7 +1,6 @@ #include "tik_15.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_tik/tik_17/tik_17_2_entity.c b/src/world/area_tik/tik_17/tik_17_2_entity.c index 32791377c1..df81e38147 100644 --- a/src/world/area_tik/tik_17/tik_17_2_entity.c +++ b/src/world/area_tik/tik_17/tik_17_2_entity.c @@ -4,7 +4,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_TIK17_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_MAKE_SUPER_BLOCK(-130, 50, 0, 0) diff --git a/src/world/area_tik/tik_17/tik_17_3_main.c b/src/world/area_tik/tik_17/tik_17_3_main.c index 6a8053a923..e74bfcf6ee 100644 --- a/src/world/area_tik/tik_17/tik_17_3_main.c +++ b/src/world/area_tik/tik_17/tik_17_3_main.c @@ -1,7 +1,6 @@ #include "tik_17.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_tik/tik_19/tik_19_2_main.c b/src/world/area_tik/tik_19/tik_19_2_main.c index 7a8a9a3492..5ebaec2ccb 100644 --- a/src/world/area_tik/tik_19/tik_19_2_main.c +++ b/src/world/area_tik/tik_19/tik_19_2_main.c @@ -1,7 +1,6 @@ #include "tik_19.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_tik/tik_19/tik_19_3_entity.c b/src/world/area_tik/tik_19/tik_19_3_entity.c index b056334cb1..523028d580 100644 --- a/src/world/area_tik/tik_19/tik_19_3_entity.c +++ b/src/world/area_tik/tik_19/tik_19_3_entity.c @@ -4,7 +4,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_TIK19_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_MAKE_SUPER_BLOCK(760, 75, -10, 0) diff --git a/src/world/area_tik/tik_20/tik_20_2_main.c b/src/world/area_tik/tik_20/tik_20_2_main.c index d264538c7a..91d141b4aa 100644 --- a/src/world/area_tik/tik_20/tik_20_2_main.c +++ b/src/world/area_tik/tik_20/tik_20_2_main.c @@ -4,7 +4,6 @@ #include "world/common/atomic/TexturePan.data.inc.c" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" EvtScript N(EVS_ExitWalk_tik_08_1) = EVT_EXIT_WALK(60, tik_20_ENTRY_0, "tik_08", tik_08_ENTRY_1); EvtScript N(EVS_ExitWalk_tik_21_0) = EVT_EXIT_WALK(60, tik_20_ENTRY_1, "tik_21", tik_21_ENTRY_0); diff --git a/src/world/area_tik/tik_21/tik_21_2_main.c b/src/world/area_tik/tik_21/tik_21_2_main.c index c0a53b4ab1..092e19df67 100644 --- a/src/world/area_tik/tik_21/tik_21_2_main.c +++ b/src/world/area_tik/tik_21/tik_21_2_main.c @@ -4,7 +4,6 @@ #include "world/common/atomic/TexturePan.data.inc.c" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" EvtScript N(EVS_ExitWalk_tik_20_1) = EVT_EXIT_WALK(60, tik_21_ENTRY_0, "tik_20", tik_20_ENTRY_1); diff --git a/src/world/area_tik/tik_22/tik_22_2_main.c b/src/world/area_tik/tik_22/tik_22_2_main.c index 3698163340..cb571644e4 100644 --- a/src/world/area_tik/tik_22/tik_22_2_main.c +++ b/src/world/area_tik/tik_22/tik_22_2_main.c @@ -4,7 +4,6 @@ #include "world/common/atomic/TexturePan.data.inc.c" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" API_CALLABLE(N(ResetTrackVolumes)) { bgm_clear_track_volumes(0, TRACK_VOLS_2); diff --git a/src/world/area_tik/tik_23/tik_23_2_main.c b/src/world/area_tik/tik_23/tik_23_2_main.c index d13b8435c5..4dc45323be 100644 --- a/src/world/area_tik/tik_23/tik_23_2_main.c +++ b/src/world/area_tik/tik_23/tik_23_2_main.c @@ -1,7 +1,6 @@ #include "tik_23.h" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" #include "world/common/atomic/TexturePan.inc.c" #include "world/common/atomic/TexturePan.data.inc.c" diff --git a/src/world/area_trd/trd_00/trd_00_2_entity.c b/src/world/area_trd/trd_00/trd_00_2_entity.c index 3577ec8bbb..413bfb1f74 100644 --- a/src/world/area_trd/trd_00/trd_00_2_entity.c +++ b/src/world/area_trd/trd_00/trd_00_2_entity.c @@ -1,7 +1,7 @@ #include "trd_00.h" #include "entity.h" -#include "world/common/atomic/Chest.inc.c" +#include "world/common/entity/Chest.inc.c" EvtScript N(EVS_OpenChest_Refund) = EVT_OPEN_CHEST_BADGE(ITEM_REFUND, GF_TRD00_Chest_Refund); EvtScript N(EVS_OpenChest_FPPlus) = EVT_OPEN_CHEST_BADGE(ITEM_FP_PLUS_B, GF_TRD00_Chest_FPPlusB); diff --git a/src/world/area_trd/trd_01/trd_01_1_main.c b/src/world/area_trd/trd_01/trd_01_1_main.c index d3e3fb3b1b..df836a1603 100644 --- a/src/world/area_trd/trd_01/trd_01_1_main.c +++ b/src/world/area_trd/trd_01/trd_01_1_main.c @@ -127,13 +127,13 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_THREAD EVT_WAIT(20) EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_KoopaTroopa_02, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_KoopaTroopa_02, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(120) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_02, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_02, ANIM_KoopaTroopa_Panic) EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_02, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_KoopaTroopa_02, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_KoopaTroopa_02, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_LOOP(4) EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_02, 270, 0) EVT_WAIT(20) @@ -158,13 +158,13 @@ EvtScript N(EVS_Scene_RaiseStairs) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(25) - EVT_CALL(ShowEmote, NPC_KoopaTroopa_03, EMOTE_QUESTION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_KoopaTroopa_03, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(120) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_03, ANIM_KoopaTroopa_ShellExit) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_KoopaTroopa_03, ANIM_KoopaTroopa_Panic) EVT_CALL(PlaySoundAtNpc, NPC_KoopaTroopa_03, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_KoopaTroopa_03, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_KoopaTroopa_03, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_LOOP(4) EVT_CALL(InterpNpcYaw, NPC_KoopaTroopa_03, 270, 0) EVT_WAIT(20) diff --git a/src/world/area_trd/trd_05/trd_05_4_npc.c b/src/world/area_trd/trd_05/trd_05_4_npc.c index 939b00d372..7511287a81 100644 --- a/src/world/area_trd/trd_05/trd_05_4_npc.c +++ b/src/world/area_trd/trd_05/trd_05_4_npc.c @@ -145,7 +145,7 @@ EvtScript N(EVS_KoopaBros_SetTrap) = { EVT_CALL(SpeakToPlayer, NPC_KoopaBros_01, ANIM_KoopaBros_Yellow_Anim14, ANIM_KoopaBros_Yellow_Anim04, 5, MSG_CH1_00D5) EVT_CALL(GetNpcPos, NPC_KoopaBros_01, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_KoopaBros_01, EMOTE_EXCLAMATION, 0, 25, 2, LVar0, LVar1, LVar2, 40) + EVT_CALL(ShowEmote, NPC_KoopaBros_01, EMOTE_EXCLAMATION, 0, 25, EMOTER_POS, LVar0, LVar1, LVar2, 40) EVT_WAIT(25) EVT_CALL(InterpNpcYaw, NPC_KoopaBros_01, 270, 2) EVT_WAIT(7) diff --git a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c index cfbbc3f814..ce6676c324 100644 --- a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c +++ b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c @@ -111,7 +111,7 @@ EvtScript N(EVS_NpcInteract_Bombette) = { EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) EVT_WAIT(25) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, -45, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(40) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00E0) EVT_EXEC_WAIT(N(EVS_Bombette_DemonstrateAbility)) diff --git a/src/world/area_tst/tst_13/tst_13_1_main.c b/src/world/area_tst/tst_13/tst_13_1_main.c index 9db64a14ad..3bb28a2f5a 100644 --- a/src/world/area_tst/tst_13/tst_13_1_main.c +++ b/src/world/area_tst/tst_13/tst_13_1_main.c @@ -180,7 +180,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_00), .pos = { 0.0f, 0.0f, 0.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, @@ -189,7 +189,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_01), .pos = { 20.0f, 0.0f, 20.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, @@ -198,7 +198,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_02), .pos = { 40.0f, 0.0f, 40.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, @@ -207,7 +207,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_03), .pos = { 60.0f, 0.0f, 60.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, @@ -216,7 +216,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_04), .pos = { 80.0f, 0.0f, 80.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, @@ -225,7 +225,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_05), .pos = { 100.0f, 0.0f, 100.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, @@ -234,7 +234,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_06), .pos = { 120.0f, 0.0f, 120.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, @@ -243,7 +243,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_07), .pos = { 140.0f, 0.0f, 140.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, @@ -252,7 +252,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_08), .pos = { 160.0f, 0.0f, 160.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, @@ -261,7 +261,7 @@ StaticNpc N(NpcData_Testing)[] = { .settings = &N(NpcSettings_09), .pos = { 180.0f, 0.0f, 180.0f }, .yaw = 0, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800, + .flags = COMMON_PASSIVE_FLAGS, .animations = { }, }, diff --git a/src/world/common/atomic/CreateDarkness.data.inc.c b/src/world/common/atomic/CreateDarkness.data.inc.c deleted file mode 100644 index f36681f2a1..0000000000 --- a/src/world/common/atomic/CreateDarkness.data.inc.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -EvtScript N(EVS_CreateDarkness) = { - EVT_THREAD - EVT_CALL(N(DarkRoomUpdate)) - EVT_END_THREAD - EVT_RETURN - EVT_END -}; diff --git a/src/world/common/atomic/CreateDarkness.inc.c b/src/world/common/atomic/CreateDarkness.inc.c index 75b7381a69..4118da4b77 100644 --- a/src/world/common/atomic/CreateDarkness.inc.c +++ b/src/world/common/atomic/CreateDarkness.inc.c @@ -42,3 +42,11 @@ API_CALLABLE(N(DarkRoomUpdate)) { return ApiStatus_BLOCK; } + +EvtScript N(EVS_CreateDarkness) = { + EVT_THREAD + EVT_CALL(N(DarkRoomUpdate)) + EVT_END_THREAD + EVT_RETURN + EVT_END +}; diff --git a/src/world/common/atomic/ItemChoice_PartA.inc.c b/src/world/common/atomic/ItemChoice_PartA.inc.c deleted file mode 100644 index 3738a0322c..0000000000 --- a/src/world/common/atomic/ItemChoice_PartA.inc.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "common.h" - -#include "world/common/todo/GetNpcCollisionHeight.inc.c" - -#include "world/common/todo/AddPlayerHandsOffset.inc.c" - -ApiStatus N(ItemChoice_WaitForSelection)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - if (isInitialCall) { - N(ItemChoice_HasSelectedItem) = FALSE; - } - - if (N(ItemChoice_HasSelectedItem)) { - N(ItemChoice_HasSelectedItem) = FALSE; - evt_set_variable(script, *args++, N(ItemChoice_SelectedItemID)); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} - -ApiStatus N(ItemChoice_SaveSelected)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - N(ItemChoice_SelectedItemID) = evt_get_variable(script, *args); - N(ItemChoice_HasSelectedItem) = TRUE; - return ApiStatus_DONE2; -} diff --git a/src/world/common/atomic/WhaleAnim.data.inc.c b/src/world/common/atomic/WhaleAnim.data.inc.c deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index 9f75ec7248..e26462c0fe 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -5,7 +5,7 @@ #include "sprite/npc/ChuckQuizmo.h" #ifndef CHUCK_QUIZMO_NPC_ID -# error CHUCK_QUIZMO_NPC_ID must be defined for Quizmo.inc.c + #error CHUCK_QUIZMO_NPC_ID must be defined for Quizmo.inc.c #endif #define QUIZMO_DROPS \ diff --git a/src/world/common/enemy/ai/AvoidPlayerAI.inc.c b/src/world/common/enemy/ai/AvoidPlayerAI.inc.c index 49e6be4488..83ca890b48 100644 --- a/src/world/common/enemy/ai/AvoidPlayerAI.inc.c +++ b/src/world/common/enemy/ai/AvoidPlayerAI.inc.c @@ -188,7 +188,7 @@ ApiStatus N(AvoidPlayerAI_Main)(Evt* script, s32 isInitialCall) { enemy->unk_118 = 0.01f; #endif - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { script->functionTemp[0] = AI_STATE_WANDER_INIT; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -200,10 +200,10 @@ ApiStatus N(AvoidPlayerAI_Main)(Evt* script, s32 isInitialCall) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_8; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->functionTemp[0] = AI_STATE_SUSPEND; script->functionTemp[1] = AI_STATE_WANDER_INIT; - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } } diff --git a/src/world/common/enemy/ai/BulletBillAI.inc.c b/src/world/common/enemy/ai/BulletBillAI.inc.c index 4738ee0fee..95893dcd79 100644 --- a/src/world/common/enemy/ai/BulletBillAI.inc.c +++ b/src/world/common/enemy/ai/BulletBillAI.inc.c @@ -56,11 +56,11 @@ API_CALLABLE(N(BulletBillAI_Main)) { enemy->AI_VAR_BULLET_BLASTER = -1; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { - if (enemy->aiPaused != 0) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { + if (enemy->aiSuspendTime != 0) { return 0; } - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } switch (script->AI_TEMP_STATE) { @@ -172,12 +172,12 @@ API_CALLABLE(N(BillBlasterAI_Main)) { return ApiStatus_BLOCK; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; - if (enemy->aiPaused != 0) { + if (enemy->aiSuspendTime != 0) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } switch (script->AI_TEMP_STATE) { diff --git a/src/world/common/enemy/ai/CleftAI.inc.c b/src/world/common/enemy/ai/CleftAI.inc.c index 5597792ad0..d6ae05159e 100644 --- a/src/world/common/enemy/ai/CleftAI.inc.c +++ b/src/world/common/enemy/ai/CleftAI.inc.c @@ -316,11 +316,11 @@ s32 N(CleftAI_Main)(Evt* script, s32 isInitialCall) { } } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { - if (enemy->aiPaused) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { + if (enemy->aiSuspendTime) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } if (((script->AI_TEMP_STATE == AI_STATE_CLEFT_CHASE_INIT) diff --git a/src/world/common/enemy/ai/ClubbaNappingAI.inc.c b/src/world/common/enemy/ai/ClubbaNappingAI.inc.c index 93ddd5d7a6..3dcd4dd7de 100644 --- a/src/world/common/enemy/ai/ClubbaNappingAI.inc.c +++ b/src/world/common/enemy/ai/ClubbaNappingAI.inc.c @@ -216,7 +216,7 @@ ApiStatus N(ClubbaNappingAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 40.0f; territory.detectFlags = 0; - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { script->AI_TEMP_STATE = AI_STATE_NAPPING_CLUBBA_INIT; npc->duration = 30; npc->currentAnim = enemy->animList[10]; @@ -227,12 +227,12 @@ ApiStatus N(ClubbaNappingAI_Main)(Evt* script, s32 isInitialCall) { } else { npc->flags = (npc->flags & ~NPC_FLAG_GRAVITY) | NPC_FLAG_8; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->AI_TEMP_STATE_AFTER_SUSPEND = AI_RETURN_HOME_INIT; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; } - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } if (script->AI_TEMP_STATE >= AI_STATE_ALERT_INIT diff --git a/src/world/common/enemy/ai/ClubbaPatrolAI.inc.c b/src/world/common/enemy/ai/ClubbaPatrolAI.inc.c index e4d91f4b76..54cf06c62a 100644 --- a/src/world/common/enemy/ai/ClubbaPatrolAI.inc.c +++ b/src/world/common/enemy/ai/ClubbaPatrolAI.inc.c @@ -22,7 +22,7 @@ ApiStatus N(ClubbaPatrolAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 65.0f; territory.detectFlags = 0; - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { script->AI_TEMP_STATE = AI_STATE_PATROL_INIT; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -34,10 +34,10 @@ ApiStatus N(ClubbaPatrolAI_Main)(Evt* script, s32 isInitialCall) { npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_8; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = AI_STATE_PATROL_INIT; - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } enemy->varTable[0] = 0; } diff --git a/src/world/common/enemy/ai/FlyingAI.inc.c b/src/world/common/enemy/ai/FlyingAI.inc.c index 6b8a1394f5..fdd02d234c 100644 --- a/src/world/common/enemy/ai/FlyingAI.inc.c +++ b/src/world/common/enemy/ai/FlyingAI.inc.c @@ -473,11 +473,11 @@ ApiStatus N(FlyingAI_Main)(Evt* script, s32 isInitialCall) { npc->verticalRenderOffset = -2; - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { - if (enemy->aiPaused != 0) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { + if (enemy->aiSuspendTime != 0) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } switch (script->AI_TEMP_STATE) { diff --git a/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c b/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c index 676e2a1965..a369a569f4 100644 --- a/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/FlyingMagikoopaAI.inc.c @@ -307,11 +307,11 @@ ApiStatus N(FlyingMagikoopaAI_Main)(Evt* script, s32 isInitialCall) { npc->verticalRenderOffset = -5; - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { - if (enemy->aiPaused != 0) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { + if (enemy->aiSuspendTime != 0) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } switch (script->AI_TEMP_STATE) { diff --git a/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c b/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c index 7dfd9e47cb..64b1c1d0d4 100644 --- a/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c +++ b/src/world/common/enemy/ai/FlyingNoAttackAI.inc.c @@ -134,11 +134,11 @@ ApiStatus N(FlyingNoAttackAI_Main)(Evt* script, s32 isInitialCall) { } npc->verticalRenderOffset = -2; - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { - if (enemy->aiPaused) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { + if (enemy->aiSuspendTime) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } switch (script->functionTemp[0]) { diff --git a/src/world/common/enemy/ai/GrooveGuyAI.inc.c b/src/world/common/enemy/ai/GrooveGuyAI.inc.c index 026754ccca..943af540d4 100644 --- a/src/world/common/enemy/ai/GrooveGuyAI.inc.c +++ b/src/world/common/enemy/ai/GrooveGuyAI.inc.c @@ -86,7 +86,7 @@ ApiStatus N(GrooveGuyAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 65.0f; territory.detectFlags = 0; - if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -100,13 +100,13 @@ ApiStatus N(GrooveGuyAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_8; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; } else if (enemy->flags & ENEMY_FLAG_40000000) { script->functionTemp[0] = 12; } - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; enemy->flags &= ~ENEMY_FLAG_40000000; hitDepth = 100.0f; diff --git a/src/world/common/enemy/ai/GuardAI.inc.c b/src/world/common/enemy/ai/GuardAI.inc.c index 9e664b9773..793f7e2233 100644 --- a/src/world/common/enemy/ai/GuardAI.inc.c +++ b/src/world/common/enemy/ai/GuardAI.inc.c @@ -202,7 +202,7 @@ ApiStatus N(GuardAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 65.0f; territory.detectFlags = 0; - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { script->AI_TEMP_STATE = AI_STATE_GUARD_IDLE_INIT; npc->duration = 0; enemy->varTable[0] = npc->yaw; @@ -217,10 +217,10 @@ ApiStatus N(GuardAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_8; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = 15; - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } else if (enemy->flags & ENEMY_FLAG_40000000) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; enemy->flags &= ~ENEMY_FLAG_40000000; diff --git a/src/world/common/enemy/ai/HoppingAI.inc.c b/src/world/common/enemy/ai/HoppingAI.inc.c index e6d1f11349..7fd2de194a 100644 --- a/src/world/common/enemy/ai/HoppingAI.inc.c +++ b/src/world/common/enemy/ai/HoppingAI.inc.c @@ -252,11 +252,11 @@ ApiStatus N(HoppingAI_Main)(Evt* script, s32 isInitialCall) { } } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { - if (enemy->aiPaused != 0) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { + if (enemy->aiSuspendTime != 0) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } switch (script->AI_TEMP_STATE) { diff --git a/src/world/common/enemy/ai/KoopaPatrolAI.inc.c b/src/world/common/enemy/ai/KoopaPatrolAI.inc.c index 1ee43a96b8..9ceb760558 100644 --- a/src/world/common/enemy/ai/KoopaPatrolAI.inc.c +++ b/src/world/common/enemy/ai/KoopaPatrolAI.inc.c @@ -28,7 +28,7 @@ ApiStatus N(KoopaPatrolAI_Main)(Evt* script, s32 isInitialCall) { enemy->aiFlags |= ENEMY_AI_FLAG_8; } - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { npc->duration = 0; script->functionTemp[0] = 0; enemy->unk_07 = 0; @@ -46,13 +46,13 @@ ApiStatus N(KoopaPatrolAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_8; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { s32 emoteTemp; script->functionTemp[0] = 99; script->functionTemp[1] = 0; fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 40, &emoteTemp); - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } else if (enemy->flags & ENEMY_FLAG_40000000) { script->functionTemp[0] = 12; enemy->flags &= ~ENEMY_FLAG_40000000; diff --git a/src/world/common/enemy/ai/LakituAI.inc.c b/src/world/common/enemy/ai/LakituAI.inc.c index a30b330761..6e432bce52 100644 --- a/src/world/common/enemy/ai/LakituAI.inc.c +++ b/src/world/common/enemy/ai/LakituAI.inc.c @@ -200,11 +200,11 @@ s32 N(LakituAI_Main)(Evt* script, s32 isInitialCall) { } npc->verticalRenderOffset = -3; - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { - if (enemy->aiPaused != 0) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { + if (enemy->aiSuspendTime != 0) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } switch (script->AI_TEMP_STATE) { diff --git a/src/world/common/enemy/ai/MagikoopaAI.inc.c b/src/world/common/enemy/ai/MagikoopaAI.inc.c index ab25c0bd33..42e120964f 100644 --- a/src/world/common/enemy/ai/MagikoopaAI.inc.c +++ b/src/world/common/enemy/ai/MagikoopaAI.inc.c @@ -248,14 +248,14 @@ ApiStatus N(MagikoopaAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 100.0f; territory.detectFlags = 0; - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { npc->currentAnim = enemy->animList[0]; npc->flags &= ~NPC_FLAG_JUMPING; npc->flags |= NPC_FLAG_200000; enemy->flags |= ENEMY_FLAG_200000; npc->duration = 0; - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; npc->alpha = 0xFF; npc->duration = 20; npc->scale.x = 1.0f; diff --git a/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c b/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c index e141aed381..3a15fd2ab9 100644 --- a/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c +++ b/src/world/common/enemy/ai/MagikoopaSpellAI.inc.c @@ -48,7 +48,7 @@ ApiStatus N(MagikoopaAI_SpellMain)(Evt* script, s32 isInitialCall) { f32 t1; f32 t2; - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { script->functionTemp[0] = 0; npc1->duration = 0; npc1->flags |= NPC_FLAG_200000 | NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_2; @@ -56,8 +56,8 @@ ApiStatus N(MagikoopaAI_SpellMain)(Evt* script, s32 isInitialCall) { ENEMY_FLAG_200000 | ENEMY_FLAG_40; npc1->scale.x = 0.4f; npc1->scale.y = 0.4f; - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } } diff --git a/src/world/common/enemy/ai/MeleeHitbox.inc.c b/src/world/common/enemy/ai/MeleeHitbox.inc.c index 29334b9121..3d7e12c84b 100644 --- a/src/world/common/enemy/ai/MeleeHitbox.inc.c +++ b/src/world/common/enemy/ai/MeleeHitbox.inc.c @@ -120,7 +120,7 @@ ApiStatus N(MeleeHitbox_Main)(Evt* script, s32 isInitialCall) { hitboxEnemy->unk_118 = 0.0001f; #endif - if (isInitialCall || (hitboxEnemy->aiFlags & ENEMY_AI_FLAG_4)) { + if (isInitialCall || (hitboxEnemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { script->functionTemp[0] = 0; hitboxNpc->duration = 0; hitboxNpc->flags |= (NPC_FLAG_2 | NPC_FLAG_100); @@ -128,8 +128,8 @@ ApiStatus N(MeleeHitbox_Main)(Evt* script, s32 isInitialCall) { hitboxNpc->pos.x = NPC_DISPOSE_POS_X; hitboxNpc->pos.y = NPC_DISPOSE_POS_Y; hitboxNpc->pos.z = NPC_DISPOSE_POS_Z; - if (hitboxEnemy->aiFlags & ENEMY_AI_FLAG_4) { - hitboxEnemy->aiFlags &= ~ENEMY_AI_FLAG_4; + if (hitboxEnemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { + hitboxEnemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } } diff --git a/src/world/common/enemy/ai/MontyMoleAI.inc.c b/src/world/common/enemy/ai/MontyMoleAI.inc.c index 81d365d4f9..cffbd3d293 100644 --- a/src/world/common/enemy/ai/MontyMoleAI.inc.c +++ b/src/world/common/enemy/ai/MontyMoleAI.inc.c @@ -249,9 +249,9 @@ ApiStatus N(MontyMoleAI_Main)(Evt* script, s32 isInitialCall) { enemy->aiFlags |= (ENEMY_AI_FLAG_8 | ENEMY_AI_FLAG_10); } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { - if (enemy->aiPaused == 0) { - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { + if (enemy->aiSuspendTime == 0) { + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } else { return ApiStatus_BLOCK; } diff --git a/src/world/common/enemy/ai/ParatroopaAI.inc.c b/src/world/common/enemy/ai/ParatroopaAI.inc.c index 495bdfc203..ec2ba569dc 100644 --- a/src/world/common/enemy/ai/ParatroopaAI.inc.c +++ b/src/world/common/enemy/ai/ParatroopaAI.inc.c @@ -121,11 +121,11 @@ ApiStatus N(ParatroopaAI_Main)(Evt* script, s32 isInitialCall) { npc->verticalRenderOffset = -3; - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { - if (enemy->aiPaused != 0) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { + if (enemy->aiSuspendTime != 0) { return ApiStatus_BLOCK; } - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } switch (script->AI_TEMP_STATE) { diff --git a/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c b/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c index 71a4dffb46..0f6ddcadfa 100644 --- a/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c +++ b/src/world/common/enemy/ai/PatrolNoAttackAI.inc.c @@ -41,7 +41,7 @@ ApiStatus N(PatrolNoAttackAI_Main)(Evt* script, s32 isInitialCall) { enemy->unk_118 = 0.0001f; #endif - if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->AI_TEMP_STATE = AI_STATE_PATROL_INIT; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -55,10 +55,10 @@ ApiStatus N(PatrolNoAttackAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_8; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = 0; - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } else if (enemy->flags & ENEMY_FLAG_40000000) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; enemy->flags &= ~ENEMY_FLAG_40000000; diff --git a/src/world/common/enemy/ai/PiranhaPlantAI.inc.c b/src/world/common/enemy/ai/PiranhaPlantAI.inc.c index abd06643d3..ea9cf967d9 100644 --- a/src/world/common/enemy/ai/PiranhaPlantAI.inc.c +++ b/src/world/common/enemy/ai/PiranhaPlantAI.inc.c @@ -1,12 +1,374 @@ +// visual enemy +#include "common.h" +#include "npc.h" +#include "effects.h" + // hitbox enemy #include "world/common/enemy/ai/WanderMeleeAI.inc.c" -// visual enemy -#include "world/common/enemy/wip/PiranhaPlantAI_00.inc.c" -#include "world/common/enemy/wip/PiranhaPlantAI_01.inc.c" -#include "world/common/enemy/wip/PiranhaPlantAI_10.inc.c" -#include "world/common/enemy/wip/PiranhaPlantAI_11.inc.c" -#include "world/common/enemy/wip/PiranhaPlantAI_12.inc.c" -#include "world/common/enemy/wip/PiranhaPlantAI_13.inc.c" -#include "world/common/enemy/wip/PiranhaPlantAI_14.inc.c" -#include "world/common/enemy/wip/PiranhaPlantAI_Main.inc.c" +void N(PiranhaPlantAI_00)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + if (npc->duration > 0) { + npc->duration--; + } else { + enemy->varTable[0] = 0; + npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; + script->functionTemp[1] = 0; + script->functionTemp[0] = 1; + } +} + +void N(PiranhaPlantAI_01)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 temp; + + if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0)) { + ai_enemy_play_sound(npc, SOUND_BURROW_DIG, 0); + fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &temp); + ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); + npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_MELEE_PRE]; + npc->duration = enemy->varTable[8]; + script->functionTemp[0] = 10; + } +} + +void N(PiranhaPlantAI_10)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 phi_s7 = FALSE; + s32 phi_fp = FALSE; + f32 sp38; + f32 yaw; + f32 yaw2; + f32 moveSpeed; + f32 posRadius; + s32 cond1; + s32 cond2; + f32 terSize; + f32 sp20; + f32 sp24; + f32 sp28; + f32 sp2C; + f32 sp30; + f32 sp34; + + npc->duration--; + if (enemy->varTable[9] >= npc->duration) { + enemy->flags |= (ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | + ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000); + } + + if (npc->duration == 0) { + if (clamp_angle(gPlayerStatusPtr->spriteFacingAngle) < 180.0f) { + yaw2 = clamp_angle(gCameras[gCurrentCameraID].currentYaw - 90.0f); + } else { + yaw2 = clamp_angle(gCameras[gCurrentCameraID].currentYaw + 90.0f); + } + + yaw = clamp_angle(yaw2 + 180.0f); + if (enemy->varTable[7] == 0) { + moveSpeed = 32.0f; + + if (gPlayerStatusPtr->actionState != 0) { + moveSpeed = 100.0f; + if (gPlayerStatusPtr->actionState == 1) { + moveSpeed = 90.0f; + } + } + } else { + moveSpeed = 38.0f; + + if (gPlayerStatusPtr->actionState != 0) { + moveSpeed = 90.0f; + if (gPlayerStatusPtr->actionState == 1) { + moveSpeed = 75.0f; + } + } + } + + npc->pos.x = gPlayerStatusPtr->position.x; + npc->pos.z = gPlayerStatusPtr->position.z; + add_vec2D_polar(&npc->pos.x, &npc->pos.z, npc->collisionRadius, yaw); + npc_move_heading(npc, moveSpeed + npc->collisionRadius, yaw2); + + if (enemy->varTable[7] == 0) { + if (npc->pos.x > 380.0) { + npc->pos.x = 380.0f; + } + if (npc->pos.x < -380.0) { + npc->pos.x = -380.0f; + } + if (npc->pos.z > 380.0) { + npc->pos.z = 380.0f; + } + if (npc->pos.z < -380.0) { + npc->pos.z = -380.0f; + } + + sp38 = sqrtf(SQ(npc->pos.x) + SQ(npc->pos.z)); + yaw2 = atan2(0.0f, 0.0f, npc->pos.x, npc->pos.z); + + if (sp38 < 305.0) { + npc->pos.x = 0.0f; + npc->pos.z = 0.0f; + add_vec2D_polar(&npc->pos.x, &npc->pos.z, 305.0f, yaw2); + } else if (sp38 > 375.0) { + npc->pos.x = 0.0f; + npc->pos.z = 0.0f; + add_vec2D_polar(&npc->pos.x, &npc->pos.z, 375.0f, yaw2); + } + } else { + if (!(npc->flags & NPC_FLAG_IGNORE_WORLD_COLLISION)) { + sp20 = gPlayerStatusPtr->position.x; + sp24 = gPlayerStatusPtr->position.y + 18.0; + sp28 = gPlayerStatusPtr->position.z; + if (npc_test_move_simple_with_slipping(npc->collisionChannel, &sp20, &sp24, &sp28, moveSpeed, yaw2, npc->collisionHeight, npc->collisionRadius) != 0) { + sp20 = gPlayerStatusPtr->position.x; + sp24 = gPlayerStatusPtr->position.y + 45.0; + sp28 = gPlayerStatusPtr->position.z; + cond1 = npc_test_move_simple_with_slipping(npc->collisionChannel, &sp20, &sp24, &sp28, moveSpeed, yaw2, npc->collisionHeight, npc->collisionRadius); + sp2C = npc->pos.x; + sp30 = npc->pos.y + 100.0; + sp34 = npc->pos.z; + sp38 = 200.0f; + cond2 = npc_raycast_down_sides(npc->collisionChannel, &sp2C, &sp30, &sp34, &sp38); + if (!cond1 && cond2 && sp38 > 80.0 && sp38 < 120.0 && npc->pos.y != sp30) { + phi_fp = TRUE; + } else { + sp20 = gPlayerStatusPtr->position.x; + sp24 = gPlayerStatusPtr->position.y + 10.0; + sp28 = gPlayerStatusPtr->position.z; + npc_test_move_simple_with_slipping(npc->collisionChannel, &sp20, &sp24, &sp28, moveSpeed, yaw2, npc->collisionHeight, npc->collisionRadius); + posRadius = dist2D(gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z, sp20, sp28); + npc->pos.x = gPlayerStatusPtr->position.x; + npc->pos.z = gPlayerStatusPtr->position.z; + add_vec2D_polar(&npc->pos.x, &npc->pos.z, npc->collisionRadius, yaw); + npc_move_heading(npc, posRadius + npc->collisionRadius, yaw2); + phi_s7 = TRUE; + } + } + } else { + sp20 = gPlayerStatusPtr->position.x; + sp24 = gPlayerStatusPtr->position.y + 18.0; + sp28 = gPlayerStatusPtr->position.z; + if (npc_test_move_simple_with_slipping(npc->collisionChannel, &sp20, &sp24, &sp28, moveSpeed, yaw2, npc->collisionHeight, npc->collisionRadius) != 0) { + posRadius = dist2D(gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z, sp20, sp28); + npc->pos.x = gPlayerStatusPtr->position.x; + npc->pos.z = gPlayerStatusPtr->position.z; + add_vec2D_polar(&npc->pos.x, &npc->pos.z, npc->collisionRadius, yaw); + npc_move_heading(npc, posRadius + npc->collisionRadius, yaw2); + } + } + } + + if (is_point_within_region(territory->shape, territory->pointX, territory->pointZ, npc->pos.x, npc->pos.z, territory->sizeX, territory->sizeZ)) { + switch (territory->shape) { + case SHAPE_CYLINDER: + sp38 = dist2D(npc->pos.x, npc->pos.z, territory->pointX, territory->pointZ); + + if (territory->sizeX < sp38) { + terSize = atan2(territory->pointX, territory->pointZ, npc->pos.x, npc->pos.z); + npc->pos.x = territory->pointX; + npc->pos.z = territory->pointZ; + add_vec2D_polar(&npc->pos.x, &npc->pos.z, territory->sizeX, terSize); + } + break; + case SHAPE_RECT: + terSize = territory->pointX + territory->sizeX; + if (npc->pos.x > terSize) { + npc->pos.x = terSize; + } + + terSize = territory->pointX - territory->sizeX; + if (npc->pos.x < terSize) { + npc->pos.x = terSize; + } + + terSize = territory->pointZ + territory->sizeZ; + if (npc->pos.z > terSize) { + npc->pos.z = terSize; + } + + terSize = territory->pointZ - territory->sizeZ; + if (npc->pos.z < terSize) { + npc->pos.z = terSize; + } + break; + } + } + + if (!phi_s7 && (!(npc->flags & NPC_FLAG_8) || phi_fp)) { + sp20 = npc->pos.x; + sp38 = 400.0f; + sp28 = npc->pos.z; + sp24 = npc->pos.y + 150.0; + + if (npc_raycast_down_sides(npc->collisionChannel, &sp20, &sp24, &sp28, &sp38) != 0) { + npc->pos.y = sp24; + } + } + + npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); + ai_enemy_play_sound(npc, SOUND_BURROW_SURFACE, 0); + npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_MELEE_HIT]; + npc->duration = enemy->varTable[10]; + script->functionTemp[0] = 11; + } +} + +void N(PiranhaPlantAI_11)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (enemy->varTable[11] >= npc->duration) { + enemy->flags &= ~(ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000); + } + if (npc->duration == 0) { + npc->currentAnim = enemy->animList[10]; + npc->duration = 0; + script->functionTemp[0] = 12; + } +} + +void N(PiranhaPlantAI_12)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 temp; + + npc->duration++; + if (npc->duration == enemy->varTable[13]) { + npc->currentAnim = enemy->animList[11]; + } + if (npc->duration == enemy->varTable[14]) { + enemy->varTable[0] = 3; + } + if (npc->duration >= enemy->varTable[12]) { + enemy->varTable[0] = 4; + npc->duration = 8; + npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; + fx_emote(EMOTE_FRUSTRATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &temp); + script->functionTemp[0] = 13; + } +} + +void N(PiranhaPlantAI_13)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + + npc->duration--; + if (npc->duration == 0) { + npc->duration = enemy->varTable[15]; + script->functionTemp[0] = 14; + } +} + +void N(PiranhaPlantAI_LosePlayer)(Evt *script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { + Enemy* enemy = script->owner1.enemy; + Npc* npc = get_npc_unsafe(enemy->npcID); + s32 retVal; + + npc->duration--; + if (npc->duration == 0) { + if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0) == 0) { + fx_emote(EMOTE_QUESTION, npc, 0, npc->collisionHeight, 1, 2, -20, 15, &retVal); + } + npc->duration = 0; + script->functionTemp[0] = 0; + } +} + +#include "common.h" +#include "npc.h" + +#ifdef _DEAD_H_ +void func_8004D8E0(DeadEnemy*); +#endif + +s32 N(PiranhaPlantAI_Main)(Evt* script, s32 isInitialCall) { + #ifdef _DEAD_H_ + DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; + #else + Enemy* enemy = script->owner1.enemy; + #endif + Npc* npc = get_npc_unsafe(enemy->npcID); + Bytecode* args = script->ptrReadPos; + EnemyDetectVolume territory; + #ifdef _DEAD_H_ + MobileAISettings* npcAISettings = (MobileAISettings*)evt_get_variable(script, *args++); + EnemyDetectVolume* territoryPtr = &territory; + #else + EnemyDetectVolume* territoryPtr = &territory; + MobileAISettings* npcAISettings = (MobileAISettings*)evt_get_variable(script, *args++); + #endif + + territory.skipPlayerDetectChance = 0; + territory.shape = enemy->territory->wander.detectShape; + territory.pointX = enemy->territory->wander.detectPos.x; + territory.pointZ = enemy->territory->wander.detectPos.z; + territory.sizeX = enemy->territory->wander.detectSize.x; + territory.sizeZ = enemy->territory->wander.detectSize.z; + territory.halfHeight = 200.0f; + territory.detectFlags = 0; + + #ifdef _DEAD_H_ + // this function doesn't seem to have a known counterpart, perhaps related to the difference in the Enemy struct + func_8004D8E0(enemy); + if (enemy->flags & ENEMY_FLAG_100000) { + enemy->unk_114 = 10.0f; + enemy->unk_118 = 0.7f; + } + #endif + + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { + script->AI_TEMP_STATE = AI_STATE_PIRANHA_PLANT_00; + npc->duration = 0; + npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; + + enemy->AI_VAR_ATTACK_STATE = MELEE_HITBOX_STATE_NONE; + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { + script->AI_TEMP_STATE = AI_STATE_SUSPEND; + script->functionTemp[1] = AI_STATE_PIRANHA_PLANT_00; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; + } + } + + switch (script->AI_TEMP_STATE) { + case AI_STATE_PIRANHA_PLANT_00: + N(PiranhaPlantAI_00)(script, npcAISettings, territoryPtr); + case AI_STATE_PIRANHA_PLANT_01: + N(PiranhaPlantAI_01)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_PIRANHA_PLANT_10: + N(PiranhaPlantAI_10)(script, npcAISettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_PIRANHA_PLANT_11) { + break; + } + case AI_STATE_PIRANHA_PLANT_11: + N(PiranhaPlantAI_11)(script, npcAISettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_PIRANHA_PLANT_12) { + break; + } + case AI_STATE_PIRANHA_PLANT_12: + N(PiranhaPlantAI_12)(script, npcAISettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_PIRANHA_PLANT_13) { + break; + } + case AI_STATE_PIRANHA_PLANT_13: + N(PiranhaPlantAI_13)(script, npcAISettings, territoryPtr); + if (script->AI_TEMP_STATE != AI_STATE_LOSE_PLAYER) { + break; + } + case AI_STATE_LOSE_PLAYER: + N(PiranhaPlantAI_LosePlayer)(script, npcAISettings, territoryPtr); + break; + case AI_STATE_SUSPEND: + basic_ai_suspend(script); + break; + } + return ApiStatus_BLOCK; +} + diff --git a/src/world/common/enemy/ai/ProjectileHitbox.inc.c b/src/world/common/enemy/ai/ProjectileHitbox.inc.c index 913310bc09..cd7636de29 100644 --- a/src/world/common/enemy/ai/ProjectileHitbox.inc.c +++ b/src/world/common/enemy/ai/ProjectileHitbox.inc.c @@ -149,7 +149,7 @@ ApiStatus N(ProjectileAI_Main)(Evt* script, s32 isInitialCall) { npc->verticalRenderOffset = npc->collisionHeight / 2; } - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { script->functionTemp[0] = 0; npc->duration = 0; npc->flags |= NPC_FLAG_40000 | NPC_FLAG_100 | NPC_FLAG_2; @@ -159,8 +159,8 @@ ApiStatus N(ProjectileAI_Main)(Evt* script, s32 isInitialCall) { enemy->flags |= ENEMY_FLAG_10000000 | ENEMY_FLAG_8000000 | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_200000 | ENEMY_FLAG_100000 | ENEMY_FLAG_40; - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } } diff --git a/src/world/common/enemy/ai/RangedAttackAI.inc.c b/src/world/common/enemy/ai/RangedAttackAI.inc.c index 48ad48eeba..a8bf7bc8a2 100644 --- a/src/world/common/enemy/ai/RangedAttackAI.inc.c +++ b/src/world/common/enemy/ai/RangedAttackAI.inc.c @@ -29,7 +29,7 @@ ApiStatus N(RangedAttackAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 40.0f; territory.detectFlags = 0; - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { script->AI_TEMP_STATE = 0; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -43,14 +43,14 @@ ApiStatus N(RangedAttackAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_8; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = 0; - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } else if (enemy->flags & ENEMY_FLAG_40000000) { script->AI_TEMP_STATE = AI_STATE_CHASE_INIT; } - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; enemy->flags &= ~ENEMY_FLAG_40000000; } diff --git a/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c b/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c index 848eb62ae2..be1c489379 100644 --- a/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c +++ b/src/world/common/enemy/ai/ShyGuyPatrolAI.inc.c @@ -80,7 +80,7 @@ ApiStatus N(ShyGuyPatrolAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 65.0f; territory.detectFlags = 0; - if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -94,10 +94,10 @@ ApiStatus N(ShyGuyPatrolAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_8; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } else if (enemy->flags & ENEMY_FLAG_40000000) { script->functionTemp[0] = 12; enemy->flags &= ~ENEMY_FLAG_40000000; diff --git a/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c b/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c index 26593d74e7..879c2452f8 100644 --- a/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c +++ b/src/world/common/enemy/ai/ShyGuyWanderAI.inc.c @@ -78,7 +78,7 @@ ApiStatus N(ShyGuyWanderAI_Main)(Evt* script, s32 isInitialCall) { territory.halfHeight = 65.0f; territory.detectFlags = 0; - if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->functionTemp[0] = 0; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -92,13 +92,13 @@ ApiStatus N(ShyGuyWanderAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_8; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->functionTemp[0] = 99; script->functionTemp[1] = 0; } else if (enemy->flags & ENEMY_FLAG_40000000) { script->functionTemp[0] = 12; } - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; enemy->flags &= ~ENEMY_FLAG_40000000; hitDepth = 100.0f; diff --git a/src/world/common/enemy/ai/SpearGuyAI.inc.c b/src/world/common/enemy/ai/SpearGuyAI.inc.c index 4bce96e1b1..d6225242cd 100644 --- a/src/world/common/enemy/ai/SpearGuyAI.inc.c +++ b/src/world/common/enemy/ai/SpearGuyAI.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" #include "effects.h" -#include "sprite/npc/JungleGuy.h" +#include "sprite/npc/SpearGuy.h" void N(SpearGuyAI_LoiterInit)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { Enemy* enemy = script->owner1.enemy; @@ -31,7 +31,7 @@ void N(SpearGuyAI_Loiter)(Evt *script, MobileAISettings* aiSettings, EnemyDetect case 1: enemy->varTable[0] = 2; enemy->varTable[1] = 0; - npc->currentAnim = ANIM_JungleGuy_Anim0F; + npc->currentAnim = ANIM_SpearGuy_Anim0F; case 2: enemy->varTable[1]++; if (enemy->varTable[1] > 50) { @@ -41,7 +41,7 @@ void N(SpearGuyAI_Loiter)(Evt *script, MobileAISettings* aiSettings, EnemyDetect case 3: enemy->varTable[0] = 4; enemy->varTable[1] = 0; - npc->currentAnim = ANIM_JungleGuy_Anim10; + npc->currentAnim = ANIM_SpearGuy_Anim10; case 4: enemy->varTable[1]++; if (enemy->varTable[1] == 25) { @@ -54,7 +54,7 @@ void N(SpearGuyAI_Loiter)(Evt *script, MobileAISettings* aiSettings, EnemyDetect case 5: enemy->varTable[0] = 6; enemy->varTable[1] = 0; - npc->currentAnim = ANIM_JungleGuy_Anim03; + npc->currentAnim = ANIM_SpearGuy_Anim03; fx_sweat(0, npc->pos.x, npc->pos.y, npc->pos.z, npc->collisionHeight, 0, 10); case 6: enemy->varTable[1]++; @@ -97,7 +97,7 @@ ApiStatus N(SpearGuyAI_Main)(Evt *script, s32 isInitialCall) { territory.halfHeight = 65.0f; territory.detectFlags = 0; - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -111,10 +111,10 @@ ApiStatus N(SpearGuyAI_Main)(Evt *script, s32 isInitialCall) { npc->flags |= NPC_FLAG_8; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->AI_TEMP_STATE_AFTER_SUSPEND = AI_STATE_WANDER_INIT; - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } enemy->varTable[0] = 0; } diff --git a/src/world/common/enemy/ai/SpinyAI.inc.c b/src/world/common/enemy/ai/SpinyAI.inc.c index 1263e12d33..c3ddbe8c47 100644 --- a/src/world/common/enemy/ai/SpinyAI.inc.c +++ b/src/world/common/enemy/ai/SpinyAI.inc.c @@ -60,10 +60,10 @@ ApiStatus N(SpinyAI_Main)(Evt* script, s32 isInitialCall) { npc->pos.z = 0.0f; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { npc->duration = 0; npc->collisionHeight = enemy->varTable[6]; - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; if (npc->flags & NPC_FLAG_JUMPING) { npc->currentAnim = ANIM_Spiny_Anim18; npc->moveSpeed = 0.0f; diff --git a/src/world/common/enemy/ai/SwooperAI.inc.c b/src/world/common/enemy/ai/SwooperAI.inc.c index 4bd24967a4..6aeb1345d6 100644 --- a/src/world/common/enemy/ai/SwooperAI.inc.c +++ b/src/world/common/enemy/ai/SwooperAI.inc.c @@ -33,9 +33,9 @@ API_CALLABLE(N(SwooperAI_Main)) { enemy->varTable[1] = y; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { - if (enemy->aiPaused == 0) { - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { + if (enemy->aiSuspendTime == 0) { + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } else { return ApiStatus_BLOCK; } diff --git a/src/world/common/enemy/ai/TackleAI.inc.c b/src/world/common/enemy/ai/TackleAI.inc.c index 531f0f8970..8723df9e0d 100644 --- a/src/world/common/enemy/ai/TackleAI.inc.c +++ b/src/world/common/enemy/ai/TackleAI.inc.c @@ -47,7 +47,7 @@ ApiStatus N(TackleAI_Main)(Evt* script, s32 isInitialCall) { enemy->aiFlags |= ENEMY_AI_FLAG_8; } - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { script->AI_TEMP_STATE = 0; npc->duration = 0; enemy->unk_07 = 0; @@ -64,13 +64,13 @@ ApiStatus N(TackleAI_Main)(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_8; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { s32 emoteTemp; script->AI_TEMP_STATE = 99; script->functionTemp[1] = 0; fx_emote(EMOTE_QUESTION, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 40, &emoteTemp); - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } else if (enemy->flags & ENEMY_FLAG_40000000) { script->AI_TEMP_STATE = 12; enemy->flags &= ~ENEMY_FLAG_40000000; diff --git a/src/world/common/enemy/ai/WanderMeleeAI.inc.c b/src/world/common/enemy/ai/WanderMeleeAI.inc.c index 45ec6257c9..85bb32a4ef 100644 --- a/src/world/common/enemy/ai/WanderMeleeAI.inc.c +++ b/src/world/common/enemy/ai/WanderMeleeAI.inc.c @@ -42,7 +42,7 @@ ApiStatus N(WanderMeleeAI_Main)(Evt *script, s32 isInitialCall) { enemy->unk_118 = 0.0001f; #endif - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { + if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND)) { script->AI_TEMP_STATE = AI_STATE_WANDER_INIT; npc->duration = 0; npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; @@ -56,10 +56,10 @@ ApiStatus N(WanderMeleeAI_Main)(Evt *script, s32 isInitialCall) { npc->flags |= NPC_FLAG_8; } - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { + if (enemy->aiFlags & ENEMY_AI_FLAG_SUSPEND) { script->AI_TEMP_STATE = AI_STATE_SUSPEND; script->functionTemp[1] = AI_STATE_WANDER_INIT; - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; + enemy->aiFlags &= ~ENEMY_AI_FLAG_SUSPEND; } enemy->AI_VAR_ATTACK_STATE = MELEE_HITBOX_STATE_NONE; } diff --git a/src/world/common/enemy/complete/HeartPlant.h b/src/world/common/enemy/complete/HeartPlant.h new file mode 100644 index 0000000000..f7a67a0d6f --- /dev/null +++ b/src/world/common/enemy/complete/HeartPlant.h @@ -0,0 +1,22 @@ +#include "common.h" +#include "sprite/npc/HeartPlant.h" + +#define HEART_PLANT_ANIMS \ +{ \ + .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, \ +} diff --git a/src/world/common/enemy/complete/HeartPlant.inc.c b/src/world/common/enemy/complete/HeartPlant.inc.c new file mode 100644 index 0000000000..ddc5885909 --- /dev/null +++ b/src/world/common/enemy/complete/HeartPlant.inc.c @@ -0,0 +1,56 @@ +#include "HeartPlant.h" + +#include "world/common/todo/HeartPlant_SpawnHeart.inc.c" + +extern EvtScript N(EVS_NpcInteract_HeartPlant); + +EvtScript N(EVS_NpcAuxAI_HeartPlant) = { + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetSelfVar, 1, 0) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_HeartPlant_RebindInteractAfterDelay) = { + EVT_WAIT(45) + EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_HeartPlant))) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_HeartPlant) = { + 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, NULL) + EVT_EXEC(N(EVS_HeartPlant_RebindInteractAfterDelay)) + 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) = { + .height = 20, + .radius = 28, + .level = 99, + .otherAI = &N(EVS_NpcAuxAI_HeartPlant), + .onInteract = &N(EVS_NpcInteract_HeartPlant), +}; + +#define HEART_PLANT_NPC_DATA \ + .settings = &N(NpcSettings_HeartPlant), \ + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_4 | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, \ + .drops = NPC_NO_DROPS, \ + .animations = HEART_PLANT_ANIMS, \ + .tattle = MSG_NpcTattle_HeartPlant, \ diff --git a/src/world/common/enemy/complete/HurtPlant.h b/src/world/common/enemy/complete/HurtPlant.h new file mode 100644 index 0000000000..eb18c32ce6 --- /dev/null +++ b/src/world/common/enemy/complete/HurtPlant.h @@ -0,0 +1,36 @@ +#include "common.h" +#include "sprite/npc/HurtPlant.h" + +#define HURT_PLANT_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAG_80, \ + .itemDropChance = 10, \ + .itemDrops = { \ + { ITEM_TASTY_TONIC, 5, 0 }, \ + { ITEM_SUPER_SODA, 5, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(3), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 0, \ + .maxCoinBonus = 2, \ +} + +#define HURT_PLANT_ANIMS \ +{ \ + .idle = ANIM_HurtPlant_Anim01, \ + .walk = ANIM_HurtPlant_Anim01, \ + .run = ANIM_HurtPlant_Anim01, \ + .chase = ANIM_HurtPlant_Anim01, \ + .anim_4 = ANIM_HurtPlant_Anim01, \ + .anim_5 = ANIM_HurtPlant_Anim01, \ + .death = ANIM_HurtPlant_Anim0E, \ + .hit = ANIM_HurtPlant_Anim0E, \ + .anim_8 = ANIM_HurtPlant_Anim01, \ + .anim_9 = ANIM_HurtPlant_Anim01, \ + .anim_A = ANIM_HurtPlant_Anim01, \ + .anim_B = ANIM_HurtPlant_Anim01, \ + .anim_C = ANIM_HurtPlant_Anim01, \ + .anim_D = ANIM_HurtPlant_Anim01, \ + .anim_E = ANIM_HurtPlant_Anim01, \ + .anim_F = ANIM_HurtPlant_Anim01, \ +} diff --git a/src/world/common/enemy/complete/HurtPlant.inc.c b/src/world/common/enemy/complete/HurtPlant.inc.c new file mode 100644 index 0000000000..3d4ea93a7e --- /dev/null +++ b/src/world/common/enemy/complete/HurtPlant.inc.c @@ -0,0 +1,75 @@ +#include "HurtPlant.h" + +EvtScript N(EVS_NpcAI_HurtPlant) = { + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HurtPlant_Anim01) + EVT_CALL(SetSelfVar, 0, 0) + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(NpcFacePlayer, NPC_SELF, 0) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HurtPlant_Anim08) + EVT_WAIT(15) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_209A, 0) + EVT_WAIT(10) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_WAIT(5) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HurtPlant_Anim02) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(StartBattle) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcInteract_HurtPlant) = { + EVT_CALL(SetSelfVar, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_HurtPlant) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_HurtPlant))) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_HurtPlant) = { + .height = 20, + .radius = 28, + .level = 16, + .onInteract = &N(EVS_NpcInteract_HurtPlant), + .ai = &N(EVS_NpcAI_HurtPlant), + .onDefeat = &N(EVS_NpcDefeat_HurtPlant), +}; + +s32 N(ExtraAnims_HurtPlant)[] = { + ANIM_HurtPlant_Anim00, + ANIM_HurtPlant_Anim01, + ANIM_HurtPlant_Anim02, + ANIM_HurtPlant_Anim08, + -1 +}; + +#define HURT_PLANT_NPC_DATA \ + .settings = &N(NpcSettings_HurtPlant), \ + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, \ + .drops = HURT_PLANT_DROPS, \ + .animations = HURT_PLANT_ANIMS, \ + .extraAnimations = N(ExtraAnims_HurtPlant), \ + .tattle = MSG_NpcTattle_HeartPlant, \ diff --git a/src/world/common/enemy/complete/JungleFuzzy.inc.c b/src/world/common/enemy/complete/JungleFuzzy.inc.c new file mode 100644 index 0000000000..65611f4757 --- /dev/null +++ b/src/world/common/enemy/complete/JungleFuzzy.inc.c @@ -0,0 +1,9 @@ +#include "Fuzzy.h" + +NpcSettings N(NpcSettings_JungleFuzzy) = { + .height = 20, + .radius = 22, + .level = 6, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; diff --git a/src/world/common/enemy/complete/MBush.h b/src/world/common/enemy/complete/MBush.h new file mode 100644 index 0000000000..18c83a6725 --- /dev/null +++ b/src/world/common/enemy/complete/MBush.h @@ -0,0 +1,36 @@ +#include "common.h" +#include "sprite/npc/MBush.h" + +#define MBUSH_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAG_80, \ + .itemDropChance = 10, \ + .itemDrops = { \ + { ITEM_TASTY_TONIC, 5, 0 }, \ + { ITEM_SUPER_SODA, 5, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(3), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 0, \ + .maxCoinBonus = 2, \ +} + +#define MBUSH_ANIMS \ +{ \ + .idle = ANIM_MBush_Anim02, \ + .walk = ANIM_MBush_Anim02, \ + .run = ANIM_MBush_Anim02, \ + .chase = ANIM_MBush_Anim02, \ + .anim_4 = ANIM_MBush_Anim02, \ + .anim_5 = ANIM_MBush_Anim02, \ + .death = ANIM_MBush_Anim07, \ + .hit = ANIM_MBush_Anim07, \ + .anim_8 = ANIM_MBush_Anim02, \ + .anim_9 = ANIM_MBush_Anim02, \ + .anim_A = ANIM_MBush_Anim02, \ + .anim_B = ANIM_MBush_Anim02, \ + .anim_C = ANIM_MBush_Anim02, \ + .anim_D = ANIM_MBush_Anim02, \ + .anim_E = ANIM_MBush_Anim02, \ + .anim_F = ANIM_MBush_Anim02, \ +} diff --git a/src/world/common/enemy/complete/MBush.inc.c b/src/world/common/enemy/complete/MBush.inc.c new file mode 100644 index 0000000000..c2cd2638a4 --- /dev/null +++ b/src/world/common/enemy/complete/MBush.inc.c @@ -0,0 +1,102 @@ +#include "MBush.h" + +EvtScript N(EVS_NpcAI_MBush) = { + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MBush_Anim00) + EVT_CALL(SetSelfVar, 0, 0) + EVT_LABEL(0) + EVT_CALL(GetSelfVar, 0, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_WAIT(1) + EVT_GOTO(0) + EVT_END_IF + EVT_SET_GROUP(EVT_GROUP_00) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_SEARCH_BUSH, 0) + EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_CALL(SetSelfVar, 10, LVar0) + EVT_CALL(SetSelfVar, 11, LVar1) + EVT_CALL(SetSelfVar, 12, LVar2) + EVT_ADD(LVar0, 2) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_SUB(LVar0, 3) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar0, 2) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_SUB(LVar0, 3) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_ADD(LVar0, 2) + EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_THREAD + EVT_WAIT(10) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MBush_Anim03) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(6) + EVT_CALL(InterpPlayerYaw, 90, 0) + EVT_END_THREAD + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, TRUE) + EVT_CALL(EnableNpcShadow, NPC_SELF, TRUE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_ADD(LVar0, 25) + EVT_SUB(LVar2, 5) + EVT_CALL(NpcJump1, NPC_SELF, LVar0, LVar1, LVar2, 15) + EVT_WAIT(4) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MBush_Anim07) + EVT_WAIT(2) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(StartBattle) +}; // fallthrough :( + +EvtScript N(EVS_NpcInteract_MBush) = { + EVT_CALL(SetSelfVar, 0, 1) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_NpcDefeat_MBush) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(DoNpcDefeat) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MBush_Anim05) + EVT_CALL(GetSelfVar, 10, LVar0) + EVT_CALL(GetSelfVar, 11, LVar1) + EVT_CALL(GetSelfVar, 12, LVar2) + EVT_CALL(NpcJump1, NPC_SELF, LVar0, LVar1, LVar2, 8) + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MBush_Anim00) + EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_100, FALSE) + EVT_CALL(BindNpcAI, NPC_SELF, EVT_PTR(N(EVS_NpcAI_MBush))) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_MBush) = { + .height = 30, + .radius = 30, + .level = 16, + .onInteract = &N(EVS_NpcInteract_MBush), + .ai = &N(EVS_NpcAI_MBush), + .onDefeat = &N(EVS_NpcDefeat_MBush), +}; + +#define MBUSH_NPC_DATA \ + .settings = &N(NpcSettings_MBush), \ + .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_8000 | ENEMY_FLAG_400000, \ + .drops = MBUSH_DROPS, \ + .animations = MBUSH_ANIMS, \ + .tattle = MSG_NpcTattle_MBush, \ diff --git a/src/world/common/enemy/complete/SpearGuy.h b/src/world/common/enemy/complete/SpearGuy.h new file mode 100644 index 0000000000..af90f731fb --- /dev/null +++ b/src/world/common/enemy/complete/SpearGuy.h @@ -0,0 +1,48 @@ +#include "common.h" +#include "sprite/npc/SpearGuy.h" + +#define SPEAR_GUY_DROPS \ +{ \ + .dropFlags = NPC_DROP_FLAG_80, \ + .itemDropChance = 5, \ + .itemDrops = { \ + { ITEM_SLEEPY_SHEEP, 10, 0 }, \ + }, \ + .heartDrops = STANDARD_HEART_DROPS(3), \ + .flowerDrops = STANDARD_FLOWER_DROPS(2), \ + .minCoinBonus = 0, \ + .maxCoinBonus = 3, \ +} + +#define SPEAR_GUY_ANIMS \ +{ \ + .idle = ANIM_SpearGuy_Anim03, \ + .walk = ANIM_SpearGuy_Anim05, \ + .run = ANIM_SpearGuy_Anim06, \ + .chase = ANIM_SpearGuy_Anim06, \ + .anim_4 = ANIM_SpearGuy_Anim03, \ + .anim_5 = ANIM_SpearGuy_Anim03, \ + .death = ANIM_SpearGuy_Anim07, \ + .hit = ANIM_SpearGuy_Anim07, \ + .anim_8 = ANIM_SpearGuy_Anim1A, \ + .anim_9 = ANIM_SpearGuy_Anim1B, \ + .anim_A = ANIM_SpearGuy_Anim03, \ + .anim_B = ANIM_SpearGuy_Anim03, \ + .anim_C = ANIM_SpearGuy_Anim03, \ + .anim_D = ANIM_SpearGuy_Anim03, \ + .anim_E = ANIM_SpearGuy_Anim03, \ + .anim_F = ANIM_SpearGuy_Anim03, \ +} + +#define SPEAR_GUY_HITBOX(npcID) \ +{ \ + .id = npcID, \ + .settings = &N(NpcSettings_SpearGuy_Hitbox), \ + .pos = { NPC_DISPOSE_LOCATION }, \ + .yaw = 0, \ + .flags = ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_NO_DROPS, \ + .drops = NPC_NO_DROPS, \ + .animations = SPEAR_GUY_ANIMS, \ + .extraAnimations = N(ExtraAnims_SpearGuy_Hitbox), \ +} + diff --git a/src/world/common/enemy/complete/SpearGuy_Patrol.inc.c b/src/world/common/enemy/complete/SpearGuy_Patrol.inc.c new file mode 100644 index 0000000000..710166e6d1 --- /dev/null +++ b/src/world/common/enemy/complete/SpearGuy_Patrol.inc.c @@ -0,0 +1,24 @@ +#include "SpearGuy.h" + +#include "world/common/enemy/ai/PatrolNoAttackAI.inc.c" + +MobileAISettings N(AISettings_SpearGuy_Patrol) = { + .moveSpeed = 1.5f, + .moveTime = 30, + .waitTime = 30, + .playerSearchInterval = -1, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_SpearGuy_Patrol) = { + EVT_CALL(N(PatrolNoAttackAI_Main), EVT_PTR(N(AISettings_SpearGuy_Patrol))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_SpearGuy_Patrol) = { + .height = 28, + .radius = 24, + .level = 99, + .ai = &N(EVS_NpcAI_SpearGuy_Patrol), +}; diff --git a/src/world/common/enemy/complete/SpearGuy_Wander.inc.c b/src/world/common/enemy/complete/SpearGuy_Wander.inc.c new file mode 100644 index 0000000000..5317f7d795 --- /dev/null +++ b/src/world/common/enemy/complete/SpearGuy_Wander.inc.c @@ -0,0 +1,99 @@ +#include "SpearGuy.h" + +#include "world/common/enemy/ai/SpearGuyAI.inc.c" + +s32 N(ExtraAnims_SpearGuy)[] = { + ANIM_SpearGuy_Anim00, + ANIM_SpearGuy_Anim03, + ANIM_SpearGuy_Anim05, + ANIM_SpearGuy_Anim06, + ANIM_SpearGuy_Anim07, + ANIM_SpearGuy_Anim0F, + ANIM_SpearGuy_Anim10, + ANIM_SpearGuy_Anim1A, + ANIM_SpearGuy_Anim1B, + -1, +}; + +s32 N(ExtraAnims_SpearGuy_Hitbox)[] = { + ANIM_SpearGuy_Anim00, + -1, +}; + +EvtScript N(EVS_NpcDefeat_SpearGuy_Hitbox) = { + EVT_CALL(GetBattleOutcome, LVar0) + EVT_SWITCH(LVar0) + EVT_CASE_EQ(OUTCOME_PLAYER_WON) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_CASE_EQ(OUTCOME_PLAYER_FLED) + EVT_CALL(SetNpcPos, NPC_SELF, NPC_DISPOSE_LOCATION) + EVT_CALL(OnPlayerFled, 1) + EVT_CASE_EQ(OUTCOME_ENEMY_FLED) + EVT_CALL(SetEnemyFlagBits, NPC_SELF, ENEMY_FLAG_FLED, 1) + EVT_CALL(RemoveNpc, NPC_SELF) + EVT_END_SWITCH + EVT_RETURN + EVT_END +}; + +MobileAISettings N(AISettings_SpearGuy_Wander) = { + .moveSpeed = 1.7f, + .moveTime = 100, + .waitTime = 1, + .alertRadius = 100.0f, + .alertOffsetDist = 30.0f, + .playerSearchInterval = 1, + .chaseSpeed = 3.5f, + .chaseTurnRate = 20, + .chaseUpdateInterval = 1, + .chaseRadius = 120.0f, + .unk_AI_2C = 1, +}; + +EvtScript N(EVS_NpcAI_SpearGuy_Wander) = { + EVT_CALL(SetSelfVar, 0, 0) + EVT_CALL(SetSelfVar, 1, 5) + EVT_CALL(SetSelfVar, 2, 12) + EVT_CALL(SetSelfVar, 3, 9) + EVT_CALL(N(SpearGuyAI_Main), EVT_PTR(N(AISettings_SpearGuy_Wander))) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_SpearGuy_Wander) = { + .height = 23, + .radius = 22, + .level = 16, + .ai = &N(EVS_NpcAI_SpearGuy_Wander), + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, +}; + +EvtScript N(EVS_NpcAI_SpearGuy_Hitbox) = { + EVT_CALL(EnableNpcShadow, NPC_SELF, FALSE) + EVT_CALL(SetSelfVar, 0, 4) + EVT_CALL(SetSelfVar, 1, 22) + EVT_CALL(SetSelfVar, 2, 40) + EVT_CALL(SetSelfVar, 3, 28) + EVT_CALL(SetSelfVar, 4, 1) + EVT_CALL(SetSelfVar, 15, 0) + EVT_CALL(N(MeleeHitbox_Main)) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_SpearGuy_Hitbox) = { + .height = 8, + .radius = 20, + .level = 16, + .ai = &N(EVS_NpcAI_SpearGuy_Hitbox), + .onDefeat = &N(EVS_NpcDefeat_SpearGuy_Hitbox), + .actionFlags = AI_ACTION_08, +}; + +#define SPEAR_GUY_WANDER_NPC_DATA \ + .settings = &N(NpcSettings_SpearGuy_Wander), \ + .drops = SPEAR_GUY_DROPS, \ + .animations = SPEAR_GUY_ANIMS, \ + .extraAnimations = N(ExtraAnims_SpearGuy), \ + .aiDetectFlags = AI_DETECT_SIGHT | AI_DETECT_SENSITIVE_MOTION, \ diff --git a/src/world/common/enemy/wip/Dead_PiranhaPlantAI_Main.inc.c b/src/world/common/enemy/wip/Dead_PiranhaPlantAI_Main.inc.c deleted file mode 100644 index aaf0613525..0000000000 --- a/src/world/common/enemy/wip/Dead_PiranhaPlantAI_Main.inc.c +++ /dev/null @@ -1,82 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -#ifdef _DEAD_H_ -#include "dead_structs.h" -#endif - -ApiStatus N(PiranhaPlantAI_Main)(Evt* script, s32 isInitialCall) { - DeadEnemy* enemy = (DeadEnemy*) script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - MobileAISettings* settings = (MobileAISettings*) evt_get_variable(script, *script->ptrReadPos); - EnemyDetectVolume territory; - EnemyDetectVolume* territoryPtr = &territory; - - territory.skipPlayerDetectChance = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detectPos.x; - territory.pointZ = enemy->territory->wander.detectPos.z; - territory.sizeX = enemy->territory->wander.detectSize.x; - territory.sizeZ = enemy->territory->wander.detectSize.z; - territory.halfHeight = 200.0f; - territory.detectFlags = 0; - - // Dead Func that doesn't seem to have an alive counterpart, probably because of the - // difference in the Enemy and DeadEnemy struct. - func_8004D8E0(enemy); - if (enemy->flags & ENEMY_FLAG_100000) { - enemy->unk_114 = 10.0f; - enemy->unk_118 = 0.7f; - } - - if (isInitialCall || enemy->aiFlags & ENEMY_AI_FLAG_4) { - script->functionTemp[0] = 0; - npc->duration = 0; - npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; - enemy->varTable[0] = 0; - - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { - script->functionTemp[0] = 99; - script->functionTemp[1] = 0; - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; - } - } - - switch (script->functionTemp[0]) { - case 0: - N(PiranhaPlantAI_00)(script, settings, territoryPtr); - /* fallthrough */ - case 1: - N(PiranhaPlantAI_01)(script, settings, territoryPtr); - break; - case 10: - N(PiranhaPlantAI_10)(script, settings, territoryPtr); - if (script->functionTemp[0] != 11) { - break; - } - case 11: - N(PiranhaPlantAI_11)(script, settings, territoryPtr); - if (script->functionTemp[0] != 12) { - break; - } - case 12: - N(PiranhaPlantAI_12)(script, settings, territoryPtr); - if (script->functionTemp[0] != 13) { - break; - } - case 13: - N(PiranhaPlantAI_13)(script, settings, territoryPtr); - if (script->functionTemp[0] != 14) { - break; - } - case 14: - N(PiranhaPlantAI_14)(script, settings, territoryPtr); - break; - case 99: - basic_ai_suspend(script); - break; - } - - return ApiStatus_BLOCK; -} diff --git a/src/world/common/enemy/wip/PiranhaPlantAI_00.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_00.inc.c deleted file mode 100644 index b7ab792e5e..0000000000 --- a/src/world/common/enemy/wip/PiranhaPlantAI_00.inc.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(PiranhaPlantAI_00)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - if (npc->duration > 0) { - npc->duration--; - } else { - enemy->varTable[0] = 0; - npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; - script->functionTemp[1] = 0; - script->functionTemp[0] = 1; - } -} diff --git a/src/world/common/enemy/wip/PiranhaPlantAI_01.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_01.inc.c deleted file mode 100644 index a03315b242..0000000000 --- a/src/world/common/enemy/wip/PiranhaPlantAI_01.inc.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(PiranhaPlantAI_01)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 temp; - - if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0)) { - ai_enemy_play_sound(npc, SOUND_BURROW_DIG, 0); - fx_emote(EMOTE_EXCLAMATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &temp); - ai_enemy_play_sound(npc, SOUND_2F4, SOUND_PARAM_MORE_QUIET); - npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_MELEE_PRE]; - npc->duration = enemy->varTable[8]; - script->functionTemp[0] = 10; - } -} diff --git a/src/world/common/enemy/wip/PiranhaPlantAI_10.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_10.inc.c deleted file mode 100644 index 71257b1144..0000000000 --- a/src/world/common/enemy/wip/PiranhaPlantAI_10.inc.c +++ /dev/null @@ -1,187 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(PiranhaPlantAI_10)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 phi_s7 = FALSE; - s32 phi_fp = FALSE; - f32 sp38; - f32 yaw; - f32 yaw2; - f32 moveSpeed; - f32 posRadius; - s32 cond1; - s32 cond2; - f32 terSize; - f32 sp20; - f32 sp24; - f32 sp28; - f32 sp2C; - f32 sp30; - f32 sp34; - - npc->duration--; - if (enemy->varTable[9] >= npc->duration) { - enemy->flags |= (ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | - ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000); - } - - if (npc->duration == 0) { - if (clamp_angle(gPlayerStatusPtr->spriteFacingAngle) < 180.0f) { - yaw2 = clamp_angle(gCameras[gCurrentCameraID].currentYaw - 90.0f); - } else { - yaw2 = clamp_angle(gCameras[gCurrentCameraID].currentYaw + 90.0f); - } - - yaw = clamp_angle(yaw2 + 180.0f); - if (enemy->varTable[7] == 0) { - moveSpeed = 32.0f; - - if (gPlayerStatusPtr->actionState != 0) { - moveSpeed = 100.0f; - if (gPlayerStatusPtr->actionState == 1) { - moveSpeed = 90.0f; - } - } - } else { - moveSpeed = 38.0f; - - if (gPlayerStatusPtr->actionState != 0) { - moveSpeed = 90.0f; - if (gPlayerStatusPtr->actionState == 1) { - moveSpeed = 75.0f; - } - } - } - - npc->pos.x = gPlayerStatusPtr->position.x; - npc->pos.z = gPlayerStatusPtr->position.z; - add_vec2D_polar(&npc->pos.x, &npc->pos.z, npc->collisionRadius, yaw); - npc_move_heading(npc, moveSpeed + npc->collisionRadius, yaw2); - - if (enemy->varTable[7] == 0) { - if (npc->pos.x > 380.0) { - npc->pos.x = 380.0f; - } - if (npc->pos.x < -380.0) { - npc->pos.x = -380.0f; - } - if (npc->pos.z > 380.0) { - npc->pos.z = 380.0f; - } - if (npc->pos.z < -380.0) { - npc->pos.z = -380.0f; - } - - sp38 = sqrtf(SQ(npc->pos.x) + SQ(npc->pos.z)); - yaw2 = atan2(0.0f, 0.0f, npc->pos.x, npc->pos.z); - - if (sp38 < 305.0) { - npc->pos.x = 0.0f; - npc->pos.z = 0.0f; - add_vec2D_polar(&npc->pos.x, &npc->pos.z, 305.0f, yaw2); - } else if (sp38 > 375.0) { - npc->pos.x = 0.0f; - npc->pos.z = 0.0f; - add_vec2D_polar(&npc->pos.x, &npc->pos.z, 375.0f, yaw2); - } - } else { - if (!(npc->flags & NPC_FLAG_IGNORE_WORLD_COLLISION)) { - sp20 = gPlayerStatusPtr->position.x; - sp24 = gPlayerStatusPtr->position.y + 18.0; - sp28 = gPlayerStatusPtr->position.z; - if (npc_test_move_simple_with_slipping(npc->collisionChannel, &sp20, &sp24, &sp28, moveSpeed, yaw2, npc->collisionHeight, npc->collisionRadius) != 0) { - sp20 = gPlayerStatusPtr->position.x; - sp24 = gPlayerStatusPtr->position.y + 45.0; - sp28 = gPlayerStatusPtr->position.z; - cond1 = npc_test_move_simple_with_slipping(npc->collisionChannel, &sp20, &sp24, &sp28, moveSpeed, yaw2, npc->collisionHeight, npc->collisionRadius); - sp2C = npc->pos.x; - sp30 = npc->pos.y + 100.0; - sp34 = npc->pos.z; - sp38 = 200.0f; - cond2 = npc_raycast_down_sides(npc->collisionChannel, &sp2C, &sp30, &sp34, &sp38); - if (!cond1 && cond2 && sp38 > 80.0 && sp38 < 120.0 && npc->pos.y != sp30) { - phi_fp = TRUE; - } else { - sp20 = gPlayerStatusPtr->position.x; - sp24 = gPlayerStatusPtr->position.y + 10.0; - sp28 = gPlayerStatusPtr->position.z; - npc_test_move_simple_with_slipping(npc->collisionChannel, &sp20, &sp24, &sp28, moveSpeed, yaw2, npc->collisionHeight, npc->collisionRadius); - posRadius = dist2D(gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z, sp20, sp28); - npc->pos.x = gPlayerStatusPtr->position.x; - npc->pos.z = gPlayerStatusPtr->position.z; - add_vec2D_polar(&npc->pos.x, &npc->pos.z, npc->collisionRadius, yaw); - npc_move_heading(npc, posRadius + npc->collisionRadius, yaw2); - phi_s7 = TRUE; - } - } - } else { - sp20 = gPlayerStatusPtr->position.x; - sp24 = gPlayerStatusPtr->position.y + 18.0; - sp28 = gPlayerStatusPtr->position.z; - if (npc_test_move_simple_with_slipping(npc->collisionChannel, &sp20, &sp24, &sp28, moveSpeed, yaw2, npc->collisionHeight, npc->collisionRadius) != 0) { - posRadius = dist2D(gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z, sp20, sp28); - npc->pos.x = gPlayerStatusPtr->position.x; - npc->pos.z = gPlayerStatusPtr->position.z; - add_vec2D_polar(&npc->pos.x, &npc->pos.z, npc->collisionRadius, yaw); - npc_move_heading(npc, posRadius + npc->collisionRadius, yaw2); - } - } - } - - if (is_point_within_region(territory->shape, territory->pointX, territory->pointZ, npc->pos.x, npc->pos.z, territory->sizeX, territory->sizeZ)) { - switch (territory->shape) { - case SHAPE_CYLINDER: - sp38 = dist2D(npc->pos.x, npc->pos.z, territory->pointX, territory->pointZ); - - if (territory->sizeX < sp38) { - terSize = atan2(territory->pointX, territory->pointZ, npc->pos.x, npc->pos.z); - npc->pos.x = territory->pointX; - npc->pos.z = territory->pointZ; - add_vec2D_polar(&npc->pos.x, &npc->pos.z, territory->sizeX, terSize); - } - break; - case SHAPE_RECT: - terSize = territory->pointX + territory->sizeX; - if (npc->pos.x > terSize) { - npc->pos.x = terSize; - } - - terSize = territory->pointX - territory->sizeX; - if (npc->pos.x < terSize) { - npc->pos.x = terSize; - } - - terSize = territory->pointZ + territory->sizeZ; - if (npc->pos.z > terSize) { - npc->pos.z = terSize; - } - - terSize = territory->pointZ - territory->sizeZ; - if (npc->pos.z < terSize) { - npc->pos.z = terSize; - } - break; - } - } - - if (!phi_s7 && (!(npc->flags & NPC_FLAG_8) || phi_fp)) { - sp20 = npc->pos.x; - sp38 = 400.0f; - sp28 = npc->pos.z; - sp24 = npc->pos.y + 150.0; - - if (npc_raycast_down_sides(npc->collisionChannel, &sp20, &sp24, &sp28, &sp38) != 0) { - npc->pos.y = sp24; - } - } - - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - ai_enemy_play_sound(npc, SOUND_BURROW_SURFACE, 0); - npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_MELEE_HIT]; - npc->duration = enemy->varTable[10]; - script->functionTemp[0] = 11; - } -} - diff --git a/src/world/common/enemy/wip/PiranhaPlantAI_11.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_11.inc.c deleted file mode 100644 index 54371c1c80..0000000000 --- a/src/world/common/enemy/wip/PiranhaPlantAI_11.inc.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "common.h" - -void N(PiranhaPlantAI_11)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (enemy->varTable[11] >= npc->duration) { - enemy->flags &= ~(ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_8000000 | ENEMY_FLAG_10000000); - } - if (npc->duration == 0) { - npc->currentAnim = enemy->animList[10]; - npc->duration = 0; - script->functionTemp[0] = 12; - } -} diff --git a/src/world/common/enemy/wip/PiranhaPlantAI_12.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_12.inc.c deleted file mode 100644 index 1f95f75ece..0000000000 --- a/src/world/common/enemy/wip/PiranhaPlantAI_12.inc.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(PiranhaPlantAI_12)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 temp; - - npc->duration++; - if (npc->duration == enemy->varTable[13]) { - npc->currentAnim = enemy->animList[11]; - } - if (npc->duration == enemy->varTable[14]) { - enemy->varTable[0] = 3; - } - if (npc->duration >= enemy->varTable[12]) { - enemy->varTable[0] = 4; - npc->duration = 8; - npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; - fx_emote(EMOTE_FRUSTRATION, npc, 0, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 10, &temp); - script->functionTemp[0] = 13; - } -} diff --git a/src/world/common/enemy/wip/PiranhaPlantAI_13.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_13.inc.c deleted file mode 100644 index e32fa0766a..0000000000 --- a/src/world/common/enemy/wip/PiranhaPlantAI_13.inc.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" -#include "npc.h" - -void N(PiranhaPlantAI_13)(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration--; - if (npc->duration == 0) { - npc->duration = enemy->varTable[15]; - script->functionTemp[0] = 14; - } -} diff --git a/src/world/common/enemy/wip/PiranhaPlantAI_14.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_14.inc.c deleted file mode 100644 index 873f906603..0000000000 --- a/src/world/common/enemy/wip/PiranhaPlantAI_14.inc.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "common.h" -#include "npc.h" -#include "effects.h" - -void N(PiranhaPlantAI_14)(Evt *script, MobileAISettings* aiSettings, EnemyDetectVolume* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 retVal; - - npc->duration--; - if (npc->duration == 0) { - if (basic_ai_check_player_dist(territory, enemy, aiSettings->alertRadius, aiSettings->alertOffsetDist, 0) == 0) { - fx_emote(EMOTE_QUESTION, npc, 0, npc->collisionHeight, 1, 2, -20, 15, &retVal); - } - npc->duration = 0; - script->functionTemp[0] = 0; - } -} diff --git a/src/world/common/enemy/wip/PiranhaPlantAI_Main.inc.c b/src/world/common/enemy/wip/PiranhaPlantAI_Main.inc.c deleted file mode 100644 index e441865a6e..0000000000 --- a/src/world/common/enemy/wip/PiranhaPlantAI_Main.inc.c +++ /dev/null @@ -1,90 +0,0 @@ -#include "common.h" -#include "npc.h" - -#ifdef _DEAD_H_ -void func_8004D8E0(DeadEnemy*); -#endif - -s32 N(PiranhaPlantAI_Main)(Evt* script, s32 isInitialCall) { - #ifdef _DEAD_H_ - DeadEnemy* enemy = (DeadEnemy*)script->owner1.enemy; - #else - Enemy* enemy = script->owner1.enemy; - #endif - Npc* npc = get_npc_unsafe(enemy->npcID); - Bytecode* args = script->ptrReadPos; - EnemyDetectVolume territory; - #ifdef _DEAD_H_ - MobileAISettings* npcAISettings = (MobileAISettings*)evt_get_variable(script, *args++); - EnemyDetectVolume* territoryPtr = &territory; - #else - EnemyDetectVolume* territoryPtr = &territory; - MobileAISettings* npcAISettings = (MobileAISettings*)evt_get_variable(script, *args++); - #endif - - territory.skipPlayerDetectChance = 0; - territory.shape = enemy->territory->wander.detectShape; - territory.pointX = enemy->territory->wander.detectPos.x; - territory.pointZ = enemy->territory->wander.detectPos.z; - territory.sizeX = enemy->territory->wander.detectSize.x; - territory.sizeZ = enemy->territory->wander.detectSize.z; - territory.halfHeight = 200.0f; - territory.detectFlags = 0; - - #ifdef _DEAD_H_ - // this function doesn't seem to have a known counterpart, perhaps related to the difference in the Enemy struct - func_8004D8E0(enemy); - if (enemy->flags & ENEMY_FLAG_100000) { - enemy->unk_114 = 10.0f; - enemy->unk_118 = 0.7f; - } - #endif - - if (isInitialCall || (enemy->aiFlags & ENEMY_AI_FLAG_4)) { - script->AI_TEMP_STATE = AI_STATE_PIRANHA_PLANT_00; - npc->duration = 0; - npc->currentAnim = enemy->animList[ENEMY_ANIM_INDEX_IDLE]; - - enemy->AI_VAR_ATTACK_STATE = MELEE_HITBOX_STATE_NONE; - if (enemy->aiFlags & ENEMY_AI_FLAG_4) { - script->AI_TEMP_STATE = AI_STATE_SUSPEND; - script->functionTemp[1] = AI_STATE_PIRANHA_PLANT_00; - enemy->aiFlags &= ~ENEMY_AI_FLAG_4; - } - } - - switch (script->AI_TEMP_STATE) { - case AI_STATE_PIRANHA_PLANT_00: - N(PiranhaPlantAI_00)(script, npcAISettings, territoryPtr); - case AI_STATE_PIRANHA_PLANT_01: - N(PiranhaPlantAI_01)(script, npcAISettings, territoryPtr); - break; - case AI_STATE_PIRANHA_PLANT_10: - N(PiranhaPlantAI_10)(script, npcAISettings, territoryPtr); - if (script->AI_TEMP_STATE != AI_STATE_PIRANHA_PLANT_11) { - break; - } - case AI_STATE_PIRANHA_PLANT_11: - N(PiranhaPlantAI_11)(script, npcAISettings, territoryPtr); - if (script->AI_TEMP_STATE != AI_STATE_PIRANHA_PLANT_12) { - break; - } - case AI_STATE_PIRANHA_PLANT_12: - N(PiranhaPlantAI_12)(script, npcAISettings, territoryPtr); - if (script->AI_TEMP_STATE != AI_STATE_PIRANHA_PLANT_13) { - break; - } - case AI_STATE_PIRANHA_PLANT_13: - N(PiranhaPlantAI_13)(script, npcAISettings, territoryPtr); - if (script->AI_TEMP_STATE != AI_STATE_PIRANHA_PLANT_14) { - break; - } - case AI_STATE_PIRANHA_PLANT_14: - N(PiranhaPlantAI_14)(script, npcAISettings, territoryPtr); - break; - case AI_STATE_SUSPEND: - basic_ai_suspend(script); - break; - } - return ApiStatus_BLOCK; -} diff --git a/src/world/common/atomic/Chest.inc.c b/src/world/common/entity/Chest.inc.c similarity index 100% rename from src/world/common/atomic/Chest.inc.c rename to src/world/common/entity/Chest.inc.c diff --git a/src/world/common/entity/Pipe.data.inc.c b/src/world/common/entity/Pipe.data.inc.c deleted file mode 100644 index c43133c6e4..0000000000 --- a/src/world/common/entity/Pipe.data.inc.c +++ /dev/null @@ -1,271 +0,0 @@ -#include "common.h" - -extern EvtScript N(EVS_Pipe_ExitVertical_Impl); - -EvtScript N(EVS_Pipe_EnterVertical) = { - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) - EVT_CALL(GetCurrentPartnerID, LVar0) - EVT_IF_NE(LVar0, PARTNER_NONE) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) - EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION) - EVT_END_IF - EVT_CALL(GetEntryID, LVar0) - EVT_CALL(N(Pipe_GetEntryPos)) - EVT_SUB(LVar2, 40) - EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) - EVT_CALL(InterpPlayerYaw, LVar4, 0) - EVT_CALL(PlaySound, SOUND_ENTER_PIPE) - EVT_CALL(func_802D286C, 0x100) - EVT_CALL(func_802D2520, ANIM_Mario_StandStill, 5, 2, 1, 1, 0) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_LOOP(40) - EVT_ADD(LVar1, 1) - EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_END_LOOP - EVT_WAIT(3) - EVT_CALL(GetCurrentPartnerID, LVar0) - EVT_IF_NE(LVar0, PARTNER_NONE) - EVT_THREAD - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_SUB(LVar2, 3) - EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_2, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) - EVT_END_THREAD - EVT_END_IF - EVT_WAIT(2) - EVT_CALL(func_802D2520, ANIM_Mario_StandStill, 0, 0, 0, 0, 0) - EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) - EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(HidePlayerShadow, FALSE) - EVT_LABEL(0) - EVT_CALL(N(Pipe_GetCurrentFloor)) - EVT_WAIT(1) - EVT_IF_NE(LVar0, -1) - EVT_GOTO(0) - EVT_END_IF - EVT_EXEC(LVarA) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_Pipe_EnterHorizontal) = { - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(GetEntryID, LVar0) - EVT_CALL(N(Pipe_GetEntryPos)) - EVT_SET(LVar5, LVar1) - EVT_SET(LVar6, LVar2) - EVT_SET(LVar7, LVar3) - EVT_ADD(LVar2, 2) - EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) - EVT_CALL(InterpPlayerYaw, LVar4, 0) - EVT_IF_EQ(LVar4, 90) - EVT_ADD(LVar5, 40) - EVT_ELSE - EVT_SUB(LVar5, 40) - EVT_END_IF - EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar5, LVar6, LVar7) - EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar5, LVar6, LVar7) - EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) - EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_CALL(GetCurrentPartnerID, LVar0) - EVT_IF_NE(LVar0, PARTNER_NONE) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) - EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION) - EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVar0, 0) - EVT_END_IF - EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_ENTER_PIPE) - EVT_THREAD - EVT_WAIT(25) - EVT_CALL(HidePlayerShadow, FALSE) - EVT_END_THREAD - EVT_CALL(func_802D286C, 0x00000900) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 3, 1, 1, 0) - EVT_LOOP(40) - EVT_CALL(N(Pipe_GetPointAheadOfPlayer), EVT_FLOAT(1.0)) - EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_END_LOOP - EVT_CALL(GetCurrentPartnerID, LVar0) - EVT_IF_NE(LVar0, PARTNER_NONE) - EVT_THREAD - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_SUB(LVar2, 3) - EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) - EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) - EVT_CALL(EnablePartnerAI) - EVT_END_THREAD - EVT_END_IF - EVT_WAIT(5) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) - EVT_CALL(ModifyColliderFlags, 1, LVarB, COLLIDER_FLAGS_UPPER_MASK) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(DisablePlayerPhysics, FALSE) - EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_EXEC(LVarA) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_Pipe_ExitVertical) = { - EVT_CALL(N(Pipe_AwaitDownInput)) - EVT_IF_EQ(LVar0, 0) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetPartnerInUse, LVar0) - EVT_IF_NE(LVar0, PARTNER_NONE) - EVT_CALL(GetCurrentPartnerID, LVar1) - EVT_IF_NE(LVar1, PARTNER_WATT) - EVT_RETURN - EVT_ELSE - EVT_CALL(InterruptUsePartner) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_ELSE - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_EXEC_WAIT(N(EVS_Pipe_ExitVertical_Impl)) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_Pipe_ExitVertical_Impl) = { - EVT_CALL(N(Pipe_SetAnimFlag)) - EVT_SET_GROUP(EVT_GROUP_1B) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_SET(LVar0, LVarA) - EVT_CALL(N(Pipe_GetEntryPos)) - EVT_CALL(PlayerMoveTo, LVar1, LVar3, 3) - EVT_SET(LVar0, LVarA) - EVT_CALL(N(Pipe_GetEntryPos)) - EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) - EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) - EVT_CALL(N(Pipe_GetCameraYaw)) - EVT_CALL(InterpPlayerYaw, LVar0, 0) - EVT_WAIT(2) - EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) - EVT_CALL(PlaySound, SOUND_ENTER_PIPE) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_THREAD - EVT_WAIT(4) - EVT_LOOP(40) - EVT_SUB(LVar1, 1) - EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_CALL(func_802D286C, 0x00000800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 2, 1, 1, 0) - EVT_WAIT(25) - EVT_EXEC_WAIT(LVarC) - EVT_RETURN - EVT_END -}; - -EvtScript N(EVS_Pipe_ExitHorizontal) = { - EVT_CALL(IsPlayerOnValidFloor, LVar0) - EVT_IF_EQ(LVar0, FALSE) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetPlayerActionState, LVar0) - EVT_IF_EQ(LVar0, ACTION_STATE_SPIN) - EVT_RETURN - EVT_END_IF - EVT_CALL(GetPartnerInUse, LVar0) - EVT_IF_NE(LVar0, PARTNER_NONE) - EVT_CALL(GetCurrentPartnerID, LVar1) - EVT_IF_NE(LVar1, PARTNER_WATT) - EVT_RETURN - EVT_ELSE - EVT_CALL(InterruptUsePartner) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_ELSE - EVT_CALL(DisablePlayerInput, TRUE) - EVT_END_IF - EVT_SET_GROUP(EVT_GROUP_1B) - EVT_CALL(N(Pipe_SetAnimFlag)) - EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, COLLIDER_FLAGS_UPPER_MASK) - EVT_SET(LVar0, LVarA) - EVT_CALL(N(Pipe_GetEntryPos)) - EVT_SET(LVar5, LVar1) - EVT_SET(LVar6, LVar2) - EVT_ADD(LVar6, 2) - EVT_SET(LVar7, LVar3) - EVT_SET(LVar8, LVar4) - EVT_ADD(LVar8, 180) - EVT_IF_GE(LVar4, 360) - EVT_SUB(LVar4, 360) - EVT_END_IF - EVT_CALL(InterpPlayerYaw, LVar8, 1) - EVT_WAIT(1) - EVT_CALL(PlaySound, SOUND_ENTER_PIPE) - EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) - EVT_CALL(SetPlayerPos, LVar0, LVar6, LVar7) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) - EVT_CALL(func_802D286C, 0x00000800) - EVT_CALL(func_802D2520, ANIM_Mario_StandStill, 5, 3, 1, 1, 0) - EVT_THREAD - EVT_WAIT(8) - EVT_CALL(HidePlayerShadow, TRUE) - EVT_END_THREAD - EVT_THREAD - EVT_WAIT(3) - EVT_LOOP(40) - EVT_CALL(N(Pipe_GetPointAheadOfPlayer), EVT_FLOAT(1.0)) - EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) - EVT_WAIT(1) - EVT_END_LOOP - EVT_END_THREAD - EVT_WAIT(25) - EVT_EXEC_WAIT(LVarC) - EVT_RETURN - EVT_END -}; - -#define EVT_EXIT_PIPE_HORIZONTAL(entry, collider, script) \ -{ \ - EVT_SET_GROUP(EVT_GROUP_1B) \ - EVT_SET(LVarA, entry) \ - EVT_SET(LVarB, collider) \ - EVT_SET(LVarC, EVT_PTR(script)) \ - EVT_EXEC_WAIT(N(EVS_Pipe_ExitHorizontal)) \ - EVT_RETURN \ - EVT_END \ -} - -#define EVT_EXIT_PIPE_VERTICAL(entry, collider, script) \ -{ \ - EVT_SET_GROUP(EVT_GROUP_1B) \ - EVT_SET(LVarA, entry) \ - EVT_SET(LVarB, collider) \ - EVT_SET(LVarC, EVT_PTR(script)) \ - EVT_EXEC_WAIT(N(EVS_Pipe_ExitVertical)) \ - EVT_RETURN \ - EVT_END \ -} - -#define EVT_ENTER_PIPE_HORIZONTAL(collider, bindExitsScript) \ - EVT_SET(LVarA, EVT_PTR(bindExitsScript)) \ - EVT_SET(LVarB, collider) \ - EVT_EXEC(N(EVS_Pipe_EnterHorizontal)) - -#define EVT_ENTER_PIPE_VERTICAL(bindExitsScript) \ - EVT_SET(LVarA, EVT_PTR(bindExitsScript)) \ - EVT_EXEC(N(EVS_Pipe_EnterVertical)) diff --git a/src/world/common/entity/Pipe.inc.c b/src/world/common/entity/Pipe.inc.c index 5377eda950..75749eafa8 100644 --- a/src/world/common/entity/Pipe.inc.c +++ b/src/world/common/entity/Pipe.inc.c @@ -1,6 +1,43 @@ #include "common.h" #include "npc.h" +// ---------------------------------------------------------------- +// User macros + +#define EVT_EXIT_PIPE_HORIZONTAL(entry, collider, script) \ +{ \ + EVT_SET_GROUP(EVT_GROUP_1B) \ + EVT_SET(LVarA, entry) \ + EVT_SET(LVarB, collider) \ + EVT_SET(LVarC, EVT_PTR(script)) \ + EVT_EXEC_WAIT(N(EVS_Pipe_ExitHorizontal)) \ + EVT_RETURN \ + EVT_END \ +} + +#define EVT_EXIT_PIPE_VERTICAL(entry, collider, script) \ +{ \ + EVT_SET_GROUP(EVT_GROUP_1B) \ + EVT_SET(LVarA, entry) \ + EVT_SET(LVarB, collider) \ + EVT_SET(LVarC, EVT_PTR(script)) \ + EVT_EXEC_WAIT(N(EVS_Pipe_ExitVertical)) \ + EVT_RETURN \ + EVT_END \ +} + +#define EVT_ENTER_PIPE_HORIZONTAL(collider, bindExitsScript) \ + EVT_SET(LVarA, EVT_PTR(bindExitsScript)) \ + EVT_SET(LVarB, collider) \ + EVT_EXEC(N(EVS_Pipe_EnterHorizontal)) + +#define EVT_ENTER_PIPE_VERTICAL(bindExitsScript) \ + EVT_SET(LVarA, EVT_PTR(bindExitsScript)) \ + EVT_EXEC(N(EVS_Pipe_EnterVertical)) + +// ---------------------------------------------------------------- +// Implementation + API_CALLABLE(N(Pipe_SetAnimFlag)) { gPlayerStatusPtr->animFlags |= PA_FLAG_CHANGING_MAP; return ApiStatus_DONE2; @@ -54,7 +91,7 @@ API_CALLABLE(N(Pipe_GetCameraYaw)) { return ApiStatus_DONE2; } -ApiStatus N(Pipe_GetPointAheadOfPlayer)(Evt* script, s32 isInitialStatus) { +API_CALLABLE(N(Pipe_GetPointAheadOfPlayer)) { PlayerStatus* playerStatus = &gPlayerStatus; f32 r = evt_get_float_variable(script, *script->ptrReadPos); f32 x = playerStatus->position.x; @@ -68,3 +105,245 @@ ApiStatus N(Pipe_GetPointAheadOfPlayer)(Evt* script, s32 isInitialStatus) { return ApiStatus_DONE2; } + +// ---------------------------------------------------------------- +// Scripts + +extern EvtScript N(EVS_Pipe_ExitVertical_Impl); + +EvtScript N(EVS_Pipe_EnterVertical) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_NE(LVar0, PARTNER_NONE) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) + EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION) + EVT_END_IF + EVT_CALL(GetEntryID, LVar0) + EVT_CALL(N(Pipe_GetEntryPos)) + EVT_SUB(LVar2, 40) + EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) + EVT_CALL(InterpPlayerYaw, LVar4, 0) + EVT_CALL(PlaySound, SOUND_ENTER_PIPE) + EVT_CALL(func_802D286C, 0x100) + EVT_CALL(func_802D2520, ANIM_Mario_StandStill, FOLD_TYPE_5, 2, 1, 1, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_LOOP(40) + EVT_ADD(LVar1, 1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_WAIT(3) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_NE(LVar0, PARTNER_NONE) + EVT_THREAD + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar2, 3) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_2, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) + EVT_END_THREAD + EVT_END_IF + EVT_WAIT(2) + EVT_CALL(func_802D2520, ANIM_Mario_StandStill, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_WAIT(1) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(HidePlayerShadow, FALSE) + EVT_LABEL(0) + EVT_CALL(N(Pipe_GetCurrentFloor)) + EVT_WAIT(1) + EVT_IF_NE(LVar0, -1) + EVT_GOTO(0) + EVT_END_IF + EVT_EXEC(LVarA) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Pipe_EnterHorizontal) = { + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(GetEntryID, LVar0) + EVT_CALL(N(Pipe_GetEntryPos)) + EVT_SET(LVar5, LVar1) + EVT_SET(LVar6, LVar2) + EVT_SET(LVar7, LVar3) + EVT_ADD(LVar2, 2) + EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) + EVT_CALL(InterpPlayerYaw, LVar4, 0) + EVT_IF_EQ(LVar4, 90) + EVT_ADD(LVar5, 40) + EVT_ELSE + EVT_SUB(LVar5, 40) + EVT_END_IF + EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar5, LVar6, LVar7) + EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar5, LVar6, LVar7) + EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_NE(LVar0, PARTNER_NONE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) + EVT_CALL(SetNpcPos, NPC_PARTNER, NPC_DISPOSE_LOCATION) + EVT_CALL(InterpNpcYaw, NPC_PARTNER, LVar0, 0) + EVT_END_IF + EVT_WAIT(1) + EVT_CALL(PlaySound, SOUND_ENTER_PIPE) + EVT_THREAD + EVT_WAIT(25) + EVT_CALL(HidePlayerShadow, FALSE) + EVT_END_THREAD + EVT_CALL(func_802D286C, 0x100 | 0x800) + EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 3, 1, 1, 0) + EVT_LOOP(40) + EVT_CALL(N(Pipe_GetPointAheadOfPlayer), EVT_FLOAT(1.0)) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_NE(LVar0, PARTNER_NONE) + EVT_THREAD + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_SUB(LVar2, 3) + EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) + EVT_CALL(EnableNpcShadow, NPC_PARTNER, TRUE) + EVT_CALL(EnablePartnerAI) + EVT_END_THREAD + EVT_END_IF + EVT_WAIT(5) + EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_CALL(ModifyColliderFlags, 1, LVarB, COLLIDER_FLAGS_UPPER_MASK) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(DisablePlayerPhysics, FALSE) + EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) + EVT_EXEC(LVarA) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Pipe_ExitVertical) = { + EVT_CALL(N(Pipe_AwaitDownInput)) + EVT_IF_EQ(LVar0, 0) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetPartnerInUse, LVar0) + EVT_IF_NE(LVar0, PARTNER_NONE) + EVT_CALL(GetCurrentPartnerID, LVar1) + EVT_IF_NE(LVar1, PARTNER_WATT) + EVT_RETURN + EVT_ELSE + EVT_CALL(InterruptUsePartner) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_END_IF + EVT_ELSE + EVT_CALL(DisablePlayerInput, TRUE) + EVT_END_IF + EVT_EXEC_WAIT(N(EVS_Pipe_ExitVertical_Impl)) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Pipe_ExitVertical_Impl) = { + EVT_CALL(N(Pipe_SetAnimFlag)) + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_SET(LVar0, LVarA) + EVT_CALL(N(Pipe_GetEntryPos)) + EVT_CALL(PlayerMoveTo, LVar1, LVar3, 3) + EVT_SET(LVar0, LVarA) + EVT_CALL(N(Pipe_GetEntryPos)) + EVT_CALL(SetPlayerPos, LVar1, LVar2, LVar3) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) + EVT_CALL(N(Pipe_GetCameraYaw)) + EVT_CALL(InterpPlayerYaw, LVar0, 0) + EVT_WAIT(2) + EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) + EVT_CALL(PlaySound, SOUND_ENTER_PIPE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_THREAD + EVT_WAIT(4) + EVT_LOOP(40) + EVT_SUB(LVar1, 1) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_CALL(func_802D286C, 0x800) + EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 2, 1, 1, 0) + EVT_WAIT(25) + EVT_EXEC_WAIT(LVarC) + EVT_RETURN + EVT_END +}; + +EvtScript N(EVS_Pipe_ExitHorizontal) = { + EVT_CALL(IsPlayerOnValidFloor, LVar0) + EVT_IF_EQ(LVar0, FALSE) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetPlayerActionState, LVar0) + EVT_IF_EQ(LVar0, ACTION_STATE_SPIN) + EVT_RETURN + EVT_END_IF + EVT_CALL(GetPartnerInUse, LVar0) + EVT_IF_NE(LVar0, PARTNER_NONE) + EVT_CALL(GetCurrentPartnerID, LVar1) + EVT_IF_NE(LVar1, PARTNER_WATT) + EVT_RETURN + EVT_ELSE + EVT_CALL(InterruptUsePartner) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_END_IF + EVT_ELSE + EVT_CALL(DisablePlayerInput, TRUE) + EVT_END_IF + EVT_SET_GROUP(EVT_GROUP_1B) + EVT_CALL(N(Pipe_SetAnimFlag)) + EVT_CALL(DisablePlayerPhysics, TRUE) + EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, LVarB, COLLIDER_FLAGS_UPPER_MASK) + EVT_SET(LVar0, LVarA) + EVT_CALL(N(Pipe_GetEntryPos)) + EVT_SET(LVar5, LVar1) + EVT_SET(LVar6, LVar2) + EVT_ADD(LVar6, 2) + EVT_SET(LVar7, LVar3) + EVT_SET(LVar8, LVar4) + EVT_ADD(LVar8, 180) + EVT_IF_GE(LVar4, 360) + EVT_SUB(LVar4, 360) + EVT_END_IF + EVT_CALL(InterpPlayerYaw, LVar8, 1) + EVT_WAIT(1) + EVT_CALL(PlaySound, SOUND_ENTER_PIPE) + EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) + EVT_CALL(SetPlayerPos, LVar0, LVar6, LVar7) + EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(func_802D286C, 0x800) + EVT_CALL(func_802D2520, ANIM_Mario_StandStill, FOLD_TYPE_5, 3, 1, 1, 0) + EVT_THREAD + EVT_WAIT(8) + EVT_CALL(HidePlayerShadow, TRUE) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(3) + EVT_LOOP(40) + EVT_CALL(N(Pipe_GetPointAheadOfPlayer), EVT_FLOAT(1.0)) + EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) + EVT_WAIT(1) + EVT_END_LOOP + EVT_END_THREAD + EVT_WAIT(25) + EVT_EXEC_WAIT(LVarC) + EVT_RETURN + EVT_END +}; diff --git a/src/world/common/entity/Pipe.inc.h b/src/world/common/entity/Pipe.inc.h deleted file mode 100644 index 01c9172c3d..0000000000 --- a/src/world/common/entity/Pipe.inc.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _ENTITY_PIPE_H_ -#define _ENTITY_PIPE_H_ - -#include "common.h" - -ApiStatus N(Pipe_GetCameraYaw)(Evt* script, s32 isInitialCall); -ApiStatus N(Pipe_GetCurrentFloor)(Evt* script, s32 isInitialCall); -ApiStatus N(Pipe_GetEntryPos)(Evt* script, s32 isInitialCall); -ApiStatus N(Pipe_SetAnimFlag)(Evt* script, s32 isInitialCall); -ApiStatus N(Pipe_GetPointAheadOfPlayer)(Evt* script, s32 isInitialCall); -ApiStatus N(Pipe_AwaitDownInput)(Evt* script, s32 isInitialCall); - -extern EvtScript N(Pipe_EnterVertical); -extern EvtScript N(Pipe_EnterHorizontal); -extern EvtScript N(Pipe_ExitVertical); -extern EvtScript N(Pipe_ScriptD); -extern EvtScript N(Pipe_ExitHorizontal); - -#endif diff --git a/src/world/common/entity/SuperBlock.data.inc.c b/src/world/common/entity/SuperBlock.data.inc.c deleted file mode 100644 index 24ac340071..0000000000 --- a/src/world/common/entity/SuperBlock.data.inc.c +++ /dev/null @@ -1,167 +0,0 @@ -#include "common.h" -#include "message_ids.h" -#include "SuperBlock.inc.h" - -// map-specific parameters for this data -// which saved byte to associate this block with -#ifndef SUPER_BLOCK_GAMEFLAG - #define SUPER_BLOCK_GAMEFLAG GF_Unused_EVT_00 -#endif -// which map var to store -#ifndef SUPER_BLOCK_MAPVAR - #define SUPER_BLOCK_MAPVAR MapVar(0) -#endif - -// 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] = { - MSG_Menus_00F0, MSG_Menus_00F1 -}; - -s16 N(SuperBlock_PartnerIDs)[8] = { - PARTNER_GOOMBARIO, - PARTNER_KOOPER, - PARTNER_BOMBETTE, - PARTNER_PARAKARRY, - PARTNER_BOW, - PARTNER_WATT, - PARTNER_SUSHIE, - PARTNER_LAKILESTER -}; - -s32 N(SuperBlock_UpgradeDescMessages)[8][2] = { - { MSG_Menus_00E0, MSG_Menus_00E1 }, - { MSG_Menus_00E2, MSG_Menus_00E3 }, - { MSG_Menus_00E4, MSG_Menus_00E5 }, - { MSG_Menus_00E6, MSG_Menus_00E7 }, - { MSG_Menus_00E8, MSG_Menus_00E9 }, - { MSG_Menus_00EA, MSG_Menus_00EB }, - { MSG_Menus_00EC, MSG_Menus_00ED }, - { MSG_Menus_00EE, MSG_Menus_00EF } -}; - -f32 N(SuperBlock_UpgradeOrbAngles)[SUPER_BLOCK_NUM_ORBS] = { - 140.0f, 180.0f, 220.0f -}; - -EvtScript N(SuperBlock_ShowUpgradeEffects) = { - EVT_WAIT(10) - EVT_CALL(PlaySound, SOUND_212D) - EVT_CALL(N(SuperBlock_GatherEnergyFX), SUPER_BLOCK_MAPVAR) - EVT_WAIT(85) - EVT_THREAD - EVT_CALL(PlaySound, SOUND_212E) - EVT_CALL(N(SuperBlock_WhiteScreenFlash), 70, 70) - EVT_WAIT(27) - EVT_CALL(PlaySound, SOUND_208E) - EVT_CALL(N(SuperBlock_WhiteScreenFlash), 50, 50) - EVT_END_THREAD - EVT_THREAD - EVT_WAIT(3) - EVT_CALL(N(SuperBlock_HideBlockContent), SUPER_BLOCK_MAPVAR) - EVT_END_THREAD - EVT_THREAD - EVT_WAIT(47) - EVT_CALL(N(SuperBlock_RadiateFaintEnergyFX)) - EVT_CALL(N(SuperBlock_PartnerSparkles2)) - EVT_WAIT(5) - EVT_CALL(N(SuperBlock_PartnerSparkles4)) - EVT_WAIT(5) - EVT_CALL(N(SuperBlock_PartnerSparkles2)) - EVT_END_THREAD - EVT_WAIT(3) - EVT_CALL(N(SuperBlock_AnimateEnergyOrbs), SUPER_BLOCK_MAPVAR) - EVT_WAIT(30) - EVT_RETURN - EVT_END -}; - -EvtScript N(SuperBlock_OnHit) = { - EVT_IF_EQ(SUPER_BLOCK_GAMEFLAG, 1) - EVT_RETURN - EVT_END_IF - EVT_CALL(IsStartingConversation, LVar0) - EVT_IF_EQ(LVar0, 1) - EVT_RETURN - EVT_END_IF - EVT_CALL(N(SuperBlock_WaitForPlayerToLand)) - EVT_IF_EQ(LVar0, 1) - EVT_RETURN - EVT_END_IF - EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS) - EVT_CALL(N(SuperBlock_SetOverride40)) - EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) - EVT_CALL(N(SuperBlock_StartGlowEffect), SUPER_BLOCK_MAPVAR, LVar9) - EVT_CALL(FindKeyItem, ITEM_ULTRA_STONE, LVarC) - EVT_CALL(N(SuperBlock_CountEligiblePartners)) - EVT_IF_EQ(LVar0, -1) - EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00DC, 160, 40) - EVT_WAIT(10) - EVT_CALL(N(SuperBlock_EndGlowEffect), LVar9) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS) - EVT_CALL(N(SuperBlock_ClearOverride40)) - EVT_RETURN - EVT_END_IF - EVT_IF_EQ(GF_Tutorial_SuperBlock, 0) - EVT_SET(GF_Tutorial_SuperBlock, 1) - EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00DA, 160, 40) - EVT_ELSE - EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00DB, 160, 40) - EVT_END_IF - EVT_CALL(N(SuperBlock_ShowSelectPartnerMenu)) - EVT_IF_EQ(LVar0, -1) - EVT_CALL(N(SuperBlock_EndGlowEffect), LVar9) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS) - EVT_CALL(N(SuperBlock_ClearOverride40)) - EVT_RETURN - EVT_END_IF - EVT_SET(LVarA, LVar0) - EVT_SET(LVarB, LVar1) - EVT_CALL(EnablePartnerAI) - EVT_CALL(GetCurrentPartnerID, LVar0) - EVT_IF_NE(LVar0, LVarB) - EVT_CALL(N(SuperBlock_SwitchToPartner), LVarB) - EVT_ELSE - EVT_CALL(func_802CF56C, 2) - EVT_END_IF - EVT_WAIT(10) - EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00DF, 160, 40) - EVT_CALL(ShowChoice, MSG_Choice_000D) - EVT_CALL(CloseMessage) - EVT_IF_NE(LVar0, 0) - EVT_CALL(N(SuperBlock_EndGlowEffect), LVar9) - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS) - EVT_CALL(N(SuperBlock_ClearOverride40)) - EVT_RETURN - EVT_END_IF - EVT_EXEC_WAIT(N(SuperBlock_ShowUpgradeEffects)) - EVT_CALL(N(SuperBlock_GetPartnerRank), LVarB, LVarD) - EVT_SET(SUPER_BLOCK_GAMEFLAG, 1) - EVT_CALL(N(SuperBlock_EndGlowEffect), LVar9) - EVT_CALL(N(SuperBlock_LoadCurrentPartnerName)) - EVT_IF_EQ(LVarD, 1) - EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00DD, 160, 40) - EVT_ELSE - EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00DE, 160, 40) - EVT_END_IF - EVT_CALL(DisablePlayerInput, FALSE) - EVT_CALL(EnablePartnerAI) - EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS) - EVT_CALL(N(SuperBlock_ClearOverride40)) - EVT_RETURN - EVT_END -}; diff --git a/src/world/common/entity/SuperBlock.inc.c b/src/world/common/entity/SuperBlock.inc.c index 4def7ab8dd..4dc953c782 100644 --- a/src/world/common/entity/SuperBlock.inc.c +++ b/src/world/common/entity/SuperBlock.inc.c @@ -1,9 +1,67 @@ #include "common.h" #include "npc.h" #include "effects.h" -#include "SuperBlock.inc.h" #include "hud_element.h" +// ---------------------------------------------------------------- +// Requirements + +// GameFlag for super block availability +#ifndef SUPER_BLOCK_GAMEFLAG + #error SUPER_BLOCK_GAMEFLAG is not defined! +#endif + +// MapVar for super block entity ID +#ifndef SUPER_BLOCK_MAPVAR + #error SUPER_BLOCK_MAPVAR is not defined! +#endif + +// ---------------------------------------------------------------- +// User macros + +// 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))) + +// ---------------------------------------------------------------- +// Implementation + +#define SUPER_BLOCK_NUM_ORBS 3 + +s32 N(SuperBlock_CantUpgradeMessages)[2] = { + MSG_Menus_00F0, MSG_Menus_00F1 +}; + +s16 N(SuperBlock_PartnerIDs)[8] = { + PARTNER_GOOMBARIO, + PARTNER_KOOPER, + PARTNER_BOMBETTE, + PARTNER_PARAKARRY, + PARTNER_BOW, + PARTNER_WATT, + PARTNER_SUSHIE, + PARTNER_LAKILESTER +}; + +s32 N(SuperBlock_UpgradeDescMessages)[8][2] = { + { MSG_Menus_00E0, MSG_Menus_00E1 }, + { MSG_Menus_00E2, MSG_Menus_00E3 }, + { MSG_Menus_00E4, MSG_Menus_00E5 }, + { MSG_Menus_00E6, MSG_Menus_00E7 }, + { MSG_Menus_00E8, MSG_Menus_00E9 }, + { MSG_Menus_00EA, MSG_Menus_00EB }, + { MSG_Menus_00EC, MSG_Menus_00ED }, + { MSG_Menus_00EE, MSG_Menus_00EF } +}; + +f32 N(SuperBlock_UpgradeOrbAngles)[SUPER_BLOCK_NUM_ORBS] = { + 140.0f, 180.0f, 220.0f +}; + API_CALLABLE(N(SuperBlock_SetOverride40)) { gOverrideFlags |= GLOBAL_OVERRIDES_40; return ApiStatus_DONE2; @@ -377,3 +435,118 @@ API_CALLABLE(N(SuperBlock_WaitForPlayerToLand)) { return ApiStatus_DONE2; } +EvtScript N(SuperBlock_ShowUpgradeEffects) = { + EVT_WAIT(10) + EVT_CALL(PlaySound, SOUND_212D) + EVT_CALL(N(SuperBlock_GatherEnergyFX), SUPER_BLOCK_MAPVAR) + EVT_WAIT(85) + EVT_THREAD + EVT_CALL(PlaySound, SOUND_212E) + EVT_CALL(N(SuperBlock_WhiteScreenFlash), 70, 70) + EVT_WAIT(27) + EVT_CALL(PlaySound, SOUND_208E) + EVT_CALL(N(SuperBlock_WhiteScreenFlash), 50, 50) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(3) + EVT_CALL(N(SuperBlock_HideBlockContent), SUPER_BLOCK_MAPVAR) + EVT_END_THREAD + EVT_THREAD + EVT_WAIT(47) + EVT_CALL(N(SuperBlock_RadiateFaintEnergyFX)) + EVT_CALL(N(SuperBlock_PartnerSparkles2)) + EVT_WAIT(5) + EVT_CALL(N(SuperBlock_PartnerSparkles4)) + EVT_WAIT(5) + EVT_CALL(N(SuperBlock_PartnerSparkles2)) + EVT_END_THREAD + EVT_WAIT(3) + EVT_CALL(N(SuperBlock_AnimateEnergyOrbs), SUPER_BLOCK_MAPVAR) + EVT_WAIT(30) + EVT_RETURN + EVT_END +}; + +EvtScript N(SuperBlock_OnHit) = { + EVT_IF_EQ(SUPER_BLOCK_GAMEFLAG, 1) + EVT_RETURN + EVT_END_IF + EVT_CALL(IsStartingConversation, LVar0) + EVT_IF_EQ(LVar0, 1) + EVT_RETURN + EVT_END_IF + EVT_CALL(N(SuperBlock_WaitForPlayerToLand)) + EVT_IF_EQ(LVar0, 1) + EVT_RETURN + EVT_END_IF + EVT_CALL(ModifyGlobalOverrideFlags, 1, GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS) + EVT_CALL(N(SuperBlock_SetOverride40)) + EVT_CALL(DisablePlayerInput, TRUE) + EVT_CALL(DisablePartnerAI, 0) + EVT_CALL(SetNpcFlagBits, NPC_PARTNER, NPC_FLAG_100, TRUE) + EVT_CALL(N(SuperBlock_StartGlowEffect), SUPER_BLOCK_MAPVAR, LVar9) + EVT_CALL(FindKeyItem, ITEM_ULTRA_STONE, LVarC) + EVT_CALL(N(SuperBlock_CountEligiblePartners)) + EVT_IF_EQ(LVar0, -1) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00DC, 160, 40) + EVT_WAIT(10) + EVT_CALL(N(SuperBlock_EndGlowEffect), LVar9) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS) + EVT_CALL(N(SuperBlock_ClearOverride40)) + EVT_RETURN + EVT_END_IF + EVT_IF_EQ(GF_Tutorial_SuperBlock, 0) + EVT_SET(GF_Tutorial_SuperBlock, 1) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00DA, 160, 40) + EVT_ELSE + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00DB, 160, 40) + EVT_END_IF + EVT_CALL(N(SuperBlock_ShowSelectPartnerMenu)) + EVT_IF_EQ(LVar0, -1) + EVT_CALL(N(SuperBlock_EndGlowEffect), LVar9) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS) + EVT_CALL(N(SuperBlock_ClearOverride40)) + EVT_RETURN + EVT_END_IF + EVT_SET(LVarA, LVar0) + EVT_SET(LVarB, LVar1) + EVT_CALL(EnablePartnerAI) + EVT_CALL(GetCurrentPartnerID, LVar0) + EVT_IF_NE(LVar0, LVarB) + EVT_CALL(N(SuperBlock_SwitchToPartner), LVarB) + EVT_ELSE + EVT_CALL(func_802CF56C, 2) + EVT_END_IF + EVT_WAIT(10) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00DF, 160, 40) + EVT_CALL(ShowChoice, MSG_Choice_000D) + EVT_CALL(CloseMessage) + EVT_IF_NE(LVar0, 0) + EVT_CALL(N(SuperBlock_EndGlowEffect), LVar9) + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS) + EVT_CALL(N(SuperBlock_ClearOverride40)) + EVT_RETURN + EVT_END_IF + EVT_EXEC_WAIT(N(SuperBlock_ShowUpgradeEffects)) + EVT_CALL(N(SuperBlock_GetPartnerRank), LVarB, LVarD) + EVT_SET(SUPER_BLOCK_GAMEFLAG, 1) + EVT_CALL(N(SuperBlock_EndGlowEffect), LVar9) + EVT_CALL(N(SuperBlock_LoadCurrentPartnerName)) + EVT_IF_EQ(LVarD, 1) + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00DD, 160, 40) + EVT_ELSE + EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_00DE, 160, 40) + EVT_END_IF + EVT_CALL(DisablePlayerInput, FALSE) + EVT_CALL(EnablePartnerAI) + EVT_CALL(ModifyGlobalOverrideFlags, 0, GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS) + EVT_CALL(N(SuperBlock_ClearOverride40)) + EVT_RETURN + EVT_END +}; diff --git a/src/world/common/entity/SuperBlock.inc.h b/src/world/common/entity/SuperBlock.inc.h deleted file mode 100644 index 53b180bc46..0000000000 --- a/src/world/common/entity/SuperBlock.inc.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef SUPER_BLOCK_INC_H -#define SUPER_BLOCK_INC_H - -#include "common.h" - -#define SUPER_BLOCK_NUM_ORBS 3 - -ApiStatus N(SuperBlock_SetOverride40)(Evt* script, s32 isInitialCall); -ApiStatus N(SuperBlock_ClearOverride40)(Evt* script, s32 isInitialCall); -ApiStatus N(SuperBlock_HideBlockContent)(Evt *script, s32 isInitialCall); -ApiStatus N(SuperBlock_GetPartnerRank)(Evt* script, s32 isInitialCall); -s32 N(SuperBlock_get_partner_rank)(s32 idx, s16 maxLevel); -ApiStatus N(SuperBlock_CountEligiblePartners)(Evt* script, s32 isInitialCall); -ApiStatus N(SuperBlock_ShowSelectPartnerMenu)(Evt* script, s32 isInitialCall); -ApiStatus N(SuperBlock_SwitchToPartner)(Evt* script, s32 isInitialCall); -ApiStatus N(SuperBlock_LoadCurrentPartnerName)(Evt* script, s32 isInitialCall); -ApiStatus N(SuperBlock_StartGlowEffect)(Evt* script, s32 isInitialCall); -ApiStatus N(SuperBlock_EndGlowEffect)(Evt* script, s32 isInitialCall); -ApiStatus N(SuperBlock_GatherEnergyFX)(Evt* script, s32 isInitialCall); -ApiStatus N(SuperBlock_RadiateFaintEnergyFX)(Evt* script, s32 isInitialCall); -ApiStatus N(SuperBlock_AnimateEnergyOrbs)(Evt* script, s32 isInitialCall); -ApiStatus N(SuperBlock_WhiteScreenFlash)(Evt* script, s32 isInitialCall); -ApiStatus N(SuperBlock_PartnerSparkles2)(Evt* script, s32 isInitialCall); -ApiStatus N(SuperBlock_PartnerSparkles4)(Evt* script, s32 isInitialCall); -ApiStatus N(SuperBlock_WaitForPlayerToLand)(Evt* script, s32 isInitialCall); - -extern s32 N(SuperBlock_CantUpgradeMessages)[2]; -extern s16 N(SuperBlock_PartnerIDs)[8]; -extern s32 N(SuperBlock_UpgradeDescMessages)[8][2]; -extern f32 N(SuperBlock_UpgradeOrbAngles)[SUPER_BLOCK_NUM_ORBS]; - -#endif diff --git a/src/world/common/npc/RaphaelRaven.h b/src/world/common/npc/RaphaelRaven.h new file mode 100644 index 0000000000..01589c2640 --- /dev/null +++ b/src/world/common/npc/RaphaelRaven.h @@ -0,0 +1,22 @@ +#include "common.h" +#include "sprite/npc/RaphaelRaven.h" + +#define RAPHAEL_RAVEN_ANIMS \ +{ \ + .idle = ANIM_RaphaelRaven_Idle, \ + .walk = ANIM_RaphaelRaven_Idle, \ + .run = ANIM_RaphaelRaven_Idle, \ + .chase = ANIM_RaphaelRaven_Idle, \ + .anim_4 = ANIM_RaphaelRaven_Idle, \ + .anim_5 = ANIM_RaphaelRaven_Idle, \ + .death = ANIM_RaphaelRaven_Idle, \ + .hit = ANIM_RaphaelRaven_Idle, \ + .anim_8 = ANIM_RaphaelRaven_Idle, \ + .anim_9 = ANIM_RaphaelRaven_Idle, \ + .anim_A = ANIM_RaphaelRaven_Idle, \ + .anim_B = ANIM_RaphaelRaven_Idle, \ + .anim_C = ANIM_RaphaelRaven_Idle, \ + .anim_D = ANIM_RaphaelRaven_Idle, \ + .anim_E = ANIM_RaphaelRaven_Idle, \ + .anim_F = ANIM_RaphaelRaven_Idle, \ +} diff --git a/src/world/common/npc/RaphaelRaven.inc.c b/src/world/common/npc/RaphaelRaven.inc.c new file mode 100644 index 0000000000..4816ecc804 --- /dev/null +++ b/src/world/common/npc/RaphaelRaven.inc.c @@ -0,0 +1,14 @@ +#include "RaphaelRaven.h" + +EvtScript N(EVS_NpcAuxAI_RaphaelRaven) = { + EVT_CALL(SetNpcScale, NPC_SELF, EVT_FLOAT(1.5), EVT_FLOAT(1.5), EVT_FLOAT(1.5)) + EVT_RETURN + EVT_END +}; + +NpcSettings N(NpcSettings_RaphaelRaven) = { + .height = 98, + .radius = 80, + .level = 99, + .otherAI = &N(EVS_NpcAuxAI_RaphaelRaven), +}; diff --git a/src/world/common/npc/Sushie.h b/src/world/common/npc/Sushie.h new file mode 100644 index 0000000000..a8eda68552 --- /dev/null +++ b/src/world/common/npc/Sushie.h @@ -0,0 +1,22 @@ +#include "common.h" +#include "sprite/npc/WorldSushie.h" + +#define SUSHIE_ANIMS \ +{ \ + .idle = ANIM_WorldSushie_Idle, \ + .walk = ANIM_WorldSushie_Idle, \ + .run = ANIM_WorldSushie_Idle, \ + .chase = ANIM_WorldSushie_Idle, \ + .anim_4 = ANIM_WorldSushie_Idle, \ + .anim_5 = ANIM_WorldSushie_Idle, \ + .death = ANIM_WorldSushie_Idle, \ + .hit = ANIM_WorldSushie_Idle, \ + .anim_8 = ANIM_WorldSushie_Idle, \ + .anim_9 = ANIM_WorldSushie_Idle, \ + .anim_A = ANIM_WorldSushie_Idle, \ + .anim_B = ANIM_WorldSushie_Idle, \ + .anim_C = ANIM_WorldSushie_Idle, \ + .anim_D = ANIM_WorldSushie_Idle, \ + .anim_E = ANIM_WorldSushie_Idle, \ + .anim_F = ANIM_WorldSushie_Idle, \ +} diff --git a/src/world/common/npc/Sushie.inc.c b/src/world/common/npc/Sushie.inc.c new file mode 100644 index 0000000000..6e38bb9029 --- /dev/null +++ b/src/world/common/npc/Sushie.inc.c @@ -0,0 +1,11 @@ +#include "common.h" +#include "Sushie.h" + +NpcSettings N(NpcSettings_Sushie) = { + .height = 23, + .radius = 22, + .level = 14, + .onHit = &EnemyNpcHit, + .onDefeat = &EnemyNpcDefeat, + .actionFlags = AI_ACTION_JUMP_WHEN_SEE_PLAYER, +}; diff --git a/src/world/common/npc/YoshiKid.h b/src/world/common/npc/YoshiKid.h index 5bc905d202..00cec89dc3 100644 --- a/src/world/common/npc/YoshiKid.h +++ b/src/world/common/npc/YoshiKid.h @@ -2,13 +2,6 @@ #include "sprite/npc/YoshiKid.h" -#define YOSHI_KID_DROPS \ -{ \ - .dropFlags = NPC_DROP_FLAG_80, \ - .heartDrops = NO_DROPS, \ - .flowerDrops = NO_DROPS, \ -} - #define YOSHI_KID_GREEN_ANIMS \ { \ .idle = ANIM_YoshiKid_Green_Idle, \ diff --git a/src/world/common/todo/GetFloorCollider.inc.c b/src/world/common/todo/GetFloorCollider.inc.c index a4bd5270f0..9de2226649 100644 --- a/src/world/common/todo/GetFloorCollider.inc.c +++ b/src/world/common/todo/GetFloorCollider.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -ApiStatus N(GetFloorCollider)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(GetFloorCollider)) { Bytecode* args = script->ptrReadPos; s32 outVar = *args++; diff --git a/src/world/common/todo/LetterDelivery.inc.c b/src/world/common/todo/LetterDelivery.inc.c deleted file mode 100644 index 67b6d5adb9..0000000000 --- a/src/world/common/todo/LetterDelivery.inc.c +++ /dev/null @@ -1,58 +0,0 @@ -#include "common.h" - -//TODO begin with a (guarded) include for GetItem functions: -// #include "world/common/atomic/ItemChoice_PartA.inc.c" - -// extern s32 N(LetterDelivery_SavedNpcAnim); - -ApiStatus N(LetterDelivery_Init)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - script->varTable[2] = evt_get_variable(script, *args++); - script->varTable[3] = evt_get_variable(script, *args++); - script->varTable[4] = evt_get_variable(script, *args++); - script->varTable[5] = evt_get_variable(script, *args++); - script->varTable[6] = evt_get_variable(script, *args++); - script->varTable[7] = evt_get_variable(script, *args++); - script->varTable[8] = evt_get_variable(script, *args++); - script->varTable[9] = evt_get_variable(script, *args++); - script->varTable[10] = evt_get_variable(script, *args++); - script->varTable[11] = evt_get_variable(script, *args++); - return ApiStatus_DONE2; -} - -ApiStatus N(LetterDelivery_CalcLetterPos)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 a0 = *args++; - f32 a = evt_get_variable(script, a0); - s32 a1 = *args++; - f32 b = evt_get_variable(script, a1); - s32 a2 = *args++; - f32 c = evt_get_variable(script, a2); - Npc* partner = get_npc_unsafe(NPC_PARTNER); - f32 currentCamYaw = clamp_angle(gCameras[gCurrentCameraID].currentYaw + 180.0f); - - add_vec2D_polar(&a, &c, 15.0f, partner->yaw); - add_vec2D_polar(&a, &c, 10.0f, currentCamYaw); - - evt_set_variable(script, a0, a); - evt_set_variable(script, a1, b); - evt_set_variable(script, a2, c); - - return ApiStatus_DONE2; -} - -ApiStatus N(LetterDelivery_SaveNpcAnim)(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(script->varTable[2]); - - N(LetterDelivery_SavedNpcAnim) = npc->currentAnim; - npc->currentAnim = script->varTable[4]; - return ApiStatus_DONE2; -} - -ApiStatus N(LetterDelivery_RestoreNpcAnim)(Evt* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(script->varTable[2]); - - npc->currentAnim = N(LetterDelivery_SavedNpcAnim); - return ApiStatus_DONE2; -} diff --git a/src/world/common/todo/PullVine.inc.c b/src/world/common/todo/PullVine.inc.c deleted file mode 100644 index ec165f500d..0000000000 --- a/src/world/common/todo/PullVine.inc.c +++ /dev/null @@ -1,35 +0,0 @@ -#include "common.h" -#include "model.h" - -ApiStatus N(PullVine_WaitForPlayerGrab)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - f32 modelX, modelY, modelZ; - f32 dx, dy, dz; - f32 dist; - s32 result; - - modelX = evt_get_float_variable(script, *args++); - modelY = evt_get_float_variable(script, *args++) + 15.0f; - modelZ = evt_get_float_variable(script, *args++); - dist = evt_get_float_variable(script, *args++); - dx = script->varTable[0] - modelX; - dy = script->varTable[1] - modelY; - dz = script->varTable[2] - modelZ; - result = 1; - if (!(SQ(dx) + SQ(dy) + SQ(dz) < SQ(dist))) { - result = 0; - } - script->varTable[0] = result; - return ApiStatus_DONE2; -} - -ApiStatus N(PullVine_UpdatePosition)(Evt* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - f32 x1 = evt_get_float_variable(script, *args++); - f32 x2 = evt_get_float_variable(script, *args++); - - evt_set_float_variable(script, *args++, (x2 - x1) / 10.0f); - return ApiStatus_DONE2; -} - -#include "world/common/todo/PullVineSub.inc.c" diff --git a/src/world/common/todo/UnkShadowFunc001.inc.c b/src/world/common/todo/UpdateLogShadow.inc.c similarity index 66% rename from src/world/common/todo/UnkShadowFunc001.inc.c rename to src/world/common/todo/UpdateLogShadow.inc.c index 4f86de0ec8..69a04474c7 100644 --- a/src/world/common/todo/UnkShadowFunc001.inc.c +++ b/src/world/common/todo/UpdateLogShadow.inc.c @@ -1,25 +1,23 @@ #include "common.h" #include "model.h" -ApiStatus N(UnkShadowFunc001)(Evt* script, s32 isInitialCall) { +API_CALLABLE(N(UpdateLogShadow)) { Bytecode* args = script->ptrReadPos; + f32 hitYaw, hitPitch, hitLength; f32 x, y, z; - f32 sp24; - f32 sp28; - f32 sp2C; Shadow* shadow; Model* model; if (isInitialCall) { - s32 treeIndex = evt_get_variable(script, *args++); + s32 modelID = evt_get_variable(script, *args++); script->functionTemp[3] = *args++; - script->functionTempPtr[1] = model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); + script->functionTempPtr[1] = model = get_model_from_list_index(get_model_list_index_from_tree_index(modelID)); script->functionTemp[2] = create_shadow_type(0, model->center.x, 0.0f, model->center.z); evt_set_variable(script, script->functionTemp[3], 0); } - if (evt_get_variable(script, script->functionTemp[3]) != 0) { + if (evt_get_variable(script, script->functionTemp[3])) { delete_shadow(script->functionTemp[2]); return ApiStatus_DONE2; } @@ -29,14 +27,14 @@ ApiStatus N(UnkShadowFunc001)(Evt* script, s32 isInitialCall) { x = model->center.x; y = model->center.y; z = model->center.z; - entity_raycast_down(&x, &y, &z, &sp24, &sp28, &sp2C); - set_standard_shadow_scale(shadow, sp2C); + entity_raycast_down(&x, &y, &z, &hitYaw, &hitPitch, &hitLength); + set_standard_shadow_scale(shadow, hitLength); shadow->rotation.y = 0.0f; shadow->position.x = x; shadow->position.y = y; shadow->position.z = z; - shadow->rotation.x = sp24; - shadow->rotation.z = sp28; + shadow->rotation.x = hitYaw; + shadow->rotation.z = hitPitch; shadow->scale.x *= 2.0f; shadow->scale.z *= 2.0f; return ApiStatus_BLOCK; diff --git a/src/world/dead/area_flo/flo_03/flo_03_3_npc.c b/src/world/dead/area_flo/flo_03/flo_03_3_npc.c index 345edb24a3..c6f1176beb 100644 --- a/src/world/dead/area_flo/flo_03/flo_03_3_npc.c +++ b/src/world/dead/area_flo/flo_03/flo_03_3_npc.c @@ -173,7 +173,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim16) EVT_WAIT(10) EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_QUESTION, -45, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_QUESTION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(GetNpcPos, NPC_MontyMole_02, LVar0, LVar1, LVar2) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0052) EVT_CALL(SetNpcYaw, NPC_MontyMole_02, 90) @@ -228,7 +228,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetNpcAnimation, NPC_Dayzee, ANIM_Dayzee_Anim0D) EVT_CALL(PlaySoundAtNpc, NPC_Dayzee, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Dayzee, EMOTE_EXCLAMATION, 45, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Dayzee, EMOTE_EXCLAMATION, 45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0056) EVT_SET(LVar4, EVT_FLOAT(90.0)) @@ -405,7 +405,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_01) = { EVT_SET(LVar1, 10) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_01, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_MontyMole_01, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF @@ -484,7 +484,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_02) = { EVT_SET(LVar1, 10) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_02, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_MontyMole_02, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_MontyMole_02, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF @@ -563,7 +563,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_03) = { EVT_SET(LVar1, 10) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_03, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_MontyMole_03, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_MontyMole_03, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF @@ -642,7 +642,7 @@ EvtScript N(EVS_NpcIdle_MontyMole_04) = { EVT_SET(LVar1, 10) EVT_END_IF EVT_CALL(PlaySoundAtNpc, NPC_MontyMole_04, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_MontyMole_04, EMOTE_EXCLAMATION, 0, LVar1, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_MontyMole_04, EMOTE_EXCLAMATION, 0, LVar1, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(LVar1) EVT_CALL(SetSelfEnemyFlagBits, ENEMY_FLAG_100000 | ENEMY_FLAG_IGNORE_TOUCH | ENEMY_FLAG_IGNORE_JUMP | ENEMY_FLAG_IGNORE_HAMMER | ENEMY_FLAG_10000000, 1) EVT_END_IF diff --git a/src/world/dead/area_flo/flo_08/flo_08_2_entity.c b/src/world/dead/area_flo/flo_08/flo_08_2_entity.c index 80e764d937..9504762b66 100644 --- a/src/world/dead/area_flo/flo_08/flo_08_2_entity.c +++ b/src/world/dead/area_flo/flo_08/flo_08_2_entity.c @@ -4,7 +4,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_FLO08_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_MakeEntities) = { EVT_MAKE_SUPER_BLOCK(-780, 120, -110, 0) diff --git a/src/world/dead/area_flo/flo_08/flo_08_4_npc.c b/src/world/dead/area_flo/flo_08/flo_08_4_npc.c index f2d50f7d1c..1113f52df2 100644 --- a/src/world/dead/area_flo/flo_08/flo_08_4_npc.c +++ b/src/world/dead/area_flo/flo_08/flo_08_4_npc.c @@ -162,7 +162,7 @@ StaticNpc N(NpcData_GateFlower) = { .settings = &N(NpcSettings_GateFlower), .pos = { -695.0f, 0.0f, -30.0f }, .yaw = 270, - .flags = ENEMY_FLAG_PASSIVE | ENEMY_FLAG_ENABLE_HIT_SCRIPT | ENEMY_FLAG_100 | ENEMY_FLAG_400 | ENEMY_FLAG_800 | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, + .flags = COMMON_PASSIVE_FLAGS | ENEMY_FLAG_2000 | ENEMY_FLAG_400000, .init = &N(EVS_NpcInit_GateFlower), .drops = GATE_FLOWER_DROPS, .animations = GATE_FLOWER_YELLOW_ANIMS, diff --git a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c b/src/world/dead/area_flo/flo_10/flo_10_5_npc.c index 457b3fd87d..d4f3c56d4e 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c +++ b/src/world/dead/area_flo/flo_10/flo_10_5_npc.c @@ -137,7 +137,7 @@ EvtScript N(EVS_NpcInteract_Lily) = { EVT_CALL(NpcFacePlayer, NPC_SELF, 1) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Lily_Idle) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Lily_Idle, ANIM_Lily_Idle, 0, MSG_CH6_007A) EVT_CALL(EndSpeech, NPC_SELF, ANIM_Lily_Dread, ANIM_Lily_Idle, 0) diff --git a/src/world/dead/area_flo/flo_11/flo_11_2_main.c b/src/world/dead/area_flo/flo_11/flo_11_2_main.c index 55dadbb27a..7dbe5b44af 100644 --- a/src/world/dead/area_flo/flo_11/flo_11_2_main.c +++ b/src/world/dead/area_flo/flo_11/flo_11_2_main.c @@ -4,7 +4,6 @@ #include "world/area_flo/common/FlowerSpawnRegion.inc.c" #include "world/common/entity/Pipe.inc.c" -#include "world/common/entity/Pipe.data.inc.c" API_CALLABLE(N(SpawnSunEffect)) { fx_sun_undeclared(FX_SUN_FROM_LEFT, 0, 0, 0, 0, 0); diff --git a/src/world/dead/area_flo/flo_16/flo_16_4_entity.c b/src/world/dead/area_flo/flo_16/flo_16_4_entity.c index 1105e453ed..4139b4c35d 100644 --- a/src/world/dead/area_flo/flo_16/flo_16_4_entity.c +++ b/src/world/dead/area_flo/flo_16/flo_16_4_entity.c @@ -4,7 +4,6 @@ #define SUPER_BLOCK_MAPVAR MV_SuperBlock #define SUPER_BLOCK_GAMEFLAG GF_FLO16_SuperBlock #include "world/common/entity/SuperBlock.inc.c" -#include "world/common/entity/SuperBlock.data.inc.c" EvtScript N(EVS_TetherCameraToPlayer) = { EVT_LABEL(0) diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c index ea29d5308d..935a7915e7 100644 --- a/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c +++ b/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c @@ -227,7 +227,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 5, MSG_CH5_010B) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Panic) EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.5)) @@ -367,7 +367,7 @@ API_CALLABLE(N(GetFloorCollider)) { return ApiStatus_DONE2; } -EvtScript N(EVS_NpcIdle_Misstar) = { +EvtScript N(EVS_Scene_Misstar) = { EVT_IF_EQ(AF_KZN20_MisstarFlightDone, FALSE) EVT_CALL(SetNpcPos, NPC_SELF, -120, 70, 45) EVT_WAIT(30) @@ -447,7 +447,7 @@ EvtScript N(EVS_NpcIdle_Misstar) = { EVT_CALL(SetNpcSpeed, NPC_SELF, EVT_FLOAT(3.0)) EVT_CALL(NpcMoveTo, NPC_SELF, 145, -10, 0) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(SetNpcRotation, NPC_SELF, 0, -30, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_Back) @@ -516,7 +516,7 @@ EvtScript N(EVS_NpcInteract_Misstar) = { EvtScript N(EVS_NpcInit_Misstar) = { EVT_IF_EQ(GB_StoryProgress, STORY_CH5_MT_LAVA_LAVA_ERUPTING) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_IdleAngry) - EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Misstar))) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_Scene_Misstar))) EVT_CALL(BindNpcInteract, NPC_SELF, EVT_PTR(N(EVS_NpcInteract_Misstar))) EVT_ELSE EVT_CALL(RemoveNpc, NPC_SELF) diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c b/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c index 7ab826ffa9..92b6540f30 100644 --- a/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c +++ b/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c @@ -164,7 +164,7 @@ EvtScript N(EVS_SetCharacterPositions) = { EVT_END }; -EvtScript N(EVS_NpcIdle_Misstar) = { +EvtScript N(EVS_Scene_Misstar) = { EVT_LOOP(0) EVT_WAIT(1) EVT_IF_NE(AF_KZN23_MessageClosed, FALSE) @@ -257,7 +257,7 @@ EvtScript N(EVS_NpcInit_Misstar) = { EVT_SET(AF_KZN23_GrabbedKolorado, FALSE) EVT_SET(AF_KZN23_GrabbedPlayer, FALSE) EVT_SET(AF_KZN22_FlewAway, FALSE) - EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Misstar))) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_Scene_Misstar))) EVT_RETURN EVT_END }; diff --git a/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c index 385681b2e2..c82a8b2e96 100644 --- a/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c +++ b/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c @@ -198,7 +198,7 @@ EvtScript N(EVS_SpawnPyroclasts) = { EVT_END }; -EvtScript N(EVS_NpcIdle_Misstar) = { +EvtScript N(EVS_Scene_Misstar) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) @@ -270,7 +270,7 @@ EvtScript N(EVS_NpcIdle_Misstar) = { EvtScript N(EVS_NpcInit_Misstar) = { EVT_CALL(SetNpcPos, NPC_SELF, 0, -100, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_IdleAngry) - EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_NpcIdle_Misstar))) + EVT_CALL(BindNpcIdle, NPC_SELF, EVT_PTR(N(EVS_Scene_Misstar))) EVT_RETURN EVT_END }; diff --git a/src/world/world.c b/src/world/world.c index bd32cf010b..1e1c207b44 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -599,24 +599,24 @@ MapConfig jan_maps[] = { { MAP(jan_01), .bgName = "yos_bg" }, { MAP(jan_02), .bgName = "yos_bg" }, { MAP(jan_03), .bgName = "yos_bg" }, - { MAP_UNSPLIT(jan_04, 0x80241140), .bgName = "yos_bg" }, - { MAP_UNSPLIT(jan_05, 0x80242710), .bgName = "yos_bg" }, - { MAP_UNSPLIT(jan_06, 0x80242620), .bgName = "jan_bg" }, - { MAP_UNSPLIT(jan_07, 0x80241230), .bgName = "yos_bg" }, - { MAP_UNSPLIT(jan_08, 0x80242460), .bgName = "yos_bg" }, - { MAP_UNSPLIT(jan_09, 0x80241960), .bgName = "yos_bg" }, - { MAP_UNSPLIT(jan_10, 0x80241750), .bgName = "yos_bg" }, - { MAP_UNSPLIT(jan_11, 0x80240810), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(jan_12, 0x80241280), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, - { MAP_UNSPLIT(jan_13, 0x802405F0), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, - { MAP_UNSPLIT(jan_14, 0x80241300), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, - { MAP_UNSPLIT(jan_15, 0x80240320), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, - { MAP_UNSPLIT(jan_16, 0x80240590), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP(jan_04), .bgName = "yos_bg" }, + { MAP(jan_05), .bgName = "yos_bg" }, + { MAP(jan_06), .bgName = "jan_bg" }, + { MAP(jan_07), .bgName = "yos_bg" }, + { MAP(jan_08), .bgName = "yos_bg" }, + { MAP(jan_09), .bgName = "yos_bg" }, + { MAP(jan_10), .bgName = "yos_bg" }, + { MAP(jan_11), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 2 }, + { MAP(jan_12), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP(jan_13), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP(jan_14), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP(jan_15), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP(jan_16), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, { MAP(jan_17), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 2 }, { MAP(jan_18), .bgName = "yos_bg" }, { MAP(jan_19), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 2 }, - { MAP_UNSPLIT(jan_22, 0x802419A0), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, - { MAP_UNSPLIT(jan_23, 0x80240010), .bgName = "yos_bg" }, + { MAP(jan_22), .bgName = "jan_bg", .songVariation = 1, .sfxReverb = 1 }, + { MAP(jan_23), .bgName = "yos_bg" }, }; /// Forever Forest diff --git a/tools/splat_ext/msg.yaml b/tools/splat_ext/msg.yaml index 69dd8f89df..0e790350b9 100644 --- a/tools/splat_ext/msg.yaml +++ b/tools/splat_ext/msg.yaml @@ -5006,7 +5006,7 @@ - [0x1A, 0x00CD, NpcTattle_RavenE] - [0x1A, 0x00CE, NpcTattle_JAN_ToadHouseToad] - [0x1A, 0x00CF, NpcTattle_Sushie] -- [0x1A, 0x00D0, NpcTattle_RafaelRaven] +- [0x1A, 0x00D0, NpcTattle_RaphaelRaven] - [0x1A, 0x00D1, NpcTattle_JAN_Bubulb_Hidden] - [0x1A, 0x00D2, NpcTattle_JAN_Bubulb_Revealed] - [0x1A, 0x00D3, NpcTattle_HeartPlant] diff --git a/tools/splat_ext/npc.yaml b/tools/splat_ext/npc.yaml index 772be4aa81..4026cf71f8 100644 --- a/tools/splat_ext/npc.yaml +++ b/tools/splat_ext/npc.yaml @@ -3967,7 +3967,7 @@ Fuzzipede: - Anim29 - Anim2A - Anim2B -JungleGuy: +SpearGuy: frames: - Raster00 - Raster01 @@ -10266,7 +10266,7 @@ LeadersFriend: - TalkSit - BowSit - TalkSitSad -RafaelRaven: +RaphaelRaven: frames: - Feathers1 - Feathers2 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B45860.data.s b/ver/us/asm/data/world/area_jan/jan_04/B45860.data.s deleted file mode 100644 index 6b05878c25..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_04/B45860.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802410F0_B45860 -.word 0xC3F18000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0x00000000, 0xC2C80000, 0x00000000, 0x42B40000, 0xC2DC0000, 0xC1700000, 0x434C0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802414C0, D_802410F0_B45860, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, jan_04_get_tattle, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000007, FadeInMusic, 0x00000000, 0x00000024, 0x00000000, 0x00000BB8, 0x00000000, 0x0000007F, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PushSong, 0x00000082, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000001F4, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, PopSong, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s b/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s deleted file mode 100644 index 032fb94d53..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_04/B45A20.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802412B0_B45A20 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_04_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_04_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000005DC, 0x00000043, 0x00000004, GotoMapSpecial, 0x802462B0, 0x00000000, 0x00000009, 0x00000008, 0x00000001, 0x00000064 - -dlabel D_80241384_B45AF4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802462B8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413E0_B45B50 -.word 0x00000047, 0x00000005, D_80241384_B45AF4, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024140C_B45B7C -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802413E0_B45B50, 0x00000044, 0x00000001, EnterWalk, 0x00000021, 0x00000002, 0x00000001, 0x00000002, 0x00000044, 0x00000001, 0x802449E0, 0x00000016, 0x00000001, 0x00000003, 0x00000044, 0x00000001, 0x80244454, 0x00000016, 0x00000001, 0x00000004, 0x00000023, 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, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80243708, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80243720, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_80241998_B46108, 0x00000044, 0x00000001, 0x80244314, 0x00000044, 0x00000001, 0x80245B74, 0x00000044, 0x00000001, 0x8024385C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000022, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000025, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000028, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000022, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000025, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000004, 0x00000001, 0x00000043, 0x00000002, MakeTransformGroup, 0x00000059, 0x00000043, 0x00000003, EnableTexPanning, 0x00000058, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000050, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 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_802412B0_B45A20, 0x00000057, 0x00000000, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, 0x80246260, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_8024140C_B45B7C, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80241180, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel jan_04_varStash -.word 0x00000000 - -dlabel D_80241804_B45F74 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000002, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, ShowGotItem, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024186C_B45FDC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000046, 0x00000001, D_80241804_B45F74, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xFE363C8B, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, AddItem, 0xFE363C8A, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, AddKeyItem, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, AddBadge, 0xFE363C8A, 0xFE363C80, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024194C_B460BC -.word 0x00000024, 0x00000002, 0xFE363C8A, 0x0000005B, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xF840604C, 0x00000001, 0x00000046, 0x00000001, D_8024186C_B45FDC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241998_B46108 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x00000026, 0x0000005F, 0x00000043, 0x00000008, MakeEntity, Entity_Chest, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000002, AssignChestFlag, 0xF840604C, 0x00000043, 0x00000002, AssignScript, D_8024194C_B460BC, 0x00000023, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0x0000012C, 0x00000000, 0xFFFFFF1F, 0x00000011, 0xF840604D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s b/ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s deleted file mode 100644 index 37389e0bd5..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_04/B461B0.data.s +++ /dev/null @@ -1,45 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241A40_B461B0 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x000E0001 - -dlabel D_80241A6C_B461DC -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241A7C_B461EC -.word 0x00000000, 0x002A001A, D_80241A6C_B461DC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241AA8_B46218 -.word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241AD4_B46244 -.word 0x00000043, 0x00000004, GetNpcVar, 0x00000000, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF9718888, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000024, 0x00000002, 0xF9718888, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00008000, 0x00000001, 0x0000000A, 0x00000002, 0xF840604A, 0x00000000, 0x0000000A, 0x00000002, 0xF8406049, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000002A0, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x0000005A, 0x0000008C, 0xFFFFFFAB, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000005A, 0x0000008C, 0xFFFFFFAB, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000005A, 0x0000008C, 0xFFFFFFAB, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000118, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000010, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000000, 0x00070004, 0x00070001, 0x00000000, 0x001000A1, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF8406049, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF9718888, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000002A0, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFFFFFFF6, 0x00000070, 0xFFFFFFB0, 0x0000000F, 0x00000024, 0x00000002, 0xF8406049, 0x00000000, 0x00000024, 0x00000002, 0xF840604A, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF9718888, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000002A0, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0x00000032, 0x00000000, 0x00000000, 0x00000014, 0x00000024, 0x00000002, 0xF8406049, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00070008, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x0000000A, 0x00000048, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00008000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E58_B465C8 -.word 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerLeave, 0x00000000, 0x00000000, 0x000000AA, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0xF8406049, 0x00000024, 0x00000002, 0xFE363C81, 0xF840604A, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000A2, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000A3, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000000, 0x00000000, 0x00000082, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FD8_B46748 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0010009E, 0x00000140, 0x0000003C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000000, 0x00000000, 0x00000082, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x0010009F, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080022, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000001E, 0x0000008C, 0xFFFFFFC4, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000010, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070008, 0x00070001, 0x00000000, 0x001000A0, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000003, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421DC_B4694C -.word 0x41F00000, 0x00000000, 0xC2DC0000, 0x00000000 - -dlabel D_802421EC_B4695C -.word 0x00000024, 0x00000002, 0xFE363C80, 0xF8406049, 0x00000024, 0x00000002, 0xFE363C81, 0xF840604A, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000046, 0x00000001, D_80241FD8_B46748, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718888, 0x00000000, 0x00000047, 0x00000005, D_80241AD4_B46244, 0x00001000, 0x0000002B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241AD4_B46244, 0x00100000, D_802421DC_B4694C, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_80241E58_B465C8, 0xFE363C89, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8A80, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000000A, 0x00000000, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070001, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8E80, 0x00000014, 0x0000012D, 0xF24ABE80, 0xF24A5E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A4, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A5, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070007, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A6, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00070004, 0x00070001, 0x00000000, 0x001000A7, 0x00000043, 0x00000001, CloseMessage, 0x00000043, 0x00000003, jan_04_ChangeNpcToPartner, 0x00000000, 0x00000007, 0x00000043, 0x00000001, jan_04_LoadPartyImage, 0x00000044, 0x00000001, 0x80241244, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D018F, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, 0x80241268, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000F, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242570_B46CE0 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000E, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00070007, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x0000000A, 0x00000002, 0xF840604A, 0x00000000, 0x0000000A, 0x00000002, 0xF8406049, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000037, 0x00000096, 0xFFFFFFA1, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000005A, 0x0000008C, 0xFFFFFFAB, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF8406049, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFFF6, 0x00000070, 0xFFFFFFB0, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802421EC_B4695C, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242714_B46E84 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000015, 0x0000000A, 0x00000002, 0xF840607C, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990305, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000321, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000323, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990302, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000002D, 0x0000001A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00990303, 0x00990302, 0x00000000, 0x001000A8, 0x00000024, 0x00000002, 0xF840607C, 0x00000001, 0x00000043, 0x00000003, SetTattleMessage, 0x00000001, 0x001A00D2, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00990303, 0x00990302, 0x00000000, 0x001000A9, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00990303, 0x00990302, 0x00000000, 0x001000AA, 0x00000018, 0x00000001, 0x0000002A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00990303, 0x00990302, 0x00000000, 0x001000AB, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00990303, 0x00990302, 0x00000000, 0x001000AC, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428E4_B47054 -.word 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242714_B46E84, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000015, 0x0000000A, 0x00000002, 0xF840607C, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x00000019, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00990307, 0x00000043, 0x00000003, SetTattleMessage, 0x00000001, 0x001A003B, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242978_B470E8 -.word 0x00000000, D_80241A40_B461B0, 0x00000000, 0xC47A0000, 0x00000000, 0x00400F09, D_80242570_B46CE0, 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, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00070001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80241A7C_B461EC, 0xC3660000, 0x00000000, 0xC3A00000, 0x00400D09, D_802428E4_B47054, 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, 0x00990302, 0x0099030E, 0x0099030E, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00990302, 0x00000000, 0x00000000, 0x00000000, 0x001A00D2 - -dlabel D_80242D58_B474C8 -.word 0x00000002, D_80241AA8_B46218, 0x00000000, 0xC47A0000, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00970001, 0x00970002, 0x00970003, 0x00970003, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00000000, 0x00000000, 0x00000000, 0x001A00C3, 0x00000003, D_80241AA8_B46218, 0x42340000, 0x00000000, 0xC28C0000, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00970401, 0x00970402, 0x00970403, 0x00970403, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00000000, 0x00000000, 0x00000000, 0x001A00C7, 0x00000004, D_80241AA8_B46218, 0x00000000, 0xC47A0000, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00970101, 0x00970102, 0x00970103, 0x00970103, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00000000, 0x00000000, 0x00000000, 0x001A00C4, 0x00000005, D_80241AA8_B46218, 0x41A00000, 0x00000000, 0xC28C0000, 0x00000005, 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, 0x00970301, 0x00970302, 0x00970303, 0x00970303, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00000000, 0x00000000, 0x00000000, 0x001A00C6, 0x00000006, D_80241AA8_B46218, 0x00000000, 0xC47A0000, 0x00000000, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00970201, 0x00970202, 0x00970203, 0x00970203, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00000000, 0x00000000, 0x00000000, 0x001A00C5, 0x00000002, D_80242978_B470E8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_80242978_B470E8, 0x00000000, 0x00000005, D_80242D58_B474C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B47EC0.data.s b/ver/us/asm/data/world/area_jan/jan_04/B47EC0.data.s deleted file mode 100644 index e313587737..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_04/B47EC0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243750_B47EC0 -.word 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000006, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFD050F81, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000028, 0x00000002, 0xFD050F81, 0x00000001, 0x00000027, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000000C, 0x00000002, 0xFD050F80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFD050F80, 0x0000005A, 0x00000024, 0x00000002, 0xFD050F81, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x0000005A, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B47FE0.data.s b/ver/us/asm/data/world/area_jan/jan_04/B47FE0.data.s deleted file mode 100644 index 8954739704..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_04/B47FE0.data.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243870_B47FE0 -.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_04_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_04_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_80243BD0_B48340 -.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_04_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_04_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_04_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_04_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_802441D4_B48944 -.word 0x00000005, 0x0000002A, 0x0000002B, 0x0000002C, 0x0000002D, 0x0000002E - -dlabel D_802441EC_B4895C -.word 0x00000001, 0x00000029 - -dlabel D_802441F4_B48964 -.word 0x00000002, 0xFFFFFE19, 0x00000072, 0xFFFFFF8D, 0xFFFFFE6E, 0x00000072, 0xFFFFFF83 - -dlabel D_80244210_B48980 -.word D_802441D4_B48944, D_802441EC_B4895C, 0x00000000, D_802441F4_B48964, 0x00000000 - -dlabel D_80244224_B48994 -.word 0xC3DF8000, 0x00000000, 0xC3110000, 0x00000000 - -dlabel D_80244234_B489A4 -.word 0x00000005, 0x00000031, 0x00000032, 0x00000033, 0x00000034, 0x00000035 - -dlabel D_8024424C_B489BC -.word 0x00000001, 0x00000030 - -dlabel D_80244254_B489C4 -.word 0x00000001, 0x00000039, 0x00000137, 0x0000005C, 0xFFFFFF23, 0x0000000D, 0xF840604B, 0xFAA2B58A - -dlabel D_80244274_B489E4 -.word 0x00000002, 0x00000147, 0x00000072, 0xFFFFFF1A, 0x0000019C, 0x00000072, 0xFFFFFF10 - -dlabel D_80244290_B48A00 -.word D_80244234_B489A4, D_8024424C_B489BC, D_80244254_B489C4, D_80244274_B489E4, 0x00000000 - -dlabel D_802442A4_B48A14 -.word 0x43B78000, 0x00000000, 0xC3820000, 0x00000000 - -dlabel D_802442B4_B48A24 -.word 0x00000005, 0x00000023, 0x00000024, 0x00000025, 0x00000026, 0x00000027 - -dlabel D_802442CC_B48A3C -.word 0x00000001, 0x00000022 - -dlabel D_802442D4_B48A44 -.word 0x00000002, 0xFFFFFFF6, 0x00000072, 0xFFFFFFB0, 0x0000004B, 0x00000072, 0xFFFFFFA6 - -dlabel D_802442F0_B48A60 -.word D_802442B4_B48A24, D_802442CC_B48A3C, 0x00000000, D_802442D4_B48A44, 0x00000000 - -dlabel D_80244304_B48A74 -.word 0x41F00000, 0x00000000, 0xC2DC0000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244210_B48980, 0x00000047, 0x00000005, D_80243BD0_B48340, 0x00001000, 0x0000003F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243BD0_B48340, 0x00100000, D_80244224_B48994, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244290_B48A00, 0x00000047, 0x00000005, D_80243BD0_B48340, 0x00001000, 0x0000003E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243BD0_B48340, 0x00100000, D_802442A4_B48A14, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802442F0_B48A60, 0x00000047, 0x00000005, D_80243BD0_B48340, 0x00001000, 0x0000002B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243BD0_B48340, 0x00100000, D_80244304_B48A74, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B48B70.data.s b/ver/us/asm/data/world/area_jan/jan_04/B48B70.data.s deleted file mode 100644 index e807e29dfb..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_04/B48B70.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244400_B48B70 -.word 0xC3AF0000, 0x00000000, 0x41700000, 0xC35C0000, 0x41C80000, 0x41700000, 0xC2DC0000, 0x00000000, 0x41F00000, 0xC2480000, 0x00000000, 0x43020000, 0x42480000, 0x00000000, 0x42DC0000, 0x43200000, 0x41C80000, 0x43200000, 0x437F0000, 0x00000000, 0x438E8000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFFFFFFD8, 0x00000000, 0x0000000F, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000010E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x0007000D, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00970307, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00970407, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABA80, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000005A, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFEA2, 0x00000000, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00970003, 0x00000043, 0x00000005, LoadPath, 0x0000005A, D_80244400_B48B70, 0x00000007, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFFFFFEA2, 0x00000000, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00970203, 0x00000043, 0x00000005, LoadPath, 0x0000005A, D_80244400_B48B70, 0x00000007, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00070004, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000000, 0xF24A8280, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00970004, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000200, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFFFFFEA2, 0x00000000, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00970103, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000004, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00970101, 0x00000058, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8280, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00970108, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00970109, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, FadeOutMusic, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, GotoMap, 0x802462CC, 0x0000000B, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B490C0.data.s b/ver/us/asm/data/world/area_jan/jan_04/B490C0.data.s deleted file mode 100644 index 194a3cb3b0..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_04/B490C0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244950_B490C0 -.word 0xC2200000, 0x43A50000, 0xC4610000, 0xC2EA0000, 0x43D20000, 0xC4160000, 0xC3430000, 0x43E88000, 0xC3960000, 0xC3880000, 0x43E88000, 0x00000000, 0xC3AF0000, 0x43A28000, 0x43960000, 0xC3AF0000, 0x437A0000, 0x43960000 - -dlabel D_80244998_B49108 -.word 0x41200000, 0x43020000, 0xC1A00000, 0x40A00000, 0x42960000, 0xC1A00000, 0x00000000, 0x00000000, 0xC1A00000 - -dlabel D_802449BC_B4912C -.word 0x00000000, 0x00000000, 0xC1A00000, 0x00000000, 0x41F00000, 0xC1000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000302, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEA2, 0x0000012C, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEA2, 0x0000012C, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x0000000A, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, MakeEntity, Entity_Chest, 0x00000000, 0x00000A5A, 0x00000000, 0x00000094, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240BE8_B45358, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, LoadPath, 0x00000046, D_80244950_B490C0, 0x00000006, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, jan_04_SetEntityPositionF, 0xFE363C89, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000003, GotoMap, 0x802462E8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000012, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000AA, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000010, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7F4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000007, MakeEntity, Entity_Chest, 0x00000000, 0x00000A5A, 0x00000000, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240D0C_B4547C, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, LoadPath, 0x0000000C, D_80244998_B49108, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, jan_04_SetEntityPositionF, 0xFE363C89, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001AF, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000056, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFFFFFFF1, 0x00000000, 0x00000000, 0x0000000A, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0x0000000F, 0x00000000, 0x00000000, 0x0000015E, 0x0000015E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000043, 0x00000005, LoadPath, 0x0000000A, D_802449BC_B4912C, 0x00000003, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, jan_04_SetEntityPositionF, 0xFE363C89, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x000001AF, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFFFFFFF6, 0x00000000, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000007, 0x00000002, 0xFFFFFFF6, 0x00000000, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000044, 0x00000001, 0x8024134C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B497F0.data.s b/ver/us/asm/data/world/area_jan/jan_04/B497F0.data.s deleted file mode 100644 index feab82456c..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_04/B497F0.data.s +++ /dev/null @@ -1,96 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80245080_B497F0 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_04_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_04_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_04_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_04_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup_jan_04_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup_jan_04_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_802459E4_B4A154 -.word 0x00000001, 0x00000042 - -dlabel D_802459EC_B4A15C -.word 0x00000001, 0xFFFFFE70, 0x00000014, 0xFFFFFF88 - -dlabel D_802459FC_B4A16C -.word D_802459E4_B4A154, 0x00000000, D_802459EC_B4A15C, 0x00000000 - -dlabel D_80245A0C_B4A17C -.word 0x00000001, 0x00000044 - -dlabel D_80245A14_B4A184 -.word 0x00000001, 0xFFFFFE9F, 0x00000016, 0xFFFFFFAF - -dlabel D_80245A24_B4A194 -.word D_80245A0C_B4A17C, 0x00000000, D_80245A14_B4A184, 0x00000000 - -dlabel D_80245A34_B4A1A4 -.word 0x00000001, 0x00000046 - -dlabel D_80245A3C_B4A1AC -.word 0x00000001, 0xFFFFFEF8, 0x00000014, 0xFFFFFE6E - -dlabel D_80245A4C_B4A1BC -.word D_80245A34_B4A1A4, 0x00000000, D_80245A3C_B4A1AC, 0x00000000 - -dlabel D_80245A5C_B4A1CC -.word 0x00000001, 0x00000048 - -dlabel D_80245A64_B4A1D4 -.word 0x00000001, 0xFFFFFF2D, 0x00000016, 0xFFFFFE5C - -dlabel D_80245A74_B4A1E4 -.word D_80245A5C_B4A1CC, 0x00000000, D_80245A64_B4A1D4, 0x00000000 - -dlabel D_80245A84_B4A1F4 -.word 0x00000001, 0x0000004A - -dlabel D_80245A8C_B4A1FC -.word 0x00000001, 0xFFFFFF91, 0x00000016, 0xFFFFFFC2 - -dlabel D_80245A9C_B4A20C -.word D_80245A84_B4A1F4, 0x00000000, D_80245A8C_B4A1FC, 0x00000000 - -dlabel D_80245AAC_B4A21C -.word 0x00000001, 0x0000004C - -dlabel D_80245AB4_B4A224 -.word 0x00000001, 0x00000102, 0x00000014, 0xFFFFFEE2 - -dlabel D_80245AC4_B4A234 -.word D_80245AAC_B4A21C, 0x00000000, D_80245AB4_B4A224, 0x00000000 - -dlabel D_80245AD4_B4A244 -.word 0x00000001, 0x0000004E - -dlabel D_80245ADC_B4A24C -.word 0x00000001, 0x0000013B, 0x00000014, 0xFFFFFEDF - -dlabel D_80245AEC_B4A25C -.word D_80245AD4_B4A244, 0x00000000, D_80245ADC_B4A24C, 0x00000000 - -dlabel D_80245AFC_B4A26C -.word 0x00000001, 0x00000050 - -dlabel D_80245B04_B4A274 -.word 0x00000001, 0x0000011C, 0x00000014, 0x000000B5 - -dlabel D_80245B14_B4A284 -.word D_80245AFC_B4A26C, 0x00000000, D_80245B04_B4A274, 0x00000000 - -dlabel D_80245B24_B4A294 -.word 0x00000001, 0x00000052 - -dlabel D_80245B2C_B4A29C -.word 0x00000001, 0x0000017A, 0x00000016, 0x000000B9 - -dlabel D_80245B3C_B4A2AC -.word D_80245B24_B4A294, 0x00000000, D_80245B2C_B4A29C, 0x00000000 - -dlabel D_80245B4C_B4A2BC -.word 0x00000001, 0x00000054 - -dlabel D_80245B54_B4A2C4 -.word 0x00000001, 0x000001B3, 0x00000014, 0x000000CD - -dlabel D_80245B64_B4A2D4 -.word D_80245B4C_B4A2BC, 0x00000000, D_80245B54_B4A2C4, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802459FC_B4A16C, 0x00000047, 0x00000005, D_80245080_B497F0, 0x00000100, 0x00000033, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80245A24_B4A194, 0x00000047, 0x00000005, D_80245080_B497F0, 0x00000100, 0x00000034, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80245A4C_B4A1BC, 0x00000047, 0x00000005, D_80245080_B497F0, 0x00000100, 0x00000035, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80245A74_B4A1E4, 0x00000047, 0x00000005, D_80245080_B497F0, 0x00000100, 0x00000036, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80245A9C_B4A20C, 0x00000047, 0x00000005, D_80245080_B497F0, 0x00000100, 0x00000037, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80245AC4_B4A234, 0x00000047, 0x00000005, D_80245080_B497F0, 0x00000100, 0x00000038, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80245AEC_B4A25C, 0x00000047, 0x00000005, D_80245080_B497F0, 0x00000100, 0x00000039, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80245B14_B4A284, 0x00000047, 0x00000005, D_80245080_B497F0, 0x00000100, 0x0000003A, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80245B3C_B4A2AC, 0x00000047, 0x00000005, D_80245080_B497F0, 0x00000100, 0x0000003B, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80245B64_B4A2D4, 0x00000047, 0x00000005, D_80245080_B497F0, 0x00000100, 0x0000003C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_04/B4A4B0.data.s b/ver/us/asm/data/world/area_jan/jan_04/B4A4B0.data.s deleted file mode 100644 index 7d7bae14b3..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_04/B4A4B0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80245D40_B4A4B0 -.word 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD8, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBD, 0x00000032, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBD, 0x00000035, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBD, 0x0000003C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBD, 0x00000041, 0x00000008, 0x00000001, 0x00000030, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFBF, 0x00000042, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFC1, 0x00000042, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFC6, 0x00000044, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFCB, 0x00000046, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD2, 0x00000048, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFD7, 0x00000049, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFDC, 0x0000004A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFDE, 0x0000004A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFE2, 0x0000004B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFE5, 0x0000004C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFEC, 0x0000004D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFF2, 0x0000004E, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFF6, 0x0000004F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0xFFFFFFFC, 0x0000004F, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DemoSetButtons, 0x00000004, 0x00000008, 0x00000001, 0x0000001C, 0x00000043, 0x00000002, DemoSetButtons, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000004, 0x00000050, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000005, 0x00000050, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000007, 0x00000051, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000000B, 0x00000051, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000010, 0x00000050, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000015, 0x0000004F, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000001F, 0x0000004D, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000028, 0x0000004B, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000032, 0x00000048, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x0000003C, 0x00000046, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, DemoJoystickXY, 0x00000040, 0x00000045, 0x00000008, 0x00000001, 0x0000001E, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802462F0, 0x00000002, 0x00000002, 0x00000008, 0x00000001, 0x0000006E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024619C_B4A90C -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetDemoState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF8405B89, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF8405B89, 0x00000001, 0x00000043, 0x00000004, GotoMapSpecial, 0x802462F0, 0x00000002, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024625C_B4A9CC -.word 0x00000000, 0x00000043, 0x00000001, func_80240FC0_B45730, 0x00000024, 0x00000002, 0xF8405B89, 0x00000000, 0x00000044, 0x00000001, D_8024619C_B4A90C, 0x00000044, 0x00000001, D_80245D40_B4A4B0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_05/B4D140.data.s b/ver/us/asm/data/world/area_jan/jan_05/B4D140.data.s deleted file mode 100644 index f54452aa2b..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_05/B4D140.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802426D0_B4D140 -.word 0x43A50000, 0x00000000, 0x43A50000, 0x439D8000, 0xC3FA0000, 0xC1A00000, 0x00000000, 0x42B40000, 0x43F00000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3E10000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242A1C, D_802426D0_B4D140, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, jan_05_get_tattle, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_05/B4D200.data.s b/ver/us/asm/data/world/area_jan/jan_05/B4D200.data.s deleted file mode 100644 index aafb18d4ff..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_05/B4D200.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242790_B4D200 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_05_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_05_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024282C_B4D29C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247A00, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242888_B4D2F8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247A08, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428E4_B4D354 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247A10, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242940_B4D3B0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247A18, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024299C_B4D40C -.word 0x00000047, 0x00000005, D_80242888_B4D2F8, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024282C_B4D29C, 0x00080000, 0x0000000D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802428E4_B4D354, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242940_B4D3B0, 0x00080000, 0x00000005, 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, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80246D28, 0x00000046, 0x00000001, 0x80247970, 0x00000044, 0x00000001, 0x80243588, 0x00000044, 0x00000001, 0x8024787C, 0x00000044, 0x00000001, 0x80244464, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002A, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000002C, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002A, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000002C, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000050, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000000, 0x00000001, 0x00000044, 0x00000001, 0x8024787C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000A, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_8024299C_B4D40C, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x80242750, 0x00000043, 0x00000002, MakeTransformGroup, 0x00000076, 0x00000043, 0x00000003, EnableTexPanning, 0x00000075, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000050, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 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_80242790_B4D200, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_05/B4D7A0.data.s b/ver/us/asm/data/world/area_jan/jan_05/B4D7A0.data.s deleted file mode 100644 index 7c2a45d0ac..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_05/B4D7A0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242D30_B4D7A0 -.word 0x0000000A, 0x00000002, 0xF8406053, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000004E, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x0000006E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000006F, 0x00000000, 0xFFFFFF10, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0x00000000, 0xFFFFFF10, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000004C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000004D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000004E, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x0000006E, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x0000006F, 0x00000000, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0x00000000, 0x0000000A, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0x0000005A, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0xFFFFFFA6, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F00_B4D970 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000004C, 0x00000165, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF10, 0xFFFFFEFD, 0x00000005, 0x00000006, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000006F, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242FC8_B4DA38 -.word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000043, 0x00000003, jan_05_UnkShadowFunc001, 0x0000006E, 0xFAA2B58B, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000004C, 0x7FFFFE00, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFEFD, 0x0000003C, 0x0000001E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000006F, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x0000003C, 0x00000000, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000006F, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000004C, 0x0000209D, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFFFFFF47, 0x00000000, 0x00000140, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000002, 0x00000003, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243204_B4DC74 -.word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFA6, 0x0000003C, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x0000006F, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000002, 0x00000003, 0x00000001, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024334C_B4DDBC -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000004C, 0x0000209E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000006E, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000071, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000001E, 0x00000008, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x00000009, 0x00000043, 0x00000005, TranslateGroup, 0x0000006F, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000072, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000006F, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000072, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802434DC_B4DF4C -.word 0x00000024, 0x00000002, 0xF8406053, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_80242F00_B4D970, 0x00000008, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80242FC8_B4DA38, 0x00000008, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80243204_B4DC74, 0x00000008, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_8024334C_B4DDBC, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000044, 0x00000001, D_80242D30_B4D7A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406053, 0x00000000, 0x00000047, 0x00000005, D_802434DC_B4DF4C, 0x00001000, 0x0000004C, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80242D30_B4D7A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_05/B4E050.data.s b/ver/us/asm/data/world/area_jan/jan_05/B4E050.data.s deleted file mode 100644 index 24193294d5..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_05/B4E050.data.s +++ /dev/null @@ -1,144 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802435E0_B4E050 -.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_05_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_05_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_05_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_05_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_05_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_05_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_80243F44_B4E9B4 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000003D, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x00000065, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000067, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_05_PullVine_ShearBushModel, 0x00000065, 0xFE363C86, 0x00000043, 0x00000003, jan_05_PullVine_ShearBushModel, 0x00000067, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024410C_B4EB7C -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003D, 0x7FFFFE00, 0x00000044, 0x00000001, D_80243F44_B4E9B4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000002E, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802441F4_B4EC64 -.word 0x00000001, 0x00000069 - -dlabel D_802441FC_B4EC6C -.word 0x00000001, 0x00000157, 0x000000A8, 0x00000014, 0x00000177, 0x00000007, 0xF8406070, 0x00000000 - -dlabel D_8024421C_B4EC8C -.word 0x00000001, 0x000000A8, 0x00000014, 0x00000177 - -dlabel D_8024422C_B4EC9C -.word D_802441F4_B4EC64, D_802441FC_B4EC6C, D_8024421C_B4EC8C, 0x00000000 - -dlabel D_8024423C_B4ECAC -.word 0x00000001, 0x00000046 - -dlabel D_80244244_B4ECB4 -.word 0x00000001, 0x00000157, 0xFFFFFE6F, 0x00000014, 0x000000B0, 0x00000006, 0xF8406057, 0xFAA2B58A - -dlabel D_80244264_B4ECD4 -.word 0x00000001, 0xFFFFFE6F, 0x00000014, 0x000000B0 - -dlabel D_80244274_B4ECE4 -.word D_8024423C_B4ECAC, D_80244244_B4ECB4, D_80244264_B4ECD4, 0x00000000 - -dlabel D_80244284_B4ECF4 -.word 0x00000001, 0x00000048 - -dlabel D_8024428C_B4ECFC -.word 0x00000001, 0xFFFFFF0E, 0x00000016, 0x000000CD - -dlabel D_8024429C_B4ED0C -.word D_80244284_B4ECF4, 0x00000000, D_8024428C_B4ECFC, 0x00000000 - -dlabel D_802442AC_B4ED1C -.word 0x00000001, 0x0000004A - -dlabel D_802442B4_B4ED24 -.word 0x00000001, 0xFFFFFF32, 0x00000014, 0x000000F8 - -dlabel D_802442C4_B4ED34 -.word D_802442AC_B4ED1C, 0x00000000, D_802442B4_B4ED24, 0x00000000 - -dlabel D_802442D4_B4ED44 -.word 0x00000001, 0x0000004C - -dlabel D_802442DC_B4ED4C -.word 0x00000001, 0xFFFFFE32, 0x00000014, 0xFFFFFF31 - -dlabel D_802442EC_B4ED5C -.word D_802442D4_B4ED44, 0x00000000, D_802442DC_B4ED4C, 0x00000000 - -dlabel D_802442FC_B4ED6C -.word 0x00000001, 0x0000004E - -dlabel D_80244304_B4ED74 -.word 0x00000001, 0xFFFFFE5F, 0x00000014, 0xFFFFFEFB - -dlabel D_80244314_B4ED84 -.word D_802442FC_B4ED6C, 0x00000000, D_80244304_B4ED74, 0x00000000 - -dlabel D_80244324_B4ED94 -.word 0x00000001, 0x00000050 - -dlabel D_8024432C_B4ED9C -.word 0x00000001, 0xFFFFFFE0, 0x00000016, 0xFFFFFE94 - -dlabel D_8024433C_B4EDAC -.word D_80244324_B4ED94, 0x00000000, D_8024432C_B4ED9C, 0x00000000 - -dlabel D_8024434C_B4EDBC -.word 0x00000001, 0x00000052 - -dlabel D_80244354_B4EDC4 -.word 0x00000001, 0xFFFFFFA5, 0x00000014, 0xFFFFFE1B - -dlabel D_80244364_B4EDD4 -.word D_8024434C_B4EDBC, 0x00000000, D_80244354_B4EDC4, 0x00000000 - -dlabel D_80244374_B4EDE4 -.word 0x00000001, 0x00000054 - -dlabel D_8024437C_B4EDEC -.word 0x00000001, 0x0000005E, 0x00000016, 0xFFFFFE1B - -dlabel D_8024438C_B4EDFC -.word D_80244374_B4EDE4, 0x00000000, D_8024437C_B4EDEC, 0x00000000 - -dlabel D_8024439C_B4EE0C -.word 0x00000001, 0x00000056 - -dlabel D_802443A4_B4EE14 -.word 0x00000001, 0x00000009, 0x00000014, 0xFFFFFFA6 - -dlabel D_802443B4_B4EE24 -.word D_8024439C_B4EE0C, 0x00000000, D_802443A4_B4EE14, 0x00000000 - -dlabel D_802443C4_B4EE34 -.word 0x00000001, 0x00000058 - -dlabel D_802443CC_B4EE3C -.word 0x00000001, 0x00000035, 0x00000014, 0xFFFFFFC1 - -dlabel D_802443DC_B4EE4C -.word D_802443C4_B4EE34, 0x00000000, D_802443CC_B4EE3C, 0x00000000 - -dlabel D_802443EC_B4EE5C -.word 0x00000001, 0x0000005A - -dlabel D_802443F4_B4EE64 -.word 0x00000001, 0x00000153, 0x00000016, 0xFFFFFF69 - -dlabel D_80244404_B4EE74 -.word D_802443EC_B4EE5C, 0x00000000, D_802443F4_B4EE64, 0x00000000 - -dlabel D_80244414_B4EE84 -.word 0x00000001, 0x0000005C - -dlabel D_8024441C_B4EE8C -.word 0x00000001, 0x00000090, 0x00000016, 0x000001EA - -dlabel D_8024442C_B4EE9C -.word D_80244414_B4EE84, 0x00000000, D_8024441C_B4EE8C, 0x00000000 - -dlabel D_8024443C_B4EEAC -.word 0x00000001, 0x0000005E - -dlabel D_80244444_B4EEB4 -.word 0x00000001, 0x000000D1, 0x00000014, 0x000001D7 - -dlabel D_80244454_B4EEC4 -.word D_8024443C_B4EEAC, 0x00000000, D_80244444_B4EEB4, 0x00000000, 0x00000047, 0x00000005, D_8024410C_B4EB7C, 0x00000100, 0x0000003D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024422C_B4EC9C, 0x00000047, 0x00000005, D_802435E0_B4E050, 0x00000100, 0x0000003C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244274_B4ECE4, 0x00000047, 0x00000005, D_802435E0_B4E050, 0x00000100, 0x0000003E, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024429C_B4ED0C, 0x00000047, 0x00000005, D_802435E0_B4E050, 0x00000100, 0x0000003F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802442C4_B4ED34, 0x00000047, 0x00000005, D_802435E0_B4E050, 0x00000100, 0x00000040, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802442EC_B4ED5C, 0x00000047, 0x00000005, D_802435E0_B4E050, 0x00000100, 0x00000041, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244314_B4ED84, 0x00000047, 0x00000005, D_802435E0_B4E050, 0x00000100, 0x00000042, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024433C_B4EDAC, 0x00000047, 0x00000005, D_802435E0_B4E050, 0x00000100, 0x00000043, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244364_B4EDD4, 0x00000047, 0x00000005, D_802435E0_B4E050, 0x00000100, 0x00000044, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024438C_B4EDFC, 0x00000047, 0x00000005, D_802435E0_B4E050, 0x00000100, 0x00000045, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802443B4_B4EE24, 0x00000047, 0x00000005, D_802435E0_B4E050, 0x00000100, 0x00000046, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802443DC_B4EE4C, 0x00000047, 0x00000005, D_802435E0_B4E050, 0x00000100, 0x00000047, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244404_B4EE74, 0x00000047, 0x00000005, D_802435E0_B4E050, 0x00000100, 0x00000048, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024442C_B4EE9C, 0x00000047, 0x00000005, D_802435E0_B4E050, 0x00000100, 0x00000049, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244454_B4EEC4, 0x00000047, 0x00000005, D_802435E0_B4E050, 0x00000100, 0x0000004A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_05/B4F170.data.s b/ver/us/asm/data/world/area_jan/jan_05/B4F170.data.s deleted file mode 100644 index bfb2310c13..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_05/B4F170.data.s +++ /dev/null @@ -1,123 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244700_B4F170 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000153, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450003, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000028, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450007, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, StartBattle - -dlabel D_80244A8C_B4F4FC -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244AB0_B4F520 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450005, 0x00000043, 0x00000003, GetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, GetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, GetSelfVar, 0x0000000C, 0xFE363C82, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244700_B4F170, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244C00_B4F670 -.word 0x00000000, 0x001E001E, 0x00000000, D_80244A8C_B4F4FC, D_80244700_B4F170, 0x00000000, 0x00000000, D_80244AB0_B4F520, 0x00000000, 0x00000000, 0x00100000 - -dlabel D_80244C2C_B4F69C -.word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80244C58_B4F6C8 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244CA4_B4F714 -.word 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244CD4_B4F744, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244CD4_B4F744 -.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_05_HeartPlant_SpawnHeart, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, D_80244CA4_B4F714, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244DE0_B4F850 -.word 0x00000000, 0x0014001C, D_80244C58_B4F6C8, D_80244CD4_B4F744, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80244E0C_B4F87C -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440008, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000209A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244F88_B4F9F8 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244FAC_B4FA1C -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244E0C_B4F87C, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024504C_B4FABC -.word 0x00000000, 0x0014001C, 0x00000000, D_80244F88_B4F9F8, D_80244E0C_B4F87C, 0x00000000, 0x00000000, D_80244FAC_B4FA1C, 0x00000000, 0x00000000, 0x00100000 - -dlabel D_80245078_B4FAE8 -.word 0x00440000, 0x00440001, 0x00440002, 0x00440008, 0xFFFFFFFF - -dlabel D_8024508C_B4FAFC -.word 0x3FC00000, 0x0000001E, 0x0000000A, 0x43160000, 0x00000000, 0x00000003, 0x40A00000, 0x00000046, 0x00000005, 0x43480000, 0x00000000, 0x00000001 - -dlabel D_802450BC_B4FB2C -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, jan_05_HoppingAI_Main, D_8024508C_B4FAFC, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802450F8_B4FB68 -.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_802450BC_B4FB2C, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 - -dlabel D_80245124_B4FB94 -.word 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF - -dlabel D_8024514C_B4FBBC -.word 0x00420000, 0xFFFFFFFF - -dlabel D_80245154_B4FBC4 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245210_B4FC80 -.word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 - -dlabel D_80245240_B4FCB0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_05_SpearGuyAI_Main, D_80245210_B4FC80, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802452B0_B4FD20 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80245240_B4FCB0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 - -dlabel D_802452DC_B4FD4C -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_05_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245384_B4FDF4 -.word 0x00000000, 0x00080014, 0x00000000, 0x00000000, D_802452DC_B4FD4C, 0x00000000, 0x00000000, D_80245154_B4FBC4, 0x00000000, 0x00000000, 0x00100008 - -dlabel D_802453B0_B4FE20 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000007, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002B0309, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000007D, 0x00000064, 0xFFFFFE78, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x00000331, 0x0000006E, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_802450BC_B4FB2C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802454F0_B4FF60 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802453B0_B4FE20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024556C_B4FFDC -.word 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, AwaitPlayerLeave, 0xFFFFFECC, 0xFFFFFEF2, 0x00000046, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000004, AwaitPlayerApproach, 0xFFFFFECC, 0xFFFFFEF2, 0x00000032, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000B8, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245670_B500E0 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x00000009, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000301, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFFFFFECC, 0x00000000, 0xFFFFFF08, 0x0000001E, 0x00000057, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, SetNpcVar, 0x00000003, 0x00000000, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245754_B501C4 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x0000032F, 0x00000000, 0x00000008, 0x00000001, 0x00000018, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x00000334, 0x00000000, 0x00000008, 0x00000001, 0x00000015, 0x00000043, 0x00000004, GetNpcVar, 0x00000003, 0x00000000, 0xFE363C80, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000009, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802457F8_B50268 -.word 0x00000045, 0x00000002, D_80245754_B501C4, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetNpcVar, 0x00000003, 0x00000000, 0xFE363C80, 0x0000000F, 0x00000002, 0xFE363C80, 0x00000009, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00970206, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x000001F0, 0x00000000, 0x00000008, 0x00000001, 0x0000000D, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802458C8_B50338 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000B8, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80245670_B500E0, 0x00001000, 0x0000002E, 0x00000001, 0x00000000, 0x00000045, 0x00000002, D_8024556C_B4FFDC, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFEF2, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEBC, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFE9D, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001B, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF28, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF47, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE5, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970202, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFEF2, 0xFFFFFF08, 0x0000001E, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFE363C81, 0xFFFFFF06, 0x0000001E, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000003, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C80, 0xFFFFFF08, 0x0000001E, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0x00000000, 0xFFFFFF08, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFFFFFF08, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000007, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097020B, 0x0097020A, 0x00000000, 0x001000B9, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097020B, 0x0097020A, 0x00000000, 0x001000BA, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00970204, 0x00970201, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970203, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFEC5, 0xFFFFFF79, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFFFFFEBB, 0x00000000, 0x000000D7, 0x00000019, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF840604E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004E, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, 0x80242750, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245EC8_B50938 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF840604E, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFECC, 0x0000006E, 0xFFFFFED4, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970207, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802458C8_B50338, 0x00000044, 0x00000001, D_802457F8_B50268, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245F84_B509F4 -.word 0x00000003, D_80244C2C_B4F69C, 0xC3A00000, 0x00000000, 0x42A00000, 0x00400D09, D_80245EC8_B50938, 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, 0x00970201, 0x00970202, 0x00970203, 0x00970203, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00970201, 0x00000000, 0x00000000, 0x00000000, 0x001A00C5 - -dlabel D_80246174_B50BE4 -.word 0x002B0301, 0x002B0302, 0x002B0303, 0x002B0308, 0xFFFFFFFF - -dlabel D_80246188_B50BF8 -.word 0x00000000, D_802450F8_B4FB68, 0x00000000, 0x00000000, 0x00000000, 0x00400400, D_802454F0_B4FF60, 0x00000000, 0x00000000, 0x0000010E, 0x800A009A, 0x00050000, 0x008B0005, 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, 0x00030000, 0x0000003F, 0x00000000, 0xFFFFFE92, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x0000003F, 0x00000000, 0xFFFFFE92, 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, 0x002B0302, 0x002B0302, 0x002B0303, 0x002B0303, 0x002B0301, 0x002B0301, 0x002B0308, 0x002B0308, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x00000003, 0x00000000, D_80246174_B50BE4, 0x00000000 - -dlabel D_80246378_B50DE8 -.word 0x00000001, D_802452B0_B4FD20, 0x00000000, 0x00000000, 0x00000000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000003, 0x00000000, D_80245124_B4FB94, 0x00000000, 0x00000002, D_80245384_B4FDF4, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, D_8024514C_B4FBBC, 0x00000000 - -dlabel D_80246758_B511C8 -.word 0x00000004, D_80244DE0_B4F850, 0x43D70000, 0x00000000, 0x434D0000, 0x00408D01, 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_80246948_B513B8 -.word 0x00000005, D_8024504C_B4FABC, 0x43BB8000, 0x00000000, 0x43820000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x0044000E, 0x0044000E, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00000000, 0x00000000, D_80245078_B4FAE8, 0x001A00D3 - -dlabel D_80246B38_B515A8 -.word 0x00000006, D_80244C00_B4F670, 0x43C80000, 0x00000000, 0xC2960000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450007, 0x00450007, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D4, 0x00000001, D_80246188_B50BF8, 0x140A0002, 0x00000002, D_80246378_B50DE8, 0x14000002, 0x00000001, D_80246758_B511C8, 0x00000000, 0x00000001, D_80246948_B513B8, 0x14080002, 0x00000001, D_80246B38_B515A8, 0x140E0002, 0x00000001, D_80245F84_B509F4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_05/B517F0.data.s b/ver/us/asm/data/world/area_jan/jan_05/B517F0.data.s deleted file mode 100644 index 41c62ef285..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_05/B517F0.data.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80246D80_B517F0 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_05_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_05_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_802470E0_B51B50 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_05_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_05_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup_jan_05_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup_jan_05_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_802476E4_B52154 -.word 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_8024268C_B4D0FC, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000007, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024773C_B521AC -.word 0x00000005, 0x00000034, 0x00000035, 0x00000036, 0x00000037, 0x00000038 - -dlabel D_80247754_B521C4 -.word 0x00000001, 0x00000033 - -dlabel D_8024775C_B521CC -.word 0x00000002, 0x00000057, 0x00000072, 0xFFFFFE7A, 0x000000AC, 0x00000072, 0xFFFFFE70 - -dlabel D_80247778_B521E8 -.word D_8024773C_B521AC, D_80247754_B521C4, 0x00000000, D_8024775C_B521CC, D_802476E4_B52154 - -dlabel D_8024778C_B521FC -.word 0x42FE0000, 0x00000000, 0xC3D20000, 0x00000000 - -dlabel D_8024779C_B5220C -.word 0x00000005, 0x0000002D, 0x0000002E, 0x0000002F, 0x00000030, 0x00000031 - -dlabel D_802477B4_B52224 -.word 0x00000001, 0x0000002C - -dlabel D_802477BC_B5222C -.word 0x00000001, 0x00000157, 0x00000190, 0x00000064, 0xFFFFFF6F, 0x0000000F, 0xF8406065, 0x00000000 - -dlabel D_802477DC_B5224C -.word 0x00000002, 0x00000192, 0x00000072, 0xFFFFFF79, 0x000001E7, 0x00000072, 0xFFFFFF6F - -dlabel D_802477F8_B52268 -.word D_8024779C_B5220C, D_802477B4_B52224, D_802477BC_B5222C, D_802477DC_B5224C, 0x00000000 - -dlabel D_8024780C_B5227C -.word 0x43DD0000, 0x00000000, 0xC3250000, 0x00000000 - -dlabel D_8024781C_B5228C -.word 0x00000005, 0x00000026, 0x00000027, 0x00000028, 0x00000029, 0x0000002A - -dlabel D_80247834_B522A4 -.word 0x00000001, 0x00000025 - -dlabel D_8024783C_B522AC -.word 0x00000002, 0xFFFFFECB, 0x00000070, 0xFFFFFED3, 0xFFFFFF1E, 0x00000069, 0xFFFFFECE - -dlabel D_80247858_B522C8 -.word D_8024781C_B5228C, D_80247834_B522A4, 0x00000000, D_8024783C_B522AC, 0x00000000 - -dlabel D_8024786C_B522DC -.word 0xC3870000, 0x00000000, 0xC39B0000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80247778_B521E8, 0x00000047, 0x00000005, D_802470E0_B51B50, 0x00001000, 0x00000039, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802470E0_B51B50, 0x00100000, D_8024778C_B521FC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802477F8_B52268, 0x00000047, 0x00000005, D_802470E0_B51B50, 0x00001000, 0x0000003A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802470E0_B51B50, 0x00100000, D_8024780C_B5227C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80247858_B522C8, 0x00000047, 0x00000005, D_802470E0_B51B50, 0x00001000, 0x0000002E, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802470E0_B51B50, 0x00100000, D_8024786C_B522DC, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_05/B523E0.data.s b/ver/us/asm/data/world/area_jan/jan_05/B523E0.data.s deleted file mode 100644 index d3f8c507eb..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_05/B523E0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80247970_B523E0 -.word 0x00000043, 0x00000008, MakeEntity, Entity_RedBlock, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000117, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406056, 0x00000043, 0x00000007, MakeEntity, Entity_CymbalPlant, 0x000000CD, 0x00000000, 0x000000DC, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_TrumpetPlant, 0xFFFFFE7E, 0x00000000, 0xFFFFFF2A, 0x000000A0, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_06/B54E10.data.s b/ver/us/asm/data/world/area_jan/jan_06/B54E10.data.s deleted file mode 100644 index 0ca9831b50..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_06/B54E10.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802425E0_B54E10 -.word 0x00000000, 0x00000000, 0x43EB0000, 0x00000000, 0x43EB0000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3EB0000, 0x43340000, 0xC3EB0000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80242C80_B554B0, D_802425E0_B54E10, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900F8 - -dlabel D_80242660_B54E90 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_06_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_06_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426FC_B54F2C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80246C90, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242758_B54F88 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80246C98, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802427B4_B54FE4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80246CA0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242810_B55040 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000003, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80246CA8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024286C_B5509C -.word 0x00000047, 0x00000005, D_802426FC_B54F2C, 0x00080000, 0x00000008, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242758_B54F88, 0x00080000, 0x0000000C, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802427B4_B54FE4, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242810_B55040, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428EC_B5511C -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000012, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006D, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000067, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000068, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000069, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006A, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006E, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006F, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000057, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006B, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006C, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006D, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000067, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000068, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000069, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006A, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006E, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000006F, 0xFFFFFF9C, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006B, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006C, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006D, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000068, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x00000069, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006A, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006E, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateModel, 0x0000006F, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x0000002A, 0xFFFFFF9C, 0x0000000F, 0xFFFFFE70, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000056, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000058, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242C80_B554B0 -.word 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, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000004, 0x00000000, 0x00000044, 0x00000001, D_802428EC_B5511C, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80245E30, 0x00000046, 0x00000001, 0x80244A90, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000036, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000038, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000003A, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000036, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000038, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000003A, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000064, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000065, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000066, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000067, 0x00000001, 0x00000044, 0x00000001, 0x802436BC, 0x00000044, 0x00000001, 0x802449E4, 0x00000044, 0x00000001, 0x80246A14, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000D, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_8024286C_B5509C, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x80243F68, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000043, 0x00000002, MakeTransformGroup, 0x0000008A, 0x00000043, 0x00000003, EnableTexPanning, 0x00000089, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000050, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 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_80242660_B54E90, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_06/B55860.data.s b/ver/us/asm/data/world/area_jan/jan_06/B55860.data.s deleted file mode 100644 index 17789ae362..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_06/B55860.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243030_B55860 -.word 0x0000002A, 0x00000000 - -dlabel D_80243038_B55868 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000019, 0xF24A7DB4, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000019, 0xF24A7D4D, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000001, 0x00000005, 0x00000032, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000029, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000029, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000070, 0xFE363C83, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000070, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetItemPos, 0xFD050F8B, 0xFE363C83, 0x0000000F, 0xFFFFFE70, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000019, 0xF24A7CE7, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000019, 0xF24A7C80, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000019, 0xF24A7C1A, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000005, 0x00000000, 0x0000004B, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000029, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000029, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000005, TranslateGroup, 0x00000070, 0xFE363C83, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000070, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetItemPos, 0xFD050F8B, 0xFE363C83, 0x0000000F, 0xFFFFFE70, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802432E4_B55B14 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000006F, 0x00000043, 0x00000004, func_80240310_B52B40, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024333C_B55B6C -.word 0x00000043, 0x00000002, PlaySound, 0x80000018, 0x00000046, 0x00000001, D_80243038_B55868, 0x00000043, 0x00000002, GetModelCenter, 0x0000006F, 0x00000043, 0x00000006, PlaySoundAt, 0x80000010, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000045, 0x00000002, D_802432E4_B55B14, 0xFE363C89, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x000000B4, 0xF24A7C1A, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFF9C, 0x000000B4, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000070, 0xFE363C80, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000070, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetItemPos, 0xFD050F8B, 0xFE363C80, 0x0000000F, 0xFFFFFE70, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7E80, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000002, StopSound, 0x80000010, 0x00000043, 0x00000002, StopSound, 0x80000018, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000056, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000058, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000057, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243544_B55D74 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000001, ShowKeyChoicePopup, 0x0000000E, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D015B, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, RemoveKeyItemAt, 0xFE363C81, 0x00000043, 0x00000007, MakeItemEntity, 0x0000002A, 0x00000000, 0x0000000F, 0xFFFFFE70, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000043, 0x00000001, CloseChoicePopup, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x01060006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_8024333C_B55B6C, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000012, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000012, 0x0000004E, 0x00000006, D_80243544_B55D74, 0x00000100, 0x00000056, D_80243030_B55860, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_06/B55F40.data.s b/ver/us/asm/data/world/area_jan/jan_06/B55F40.data.s deleted file mode 100644 index 817572fea4..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_06/B55F40.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243710_B55F40 -.word 0x0000000A, 0x00000002, 0xF8406054, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000005C, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000085, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000005A, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000005B, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000005C, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000085, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0x00000000, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0x00000000, 0x0000000A, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000083, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000086, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000083, 0x0000005A, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000086, 0xFFFFFFA6, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802438E0_B56110 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000005A, 0x00000165, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF6A, 0xFFFFFF57, 0x00000005, 0x00000006, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802439A8_B561D8 -.word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000043, 0x00000003, jan_06_UnkShadowFunc001, 0x00000082, 0xFAA2B58B, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000005A, 0x7FFFFE00, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF57, 0x0000003C, 0x0000001E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x0000003C, 0x00000000, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000005A, 0x0000209D, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0xFFFFFF9C, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000002, 0x00000003, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243BE4_B56414 -.word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFFFFFFA6, 0x0000003C, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000083, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000086, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000002, 0x00000003, 0x00000001, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243D2C_B5655C -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000005A, 0x0000209E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000082, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x00000085, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000001E, 0x00000008, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x00000009, 0x00000043, 0x00000005, TranslateGroup, 0x00000083, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000086, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000083, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000086, 0xFFFFFFA6, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000083, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000086, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243EBC_B566EC -.word 0x00000024, 0x00000002, 0xF8406054, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_802438E0_B56110, 0x00000008, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_802439A8_B561D8, 0x00000008, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80243BE4_B56414, 0x00000008, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80243D2C_B5655C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000044, 0x00000001, D_80243710_B55F40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406054, 0x00000000, 0x00000047, 0x00000005, D_80243EBC_B566EC, 0x00001000, 0x0000005A, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80243710_B55F40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_06/B567F0.data.s b/ver/us/asm/data/world/area_jan/jan_06/B567F0.data.s deleted file mode 100644 index f45316f58b..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_06/B567F0.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243FC0_B567F0 -.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_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, jan_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_80244320_B56B50 -.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_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, jan_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, jan_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, jan_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_80244924_B57154 -.word 0x00000001, 0x00000034 - -dlabel D_8024492C_B5715C -.word 0x00000001, 0x0000002B - -dlabel D_80244934_B57164 -.word 0x00000001, 0x00000157, 0xFFFFFF1F, 0x00000050, 0xFFFFFE84, 0x0000000F, 0xF8406066, 0xFAA2B58A - -dlabel D_80244954_B57184 -.word 0x00000002, 0xFFFFFEBB, 0x00000072, 0xFFFFFEB6, 0xFFFFFF10, 0x00000072, 0xFFFFFEAC - -dlabel D_80244970_B571A0 -.word D_80244924_B57154, D_8024492C_B5715C, D_80244934_B57164, D_80244954_B57184, 0x00000000 - -dlabel D_80244984_B571B4 -.word 0xC38E8000, 0x00000000, 0xC3B40000, 0x00000000 - -dlabel D_80244994_B571C4 -.word 0x00000001, 0x0000003B - -dlabel D_8024499C_B571CC -.word 0x00000001, 0x0000002C - -dlabel D_802449A4_B571D4 -.word 0x00000002, 0x0000019C, 0x00000072, 0xFFFFFF97, 0x000001F1, 0x00000072, 0xFFFFFF8D - -dlabel D_802449C0_B571F0 -.word D_80244994_B571C4, D_8024499C_B571CC, 0x00000000, D_802449A4_B571D4, 0x00000000 - -dlabel D_802449D4_B57204 -.word 0x43E20000, 0x00000000, 0xC3070000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244970_B571A0, 0x00000047, 0x00000005, D_80244320_B56B50, 0x00001000, 0x00000043, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244320_B56B50, 0x00100000, D_80244984_B571B4, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802449C0_B571F0, 0x00000047, 0x00000005, D_80244320_B56B50, 0x00001000, 0x00000044, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80244320_B56B50, 0x00100000, D_802449D4_B57204, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_06/B572C0.data.s b/ver/us/asm/data/world/area_jan/jan_06/B572C0.data.s deleted file mode 100644 index ad62e89364..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_06/B572C0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244A90_B572C0 -.word 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0x00000054, 0x00000000, 0xFFFFFEC0, 0x00000005, 0x80000000, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000011D, 0xFFFFFFC4, 0x000000DC, 0x00000011, 0xF8406058, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_06/B57320.data.s b/ver/us/asm/data/world/area_jan/jan_06/B57320.data.s deleted file mode 100644 index d12df53836..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_06/B57320.data.s +++ /dev/null @@ -1,78 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244AF0_B57320 -.word 0x3FC00000, 0x0000001E, 0x0000000A, 0x43160000, 0x00000000, 0x00000003, 0x40A00000, 0x00000046, 0x00000005, 0x43480000, 0x00000000, 0x00000001 - -dlabel D_80244B20_B57350 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, jan_06_HoppingAI_Main, D_80244AF0_B57320, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244B5C_B5738C -.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80244B20_B57350, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 - -dlabel D_80244B88_B573B8 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244BD4_B57404 -.word 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244C04_B57434, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244C04_B57434 -.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_06_HeartPlant_SpawnHeart, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, D_80244BD4_B57404, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244D10_B57540 -.word 0x00000000, 0x0014001C, D_80244B88_B573B8, D_80244C04_B57434, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80244D3C_B5756C -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440008, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000209A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244EB8_B576E8 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244EDC_B5770C -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244D3C_B5756C, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244F7C_B577AC -.word 0x00000000, 0x0014001C, 0x00000000, D_80244EB8_B576E8, D_80244D3C_B5756C, 0x00000000, 0x00000000, D_80244EDC_B5770C, 0x00000000, 0x00000000, 0x00100000, 0x00440000, 0x00440001, 0x00440002, 0x00440008, 0xFFFFFFFF, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF - -dlabel D_80244FE4_B57814 -.word 0x00420000, 0xFFFFFFFF - -dlabel D_80244FEC_B5781C -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802450A8_B578D8 -.word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 - -dlabel D_802450D8_B57908 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_06_SpearGuyAI_Main, D_802450A8_B578D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245148_B57978 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802450D8_B57908, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 - -dlabel D_80245174_B579A4 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_06_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024521C_B57A4C -.word 0x00000000, 0x00080014, 0x00000000, 0x00000000, D_80245174_B579A4, 0x00000000, 0x00000000, D_80244FEC_B5781C, 0x00000000, 0x00000000, 0x00100008 - -dlabel D_80245248_B57A78 -.word 0x002B0201, 0x002B0202, 0x002B0203, 0x002B0208, 0xFFFFFFFF - -dlabel D_8024525C_B57A8C -.word 0x00000000, D_80244B5C_B5738C, 0x439B0000, 0x41C00000, 0x420C0000, 0x00400400, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800A009A, 0x00050000, 0x008B0005, 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, 0x00030000, 0x00000136, 0x00000018, 0x00000023, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000136, 0x00000018, 0x00000023, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0302, 0x002B0302, 0x002B0303, 0x002B0303, 0x002B0301, 0x002B0301, 0x002B0308, 0x002B0308, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x00000003, 0x00000000, D_80245248_B57A78, 0x00000000 - -dlabel D_8024544C_B57C7C -.word 0x00420003, 0x00420004, 0x00420005, 0x00420006, 0x0042000F, 0x00420010, 0x00420007, 0x00420008, 0x00420009, 0x0042000D, 0x0042001A, 0x0042001B, 0xFFFFFFFF - -dlabel D_80245480_B57CB0 -.word 0x00000001, D_80245148_B57978, 0xC3950000, 0x420C0000, 0x42140000, 0x00400400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFED6, 0x00000000, 0x00000025, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFED6, 0x00000000, 0x00000025, 0x00000096, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000003, 0x00000000, D_8024544C_B57C7C, 0x00000000, 0x00000002, D_8024521C_B57A4C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, D_80244FE4_B57814, 0x00000000 - -dlabel D_80245860_B58090 -.word 0x00000003, D_80244D10_B57540, 0x43CD0000, 0x00000000, 0xC1F00000, 0x00408D01, 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_80245A50_B58280 -.word 0x00000004, D_80244F7C_B577AC, 0x42DC0000, 0x00000000, 0x425C0000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x0044000E, 0x0044000E, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3 - -dlabel D_80245C40_B58470 -.word 0x00000005, D_80244F7C_B577AC, 0xC3D70000, 0x00000000, 0xC2A00000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x0044000E, 0x0044000E, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00000000, 0x00000000, 0x00000000, 0x001A00D3, 0x00000001, D_8024525C_B57A8C, 0x140D0002, 0x00000002, D_80245480_B57CB0, 0x14020002, 0x00000001, D_80245860_B58090, 0x00000000, 0x00000001, D_80245A50_B58280, 0x14080002, 0x00000001, D_80245C40_B58470, 0x14080002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_06/B586B0.data.s b/ver/us/asm/data/world/area_jan/jan_06/B586B0.data.s deleted file mode 100644 index 2124c17089..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_06/B586B0.data.s +++ /dev/null @@ -1,132 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80245E80_B586B0 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_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, dup_jan_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, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_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, dup_jan_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, dup_jan_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, dup_jan_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_802467E4_B59014 -.word 0x00000001, 0x0000004A - -dlabel D_802467EC_B5901C -.word 0x00000001, 0xFFFFFE2B, 0x00000014, 0xFFFFFF8B - -dlabel D_802467FC_B5902C -.word D_802467E4_B59014, 0x00000000, D_802467EC_B5901C, 0x00000000 - -dlabel D_8024680C_B5903C -.word 0x00000001, 0x0000004C - -dlabel D_80246814_B59044 -.word 0x00000001, 0xFFFFFE3D, 0x00000016, 0xFFFFFF6F - -dlabel D_80246824_B59054 -.word D_8024680C_B5903C, 0x00000000, D_80246814_B59044, 0x00000000 - -dlabel D_80246834_B59064 -.word 0x00000001, 0x0000004E - -dlabel D_8024683C_B5906C -.word 0x00000001, 0xFFFFFF00, 0x00000016, 0xFFFFFE5A - -dlabel D_8024684C_B5907C -.word D_80246834_B59064, 0x00000000, D_8024683C_B5906C, 0x00000000 - -dlabel D_8024685C_B5908C -.word 0x00000001, 0x00000050 - -dlabel D_80246864_B59094 -.word 0x00000001, 0xFFFFFF73, 0x00000014, 0xFFFFFE1C - -dlabel D_80246874_B590A4 -.word D_8024685C_B5908C, 0x00000000, D_80246864_B59094, 0x00000000 - -dlabel D_80246884_B590B4 -.word 0x00000001, 0x00000052 - -dlabel D_8024688C_B590BC -.word 0x00000001, 0xFFFFFFB0, 0x00000014, 0xFFFFFE16 - -dlabel D_8024689C_B590CC -.word D_80246884_B590B4, 0x00000000, D_8024688C_B590BC, 0x00000000 - -dlabel D_802468AC_B590DC -.word 0x00000001, 0x00000054 - -dlabel D_802468B4_B590E4 -.word 0x00000001, 0x00000054, 0x00000016, 0xFFFFFE16 - -dlabel D_802468C4_B590F4 -.word D_802468AC_B590DC, 0x00000000, D_802468B4_B590E4, 0x00000000 - -dlabel D_802468D4_B59104 -.word 0x00000001, 0x00000056 - -dlabel D_802468DC_B5910C -.word 0x00000001, 0x000000C8, 0x00000014, 0xFFFFFE30 - -dlabel D_802468EC_B5911C -.word D_802468D4_B59104, 0x00000000, D_802468DC_B5910C, 0x00000000 - -dlabel D_802468FC_B5912C -.word 0x00000001, 0x00000058 - -dlabel D_80246904_B59134 -.word 0x00000001, 0x00000072, 0x00000014, 0xFFFFFFF9 - -dlabel D_80246914_B59144 -.word D_802468FC_B5912C, 0x00000000, D_80246904_B59134, 0x00000000 - -dlabel D_80246924_B59154 -.word 0x00000001, 0x0000005A - -dlabel D_8024692C_B5915C -.word 0x00000001, 0x000000A4, 0x00000016, 0xFFFFFFE7 - -dlabel D_8024693C_B5916C -.word D_80246924_B59154, 0x00000000, D_8024692C_B5915C, 0x00000000 - -dlabel D_8024694C_B5917C -.word 0x00000001, 0x0000005C - -dlabel D_80246954_B59184 -.word 0x00000001, 0xFFFFFF84, 0x00000016, 0x00000174 - -dlabel D_80246964_B59194 -.word D_8024694C_B5917C, 0x00000000, D_80246954_B59184, 0x00000000 - -dlabel D_80246974_B591A4 -.word 0x00000001, 0x0000005E - -dlabel D_8024697C_B591AC -.word 0x00000001, 0xFFFFFFA9, 0x00000014, 0x00000155 - -dlabel D_8024698C_B591BC -.word D_80246974_B591A4, 0x00000000, D_8024697C_B591AC, 0x00000000 - -dlabel D_8024699C_B591CC -.word 0x00000001, 0x00000060 - -dlabel D_802469A4_B591D4 -.word 0x00000001, 0x00000096, 0x00000014, 0x000001E6 - -dlabel D_802469B4_B591E4 -.word D_8024699C_B591CC, 0x00000000, D_802469A4_B591D4, 0x00000000 - -dlabel D_802469C4_B591F4 -.word 0x00000001, 0x00000062 - -dlabel D_802469CC_B591FC -.word 0x00000001, 0x0000018C, 0x00000014, 0xFFFFFFA6 - -dlabel D_802469DC_B5920C -.word D_802469C4_B591F4, 0x00000000, D_802469CC_B591FC, 0x00000000 - -dlabel D_802469EC_B5921C -.word 0x00000001, 0x00000064 - -dlabel D_802469F4_B59224 -.word 0x00000001, 0x000001B7, 0x00000016, 0x0000008C - -dlabel D_80246A04_B59234 -.word D_802469EC_B5921C, 0x00000000, D_802469F4_B59224, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802467FC_B5902C, 0x00000047, 0x00000005, D_80245E80_B586B0, 0x00000100, 0x00000046, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246824_B59054, 0x00000047, 0x00000005, D_80245E80_B586B0, 0x00000100, 0x00000047, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024684C_B5907C, 0x00000047, 0x00000005, D_80245E80_B586B0, 0x00000100, 0x00000048, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246874_B590A4, 0x00000047, 0x00000005, D_80245E80_B586B0, 0x00000100, 0x00000049, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024689C_B590CC, 0x00000047, 0x00000005, D_80245E80_B586B0, 0x00000100, 0x0000004A, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802468C4_B590F4, 0x00000047, 0x00000005, D_80245E80_B586B0, 0x00000100, 0x0000004B, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802468EC_B5911C, 0x00000047, 0x00000005, D_80245E80_B586B0, 0x00000100, 0x0000004C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246914_B59144, 0x00000047, 0x00000005, D_80245E80_B586B0, 0x00000100, 0x0000004D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024693C_B5916C, 0x00000047, 0x00000005, D_80245E80_B586B0, 0x00000100, 0x0000004E, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246964_B59194, 0x00000047, 0x00000005, D_80245E80_B586B0, 0x00000100, 0x0000004F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024698C_B591BC, 0x00000047, 0x00000005, D_80245E80_B586B0, 0x00000100, 0x00000050, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802469B4_B591E4, 0x00000047, 0x00000005, D_80245E80_B586B0, 0x00000100, 0x00000051, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802469DC_B5920C, 0x00000047, 0x00000005, D_80245E80_B586B0, 0x00000100, 0x00000052, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246A04_B59234, 0x00000047, 0x00000005, D_80245E80_B586B0, 0x00000100, 0x00000053, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_07/B5AA90.data.s b/ver/us/asm/data/world/area_jan/jan_07/B5AA90.data.s deleted file mode 100644 index 7ffd44b1bc..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_07/B5AA90.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241220_B5AA90 -.word 0xC35C0000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241338, D_80241220_B5AA90, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900F7, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_07/B5AB20.data.s b/ver/us/asm/data/world/area_jan/jan_07/B5AB20.data.s deleted file mode 100644 index 48872b7a50..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_07/B5AB20.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802412B0_B5AB20 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802446F0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024130C_B5AB7C -.word 0x00000047, 0x00000005, D_802412B0_B5AB20, 0x00080000, 0x00000000, 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, MakeNpcs, 0x00000000, 0x802431A8, 0x00000044, 0x00000001, 0x80243BC4, 0x00000044, 0x00000001, 0x80244624, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_8024130C_B5AB7C, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x80241270, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s b/ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s deleted file mode 100644 index b7b1e1c4c3..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_07/B5ACA0.data.s +++ /dev/null @@ -1,57 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241430_B5ACA0 -.word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024145C_B5ACCC -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF, 0x00420000, 0xFFFFFFFF - -dlabel D_802414B8_B5AD28 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241574_B5ADE4 -.word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 - -dlabel D_802415A4_B5AE14 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_07_SpearGuyAI_Main, D_80241574_B5ADE4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241614_B5AE84 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_802415A4_B5AE14, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 - -dlabel D_80241640_B5AEB0 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_07_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802416E8_B5AF58 -.word 0x00000000, 0x00080014, 0x00000000, 0x00000000, D_80241640_B5AEB0, 0x00000000, 0x00000000, D_802414B8_B5AD28, 0x00000000, 0x00000000, 0x00100008 - -dlabel D_80241714_B5AF84 -.word 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000001F0, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024178C_B5AFFC -.word 0x0000000A, 0x00000002, 0xF8406078, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000B4, 0x00000140, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFF49, 0x00000032, 0xFFFFFFF5, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000032, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000010, 0xF24A6280, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0x00000003, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00970306, 0x00970306, 0x00000005, 0x001000B5, 0x00000008, 0x00000001, 0x0000000A, 0x00000044, 0x00000001, D_80241714_B5AF84, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF8406078, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF24F2A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000102, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFFC9, 0x00000005, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFFEC, 0x0000000A, 0x00000019, 0x00000008, 0x00000001, 0x0000000F, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x0097030A, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000007, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097030B, 0x0097030A, 0x00000000, 0x001000B6, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097030B, 0x0097030A, 0x00000000, 0x001000B7, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00970304, 0x00970301, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970303, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF6A, 0x0000000F, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF840604F, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004E, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, 0x80241270, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8C80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241EC8_B5B738 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF840604F, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970306, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024178C_B5AFFC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F48_B5B7B8 -.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF42, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000001, 0x00000030, 0x00000028, 0x00000043, 0x00000004, SetNpcCollisionSize, 0x00000002, 0x00000030, 0x00000028, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x0000003C, 0x00000014, 0x0000008C, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000002, 0x00000000, 0x00000000, 0x00000026, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000001, 0x00000000, 0x00000000, 0x00000023, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000020B1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B2, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B3, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360006, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000003B2, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024263C_B5BEAC -.word 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFEC, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0xF2524A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242730_B5BFA0 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF840604F, 0x00000000, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241F48_B5B7B8, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_8024263C_B5BEAC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveEncounter, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802427B0_B5C020 -.word 0x0000000A, 0x00000002, 0xF840604F, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0x0000000A, 0x00000043, 0x00000002, RemoveNpc, 0x0000000B, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802427F8_B5C068 -.word 0x0000000A, D_80241614_B5AE84, 0xC1E00000, 0x00000000, 0x41500000, 0x00000D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFFE4, 0x00000000, 0x0000000D, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFE4, 0x00000000, 0x0000000D, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x0000000B, D_802416E8_B5AF58, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D00, D_802427B0_B5C020, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242BD8_B5C448 -.word 0x00000001, D_8024145C_B5ACCC, 0xC1A00000, 0x00000000, 0x41A00000, 0x00C40900, D_80242730_B5BFA0, 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, 0x00360001, 0x00360002, 0x00360003, 0x00360003, 0x00360001, 0x00360001, 0x0036000E, 0x0036000E, 0x00360018, 0x00360017, 0x00360005, 0x00360006, 0x00360007, 0x00360001, 0x00360001, 0x00360001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_8024145C_B5ACCC, 0x42A00000, 0x00000000, 0x41A00000, 0x00C40900, 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, 0x00360001, 0x00360002, 0x00360003, 0x00360003, 0x00360001, 0x00360001, 0x0036000E, 0x0036000E, 0x00360018, 0x00360017, 0x00360005, 0x00360006, 0x00360007, 0x00360001, 0x00360001, 0x00360001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242FB8_B5C828 -.word 0x00000000, D_80241430_B5ACA0, 0x41F00000, 0x00000000, 0x41A00000, 0x0040090D, D_80241EC8_B5B738, 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, 0x00970301, 0x00970302, 0x00970303, 0x00970303, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00970301, 0x00000000, 0x00000000, 0x00000000, 0x001A00C6, 0x00000002, D_802427F8_B5C068, 0x14010004, 0x00000002, D_80242BD8_B5C448, 0x15010004, 0x00000001, D_80242FB8_B5C828, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_07/B5CA50.data.s b/ver/us/asm/data/world/area_jan/jan_07/B5CA50.data.s deleted file mode 100644 index bd21709f3f..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_07/B5CA50.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802431E0_B5CA50 -.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_07_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_07_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_80243540_B5CDB0 -.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_07_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_07_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_07_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_07_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_80243B44_B5D3B4 -.word 0x00000005, 0x00000008, 0x00000009, 0x0000000A, 0x0000000B, 0x0000000C - -dlabel D_80243B5C_B5D3CC -.word 0x00000001, 0x00000007 - -dlabel D_80243B64_B5D3D4 -.word 0x00000001, 0x00000157, 0xFFFFFF6A, 0x00000064, 0xFFFFFFB0, 0x0000000F, 0xF8406067, 0x00000000 - -dlabel D_80243B84_B5D3F4 -.word 0x00000002, 0xFFFFFF18, 0x00000072, 0xFFFFFFB5, 0xFFFFFF6D, 0x00000072, 0xFFFFFFAB - -dlabel D_80243BA0_B5D410 -.word D_80243B44_B5D3B4, D_80243B5C_B5D3CC, D_80243B64_B5D3D4, D_80243B84_B5D3F4, 0x00000000 - -dlabel D_80243BB4_B5D424 -.word 0xC3400000, 0x00000000, 0xC2D20000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243BA0_B5D410, 0x00000047, 0x00000005, D_80243540_B5CDB0, 0x00001000, 0x00000009, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243540_B5CDB0, 0x00100000, D_80243BB4_B5D424, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_07/B5D490.data.s b/ver/us/asm/data/world/area_jan/jan_07/B5D490.data.s deleted file mode 100644 index 2c9760fcbf..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_07/B5D490.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243C20_B5D490 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_07_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_07_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_07_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_07_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup_jan_07_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup_jan_07_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_80244584_B5DDF4 -.word 0x00000001, 0x0000001B - -dlabel D_8024458C_B5DDFC -.word 0x00000001, 0xFFFFFF97, 0x00000014, 0x00000073 - -dlabel D_8024459C_B5DE0C -.word D_80244584_B5DDF4, 0x00000000, D_8024458C_B5DDFC, 0x00000000 - -dlabel D_802445AC_B5DE1C -.word 0x00000001, 0x0000001D - -dlabel D_802445B4_B5DE24 -.word 0x00000001, 0x0000008E, 0x00000014, 0x00000042 - -dlabel D_802445C4_B5DE34 -.word D_802445AC_B5DE1C, 0x00000000, D_802445B4_B5DE24, 0x00000000 - -dlabel D_802445D4_B5DE44 -.word 0x00000001, 0x0000001F - -dlabel D_802445DC_B5DE4C -.word 0x00000001, 0xFFFFFF8C, 0x00000014, 0xFFFFFF9A - -dlabel D_802445EC_B5DE5C -.word D_802445D4_B5DE44, 0x00000000, D_802445DC_B5DE4C, 0x00000000 - -dlabel D_802445FC_B5DE6C -.word 0x00000001, 0x00000021 - -dlabel D_80244604_B5DE74 -.word 0x00000001, 0xFFFFFFB5, 0x00000014, 0xFFFFFF79 - -dlabel D_80244614_B5DE84 -.word D_802445FC_B5DE6C, 0x00000000, D_80244604_B5DE74, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024459C_B5DE0C, 0x00000047, 0x00000005, D_80243C20_B5D490, 0x00000100, 0x0000000A, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802445C4_B5DE34, 0x00000047, 0x00000005, D_80243C20_B5D490, 0x00000100, 0x0000000B, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802445EC_B5DE5C, 0x00000047, 0x00000005, D_80243C20_B5D490, 0x00000100, 0x0000000C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244614_B5DE84, 0x00000047, 0x00000005, D_80243C20_B5D490, 0x00000100, 0x0000000D, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_08/B606E0.data.s b/ver/us/asm/data/world/area_jan/jan_08/B606E0.data.s deleted file mode 100644 index 2319e05edd..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_08/B606E0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242430_B606E0 -.word 0xC3A50000, 0x00000000, 0x43A50000, 0x42340000, 0x43FA0000, 0xC1A00000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0xC3E10000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802426F4, D_80242430_B606E0, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900F4, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_08/B60790.data.s b/ver/us/asm/data/world/area_jan/jan_08/B60790.data.s deleted file mode 100644 index 0d5c7a7466..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_08/B60790.data.s +++ /dev/null @@ -1,147 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802424E0_B60790 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_08_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_08_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024257C_B6082C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247490, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802425D8_B60888 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80247498, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242634_B608E4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802474A0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242690_B60940 -.word 0x00000047, 0x00000005, D_8024257C_B6082C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802425D8_B60888, 0x00080000, 0x0000000B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242634_B608E4, 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, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024687C, 0x00000046, 0x00000001, 0x80244448, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000035, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000037, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000035, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000037, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000056, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000008, 0x00000001, 0x00000044, 0x00000001, D_80243B90_B61E40, 0x00000044, 0x00000001, 0x802473A4, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80242690_B60940, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x802424A0, 0x00000043, 0x00000002, MakeTransformGroup, 0x0000006D, 0x00000043, 0x00000003, EnableTexPanning, 0x0000006C, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000050, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 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_802424E0_B60790, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802429D0_B60C80 -.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_08_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_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_08_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_08_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_08_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_08_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_80243334_B615E4 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000054, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x00000066, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000068, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_08_PullVine_ShearBushModel, 0x00000066, 0xFE363C86, 0x00000043, 0x00000003, jan_08_PullVine_ShearBushModel, 0x00000068, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802434FC_B617AC -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000054, 0x7FFFFE00, 0x00000044, 0x00000001, D_80243334_B615E4, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000002E, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802435E8_B61898 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000053, 0x00000153, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, jan_08_PullVine_ShearBushModel, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, jan_08_PullVine_ShearBushModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, jan_08_PullVine_ShearBushModel, 0xFE363C81, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF8406050, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000001, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0xFFFFFEC5, 0xFE363C85, 0x00000014, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x00000007, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00008140, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlayerMoveTo, 0xFFFFFEAC, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000007, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000053, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000009, 0x00000043, 0x00000006, RotateModel, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x0000010E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0xFE363C84, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFFFFFE79, 0x00000000, 0xFFFFFF70, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00000102, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x00000009, 0x00000043, 0x00000006, RotateModel, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x00000009, 0x00000043, 0x00000005, SetNpcRotation, 0x00000007, 0x00000000, 0xFE363C84, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000007, 0x00000001, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000007, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcVar, 0x00000007, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243970_B61C20 -.word 0x00000001, 0x00000062 - -dlabel D_80243978_B61C28 -.word 0x00000001, 0x00000157, 0x00000075, 0x00000014, 0xFFFFFE58, 0x00000007, 0xF8406071, 0x00000000 - -dlabel D_80243998_B61C48 -.word 0x00000001, 0x00000075, 0x00000014, 0xFFFFFE58 - -dlabel D_802439A8_B61C58 -.word D_80243970_B61C20, D_80243978_B61C28, D_80243998_B61C48, 0x00000000 - -dlabel D_802439B8_B61C68 -.word 0x00000001, 0x0000004B - -dlabel D_802439C0_B61C70 -.word 0x00000001, 0x00000157, 0xFFFFFF36, 0x00000014, 0x000000A7, 0x00000007, 0xF8406072, 0x00000000 - -dlabel D_802439E0_B61C90 -.word 0x00000001, 0xFFFFFF36, 0x00000014, 0x000000A7 - -dlabel D_802439F0_B61CA0 -.word D_802439B8_B61C68, D_802439C0_B61C70, D_802439E0_B61C90, 0x00000000 - -dlabel D_80243A00_B61CB0 -.word 0x00000001, 0x0000004D - -dlabel D_80243A08_B61CB8 -.word 0x00000001, 0xFFFFFE35, 0x00000014, 0x0000007E - -dlabel D_80243A18_B61CC8 -.word D_80243A00_B61CB0, 0x00000000, D_80243A08_B61CB8, 0x00000000 - -dlabel D_80243A28_B61CD8 -.word 0x00000001, 0x0000004F - -dlabel D_80243A30_B61CE0 -.word 0x00000001, 0xFFFFFE33, 0x00000014, 0xFFFFFFD9 - -dlabel D_80243A40_B61CF0 -.word D_80243A28_B61CD8, 0x00000000, D_80243A30_B61CE0, 0x00000000 - -dlabel D_80243A50_B61D00 -.word 0x00000001, 0x00000051 - -dlabel D_80243A58_B61D08 -.word 0x00000001, 0xFFFFFEBF, 0x00000014, 0xFFFFFFD4 - -dlabel D_80243A68_B61D18 -.word D_80243A50_B61D00, 0x00000000, D_80243A58_B61D08, 0x00000000 - -dlabel D_80243A78_B61D28 -.word 0x00000001, 0x00000053 - -dlabel D_80243A80_B61D30 -.word 0x00000001, 0xFFFFFEE9, 0x00000014, 0xFFFFFFC9 - -dlabel D_80243A90_B61D40 -.word D_80243A78_B61D28, 0x00000000, D_80243A80_B61D30, 0x00000000 - -dlabel D_80243AA0_B61D50 -.word 0x00000001, 0x00000055 - -dlabel D_80243AA8_B61D58 -.word 0x00000001, 0xFFFFFED0, 0x00000016, 0xFFFFFF0E - -dlabel D_80243AB8_B61D68 -.word D_80243AA0_B61D50, 0x00000000, D_80243AA8_B61D58, 0x00000000 - -dlabel D_80243AC8_B61D78 -.word 0x00000001, 0x00000057 - -dlabel D_80243AD0_B61D80 -.word 0x00000001, 0xFFFFFFA1, 0x00000014, 0xFFFFFE1B - -dlabel D_80243AE0_B61D90 -.word D_80243AC8_B61D78, 0x00000000, D_80243AD0_B61D80, 0x00000000 - -dlabel D_80243AF0_B61DA0 -.word 0x00000001, 0x00000059 - -dlabel D_80243AF8_B61DA8 -.word 0x00000001, 0x00000059, 0x00000014, 0xFFFFFE1B - -dlabel D_80243B08_B61DB8 -.word D_80243AF0_B61DA0, 0x00000000, D_80243AF8_B61DA8, 0x00000000 - -dlabel D_80243B18_B61DC8 -.word 0x00000001, 0x0000005B - -dlabel D_80243B20_B61DD0 -.word 0x00000001, 0x00000098, 0x00000014, 0xFFFFFE17 - -dlabel D_80243B30_B61DE0 -.word D_80243B18_B61DC8, 0x00000000, D_80243B20_B61DD0, 0x00000000 - -dlabel D_80243B40_B61DF0 -.word 0x00000001, 0x0000005D - -dlabel D_80243B48_B61DF8 -.word 0x00000001, 0x0000018A, 0x00000014, 0x000000B0 - -dlabel D_80243B58_B61E08 -.word D_80243B40_B61DF0, 0x00000000, D_80243B48_B61DF8, 0x00000000 - -dlabel D_80243B68_B61E18 -.word 0x00000001, 0x0000005F - -dlabel D_80243B70_B61E20 -.word 0x00000001, 0x000000EF, 0x00000016, 0x000001AE - -dlabel D_80243B80_B61E30 -.word D_80243B68_B61E18, 0x00000000, D_80243B70_B61E20, 0x00000000 - -dlabel D_80243B90_B61E40 -.word 0x00000047, 0x00000005, D_802434FC_B617AC, 0x00000100, 0x00000054, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x0000004E, 0x00000006, D_802435E8_B61898, 0x00000100, 0x00000053, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, D_802439A8_B61C58, 0x00000047, 0x00000005, D_802429D0_B60C80, 0x00000100, 0x00000052, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802439F0_B61CA0, 0x00000047, 0x00000005, D_802429D0_B60C80, 0x00000100, 0x0000003D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243A18_B61CC8, 0x00000047, 0x00000005, D_802429D0_B60C80, 0x00000100, 0x0000003E, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243A40_B61CF0, 0x00000047, 0x00000005, D_802429D0_B60C80, 0x00000100, 0x0000003F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243A68_B61D18, 0x00000047, 0x00000005, D_802429D0_B60C80, 0x00000100, 0x00000040, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243A90_B61D40, 0x00000047, 0x00000005, D_802429D0_B60C80, 0x00000100, 0x00000041, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243AB8_B61D68, 0x00000047, 0x00000005, D_802429D0_B60C80, 0x00000100, 0x00000042, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243AE0_B61D90, 0x00000047, 0x00000005, D_802429D0_B60C80, 0x00000100, 0x00000043, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243B08_B61DB8, 0x00000047, 0x00000005, D_802429D0_B60C80, 0x00000100, 0x00000044, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243B30_B61DE0, 0x00000047, 0x00000005, D_802429D0_B60C80, 0x00000100, 0x00000045, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243B58_B61E08, 0x00000047, 0x00000005, D_802429D0_B60C80, 0x00000100, 0x00000046, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243B80_B61E30, 0x00000047, 0x00000005, D_802429D0_B60C80, 0x00000100, 0x00000047, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s b/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s deleted file mode 100644 index 8f4cf62ec4..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_08/B620B0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel jan_08_SuperBlock_CantUpgradeMessages -.word 0x001D00F0, 0x001D00F1 - -dlabel jan_08_SuperBlock_PartnerIDs -.word 0x00010002, 0x00030004, 0x00090006, 0x00070008 - -dlabel jan_08_SuperBlock_UpgradeDescMessages -.word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF - -dlabel jan_08_SuperBlock_UpgradeOrbAngles -.word 0x430C0000, 0x43340000, 0x435C0000 - -dlabel D_80243E64_B62114 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, PlaySound, 0x0000212D, 0x00000043, 0x00000002, jan_08_SuperBlock_GatherEnergyFX, 0xFD050F82, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x0000212E, 0x00000043, 0x00000003, jan_08_SuperBlock_WhiteScreenFlash, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, PlaySound, 0x0000208E, 0x00000043, 0x00000003, jan_08_SuperBlock_WhiteScreenFlash, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, jan_08_SuperBlock_HideBlockContent, 0xFD050F82, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, jan_08_SuperBlock_RadiateFaintEnergyFX, 0x00000043, 0x00000001, jan_08_SuperBlock_PartnerSparkles2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_SuperBlock_PartnerSparkles4, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, jan_08_SuperBlock_PartnerSparkles2, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, jan_08_SuperBlock_AnimateEnergyOrbs, 0xFD050F82, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243FC8_B62278 -.word 0x0000000A, 0x00000002, 0xF840607E, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsStartingConversation, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_08_SuperBlock_WaitForPlayerToLand, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000001, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_SetOverride40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, jan_08_SuperBlock_StartGlowEffect, 0xFD050F82, 0xFE363C89, 0x00000043, 0x00000003, FindKeyItem, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, jan_08_SuperBlock_CountEligiblePartners, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_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, jan_08_SuperBlock_ShowSelectPartnerMenu, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_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, jan_08_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, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ModifyGlobalOverrideFlags, 0x00000000, 0x00200000, 0x00000043, 0x00000001, jan_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80243E64_B62114, 0x00000043, 0x00000003, jan_08_SuperBlock_GetPartnerRank, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF840607E, 0x00000001, 0x00000043, 0x00000002, jan_08_SuperBlock_EndGlowEffect, 0xFE363C89, 0x00000043, 0x00000001, jan_08_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, jan_08_SuperBlock_ClearOverride40, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_SuperBlock, 0x000000FA, 0x0000003C, 0x0000012C, 0x00000000, 0x80000000, 0x00000024, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000043, 0x00000002, AssignBlockFlag, 0xF840607E, 0x00000043, 0x00000002, AssignScript, D_80243FC8_B62278, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000004B, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF840607F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x00000064, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406080, 0x00000043, 0x00000007, MakeItemEntity, 0x00000157, 0x0000007D, 0xFFFFFFC4, 0x0000005A, 0x00000011, 0xF8406081, 0x00000043, 0x00000007, MakeEntity, Entity_BellbellPlant, 0x00000036, 0x00000000, 0xFFFFFE84, 0x00000023, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0x00000018, 0x0000003C, 0xFFFFFE66, 0x00000000, 0x00000082, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406061, 0x00000043, 0x00000007, MakeEntity, Entity_TrumpetPlant, 0xFFFFFE3E, 0x00000000, 0x000000A6, 0x000000AA, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_08/B62850.data.s b/ver/us/asm/data/world/area_jan/jan_08/B62850.data.s deleted file mode 100644 index 1da12388ad..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_08/B62850.data.s +++ /dev/null @@ -1,105 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802445A0_B62850 -.word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802445CC_B6287C -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000153, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450003, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000028, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450007, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, StartBattle - -dlabel D_80244958_B62C08 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024497C_B62C2C -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450005, 0x00000043, 0x00000003, GetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, GetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, GetSelfVar, 0x0000000C, 0xFE363C82, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_802445CC_B6287C, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244ACC_B62D7C -.word 0x00000000, 0x001E001E, 0x00000000, D_80244958_B62C08, D_802445CC_B6287C, 0x00000000, 0x00000000, D_8024497C_B62C2C, 0x00000000, 0x00000000, 0x00100000 - -dlabel D_80244AF8_B62DA8 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244B44_B62DF4 -.word 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80244B74_B62E24, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244B74_B62E24 -.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_08_HeartPlant_SpawnHeart, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, D_80244B44_B62DF4, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244C80_B62F30 -.word 0x00000000, 0x0014001C, D_80244AF8_B62DA8, D_80244B74_B62E24, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80244CAC_B62F5C -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440008, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000209A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00440002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000001, StartBattle, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244E28_B630D8 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244E4C_B630FC -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80244CAC_B62F5C, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244EEC_B6319C -.word 0x00000000, 0x0014001C, 0x00000000, D_80244E28_B630D8, D_80244CAC_B62F5C, 0x00000000, 0x00000000, D_80244E4C_B630FC, 0x00000000, 0x00000000, 0x00100000 - -dlabel D_80244F18_B631C8 -.word 0x00440000, 0x00440001, 0x00440002, 0x00440008, 0xFFFFFFFF - -dlabel D_80244F2C_B631DC -.word 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF - -dlabel D_80244F54_B63204 -.word 0x00420000, 0xFFFFFFFF - -dlabel D_80244F5C_B6320C -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245018_B632C8 -.word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 - -dlabel D_80245048_B632F8 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_08_SpearGuyAI_Main, D_80245018_B632C8, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802450B8_B63368 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80245048_B632F8, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 - -dlabel D_802450E4_B63394 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_08_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024518C_B6343C -.word 0x00000000, 0x00080014, 0x00000000, 0x00000000, D_802450E4_B63394, 0x00000000, 0x00000000, D_80244F5C_B6320C, 0x00000000, 0x00000000, 0x00100008 - -dlabel D_802451B8_B63468 -.word 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x000001F0, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245230_B634E0 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000E, 0x00000002, 0xFE363C81, 0xFFFFFFA6, 0x0000000D, 0x00000002, 0xFE363C83, 0x00000118, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000012, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000AF, 0x000000A0, 0x00000028, 0x00000044, 0x00000001, D_802451B8_B63468, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0xFFFFFFE9, 0x0000015E, 0xF24ABE80, 0xF24A5E80, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000007, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097040B, 0x0097040A, 0x00000000, 0x001000B0, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097040B, 0x0097040A, 0x00000000, 0x001000B1, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00970404, 0x00970401, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970403, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE5E, 0xFFFFFFC4, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFED4, 0x00000050, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFEC0, 0x00000073, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF8406050, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004E, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, 0x802424A0, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245694_B63944 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x0000000A, 0x00000002, 0xF8406050, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000102, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970406, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFE79, 0x00000000, 0xFFFFFF5C, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80245230_B634E0, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245770_B63A20 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450005, 0x00000043, 0x00000003, GetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, GetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, GetSelfVar, 0x0000000C, 0xFE363C82, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_802445CC_B6287C, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802458C0_B63B70 -.word 0x00000043, 0x00000004, SetNpcCollisionSize, 0xFFFFFFFF, 0x0000003C, 0x0000001E, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80245770_B63A20, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802458FC_B63BAC -.word 0x00000000, D_802450B8_B63368, 0x437F0000, 0x41700000, 0xC2820000, 0x00000400, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000000FF, 0x00000000, 0xFFFFFFBF, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000FF, 0x00000000, 0xFFFFFFBF, 0x00000096, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000003, 0x00000000, D_80244F2C_B631DC, 0x00000000, 0x00000001, D_8024518C_B6343C, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, D_80244F54_B63204, 0x00000000 - -dlabel D_80245CDC_B63F8C -.word 0x00000002, D_80244EEC_B6319C, 0x43C80000, 0x00000000, 0x436B0000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x0044000E, 0x0044000E, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00440001, 0x00000000, 0x00000000, D_80244F18_B631C8, 0x001A00D3 - -dlabel D_80245ECC_B6417C -.word 0x00000003, D_80244ACC_B62D7C, 0xC3CB8000, 0x00000000, 0xC2280000, 0x00408D01, D_802458C0_B63B70, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450007, 0x00450007, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D4 - -dlabel D_802460BC_B6436C -.word 0x00000004, D_80244ACC_B62D7C, 0xC2F00000, 0x00000000, 0xC3C58000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450007, 0x00450007, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D4 - -dlabel D_802462AC_B6455C -.word 0x00000005, D_80244C80_B62F30, 0xC35B0000, 0x00000000, 0x43D20000, 0x00408D05, 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_8024649C_B6474C -.word 0x00000006, D_80244C80_B62F30, 0xC31D0000, 0x00000000, 0x43E20000, 0x00408D05, 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_8024668C_B6493C -.word 0x00000007, D_802445A0_B62850, 0xC3E10000, 0x00000000, 0xC3910000, 0x00400D0D, D_80245694_B63944, 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, 0x00970401, 0x00970402, 0x00970403, 0x00970403, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00970401, 0x00000000, 0x00000000, 0x00000000, 0x001A00C7, 0x00000002, D_802458FC_B63BAC, 0x14010002, 0x00000001, D_80245CDC_B63F8C, 0x14080002, 0x00000001, D_80245ECC_B6417C, 0x14100002, 0x00000001, D_802460BC_B6436C, 0x140E0002, 0x00000001, D_802462AC_B6455C, 0x00000000, 0x00000001, D_8024649C_B6474C, 0x00000000, 0x00000001, D_8024668C_B6493C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_08/B64B90.data.s b/ver/us/asm/data/world/area_jan/jan_08/B64B90.data.s deleted file mode 100644 index 5d2364a48b..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_08/B64B90.data.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802468E0_B64B90 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_08_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_80246C40_B64EF0 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_08_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup_jan_08_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup_jan_08_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_80247244_B654F4 -.word 0x00000005, 0x0000002F, 0x00000030, 0x00000031, 0x00000032, 0x00000033 - -dlabel D_8024725C_B6550C -.word 0x00000001, 0x0000002E - -dlabel D_80247264_B65514 -.word 0x00000002, 0xFFFFFE73, 0x00000072, 0xFFFFFF10, 0xFFFFFEC8, 0x00000072, 0xFFFFFF06 - -dlabel D_80247280_B65530 -.word D_80247244_B654F4, D_8024725C_B6550C, 0x00000000, D_80247264_B65514, 0x00000000 - -dlabel D_80247294_B65544 -.word 0xC3B28000, 0x00000000, 0xC3870000, 0x00000000 - -dlabel D_802472A4_B65554 -.word 0x00000005, 0x00000028, 0x00000029, 0x0000002A, 0x0000002B, 0x0000002C - -dlabel D_802472BC_B6556C -.word 0x00000001, 0x00000027 - -dlabel D_802472C4_B65574 -.word 0x00000001, 0x00000157, 0xFFFFFFB7, 0x0000004C, 0xFFFFFE26, 0x0000000F, 0xF8406068, 0x00000000 - -dlabel D_802472E4_B65594 -.word 0x00000002, 0xFFFFFF47, 0x00000072, 0xFFFFFE52, 0xFFFFFF9C, 0x00000072, 0xFFFFFE48 - -dlabel D_80247300_B655B0 -.word D_802472A4_B65554, D_802472BC_B6556C, D_802472C4_B65574, D_802472E4_B65594, 0x00000000 - -dlabel D_80247314_B655C4 -.word 0xC3110000, 0x00000000, 0xC3E60000, 0x00000000 - -dlabel D_80247324_B655D4 -.word 0x00000005, 0x00000036, 0x00000037, 0x00000038, 0x00000039, 0x0000003A - -dlabel D_8024733C_B655EC -.word 0x00000001, 0x00000035 - -dlabel D_80247344_B655F4 -.word 0x00000001, 0x00000157, 0x0000017C, 0x00000064, 0xFFFFFFA1, 0x0000000F, 0xF8406069, 0x00000000 - -dlabel D_80247364_B65614 -.word 0x00000002, 0x0000012D, 0x00000072, 0xFFFFFFA2, 0x00000182, 0x00000072, 0xFFFFFF98 - -dlabel D_80247380_B65630 -.word D_80247324_B655D4, D_8024733C_B655EC, D_80247344_B655F4, D_80247364_B65614, 0x00000000 - -dlabel D_80247394_B65644 -.word 0x43AA8000, 0x00000000, 0xC2F80000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80247280_B65530, 0x00000047, 0x00000005, D_80246C40_B64EF0, 0x00001000, 0x00000049, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246C40_B64EF0, 0x00100000, D_80247294_B65544, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80247300_B655B0, 0x00000047, 0x00000005, D_80246C40_B64EF0, 0x00001000, 0x0000004A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246C40_B64EF0, 0x00100000, D_80247314_B655C4, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80247380_B65630, 0x00000047, 0x00000005, D_80246C40_B64EF0, 0x00001000, 0x0000004B, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80246C40_B64EF0, 0x00100000, D_80247394_B65644, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s b/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s deleted file mode 100644 index 4bbb5d2df6..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_09/B673D0.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241920_B673D0 -.word 0x00000000, 0x00000000, 0x43F00000, 0x00000000, 0x43F00000, 0x00000000, 0x00000000, 0x43870000, 0xC3F00000, 0xC1A00000, 0x00000000, 0x42B40000, 0xC3310000, 0x42FA0000, 0xC3D98000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802429C4_B68474, D_80241920_B673D0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900F5 - -dlabel D_802419A0_B67450 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_09_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_09_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_09_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_09_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420E4_B67B94 -.word 0x00000043, 0x00000001, jan_09_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802421C0_B67C70, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421C0_B67C70 -.word 0x00000043, 0x00000001, jan_09_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_09_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, jan_09_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_09_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_09_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802426D0_B68180 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_09_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_09_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024276C_B6821C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80246570, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802427C8_B68278 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80246578, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242824_B682D4 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80246580, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242880_B68330 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, GotoMap, 0x80246588, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802428BC_B6836C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000046, 0x00000001, D_802420E4_B67B94, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242914_B683C4 -.word 0x00000047, 0x00000005, D_8024276C_B6821C, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802427C8_B68278, 0x00080000, 0x00000005, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242824_B682D4, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000023, 0x00000024, 0x00000002, 0xFE363C82, D_80242880_B68330, 0x00000047, 0x00000005, D_802428BC_B6836C, 0x00000080, 0xFE363C81, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802429C4_B68474 -.word 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, 0x00000043, 0x00000003, SetZoneEnabled, 0x00000003, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80245918, 0x00000046, 0x00000001, 0x80246500, 0x00000044, 0x00000001, 0x802445E4, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000001F, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000021, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001F, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000021, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000004A, 0x00000001, 0x00000044, 0x00000001, 0x80246414, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000006, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000A, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, D_80242914_B683C4, 0x00000044, 0x00000001, EnterWalk, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, D_80242914_B683C4, 0x00000044, 0x00000001, D_802419A0_B67450, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000043, 0x00000002, MakeTransformGroup, 0x00000077, 0x00000043, 0x00000003, EnableTexPanning, 0x00000076, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000050, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 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_802426D0_B68180, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s b/ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s deleted file mode 100644 index edc421cbe4..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_09/B687D0.data.s +++ /dev/null @@ -1,240 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242D20_B687D0 -.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_09_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_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_09_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_09_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_09_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_09_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_80243684_B69134 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000046, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x0000005F, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000061, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0x0000005F, 0xFE363C86, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0x00000061, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024384C_B692FC -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000047, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F82, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F82, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, TranslateModel, 0x00000063, 0xFD050F82, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0x00000063, 0xFE363C86, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243954_B69404 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000048, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F83, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F84, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F83, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F84, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x00000065, 0xFD050F83, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000067, 0xFD050F84, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0x00000065, 0xFE363C86, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0x00000067, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243B1C_B695CC -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000046, 0x7FFFFE00, 0x00000044, 0x00000001, D_80243684_B69134, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000002E, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243C08_B696B8 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000047, 0x7FFFFE00, 0x00000044, 0x00000001, D_8024384C_B692FC, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243CD4_B69784 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000048, 0x7FFFFE00, 0x00000044, 0x00000001, D_80243954_B69404, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F83, 0xFD050F84, 0x0000002E, 0x00000002, 0xFD050F83, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243DC0_B69870 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000047, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000048, 0x7FFFFE00, 0x00000044, 0x00000001, D_8024384C_B692FC, 0x00000044, 0x00000001, D_80243954_B69404, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F82, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F84, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F83, 0xFD050F84, 0x0000002E, 0x00000002, 0xFD050F83, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, jan_09_PullVine_ShearBushModel, 0xFE363C81, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C81, 0x00000043, 0x00000007, DropItemEntity, 0x00000157, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000007, 0xFE363C8A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243FC4_B69A74 -.word 0x00000003, 0x00000001, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFD050F85, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0xFD050F85, 0x00000078, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFD050F85, 0xFE363C83, 0x00000028, 0x00000002, 0xFD050F85, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000024, 0x00000002, 0xFD050F85, 0x00000E10, 0x00000005, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFD050F85, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C80, 0xF24A9280, 0x0000002C, 0x00000002, 0xFE363C81, 0xF24A8680, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24A0680, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24A7EE0, 0x0000002F, 0x00000002, 0xFE363C81, 0xF24A7EE0, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A7EE0, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7BB0, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x0000003C, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFFFFFFE7, 0x0000005A, 0xFFFFFEB6, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802442D4_B69D84 -.word 0x00000001, 0x0000005D - -dlabel D_802442DC_B69D8C -.word 0x00000001, 0x00000157, 0x00000192, 0x00000014, 0x000000A1, 0x00000007, 0xF8406073, 0x00000000 - -dlabel D_802442FC_B69DAC -.word 0x00000001, 0x00000192, 0x00000014, 0x000000A1 - -dlabel D_8024430C_B69DBC -.word D_802442D4_B69D84, D_802442DC_B69D8C, D_802442FC_B69DAC, 0x00000000 - -dlabel D_8024431C_B69DCC -.word 0x00000001, 0x0000003E - -dlabel D_80244324_B69DD4 -.word 0x00000001, 0xFFFFFF67, 0x00000014, 0x000001DB - -dlabel D_80244334_B69DE4 -.word D_8024431C_B69DCC, 0x00000000, D_80244324_B69DD4, 0x00000000 - -dlabel D_80244344_B69DF4 -.word 0x00000001, 0x00000040 - -dlabel D_8024434C_B69DFC -.word 0x00000001, 0x00000093, 0x00000014, 0x000001E9 - -dlabel D_8024435C_B69E0C -.word D_80244344_B69DF4, 0x00000000, D_8024434C_B69DFC, 0x00000000 - -dlabel D_8024436C_B69E1C -.word 0x00000001, 0x00000042 - -dlabel D_80244374_B69E24 -.word 0x00000001, 0x000000C1, 0x00000014, 0x000001D9 - -dlabel D_80244384_B69E34 -.word D_8024436C_B69E1C, 0x00000000, D_80244374_B69E24, 0x00000000 - -dlabel D_80244394_B69E44 -.word 0x00000001, 0x00000044 - -dlabel D_8024439C_B69E4C -.word 0x00000001, 0xFFFFFFA3, 0x00000014, 0x00000121 - -dlabel D_802443AC_B69E5C -.word D_80244394_B69E44, 0x00000000, D_8024439C_B69E4C, 0x00000000 - -dlabel D_802443BC_B69E6C -.word 0x00000001, 0x00000046 - -dlabel D_802443C4_B69E74 -.word 0x00000001, 0x00000157, 0xFFFFFFDE, 0x00000016, 0x0000013D, 0x00000007, 0xF8406074, 0x00000000 - -dlabel D_802443E4_B69E94 -.word 0x00000001, 0xFFFFFFDE, 0x00000016, 0x0000013D - -dlabel D_802443F4_B69EA4 -.word D_802443BC_B69E6C, D_802443C4_B69E74, D_802443E4_B69E94, 0x00000000 - -dlabel D_80244404_B69EB4 -.word 0x00000001, 0x00000048 - -dlabel D_8024440C_B69EBC -.word 0x00000001, 0x00000022, 0x00000014, 0x000000A7 - -dlabel D_8024441C_B69ECC -.word D_80244404_B69EB4, 0x00000000, D_8024440C_B69EBC, 0x00000000 - -dlabel D_8024442C_B69EDC -.word 0x00000001, 0x0000004A - -dlabel D_80244434_B69EE4 -.word 0x00000001, 0x0000005F, 0x00000014, 0x000000B8 - -dlabel D_80244444_B69EF4 -.word D_8024442C_B69EDC, 0x00000000, D_80244434_B69EE4, 0x00000000 - -dlabel D_80244454_B69F04 -.word 0x00000001, 0x0000004C - -dlabel D_8024445C_B69F0C -.word 0x00000001, 0x0000014E, 0x00000014, 0x0000011F - -dlabel D_8024446C_B69F1C -.word D_80244454_B69F04, 0x00000000, D_8024445C_B69F0C, 0x00000000 - -dlabel D_8024447C_B69F2C -.word 0x00000001, 0x0000004E - -dlabel D_80244484_B69F34 -.word 0x00000001, 0x00000184, 0x00000014, 0x00000117 - -dlabel D_80244494_B69F44 -.word D_8024447C_B69F2C, 0x00000000, D_80244484_B69F34, 0x00000000 - -dlabel D_802444A4_B69F54 -.word 0x00000001, 0x00000050 - -dlabel D_802444AC_B69F5C -.word 0x00000001, 0x000001C6, 0x00000014, 0x00000094 - -dlabel D_802444BC_B69F6C -.word D_802444A4_B69F54, 0x00000000, D_802444AC_B69F5C, 0x00000000 - -dlabel D_802444CC_B69F7C -.word 0x00000001, 0x00000052 - -dlabel D_802444D4_B69F84 -.word 0x00000001, 0x00000167, 0x00000014, 0xFFFFFF81 - -dlabel D_802444E4_B69F94 -.word D_802444CC_B69F7C, 0x00000000, D_802444D4_B69F84, 0x00000000 - -dlabel D_802444F4_B69FA4 -.word 0x00000001, 0x00000054 - -dlabel D_802444FC_B69FAC -.word 0x00000001, 0xFFFFFEA9, 0x0000006E, 0xFFFFFEC1 - -dlabel D_8024450C_B69FBC -.word D_802444F4_B69FA4, 0x00000000, D_802444FC_B69FAC, 0x00000000 - -dlabel D_8024451C_B69FCC -.word 0x00000001, 0x00000055 - -dlabel D_80244524_B69FD4 -.word 0x00000001, 0xFFFFFEE2, 0x00000070, 0xFFFFFE83 - -dlabel D_80244534_B69FE4 -.word D_8024451C_B69FCC, 0x00000000, D_80244524_B69FD4, 0x00000000 - -dlabel D_80244544_B69FF4 -.word 0x00000001, 0x00000056 - -dlabel D_8024454C_B69FFC -.word 0x00000001, 0xFFFFFF16, 0x0000006E, 0xFFFFFE88 - -dlabel D_8024455C_B6A00C -.word D_80244544_B69FF4, 0x00000000, D_8024454C_B69FFC, 0x00000000 - -dlabel D_8024456C_B6A01C -.word 0x00000001, 0x00000057 - -dlabel D_80244574_B6A024 -.word 0x00000001, 0xFFFFFFC7, 0x0000006E, 0xFFFFFE4A - -dlabel D_80244584_B6A034 -.word D_8024456C_B6A01C, 0x00000000, D_80244574_B6A024, 0x00000000 - -dlabel D_80244594_B6A044 -.word 0x00000001, 0x00000058 - -dlabel D_8024459C_B6A04C -.word 0x00000001, 0x0000006D, 0x00000014, 0xFFFFFE3C - -dlabel D_802445AC_B6A05C -.word D_80244594_B6A044, 0x00000000, D_8024459C_B6A04C, 0x00000000 - -dlabel D_802445BC_B6A06C -.word 0x00000001, 0x0000005A - -dlabel D_802445C4_B6A074 -.word 0x00000001, 0x0000009F, 0x00000014, 0xFFFFFE1B - -dlabel D_802445D4_B6A084 -.word D_802445BC_B6A06C, 0x00000000, D_802445C4_B6A074, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000044, 0x00000001, D_80243DC0_B69870, 0x00000013, 0x00000000, 0x00000047, 0x00000005, D_80243B1C_B695CC, 0x00000100, 0x00000046, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243C08_B696B8, 0x00000100, 0x00000047, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243CD4_B69784, 0x00000100, 0x00000048, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_80243FC4_B69A74, 0x00000024, 0x00000002, 0xFE363C80, D_8024430C_B69DBC, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000045, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244334_B69DE4, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000026, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024435C_B69E0C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244384_B69E34, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000028, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802443AC_B69E5C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000029, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802443F4_B69EA4, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002A, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024441C_B69ECC, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002B, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244444_B69EF4, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024446C_B69F1C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244494_B69F44, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002E, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802444BC_B69F6C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x0000002F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802444E4_B69F94, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000030, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024450C_B69FBC, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000031, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244534_B69FE4, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000032, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024455C_B6A00C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000033, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244584_B6A034, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000034, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802445AC_B6A05C, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000035, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802445D4_B6A084, 0x00000047, 0x00000005, D_80242D20_B687D0, 0x00000100, 0x00000036, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802449A0_B6A450 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000153, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, SetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, SetSelfVar, 0x0000000C, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450003, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000019, 0x00000028, 0x00000002, 0xFE363C82, 0x00000005, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450007, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, StartBattle - -dlabel D_80244D2C_B6A7DC -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244D50_B6A800 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450005, 0x00000043, 0x00000003, GetSelfVar, 0x0000000A, 0xFE363C80, 0x00000043, 0x00000003, GetSelfVar, 0x0000000B, 0xFE363C81, 0x00000043, 0x00000003, GetSelfVar, 0x0000000C, 0xFE363C82, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00450000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_802449A0_B6A450, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244EA0_B6A950 -.word 0x00000000, 0x001E001E, 0x00000000, D_80244D2C_B6A7DC, D_802449A0_B6A450, 0x00000000, 0x00000000, D_80244D50_B6A800, 0x00000000, 0x00000000, 0x00100000, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF - -dlabel D_80244EF4_B6A9A4 -.word 0x00420000, 0xFFFFFFFF - -dlabel D_80244EFC_B6A9AC -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244FB8_B6AA68 -.word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 - -dlabel D_80244FE8_B6AA98 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_09_SpearGuyAI_Main, D_80244FB8_B6AA68, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245058_B6AB08 -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80244FE8_B6AA98, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 - -dlabel D_80245084_B6AB34 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_09_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024512C_B6ABDC -.word 0x00000000, 0x00080014, 0x00000000, 0x00000000, D_80245084_B6AB34, 0x00000000, 0x00000000, D_80244EFC_B6A9AC, 0x00000000, 0x00000000, 0x00100008 - -dlabel D_80245158_B6AC08 -.word 0x0000001E, D_80245058_B6AB08, 0xC3480000, 0x42B40000, 0xC3A50000, 0x00002C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFF38, 0x0000005A, 0xFFFFFEB6, 0x00000014, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF4A, 0x0000005A, 0xFFFFFED2, 0x000000D4, 0x00000064, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x0000001F, D_8024512C_B6ABDC, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, D_80244EF4_B6A9A4, 0x00000000 - -dlabel D_80245538_B6AFE8 -.word 0x00000046, D_80244EA0_B6A950, 0x43A78000, 0x00000000, 0xC2200000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450007, 0x00450007, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D4 - -dlabel D_80245728_B6B1D8 -.word 0x00000050, D_80244EA0_B6A950, 0x43CF8000, 0x00000000, 0xC2820000, 0x00408D01, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0089, 0x00050000, 0x009B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450007, 0x00450007, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00450002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D4, 0x00000002, D_80245158_B6AC08, 0x14030003, 0x00000001, D_80245538_B6AFE8, 0x140E0003, 0x00000001, D_80245728_B6B1D8, 0x140E0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_09/B6B400.data.s b/ver/us/asm/data/world/area_jan/jan_09/B6B400.data.s deleted file mode 100644 index 7640ba015d..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_09/B6B400.data.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80245950_B6B400 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_09_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_80245CB0_B6B760 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_09_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup_jan_09_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup_jan_09_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_802462B4_B6BD64 -.word 0x00000005, 0x0000001D, 0x0000001E, 0x0000001F, 0x00000020, 0x00000021 - -dlabel D_802462CC_B6BD7C -.word 0x00000001, 0x0000001C - -dlabel D_802462D4_B6BD84 -.word 0x00000002, 0xFFFFFE33, 0x00000072, 0xFFFFFF34, 0xFFFFFE88, 0x00000072, 0xFFFFFF2A - -dlabel D_802462F0_B6BDA0 -.word D_802462B4_B6BD64, D_802462CC_B6BD7C, 0x00000000, D_802462D4_B6BD84, 0x00000000 - -dlabel D_80246304_B6BDB4 -.word 0xC3D28000, 0x00000000, 0xC36A0000, 0x00000000 - -dlabel D_80246314_B6BDC4 -.word 0x00000005, 0x00000024, 0x00000025, 0x00000026, 0x00000027, 0x00000028 - -dlabel D_8024632C_B6BDDC -.word 0x00000001, 0x00000023 - -dlabel D_80246334_B6BDE4 -.word 0x00000001, 0x00000157, 0x00000032, 0x000000BE, 0xFFFFFE5C, 0x0000000F, 0xF840606A, 0x00000000 - -dlabel D_80246354_B6BE04 -.word 0x00000002, 0xFFFFFFE6, 0x000000CC, 0xFFFFFE53, 0x0000003B, 0x000000CC, 0xFFFFFE49 - -dlabel D_80246370_B6BE20 -.word D_80246314_B6BDC4, D_8024632C_B6BDDC, D_80246334_B6BDE4, D_80246354_B6BE04, 0x00000000 - -dlabel D_80246384_B6BE34 -.word 0x41600000, 0x42B40000, 0xC3E58000, 0x00000000 - -dlabel D_80246394_B6BE44 -.word 0x00000005, 0x0000002B, 0x0000002C, 0x0000002D, 0x0000002E, 0x0000002F - -dlabel D_802463AC_B6BE5C -.word 0x00000001, 0x0000002A - -dlabel D_802463B4_B6BE64 -.word 0x00000001, 0x00000098, 0x00000186, 0x00000064, 0xFFFFFF92, 0x0000000F, 0xF840606B, 0x00000000 - -dlabel D_802463D4_B6BE84 -.word 0x00000002, 0x0000019F, 0x00000072, 0xFFFFFF88, 0x000001F4, 0x00000072, 0xFFFFFF7E - -dlabel D_802463F0_B6BEA0 -.word D_80246394_B6BE44, D_802463AC_B6BE5C, D_802463B4_B6BE64, D_802463D4_B6BE84, 0x00000000 - -dlabel D_80246404_B6BEB4 -.word 0x43E38000, 0x00000000, 0xC3160000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802462F0_B6BDA0, 0x00000047, 0x00000005, D_80245CB0_B6B760, 0x00001000, 0x00000038, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245CB0_B6B760, 0x00100000, D_80246304_B6BDB4, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80246370_B6BE20, 0x00000047, 0x00000005, D_80245CB0_B6B760, 0x00001000, 0x00000039, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245CB0_B6B760, 0x00100000, D_80246384_B6BE34, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802463F0_B6BEA0, 0x00000047, 0x00000005, D_80245CB0_B6B760, 0x00001000, 0x0000003A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80245CB0_B6B760, 0x00100000, D_80246404_B6BEB4, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_09/B6BFB0.data.s b/ver/us/asm/data/world/area_jan/jan_09/B6BFB0.data.s deleted file mode 100644 index c8b8ab97a4..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_09/B6BFB0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80246500_B6BFB0 -.word 0x00000043, 0x0000000A, MakeEntity, Entity_SpinningFlower, 0x0000001E, 0x00000000, 0xFFFFFF06, 0x00000000, 0xFFFFFFDF, 0x0000005A, 0xFFFFFEA5, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_Munchlesia, 0x0000010F, 0x00000000, 0x00000150, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_10/B6DAD0.data.s b/ver/us/asm/data/world/area_jan/jan_10/B6DAD0.data.s deleted file mode 100644 index a0a1ee8bcf..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_10/B6DAD0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241740_B6DAD0 -.word 0x43BE0000, 0xC1A00000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802418F4, D_80241740_B6DAD0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900F6, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000008, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_10/B6DB60.data.s b/ver/us/asm/data/world/area_jan/jan_10/B6DB60.data.s deleted file mode 100644 index f4443d6e1d..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_10/B6DB60.data.s +++ /dev/null @@ -1,69 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802417D0_B6DB60 -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, jan_10_UpdateTexturePanSmooth, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_10_UpdateTexturePanStepped, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024186C_B6DBFC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80244470, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802418C8_B6DC58 -.word 0x00000047, 0x00000005, D_8024186C_B6DBFC, 0x00080000, 0x00000003, 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, MakeNpcs, 0x00000000, D_8024256C_B6E8FC, 0x00000046, 0x00000001, 0x80244430, 0x00000044, 0x00000001, D_80242DE8_B6F178, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x0000000E, 0x00000004, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x00080000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000020, 0x00000001, 0x00000044, 0x00000001, 0x8024385C, 0x00000044, 0x00000001, 0x80244314, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802418C8_B6DC58, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x80241790, 0x00000043, 0x00000002, MakeTransformGroup, 0x00000045, 0x00000043, 0x00000003, EnableTexPanning, 0x00000044, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000050, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 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_802417D0_B6DB60, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241B50_B6DEE0 -.word 0x3FC00000, 0x0000001E, 0x0000000A, 0x43160000, 0x00000000, 0x00000003, 0x40A00000, 0x00000046, 0x00000005, 0x43480000, 0x00000000, 0x00000001 - -dlabel D_80241B80_B6DF10 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, jan_10_HoppingAI_Main, D_80241B50_B6DEE0, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BBC_B6DF4C -.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_80241B80_B6DF10, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 - -dlabel D_80241BE8_B6DF78 -.word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80241C14_B6DFA4 -.word 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000007, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x002B0309, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFDCA, 0x00000064, 0x00000041, 0x00000043, 0x00000003, PlaySoundWithVolume, 0x00000331, 0x0000006E, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_80241B80_B6DF10, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D54_B6E0E4 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000007, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80241C14_B6DFA4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DD0_B6E160 -.word 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000001F0, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E48_B6E1D8 -.word 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0x00000000, 0x0000015E, 0xF24ABE80, 0xF24A5E80, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000007, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097010B, 0x0097010A, 0x00000000, 0x001000B2, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097010B, 0x0097010A, 0x00000000, 0x001000B3, 0x00000013, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00970104, 0x00970101, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970103, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF10, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF8406051, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004E, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, 0x80241790, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420D0_B6E460 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x00000044, 0x00000001, D_80241DD0_B6E160, 0x0000000A, 0x00000002, 0xF8406051, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970106, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFE3E, 0x00000000, 0x00000046, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241E48_B6E1D8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024218C_B6E51C -.word 0x00000000, D_80241BE8_B6DF78, 0xC3820000, 0x00000000, 0xC35C0000, 0x0040090D, D_802420D0_B6E460, 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, 0x00970101, 0x00970102, 0x00970103, 0x00970103, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00970101, 0x00000000, 0x00000000, 0x00000000, 0x001A00C4 - -dlabel D_8024237C_B6E70C -.word 0x00000001, D_80241BBC_B6DF4C, 0x00000000, 0x00000000, 0x00000000, 0x00400400, D_80241D54_B6E0E4, 0x00000000, 0x00000000, 0x0000010E, 0x800A009A, 0x00050000, 0x008B0005, 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, 0x00030000, 0xFFFFFE34, 0x00000000, 0x00000046, 0x00000032, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFE34, 0x00000000, 0x00000046, 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, 0x002B0302, 0x002B0302, 0x002B0303, 0x002B0303, 0x002B0301, 0x002B0301, 0x002B0308, 0x002B0308, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024256C_B6E8FC -.word 0x00000001, D_8024218C_B6E51C, 0x00000000, 0x00000001, D_8024237C_B6E70C, 0x140A0004, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80242590_B6E920 -.word 0x0000000A, 0x00000002, 0xF8406055, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001D, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x0000003F, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003C, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0xFFFFFF5B, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000003D, 0x00000000, 0xFFFFFF5B, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000001D, 0x7FFFFE00, 0x00000043, 0x00000003, EnableModel, 0x0000003F, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000003C, 0x00000001, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0x0000000A, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000003D, 0x00000000, 0x0000000A, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000040, 0x0000005A, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000003D, 0x0000005A, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000040, 0x0000005A, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000003D, 0xFFFFFFA6, 0x00000000, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242760_B6EAF0 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001C, 0x00000165, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF5B, 0xFFFFFF48, 0x00000005, 0x00000006, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000003D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242828_B6EBB8 -.word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000011, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000043, 0x00000003, jan_10_UnkShadowFunc001, 0x0000003F, 0xFAA2B58A, 0x00000057, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001C, 0x7FFFFE00, 0x00000043, 0x00000005, MakeLerp, 0xFFFFFF48, 0x0000003C, 0x0000001E, 0x00000004, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000003D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x0000003C, 0x00000000, 0x0000001E, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000003D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001C, 0x0000209D, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000002, 0x00000003, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A64_B6EDF4 -.word 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000032, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000003C, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000003D, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000040, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000003D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000002, 0x00000003, 0x00000001, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242BAC_B6EF3C -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001C, 0x0000209E, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003F, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0x0000003C, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000005A, 0x0000001E, 0x00000008, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0x00000009, 0x00000043, 0x00000005, TranslateGroup, 0x00000040, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, TranslateGroup, 0x0000003D, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x00000040, 0x0000005A, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x0000003D, 0x0000005A, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, RotateGroup, 0x00000040, 0xFE363C80, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, RotateGroup, 0x0000003D, 0xFE363C80, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242D3C_B6F0CC -.word 0x00000024, 0x00000002, 0xF8406055, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000046, 0x00000001, D_80242760_B6EAF0, 0x00000008, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80242828_B6EBB8, 0x00000008, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80242A64_B6EDF4, 0x00000008, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80242BAC_B6EF3C, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000044, 0x00000001, D_80242590_B6E920, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242DE8_B6F178 -.word 0x0000000A, 0x00000002, 0xF8406055, 0x00000000, 0x00000047, 0x00000005, D_80242D3C_B6F0CC, 0x00001000, 0x0000001C, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, D_80242590_B6E920, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_10/B6F1D0.data.s b/ver/us/asm/data/world/area_jan/jan_10/B6F1D0.data.s deleted file mode 100644 index 74d8c50785..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_10/B6F1D0.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242E40_B6F1D0 -.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_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802431A0_B6F530 -.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_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, jan_10_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, jan_10_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802437A4_B6FB34 -.word 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802414BC_B6D84C, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000007, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802437FC_B6FB8C -.word 0x00000005, 0x00000013, 0x00000014, 0x00000015, 0x00000016, 0x00000017 - -dlabel D_80243814_B6FBA4 -.word 0x00000001, 0x00000012 - -dlabel D_8024381C_B6FBAC -.word 0x00000002, 0xFFFFFDAB, 0x00000072, 0x0000003B, 0xFFFFFE00, 0x00000072, 0x00000031 - -dlabel D_80243838_B6FBC8 -.word D_802437FC_B6FB8C, D_80243814_B6FBA4, 0x00000000, D_8024381C_B6FBAC, D_802437A4_B6FB34 - -dlabel D_8024384C_B6FBDC -.word 0xC40B4000, 0x00000000, 0x41E80000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243838_B6FBC8, 0x00000047, 0x00000005, D_802431A0_B6F530, 0x00001000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802431A0_B6F530, 0x00100000, D_8024384C_B6FBDC, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_10/B6FC50.data.s b/ver/us/asm/data/world/area_jan/jan_10/B6FC50.data.s deleted file mode 100644 index 9056fa9512..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_10/B6FC50.data.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802438C0_B6FC50 -.word 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_10_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup_jan_10_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup_jan_10_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244224_B705B4 -.word 0x00000001, 0x0000002D - -dlabel D_8024422C_B705BC -.word 0x00000001, 0xFFFFFDF1, 0x00000014, 0x0000007C - -dlabel D_8024423C_B705CC -.word D_80244224_B705B4, 0x00000000, D_8024422C_B705BC, 0x00000000 - -dlabel D_8024424C_B705DC -.word 0x00000001, 0x0000002F - -dlabel D_80244254_B705E4 -.word 0x00000001, 0xFFFFFE90, 0x00000016, 0x00000091 - -dlabel D_80244264_B705F4 -.word D_8024424C_B705DC, 0x00000000, D_80244254_B705E4, 0x00000000 - -dlabel D_80244274_B70604 -.word 0x00000001, 0x00000031 - -dlabel D_8024427C_B7060C -.word 0x00000001, 0xFFFFFECF, 0x00000014, 0xFFFFFFF6 - -dlabel D_8024428C_B7061C -.word D_80244274_B70604, 0x00000000, D_8024427C_B7060C, 0x00000000 - -dlabel D_8024429C_B7062C -.word 0x00000001, 0x00000033 - -dlabel D_802442A4_B70634 -.word 0x00000001, 0xFFFFFEFB, 0x00000014, 0xFFFFFFF2 - -dlabel D_802442B4_B70644 -.word D_8024429C_B7062C, 0x00000000, D_802442A4_B70634, 0x00000000 - -dlabel D_802442C4_B70654 -.word 0x00000001, 0x00000035 - -dlabel D_802442CC_B7065C -.word 0x00000001, 0x00000023, 0x00000016, 0xFFFFFFBA - -dlabel D_802442DC_B7066C -.word D_802442C4_B70654, 0x00000000, D_802442CC_B7065C, 0x00000000 - -dlabel D_802442EC_B7067C -.word 0x00000001, 0x00000037 - -dlabel D_802442F4_B70684 -.word 0x00000001, 0x0000004B, 0x00000014, 0xFFFFFFD1 - -dlabel D_80244304_B70694 -.word D_802442EC_B7067C, 0x00000000, D_802442F4_B70684, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024423C_B705CC, 0x00000047, 0x00000005, D_802438C0_B6FC50, 0x00000100, 0x00000014, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244264_B705F4, 0x00000047, 0x00000005, D_802438C0_B6FC50, 0x00000100, 0x00000015, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024428C_B7061C, 0x00000047, 0x00000005, D_802438C0_B6FC50, 0x00000100, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802442B4_B70644, 0x00000047, 0x00000005, D_802438C0_B6FC50, 0x00000100, 0x00000017, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802442DC_B7066C, 0x00000047, 0x00000005, D_802438C0_B6FC50, 0x00000100, 0x00000018, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80244304_B70694, 0x00000047, 0x00000005, D_802438C0_B6FC50, 0x00000100, 0x00000019, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_10/B707C0.data.s b/ver/us/asm/data/world/area_jan/jan_10/B707C0.data.s deleted file mode 100644 index 54aeb66bb0..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_10/B707C0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80244430_B707C0 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x0000015C, 0xFFFFFF6A, 0xFFFFFFC4, 0x0000003C, 0x00000011, 0xF8406082, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_11/B71060.data.s b/ver/us/asm/data/world/area_jan/jan_11/B71060.data.s deleted file mode 100644 index a97e730afa..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_11/B71060.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240800_B71060 -.word 0xC2B40000, 0x00000000, 0x42740000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241F64, D_80240800_B71060, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900F9, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000024, 0x00000000, 0x00000006, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s b/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s deleted file mode 100644 index 6de27233ab..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_11/B710F0.data.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240890_B710F0 -.word 0x00000056, 0x00000000, 0x00000043, 0x00000001, jan_11_DarkRoomUpdate, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_11_Pipe_GetEntryPos, 0x00000028, 0x00000002, 0xFE363C82, 0x00000028, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000002, func_802D286C, 0x00000100, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000001, 0x00000028, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_11_Pipe_GetCurrentFloor, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000043, 0x00000001, jan_11_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C84, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000027, 0x00000002, 0xFE363C85, 0x00000028, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000900, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_11_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000003, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0xFE363C8B, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000044, 0x00000001, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, jan_11_Pipe_AwaitDownInput, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802410DC_B7193C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410DC_B7193C -.word 0x00000043, 0x00000001, jan_11_Pipe_SetAnimFlag, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_11_Pipe_GetEntryPos, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_11_Pipe_GetEntryPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000001, 0x00000043, 0x00000001, jan_11_Pipe_GetCameraYaw, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00200000, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000005, 0x00000001, 0x00000028, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010002, 0x00000005, 0x00000002, 0x00000001, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802412B8_B71B18 -.word 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, GetCurrentPartnerID, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000006, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000013, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000001, jan_11_Pipe_SetAnimFlag, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C8B, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000043, 0x00000001, jan_11_Pipe_GetEntryPos, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C86, 0x00000002, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C88, 0x000000B4, 0x0000000F, 0x00000002, 0xFE363C84, 0x00000168, 0x00000028, 0x00000002, 0xFE363C84, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0xFE363C88, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, PlaySound, 0x00000163, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010000, 0x00000043, 0x00000002, func_802D286C, 0x00000800, 0x00000043, 0x00000007, func_802D2520, 0x00010000, 0x00000005, 0x00000003, 0x00000001, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000005, 0x00000001, 0x00000028, 0x00000043, 0x00000002, jan_11_Pipe_GetPointAheadOfPlayer, 0xF24A7E80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000046, 0x00000001, 0xFE363C8C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802415EC_B71E4C -.word 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C83, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C84, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C86, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C87, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C87, 0x00000003, 0x00000024, 0x00000002, 0xFE363C88, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C89, 0xF4ACD481, 0x00000024, 0x00000002, 0xFE363C8A, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C8A, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8B, 0xF4ACD480, 0x00000024, 0x00000002, 0xFE363C8C, 0xF4ACD481, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000001, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C81, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, ScaleModel, 0xFE363C81, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C86, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xFE363C84, 0xFE363C85, 0xFE363C80, 0xFE363C86, 0x00000043, 0x00000005, ScaleModel, 0xFE363C84, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C89, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C87, 0xFE363C88, 0xFE363C80, 0xFE363C89, 0x00000043, 0x00000005, ScaleModel, 0xFE363C87, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000027, 0x00000002, 0xFE363C8B, 0xFFFFFFFF, 0x00000027, 0x00000002, 0xFE363C8C, 0xFFFFFFFF, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFE363C8B, 0xFE363C80, 0xFE363C8C, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xF24A7C80, 0xF24A7C80, 0xF24A7C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C87, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241ABC_B7231C -.word 0x0000004D, 0x00000001, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C85, 0xF4ACD485, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000003, CloneModel, 0x00000023, 0xFE363C85, 0x00000043, 0x00000005, TranslateModel, 0xFE363C85, 0xF4ACD480, 0xF4ACD482, 0xF4ACD481, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x000000C8, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000008, 0x00000001, 0xFE363C80, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0xF4ACD482, 0xF4ACD483, 0xF4ACD484, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD485, 0xF4ACD480, 0xFE363C80, 0xF4ACD481, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, jan_11_CheckDripCollisionWithNPC, 0xF4ACD485, 0x0000000A, 0x00000002, 0xFE363C82, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, EnableModel, 0xF4ACD485, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x000003F6, 0x00000046, 0x00000001, D_802415EC_B71E4C, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C94_B724F4 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000030, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000005, 0x00000001, 0xFE363C81, 0x00000034, 0x00000004, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000031, 0x00000001, 0xFE363C89, 0x00000005, 0x00000001, 0xFE363C89, 0x0000003E, 0x00000002, 0x00000006, 0xFE363C8A, 0x0000003C, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, RandInt, 0xFE363C84, 0xFE363C8B, 0x00000043, 0x00000003, RandInt, 0xFE363C85, 0xFE363C8C, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C8D, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C8E, 0xFE363C8C, 0x00000024, 0x00000002, 0xF4ACD480, 0xFE363C8D, 0x00000024, 0x00000002, 0xF4ACD481, 0xFE363C8E, 0x00000024, 0x00000002, 0xF4ACD482, 0xFE363C86, 0x00000024, 0x00000002, 0xF4ACD483, 0xFE363C87, 0x00000024, 0x00000002, 0xF4ACD484, 0xFE363C88, 0x00000024, 0x00000002, 0xF4ACD485, 0xFE363C8F, 0x00000044, 0x00000001, D_80241ABC_B7231C, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000005, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E40_B726A0 -.word 0x00000002, 0xFFFFFF66, 0x00000064, 0x0000005C, 0x00000024, 0x000000C8, 0x00000000, 0x0000003C, 0x00000002, 0x000000D4, 0x0000000A, 0x00000035, 0x0000007A, 0x000000C8, 0x00000000, 0x0000003C, 0x00000002 - -dlabel D_80241E84_B726E4 -.word 0x00000024, 0x00000002, 0xFE363C80, D_80241E40_B726A0, 0x00000044, 0x00000001, D_80241C94_B724F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241EB0_B72710 -.word 0x00000043, 0x00000003, GotoMap, 0x80242840, 0x00000003, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241EE0_B72740 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8C, D_80241EB0_B72710, 0x00000046, 0x00000001, D_802412B8_B71B18, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F38_B72798 -.word 0x00000047, 0x00000005, D_80241EE0_B72740, 0x00000040, 0x00000001, 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, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x80242820, 0x00000044, 0x00000001, D_80240890_B710F0, 0x00000024, 0x00000002, 0xFE363C80, D_80241F38_B72798, 0x00000044, 0x00000001, EnterWalk, 0x00000044, 0x00000001, 0x80240850, 0x00000046, 0x00000001, D_80241E84_B726E4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_11/B728B0.data.s b/ver/us/asm/data/world/area_jan/jan_11/B728B0.data.s deleted file mode 100644 index 01c1ee8ca6..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_11/B728B0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242050_B728B0 -.word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024207C_B728DC -.word 0x00000024, 0x00000002, 0xF9718882, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000001F0, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF9718882, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420F4_B72954 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, jan_11_GetFloorCollider, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, jan_11_IsPartnerWatt, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000C, 0x00000002, 0xFE363C82, 0x00000055, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000000C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFCE, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A7E80, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000028, 0x00000002, 0xFE363C84, 0xFE363C81, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000002, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24A8A80, 0xFE363C84, 0x0000015E, 0xF24ABE80, 0xF24A5E80, 0x00000024, 0x00000002, 0xF9718882, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x0097000B, 0x0097000A, 0x00000000, 0x001000AE, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00970004, 0x00970001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000300, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970003, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000032, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF8406052, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604E, 0x00000027, 0x00000002, 0xFE363C80, 0xF840604F, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406050, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406051, 0x00000027, 0x00000002, 0xFE363C80, 0xF8406052, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000005, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x0000004E, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000010, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x00000078, 0x00000044, 0x00000001, 0x80240850, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000013, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242544_B72DA4 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00970006, 0x00970006, 0x00000000, 0x001000AD, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242574_B72DD4 -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000000F, 0x00000044, 0x00000001, D_8024207C_B728DC, 0x0000000A, 0x00000002, 0xF8406052, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00970006, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000084, 0x00000055, 0x0000000B, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802420F4_B72954, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242544_B72DA4, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242630_B72E90 -.word 0x00000000, D_80242050_B728B0, 0xC3E10000, 0x00000000, 0xC3200000, 0x0040090D, D_80242574_B72DD4, 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, 0x00970001, 0x00970002, 0x00970003, 0x00970003, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00970001, 0x00000000, 0x00000000, 0x00000000, 0x001A00C3, 0x00000001, D_80242630_B72E90, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_12/B74310.data.s b/ver/us/asm/data/world/area_jan/jan_12/B74310.data.s deleted file mode 100644 index 6cd98dd563..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_12/B74310.data.s +++ /dev/null @@ -1,33 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241260_B74310 -.word 0xC3960000, 0x00000000, 0x42F00000, 0x00000000, 0x437A0000, 0x00000000, 0xC2F00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802413C0_B74470, D_80241260_B74310, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900FA - -dlabel D_802412C0_B74370 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802433A0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024131C_B743CC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802433A8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241378_B74428 -.word 0x00000047, 0x00000005, D_8024131C_B743CC, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802412C0_B74370, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413C0_B74470 -.word 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, MakeNpcs, 0x00000000, 0x8024337C, 0x00000046, 0x00000001, 0x80242C80, 0x00000044, 0x00000001, D_80242098_B75148, 0x00000044, 0x00000001, 0x80242BD4, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80241378_B74428, 0x00000044, 0x00000001, EnterWalk, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802414F0_B745A0 -.word 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C87, 0xFFFFFFEC, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, jan_12_PullVine_WaitForPlayerGrab, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8D, 0x00000043, 0x00000006, PlaySoundAt, 0x00002089, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000044, 0x00000001, 0xFD050F8A, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0xFE363C85, 0x00000044, 0x00000001, 0xFD050F8A, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000D, 0x00000005, 0x00000001, 0x00000032, 0x00000043, 0x00000004, jan_12_PullVine_UpdatePosition, 0xFE363C80, 0xF24A3E80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000027, 0x00000002, 0xFE363C83, 0x00000005, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8F, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000005, PlayerJump, 0xFE363C86, 0xFE363C81, 0xFE363C84, 0x0000000A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8D, 0x00000043, 0x00000006, PlaySoundAt, 0x00002089, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A3E80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, jan_12_PullVine_UpdatePosition, 0xFE363C80, 0xF24ACA80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D90_B74E40 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000011, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x0000001C, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001E, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_12_PullVine_ShearBushModel, 0x0000001C, 0xFE363C86, 0x00000043, 0x00000003, jan_12_PullVine_ShearBushModel, 0x0000001E, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F58_B75008 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000011, 0x7FFFFE00, 0x00000044, 0x00000001, D_80241D90_B74E40, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000002E, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242044_B750F4 -.word 0x00000043, 0x00000002, GetModelCenter, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000007, MakeItemEntity, 0x000000AB, 0xFE363C80, 0x00000064, 0xFE363C82, 0x0000000E, 0xF840605A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242098_B75148 -.word 0x00000047, 0x00000005, D_80241F58_B75008, 0x00000100, 0x00000011, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, D_80241F58_B75008, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, D_80242044_B750F4, 0x00000024, 0x00000002, 0xFE363C8F, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000017, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000018, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C85, 0x0000000F, 0x00000044, 0x00000001, D_802414F0_B745A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_12/B75250.data.s b/ver/us/asm/data/world/area_jan/jan_12/B75250.data.s deleted file mode 100644 index a500f16711..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_12/B75250.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802421A0_B75250 -.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_12_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_12_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_80242500_B755B0 -.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_12_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_12_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_12_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_12_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_80242B04_B75BB4 -.word 0x00000003, 0x0000000D, 0x0000000E, 0x0000000F - -dlabel D_80242B14_B75BC4 -.word 0x00000001, 0x0000000C - -dlabel D_80242B1C_B75BCC -.word 0x00000001, 0x00000157, 0xFFFFFF0B, 0x00000064, 0xFFFFFFAB, 0x0000000F, 0xF840606C, 0x00000000 - -dlabel D_80242B3C_B75BEC -.word 0x00000002, 0xFFFFFF02, 0x00000090, 0xFFFFFFAF, 0xFFFFFF57, 0x00000090, 0xFFFFFFA5 - -dlabel D_80242B58_B75C08 -.word D_80242B04_B75BB4, D_80242B14_B75BC4, D_80242B1C_B75BCC, D_80242B3C_B75BEC, 0x00000000 - -dlabel D_80242B6C_B75C1C -.word 0xC3560000, 0x41F00000, 0xC2DE0000, 0x00000000 - -dlabel D_80242B7C_B75C2C -.word 0x00000003, 0x00000012, 0x00000013, 0x00000014 - -dlabel D_80242B8C_B75C3C -.word 0x00000001, 0x00000011 - -dlabel D_80242B94_B75C44 -.word 0x00000002, 0x00000140, 0x00000072, 0xFFFFFFBF, 0x00000195, 0x00000072, 0xFFFFFFB5 - -dlabel D_80242BB0_B75C60 -.word D_80242B7C_B75C2C, D_80242B8C_B75C3C, 0x00000000, D_80242B94_B75C44, 0x00000000 - -dlabel D_80242BC4_B75C74 -.word 0x43B40000, 0x00000000, 0xC2BE0000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242B58_B75C08, 0x00000047, 0x00000005, D_80242500_B755B0, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242500_B755B0, 0x00100000, D_80242B6C_B75C1C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242BB0_B75C60, 0x00000047, 0x00000005, D_80242500_B755B0, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242500_B755B0, 0x00100000, D_80242BC4_B75C74, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s b/ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s deleted file mode 100644 index 16574be555..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_12/B75D30.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242C80_B75D30 -.word 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0x00000082, 0x00000000, 0xFFFFFF92, 0x000000AA, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_BellbellPlant, 0xFFFFFEA2, 0x0000001E, 0xFFFFFFC9, 0x00000019, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFECA, 0x0000005A, 0xFFFFFFE7, 0x00000000, 0x00000088, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406062, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00420000, 0x00420003, 0x00420005, 0x00420006, 0x00420007, 0x0042000F, 0x00420010, 0x0042001A, 0x0042001B, 0xFFFFFFFF - -dlabel D_80242D38_B75DE8 -.word 0x00420000, 0xFFFFFFFF - -dlabel D_80242D40_B75DF0 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, OnPlayerFled, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, SetEnemyFlagBits, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242DFC_B75EAC -.word 0x3FD9999A, 0x00000064, 0x00000001, 0x42C80000, 0x41F00000, 0x00000001, 0x40600000, 0x00000014, 0x00000001, 0x42F00000, 0x00000000, 0x00000001 - -dlabel D_80242E2C_B75EDC -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x0000000C, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x00000009, 0x00000043, 0x00000002, jan_12_SpearGuyAI_Main, D_80242DFC_B75EAC, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E9C_B75F4C -.word 0x00000000, 0x00170016, 0x00000000, 0x00000000, D_80242E2C_B75EDC, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00100000 - -dlabel D_80242EC8_B75F78 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000004, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000016, 0x00000043, 0x00000003, SetSelfVar, 0x00000002, 0x00000028, 0x00000043, 0x00000003, SetSelfVar, 0x00000003, 0x0000001C, 0x00000043, 0x00000003, SetSelfVar, 0x00000004, 0x00000001, 0x00000043, 0x00000003, SetSelfVar, 0x0000000F, 0x00000000, 0x00000043, 0x00000001, jan_12_MeleeHitbox_Main, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242F70_B76020 -.word 0x00000000, 0x00080014, 0x00000000, 0x00000000, D_80242EC8_B75F78, 0x00000000, 0x00000000, D_80242D40_B75DF0, 0x00000000, 0x00000000, 0x00100008 - -dlabel D_80242F9C_B7604C -.word 0x00000000, D_80242E9C_B75F4C, 0x43250000, 0x00000000, 0x41700000, 0x00400D00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8005008F, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x000000A5, 0x00000000, 0x0000000F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000A5, 0x00000000, 0x0000000F, 0x00000096, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80242F70_B76020, 0x00000000, 0xC47A0000, 0x00000000, 0x00800D00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, D_80242D38_B75DE8, 0x00000000, 0x00000002, D_80242F9C_B7604C, 0x14060007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_13/B76D80.data.s b/ver/us/asm/data/world/area_jan/jan_13/B76D80.data.s deleted file mode 100644 index afc0444b8d..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_13/B76D80.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802405D0_B76D80 -.word 0xC3960000, 0x00000000, 0x42F00000, 0x00000000, 0x425C0000, 0x00000000, 0xC2F00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240730_B76EE0, D_802405D0_B76D80, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900FB - -dlabel D_80240630_B76DE0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243870, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024068C_B76E3C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243878, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406E8_B76E98 -.word 0x00000047, 0x00000005, D_8024068C_B76E3C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240630_B76DE0, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240730_B76EE0 -.word 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, 0x00000044, 0x00000001, 0x802437F0, 0x00000044, 0x00000001, 0x80242438, 0x00000044, 0x00000001, 0x80243744, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802406E8_B76E98, 0x00000044, 0x00000001, EnterWalk, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_13/B77000.data.s b/ver/us/asm/data/world/area_jan/jan_13/B77000.data.s deleted file mode 100644 index 1f17e6f79b..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_13/B77000.data.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240850_B77000 -.word 0x00000000 - -dlabel D_80240854_B77004 -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8B, 0xFD050F80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF6, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFF6, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFF6, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000064, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401AC_B7695C, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000012, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xFE363C83, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240A64_B77214 -.word 0x00000043, 0x00000001, func_802401AC_B7695C, 0x0000000C, 0x00000002, 0xFE363C83, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E80, 0x00000013, 0x00000000, 0x00000043, 0x00000005, ScaleModel, 0xFE363C8A, 0xFE363C84, 0xFE363C82, 0xFE363C83, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240ADC_B7728C -.word 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x0000000A, 0x00000002, 0xF8406077, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000005, 0x0000000A, 0x00000002, 0xF70F2E82, 0x00000001, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF6, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF6, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFF6, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFF6, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000032, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000046, 0x00000024, 0x00000002, 0xFE363C81, 0x00000046, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000046, 0x00000001, D_80240A64_B77214, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E82, 0x00000002, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000D, 0x00000002, 0xFE363C81, 0x0000012C, 0x00000024, 0x00000002, 0xFE363C81, 0x0000012C, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_80240A64_B77214, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xF8406077, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFF9, 0x00000005, 0x00000001, 0x0000001C, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000046, 0x00000001, D_80240A64_B77214, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFF6, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFFF6, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFFF6, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000064, 0x00000024, 0x00000002, 0xFE363C81, 0x00000064, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0xFE363C8A, 0x00000001, 0x00000046, 0x00000001, D_80240A64_B77214, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240F70_B77720 -.word 0x00000138, 0x00000000, 0x0000000C, 0x000000ED, 0x00000000, 0xFFFFFFDA, 0x00000089, 0x00000000, 0x0000003E, 0xFFFFFEE0, 0x00000000, 0xFFFFFFDA, 0xFFFFFFDA, 0x00000000, 0x0000000C, 0x00000025, 0x00000000, 0xFFFFFF76 - -dlabel D_80240FB8_B77768 -.word 0x0000000B, 0x00000002, 0xF70F2E83, 0xFD050F80, 0x00000024, 0x00000002, 0xF70F2E83, 0xFD050F80, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000001C, 0x00000043, 0x00000002, StopSound, 0x8000001D, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000005, 0x0000000A, 0x00000002, 0xF8406077, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000006, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x8000001C, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, D_80240F70_B77720, 0x00000005, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000006, 0x00000000, 0x00000043, 0x00000005, func_80240214_B769C4, 0xFAA2B58A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241110_B778C0 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x00000019, 0x00000191, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A8080, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241154_B77904 -.word 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E83, 0xFFFFFFFF, 0x00000044, 0x00000001, D_80240FB8_B77768, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF8406077, 0x00000001, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003B, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000F, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000010, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000011, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000013, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000010, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000011, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000012, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000013, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000F, 0x00000002, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000010, 0x00000002, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000011, 0x00000002, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000012, 0x00000002, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000013, 0x00000002, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetPushBlock, 0x00000000, 0x0000001C, 0x00000006, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetPushBlock, 0x00000000, 0x00000019, 0x00000004, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetPushBlock, 0x00000000, 0x00000015, 0x00000008, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000002, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetPushBlock, 0x00000000, 0x00000004, 0x00000004, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000003, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetPushBlock, 0x00000000, 0x0000000E, 0x00000006, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000004, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8406077, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000F, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000010, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000011, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000012, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000013, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000010, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000011, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000012, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000013, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000F, 0x00000002, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000010, 0x00000002, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000011, 0x00000002, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000012, 0x00000002, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000013, 0x00000002, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000005, 0x00000008, 0x00000001, 0x0000001E, 0x00000005, 0x00000001, 0x00000002, 0x00000044, 0x00000001, D_80241110_B778C0, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0x00000003, 0x00000000, 0xF24A7B4D, 0x00000001, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0xFFFFFFFD, 0x00000000, 0xF24A7B4D, 0x00000001, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x0000003B, 0x00000043, 0x00000004, FacePlayerTowardPoint, 0xFE363C80, 0xFE363C82, 0x00000004, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C84, 0x00000078, 0x00000027, 0x00000002, 0xFE363C85, 0x00000078, 0x00000014, 0x00000001, 0xFE363C83, 0x00000021, 0x00000002, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000023, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000044, 0x00000001, D_80241110_B778C0, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0x00000005, 0x00000000, 0xF24A7B4D, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0xFFFFFFFB, 0x00000000, 0xF24A7B4D, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000007, 0x00000044, 0x00000001, D_80241110_B778C0, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0x00000007, 0x00000000, 0xF24A7B4D, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0xFFFFFFF9, 0x00000000, 0xF24A7B4D, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000008, 0x00000043, 0x00000003, RandInt, 0x00000002, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000008, 0x00000000, 0xFFFFFFAE, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000026, 0x00000000, 0xFFFFFFC2, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x0000004E, 0x00000000, 0xFFFFFFB3, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000023, 0x00000000, 0x00000044, 0x00000001, D_80241110_B778C0, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0x0000000A, 0x00000000, 0xF24A7B4D, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0xFFFFFFF6, 0x00000000, 0xF24A7B4D, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x0000000F, 0xF24A7C1A, 0x00000057, 0x00000000, 0x00000043, 0x00000006, PlaySoundAt, 0x8000001D, 0x00000000, 0x00000025, 0x00000000, 0xFFFFFF76, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x000000C8, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0x0000000A, 0x00000000, 0xF24A7B4D, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0xFFFFFFF6, 0x00000000, 0xF24A7B4D, 0x00000001, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000012, 0x00000027, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, TranslateModel, 0x0000003B, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, TranslateModel, 0x0000003B, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E82, 0x00000002, 0x00000005, 0x00000001, 0x00000019, 0x00000027, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000005, TranslateModel, 0x0000003B, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000043, 0x00000005, TranslateModel, 0x0000003B, 0xFFFFFF38, 0xFE363C80, 0xFFFFFE0C, 0x00000043, 0x00000006, RotateModel, 0x0000003B, 0xFE363C82, 0xFFFFFFFF, 0xF24A7AE7, 0xF24A7AE7, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, EnableModel, 0x0000003B, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF8406077, 0x00000001, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, GetPushBlock, 0x00000000, 0x00000011, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000005, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F80, 0x00000006, 0x00000003, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80240FB8_B77768, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F5C_B7870C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000007, GetGridIndexFromPos, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x0000001C, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000006, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000019, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000004, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000015, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000008, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000003, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000004, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000004, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000004, 0x0000000A, 0x00000002, 0xFE363C83, 0x0000000E, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000006, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000005, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000011, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000005, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000010, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000005, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000012, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F80, 0x00000005, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000013, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000001, func_802402B8_B76A68, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C84, 0x00000028, 0x0000002C, 0x00000002, 0xFE363C84, 0x00000006, 0x00000013, 0x00000000, 0x0000002E, 0x00000002, 0xFE363C83, 0x0000000A, 0x0000002E, 0x00000002, 0xFE363C85, 0x0000000A, 0x0000002C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C85, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x0000000B, 0x0000002F, 0x00000002, 0xFE363C85, 0x0000000B, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002E, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, CreatePushBlockGrid, 0x00000000, 0x00000020, 0x0000000C, 0xFFFFFE70, 0x00000000, 0xFFFFFF6A, 0x00000000, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000007, 0x00000005, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000D, 0x00000009, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000010, 0x00000005, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000015, 0x00000002, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000016, 0x00000004, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000001A, 0x00000006, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000001B, 0x00000007, 0x00000001, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000F, 0x00000000, 0x00000002, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000010, 0x00000000, 0x00000002, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000011, 0x00000000, 0x00000002, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000012, 0x00000000, 0x00000002, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000F, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000010, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000011, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000012, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000013, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x0000000F, 0x00000002, 0x00000002, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000010, 0x00000002, 0x00000002, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000011, 0x00000002, 0x00000002, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000012, 0x00000002, 0x00000002, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0x00000013, 0x00000002, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000020, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0xFE363C80, 0x00000000, 0x00000002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0xFE363C80, 0x00000001, 0x00000002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000014, 0x00000005, 0x00000001, 0x0000000C, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0xFE363C80, 0x00000001, 0x00000002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0xFE363C80, 0x00000002, 0x00000002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0xFE363C80, 0x00000002, 0x00000002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000001A, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0xFE363C80, 0x00000002, 0x00000002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000002, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0xFE363C80, 0x00000003, 0x00000002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000005, SetPushBlock, 0x00000000, 0xFE363C80, 0x00000003, 0x00000002, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000006, 0x00000000, 0x00000044, 0x00000001, D_80241154_B77904, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000013, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C82, 0x7FFFFE00, 0x00000044, 0x00000001, D_80240854_B77004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000030, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000024, 0x00000002, 0xFE363C82, 0x00000014, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C82, 0x7FFFFE00, 0x00000044, 0x00000001, D_80240854_B77004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFE363C81, 0x00000002, 0x00000024, 0x00000002, 0xFE363C82, 0x00000015, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C82, 0x7FFFFE00, 0x00000044, 0x00000001, D_80240854_B77004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000034, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000024, 0x00000002, 0xFE363C82, 0x00000016, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C82, 0x7FFFFE00, 0x00000044, 0x00000001, D_80240854_B77004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000036, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000024, 0x00000002, 0xFE363C82, 0x00000017, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C82, 0x7FFFFE00, 0x00000044, 0x00000001, D_80240854_B77004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000038, 0x00000024, 0x00000002, 0xFE363C81, 0x00000005, 0x00000024, 0x00000002, 0xFE363C82, 0x0000001A, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0xFE363C82, 0x7FFFFE00, 0x00000044, 0x00000001, D_80240ADC_B7728C, 0x00000044, 0x00000001, D_80241F5C_B7870C, 0x00000043, 0x00000003, EnableTexPanning, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000030, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000032, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000034, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000036, 0x00000001, 0x00000043, 0x00000003, EnableTexPanning, 0x00000038, 0x00000001, 0x00000043, 0x00000004, SetModelCustomGfx, 0x0000002E, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000030, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000032, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000034, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000036, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetModelCustomGfx, 0x00000038, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000004, SetCustomGfxBuilders, 0x00000000, func_80240000_B767B0, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000028, 0x00000002, 0xFE363C80, 0x000007D0, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000027, 0x00000002, 0xFE363C80, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0xFE363C80, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_13/B794C0.data.s b/ver/us/asm/data/world/area_jan/jan_13/B794C0.data.s deleted file mode 100644 index c32ea5cd66..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_13/B794C0.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242D10_B794C0 -.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_13_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_13_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_80243070_B79820 -.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_13_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_13_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_13_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_13_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_80243674_B79E24 -.word 0x00000003, 0x00000015, 0x00000016, 0x00000017 - -dlabel D_80243684_B79E34 -.word 0x00000001, 0x00000014 - -dlabel D_8024368C_B79E3C -.word 0x00000001, 0x00000157, 0xFFFFFEB1, 0x00000064, 0xFFFFFFC9, 0x0000000F, 0xF840606D, 0x00000000 - -dlabel D_802436AC_B79E5C -.word 0x00000002, 0xFFFFFE7C, 0x00000072, 0xFFFFFFB3, 0xFFFFFED1, 0x00000072, 0xFFFFFFA9 - -dlabel D_802436C8_B79E78 -.word D_80243674_B79E24, D_80243684_B79E34, D_8024368C_B79E3C, D_802436AC_B79E5C, 0x00000000 - -dlabel D_802436DC_B79E8C -.word 0xC3AE0000, 0x00000000, 0xC2D60000, 0x00000000 - -dlabel D_802436EC_B79E9C -.word 0x00000003, 0x00000010, 0x00000011, 0x00000012 - -dlabel D_802436FC_B79EAC -.word 0x00000001, 0x0000000F - -dlabel D_80243704_B79EB4 -.word 0x00000002, 0x00000108, 0x00000072, 0xFFFFFFAF, 0x0000015D, 0x00000072, 0xFFFFFFA5 - -dlabel D_80243720_B79ED0 -.word D_802436EC_B79E9C, D_802436FC_B79EAC, 0x00000000, D_80243704_B79EB4, 0x00000000 - -dlabel D_80243734_B79EE4 -.word 0x43980000, 0x00000000, 0xC2DE0000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802436C8_B79E78, 0x00000047, 0x00000005, D_80243070_B79820, 0x00001000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243070_B79820, 0x00100000, D_802436DC_B79E8C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243720_B79ED0, 0x00000047, 0x00000005, D_80243070_B79820, 0x00001000, 0x0000000F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80243070_B79820, 0x00100000, D_80243734_B79EE4, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_13/B79FA0.data.s b/ver/us/asm/data/world/area_jan/jan_13/B79FA0.data.s deleted file mode 100644 index 2a02c9cdb2..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_13/B79FA0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802437F0_B79FA0 -.word 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0xFFFFFF57, 0x00000000, 0xFFFFFF8D, 0x0000000A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenYellowBlock, 0xFFFFFF47, 0x00000055, 0xFFFFFFDD, 0x00000000, 0x0000008B, 0x80000000, 0x00000043, 0x00000002, AssignBlockFlag, 0xF8406063, 0x00000043, 0x00000002, UseDynamicShadow, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_14/B7B330.data.s b/ver/us/asm/data/world/area_jan/jan_14/B7B330.data.s deleted file mode 100644 index a3cde316aa..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_14/B7B330.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802412E0_B7B330 -.word 0xC37A0000, 0x00000000, 0x42F00000, 0x00000000, 0x437A0000, 0x00000000, 0xC2F00000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241440_B7B490, D_802412E0_B7B330, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900FC - -dlabel D_80241340_B7B390 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243860, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024139C_B7B3EC -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243868, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802413F8_B7B448 -.word 0x00000047, 0x00000005, D_8024139C_B7B3EC, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241340_B7B390, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241440_B7B490 -.word 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, MakeNpcs, 0x00000000, 0x80243834, 0x00000044, 0x00000001, 0x80242270, 0x00000044, 0x00000001, 0x802430F4, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802413F8_B7B448, 0x00000044, 0x00000001, EnterWalk, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_14/B7B5C0.data.s b/ver/us/asm/data/world/area_jan/jan_14/B7B5C0.data.s deleted file mode 100644 index 3d6a72bc36..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_14/B7B5C0.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241570_B7B5C0 -.word 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8E, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C87, 0xFFFFFFEC, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, jan_14_PullVine_WaitForPlayerGrab, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8D, 0x00000043, 0x00000006, PlaySoundAt, 0x00002089, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000044, 0x00000001, 0xFD050F8A, 0x00000012, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0xFE363C85, 0x00000044, 0x00000001, 0xFD050F8A, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000D, 0x00000005, 0x00000001, 0x00000032, 0x00000043, 0x00000004, jan_14_PullVine_UpdatePosition, 0xFE363C80, 0xF24A3E80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C87, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C88, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000027, 0x00000002, 0xFE363C83, 0x00000005, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C86, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8F, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000001, 0x00000043, 0x00000005, PlayerJump, 0xFE363C86, 0xFE363C81, 0xFE363C84, 0x0000000A, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C8D, 0x00000043, 0x00000006, PlaySoundAt, 0x00002089, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000005, 0x00000001, 0x00000005, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000002, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000001, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C89, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C89, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8B, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24A3E80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A7A80, 0x00000005, 0x00000001, 0x00000064, 0x00000043, 0x00000004, jan_14_PullVine_UpdatePosition, 0xFE363C80, 0xF24ACA80, 0xFE363C82, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C82, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7E39, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xFE363C8E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E10_B7BE60 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000E, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x00000037, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x00000039, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_14_PullVine_ShearBushModel, 0x00000037, 0xFE363C86, 0x00000043, 0x00000003, jan_14_PullVine_ShearBushModel, 0x00000039, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FD8_B7C028 -.word 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000002E, 0x00000002, 0xFD050F81, 0xF24A8080, 0x0000002E, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420A8_B7C0F8 -.word 0x00000014, 0x00000001, 0xFE363C8C, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, D_80241E10_B7BE60, 0x00000044, 0x00000001, D_80241FD8_B7C028, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFEC, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0xFE363C80, 0x00000064, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00008200, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000007, MakeItemEntity, 0x00000080, 0xFE363C80, 0x00000064, 0xFE363C82, 0x0000000E, 0xF840605B, 0x00000016, 0x00000001, 0x00000004, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFEC, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C80, 0x00000064, 0xFE363C82, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00008200, 0x00000001, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000002, GetModelCenter, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000007, MakeItemEntity, 0x0000008A, 0xFE363C80, 0x00000064, 0xFE363C82, 0x0000000E, 0xF840605C, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001F, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001C, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001D, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001E, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000020, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, D_80241E10_B7BE60, 0x00000044, 0x00000001, D_80241FD8_B7C028, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000007, 0x00000024, 0x00000002, 0xFD050F8A, D_802420A8_B7C0F8, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000045, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000046, 0x00000024, 0x00000002, 0xFE363C89, 0x00000019, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001A, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000001B, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000044, 0x00000001, D_80241570_B7B5C0, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C8E, 0x0000003D, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000000C, 0x00000024, 0x00000002, 0xFE363C8B, 0x0000000D, 0x00000024, 0x00000002, 0xFE363C85, 0x0000000F, 0x00000044, 0x00000001, D_80241570_B7B5C0, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000003, 0x00000024, 0x00000002, 0xFE363C8D, 0x0000003F, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000040, 0x00000024, 0x00000002, 0xFE363C89, 0x00000010, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000011, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x0000000F, 0x00000044, 0x00000001, D_80241570_B7B5C0, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000004, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000042, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000043, 0x00000024, 0x00000002, 0xFE363C89, 0x00000014, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000015, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000016, 0x00000024, 0x00000002, 0xFE363C85, 0x0000000F, 0x00000044, 0x00000001, D_80241570_B7B5C0, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000005, 0x00000024, 0x00000002, 0xFE363C8D, 0x00000048, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000049, 0x00000024, 0x00000002, 0xFE363C89, 0x0000001F, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x0000000F, 0x00000044, 0x00000001, D_80241570_B7B5C0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_14/B7C630.data.s b/ver/us/asm/data/world/area_jan/jan_14/B7C630.data.s deleted file mode 100644 index 3be0876508..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_14/B7C630.data.s +++ /dev/null @@ -1,84 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802425E0_B7C630 -.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_14_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_14_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_80242940_B7C990 -.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_14_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_14_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_14_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_14_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_80242F44_B7CF94 -.word 0x00000003, 0x0000000B, 0x0000000C, 0x0000000D - -dlabel D_80242F54_B7CFA4 -.word 0x00000001, 0x0000000A - -dlabel D_80242F5C_B7CFAC -.word 0x00000002, 0xFFFFFE7C, 0x00000072, 0xFFFFFFB3, 0xFFFFFED1, 0x00000072, 0xFFFFFFA9 - -dlabel D_80242F78_B7CFC8 -.word D_80242F44_B7CF94, D_80242F54_B7CFA4, 0x00000000, D_80242F5C_B7CFAC, 0x00000000 - -dlabel D_80242F8C_B7CFDC -.word 0xC3AE0000, 0x00000000, 0xC2D60000, 0x00000000 - -dlabel D_80242F9C_B7CFEC -.word 0x00000002, 0x00000010, 0x00000011 - -dlabel D_80242FA8_B7CFF8 -.word 0x00000001, 0x0000000F - -dlabel D_80242FB0_B7D000 -.word 0x00000002, 0xFFFFFF16, 0x00000072, 0x00000013, 0xFFFFFF6B, 0x00000072, 0x00000009 - -dlabel D_80242FCC_B7D01C -.word D_80242F9C_B7CFEC, D_80242FA8_B7CFF8, 0x00000000, D_80242FB0_B7D000, 0x00000000 - -dlabel D_80242FE0_B7D030 -.word 0xC3420000, 0x00000000, 0xC1300000, 0x00000000 - -dlabel D_80242FF0_B7D040 -.word 0x00000003, 0x00000014, 0x00000015, 0x00000016 - -dlabel D_80243000_B7D050 -.word 0x00000001, 0x00000013 - -dlabel D_80243008_B7D058 -.word 0x00000002, 0xFFFFFFCA, 0x00000072, 0xFFFFFFC3, 0x0000001F, 0x00000072, 0xFFFFFFB9 - -dlabel D_80243024_B7D074 -.word D_80242FF0_B7D040, D_80243000_B7D050, 0x00000000, D_80243008_B7D058, 0x00000000 - -dlabel D_80243038_B7D088 -.word 0x41600000, 0x00000000, 0xC2B60000, 0x00000000 - -dlabel D_80243048_B7D098 -.word 0x00000003, 0x00000019, 0x0000001A, 0x0000001B - -dlabel D_80243058_B7D0A8 -.word 0x00000001, 0x00000018 - -dlabel D_80243060_B7D0B0 -.word 0x00000002, 0x0000016C, 0x00000072, 0xFFFFFFC3, 0x000001C1, 0x00000072, 0xFFFFFFB9 - -dlabel D_8024307C_B7D0CC -.word D_80243048_B7D098, D_80243058_B7D0A8, 0x00000000, D_80243060_B7D0B0, 0x00000000 - -dlabel D_80243090_B7D0E0 -.word 0x43CA0000, 0x00000000, 0xC2B60000, 0x00000000 - -dlabel D_802430A0_B7D0F0 -.word 0x00000002, 0x0000001E, 0x0000001F - -dlabel D_802430AC_B7D0FC -.word 0x00000001, 0x0000001D - -dlabel D_802430B4_B7D104 -.word 0x00000002, 0x000001D7, 0x00000072, 0x00000017, 0x0000022C, 0x00000072, 0x0000000D - -dlabel D_802430D0_B7D120 -.word D_802430A0_B7D0F0, D_802430AC_B7D0FC, 0x00000000, D_802430B4_B7D104, 0x00000000 - -dlabel D_802430E4_B7D134 -.word 0x43FF8000, 0x00000000, 0xC0E00000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242F78_B7CFC8, 0x00000047, 0x00000005, D_80242940_B7C990, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242940_B7C990, 0x00100000, D_80242F8C_B7CFDC, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242FCC_B7D01C, 0x00000047, 0x00000005, D_80242940_B7C990, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242940_B7C990, 0x00100000, D_80242FE0_B7D030, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243024_B7D074, 0x00000047, 0x00000005, D_80242940_B7C990, 0x00001000, 0x00000014, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242940_B7C990, 0x00100000, D_80243038_B7D088, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024307C_B7D0CC, 0x00000047, 0x00000005, D_80242940_B7C990, 0x00001000, 0x00000015, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242940_B7C990, 0x00100000, D_80243090_B7D0E0, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802430D0_B7D120, 0x00000047, 0x00000005, D_80242940_B7C990, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80242940_B7C990, 0x00100000, D_802430E4_B7D134, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_14/B7D2C0.data.s b/ver/us/asm/data/world/area_jan/jan_14/B7D2C0.data.s deleted file mode 100644 index 0c01506194..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_14/B7D2C0.data.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80243270_B7D2C0 -.word 0x40000000, 0x0000001E, 0x0000001E, 0x42C80000, 0x00000000, 0x0000000A, 0x40900000, 0x00000046, 0x0000000A, 0x43480000, 0x00000000, 0x00000001 - -dlabel D_802432A0_B7D2F0 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000040, 0x00000001, 0x00000043, 0x00000003, jan_14_HoppingAI_Main, D_80243270_B7D2C0, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, D_802432A0_B7D2F0, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel D_80243308_B7D358 -.word 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x00000000, EnemyNpcHit, 0x00000000, EnemyNpcDefeat, 0x00000000, 0x00000000, 0x00060000 - -dlabel D_80243334_B7D384 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000028, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcAI, 0xFFFFFFFF, D_802432A0_B7D2F0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243430_B7D480 -.word 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80243334_B7D384, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243454_B7D4A4 -.word 0x00000000, D_80243308_B7D358, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D00, D_80243430_B7D480, 0x00000000, 0x00000000, 0x0000010E, 0x800A009A, 0x00050000, 0x008B0005, 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, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0302, 0x002B0302, 0x002B0303, 0x002B0303, 0x002B0301, 0x002B0301, 0x002B0308, 0x002B0308, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x00000003, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80243644_B7D694 -.word 0x00000001, D_80243308_B7D358, 0x00000000, 0xC47A0000, 0x00000000, 0x00000D00, D_80243430_B7D480, 0x00000000, 0x00000000, 0x0000010E, 0x800A009A, 0x00050000, 0x008B0005, 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, 0x00030000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002B0302, 0x002B0302, 0x002B0303, 0x002B0303, 0x002B0301, 0x002B0301, 0x002B0308, 0x002B0308, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x002B0303, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_80243454_B7D4A4, 0x140A0005, 0x00000001, D_80243644_B7D694, 0x140B0005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_15/B7DC20.data.s b/ver/us/asm/data/world/area_jan/jan_15/B7DC20.data.s deleted file mode 100644 index 30e663ff67..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_15/B7DC20.data.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240300_B7DC20 -.word 0xC3960000, 0x00000000, 0x42F00000, 0x00000000, 0x43BE0000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240494_B7DDB4, D_80240300_B7DC20, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900FD - -dlabel D_80240360_B7DC80 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000014, 0x00000043, 0x00000003, GotoMap, 0x802426D0, 0x00000003, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GotoMap, 0x802426D0, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802403F0_B7DD10 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802426D8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024044C_B7DD6C -.word 0x00000047, 0x00000005, D_802403F0_B7DD10, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240360_B7DC80, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240494_B7DDB4 -.word 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, MakeNpcs, 0x00000000, 0x80241B44, 0x00000046, 0x00000001, 0x80242660, 0x00000044, 0x00000001, 0x802425B4, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_8024044C_B7DD6C, 0x00000044, 0x00000001, EnterWalk, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_15/B7DEE0.data.s b/ver/us/asm/data/world/area_jan/jan_15/B7DEE0.data.s deleted file mode 100644 index d06668b7ee..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_15/B7DEE0.data.s +++ /dev/null @@ -1,39 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802405C0_B7DEE0 -.word 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00170013, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240618_B7DF38 -.word 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240664_B7DF84 -.word 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80240694_B7DFB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240694_B7DFB4 -.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_15_HeartPlant_SpawnHeart, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000044, 0x00000001, D_80240664_B7DF84, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, SetSelfVar, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00430000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407A0_B7E0C0 -.word 0x00000000, 0x0014001C, D_80240618_B7DF38, D_80240694_B7DFB4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802407CC_B7E0EC -.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00360001, 0x00000008, 0x00000001, 0x0000000F, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00360005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00360006, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360001, 0x00000008, 0x00000001, 0x0000000F, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360006, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, RandInt, 0x00000005, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360001, 0x00000008, 0x00000001, 0x0000000F, 0x00000012, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360005, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360006, 0x00000008, 0x00000001, 0x00000005, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409F4_B7E314 -.word 0x0000000A, 0x00000002, 0xF8406079, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000022, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000BB, 0x00000140, 0x0000003C, 0x00000024, 0x00000002, 0xF8406079, 0x00000001, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000045, 0x00000002, D_802407CC_B7E0EC, 0xFE363C89, 0x00000043, 0x00000004, AwaitPlayerApproach, 0x00000190, 0xFFFFFFF6, 0x00000087, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000049, 0x00000001, 0xFE363C89, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00360001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x000003B1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360001, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020B1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000027, 0x00000002, 0xFE363C80, 0x00000018, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x000020B1, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00360004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020B2, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetNpcRotation, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020B2, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000020B3, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00360005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360005, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00360006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00360006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00360006, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000003B2, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000002, StartBossBattle, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241080_B7E9A0 -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000013, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410E8_B7EA08 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000013, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802409F4_B7E314, 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_80241080_B7E9A0, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000000, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241194_B7EAB4 -.word 0x00000000, D_802405C0_B7DEE0, 0x43B68000, 0x00000000, 0xC2340000, 0x00040800, D_802410E8_B7EA08, 0x00000000, 0x00000000, 0x0000010E, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00360001, 0x00360002, 0x00360003, 0x00360003, 0x00360001, 0x00360001, 0x0036000E, 0x0036000E, 0x00360018, 0x00360017, 0x00360005, 0x00360006, 0x00360007, 0x00360001, 0x00360001, 0x00360001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, D_802405C0_B7DEE0, 0x43A28000, 0x00000000, 0x00000000, 0x00040800, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00360001, 0x00360002, 0x00360003, 0x00360003, 0x00360001, 0x00360001, 0x0036000E, 0x0036000E, 0x00360018, 0x00360017, 0x00360005, 0x00360006, 0x00360007, 0x00360001, 0x00360001, 0x00360001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, D_802405C0_B7DEE0, 0x43BB8000, 0x00000000, 0x42340000, 0x00040800, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x80050080, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00360001, 0x00360002, 0x00360003, 0x00360003, 0x00360001, 0x00360001, 0x0036000E, 0x0036000E, 0x00360018, 0x00360017, 0x00360005, 0x00360006, 0x00360007, 0x00360001, 0x00360001, 0x00360001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_80241764_B7F084 -.word 0x00000003, D_802407A0_B7E0C0, 0xC3370000, 0x00000000, 0x423C0000, 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_80241954_B7F274 -.word 0x00000004, D_802407A0_B7E0C0, 0xC2F80000, 0x00000000, 0x41A00000, 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_80241194_B7EAB4, 0x15030005, 0x00000001, D_80241764_B7F084, 0x00000000, 0x00000001, D_80241954_B7F274, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_15/B7F4A0.data.s b/ver/us/asm/data/world/area_jan/jan_15/B7F4A0.data.s deleted file mode 100644 index 2c463ab32c..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_15/B7F4A0.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241B80_B7F4A0 -.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_15_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_15_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_80241EE0_B7F800 -.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_15_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_15_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_15_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_15_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_802424E4_B7FE04 -.word 0x00000003, 0x00000010, 0x00000011, 0x00000012 - -dlabel D_802424F4_B7FE14 -.word 0x00000001, 0x0000000F - -dlabel D_802424FC_B7FE1C -.word 0x00000002, 0xFFFFFF7A, 0x00000072, 0xFFFFFFB8, 0xFFFFFFCF, 0x00000072, 0xFFFFFFAE - -dlabel D_80242518_B7FE38 -.word D_802424E4_B7FE04, D_802424F4_B7FE14, 0x00000000, D_802424FC_B7FE1C, 0x00000000 - -dlabel D_8024252C_B7FE4C -.word 0xC2BC0000, 0x00000000, 0xC2CC0000, 0x00000000 - -dlabel D_8024253C_B7FE5C -.word 0x00000003, 0x00000015, 0x00000016, 0x00000017 - -dlabel D_8024254C_B7FE6C -.word 0x00000001, 0x00000014 - -dlabel D_80242554_B7FE74 -.word 0x00000001, 0x00000157, 0x000000AA, 0x00000064, 0xFFFFFFB0, 0x0000000F, 0xF840606E, 0x00000000 - -dlabel D_80242574_B7FE94 -.word 0x00000002, 0x000000A4, 0x00000072, 0xFFFFFFB9, 0x000000F9, 0x00000072, 0xFFFFFFAF - -dlabel D_80242590_B7FEB0 -.word D_8024253C_B7FE5C, D_8024254C_B7FE6C, D_80242554_B7FE74, D_80242574_B7FE94, 0x00000000 - -dlabel D_802425A4_B7FEC4 -.word 0x434C0000, 0x00000000, 0xC2CA0000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242518_B7FE38, 0x00000047, 0x00000005, D_80241EE0_B7F800, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241EE0_B7F800, 0x00100000, D_8024252C_B7FE4C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80242590_B7FEB0, 0x00000047, 0x00000005, D_80241EE0_B7F800, 0x00001000, 0x00000014, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241EE0_B7F800, 0x00100000, D_802425A4_B7FEC4, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_15/B7FF80.data.s b/ver/us/asm/data/world/area_jan/jan_15/B7FF80.data.s deleted file mode 100644 index 2b6bf4c7dd..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_15/B7FF80.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242660_B7FF80 -.word 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0x00000181, 0x00000000, 0xFFFFFFB5, 0x0000000A, 0x80000000, 0x00000043, 0x00000008, MakeEntity, Entity_HiddenPanel, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007, 0x80000000, 0x00000043, 0x00000002, AssignPanelFlag, 0xF8406076, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_16/B80540.data.s b/ver/us/asm/data/world/area_jan/jan_16/B80540.data.s deleted file mode 100644 index 68793be1e8..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_16/B80540.data.s +++ /dev/null @@ -1,63 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240540_B80540 -.word 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0x43F00000, 0x00000000, 0x00000000, 0x43870000, 0xC3770000, 0x00000000, 0x00000000, 0x43610000, 0xC3C30000, 0x00000000, 0x41A00000, 0x42C80000, 0x420C0000, 0x44160000, 0x43A50000, 0x43340000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80241074_B81074, D_80240540_B80540, 0x00000005, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900FE - -dlabel D_802405D0_B805D0 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000001, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000001, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xF9718883, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406C0_B806C0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802437A0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024071C_B8071C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802437A8, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240778_B80778 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802437B0, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802407D4_B807D4 -.word 0x00000047, 0x00000005, D_802406C0_B806C0, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024071C_B8071C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80240778_B80778, 0x00080000, 0x00000009, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240838_B80838 -.word 0x0000000B, 0x00000002, 0xF5DE0180, 0x00000015, 0x00000043, 0x0000000F, PlayEffect, 0x00000055, 0x00000005, 0xFFFFFECA, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000055, 0x00000005, 0xFFFFFF2E, 0x0000000A, 0x000000F0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000055, 0x00000005, 0x0000014A, 0x0000000A, 0x00000104, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000055, 0x00000005, 0xFFFFFED4, 0x0000000A, 0x0000010E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000055, 0x00000005, 0xFFFFFFB0, 0x0000000A, 0x00000186, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000055, 0x00000005, 0x000001AE, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802409F8_B809F8 -.word 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFD050F8A, 0x00000026, 0x00000002, 0xFE363C81, 0xFD050F8A, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7A6C, 0x0000002E, 0x00000002, 0xFE363C81, 0xF24A7AA9, 0x0000002C, 0x00000002, 0xFE363C80, 0x00000001, 0x0000002C, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, ScaleGroup, 0x00000015, 0xFE363C80, 0xFE363C81, 0x00000001, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x0000000F, 0x00000002, 0xFE363C8F, 0x00000258, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24A7A50, 0x0000002C, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x0000002E, 0x00000002, 0xFD050F8A, 0xF24A7DE0, 0x0000002C, 0x00000002, 0xFE363C8A, 0xFD050F8A, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240B3C_B80B3C -.word 0x00000044, 0x00000001, D_802409F8_B809F8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000023, 0x00000064, 0x0000014A, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000023, 0x00000064, 0x0000014A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000023, 0x00000000, 0x0000014A, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000004, SetPlayerPos, 0x00000023, 0x00000258, 0x00000154, 0x00000043, 0x00000005, MakeLerp, 0x00000258, 0x00000082, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000004, SetPlayerPos, 0x00000023, 0xFE363C80, 0x00000154, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000023, 0x00000078, 0x00000154, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000037, 0x00000078, 0x0000014A, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F8A, 0xF24A5C80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000000, 0x000000BE, 0x0000015E, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7F4D, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A8280, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000166, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xFFFFFFDD, 0x00000000, 0x00000181, 0x0000001E, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x00000023, 0x00000082, 0x0000014A, 0x0000000F, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000023, 0x00000078, 0x00000154, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000014, 0x00000000, 0x00000037, 0x00000078, 0x00000154, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x0000002C, 0x00000002, 0xFD050F8A, 0xF24A5C80, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFFDD, 0x00000000, 0x00000181, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A81B4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A8280, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFFFFFFF6, 0x00000000, 0x0000018B, 0x00000014, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241074_B81074 -.word 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, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_80242C50_B82C50, 0x00000046, 0x00000001, 0x80242C70, 0x00000044, 0x00000001, D_802412D4_B812D4, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x00000044, 0x00000001, D_80240B3C_B80B3C, 0x00000044, 0x00000001, D_802407D4_B807D4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802407D4_B807D4, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802405D0_B805D0, 0x00000044, 0x00000001, 0x802436D4, 0x00000044, 0x00000001, D_80240838_B80838, 0x00000043, 0x00000004, jan_16_UnkFunc27, 0x00000000, 0xFFFFFFFF, 0x00000003, 0x00000043, 0x00000004, jan_16_UnkFunc27, 0x00000002, 0x00000000, 0x00000003, 0x00000043, 0x0000000B, jan_16_UnkFunc26, 0x00000003, 0x000000FF, 0x000000FF, 0x000000FF, 0x00000000, 0x00000000, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241250_B81250 -.word 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A8080, 0xF24A8080, 0xF24A8080, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024127C_B8127C -.word 0x00000000, 0x00620050, D_80241250_B81250, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802412A8_B812A8 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802412D4_B812D4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000014, 0x00000043, 0x00000003, EnableGroup, 0x00000016, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x0000002C, 0x00000000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamType, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFFFFFEF3, 0x0000005E, 0xFFFFFFF8, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFFFFFEF3, 0x0000005E, 0xFFFFFFF8, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000003E8, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0x00000014, 0x00000000, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFE66, 0xFFFFFFAB, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xFFFFFFF3, 0x00000001, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C4D, 0x00000043, 0x00000004, SetCamPosA, 0x00000000, 0xFFFFFF31, 0xFFFFFFAB, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0xF24A7DB4, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000016, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, EnableGroup, 0x0000001A, 0x00000000, 0x00000043, 0x00000003, EnableGroup, 0x00000035, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241540_B81540 -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00980005, 0x00980001, 0x00000000, 0x001000E3, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241570_B81570 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000015, 0x00000004, 0x00000001, 0x00000014, 0x00000021, 0x00000002, 0x00000015, 0x00000016, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80241540_B81540, 0x00000043, 0x00000002, GetSelfNpcID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFFFFFE3E, 0x00000000, 0x0000001A, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFFFFFE52, 0x00000000, 0x00000004, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFFFFFE66, 0x00000000, 0xFFFFFFEE, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0xFFFFFE7A, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFFFFFE65, 0x0000005D, 0xFFFFFFF0, 0x00000013, 0x00000000, 0x00000019, 0x00000001, 0x00000016, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000020, 0x7FFFFE00, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802416C4_B816C4 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000021, 0x7FFFFE00, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000140, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C40002, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000004, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000009, SetCamProperties, 0x00000000, 0xF24A8C80, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x000001C2, 0xF24ACA80, 0xF24A5480, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C4000C, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C4000D, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C40008, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C40008, 0x00C40008, 0x00000005, 0x001000E1, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C40003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C40002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0x00000002, 0x00000043, 0x00000006, NpcJump1, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000018A, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000032, 0xF24A7E80, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002B, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000073, 0x00000000, 0x00000163, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x000000CD, 0x00000000, 0x000001DB, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x000000BE, 0x00000000, 0x000001BD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x0000008C, 0x00000000, 0x0000017C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x000000AA, 0x00000000, 0x00000190, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, ScaleGroup, 0x00000054, 0x00000001, 0xF24A7EB4, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000005, ScaleGroup, 0x00000054, 0x00000001, 0xF24A7E4D, 0x00000001, 0x00000008, 0x00000001, 0x00000002, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000064, 0x00000064, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, TranslateGroup, 0x00000054, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000005, 0x00000001, 0x00000006, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x00000001, 0x00000004, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001E, 0x0000018C, 0x00000000, 0x00000016, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001E, 0x0000018D, 0x00000000, 0x00000016, 0x00000001, 0x00000006, 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000001E, 0x0000018E, 0x00000000, 0x00000023, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7B80, 0x00000005, 0x00000001, 0x00000005, 0x00000005, 0x00000001, 0x0000000A, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, ScaleGroup, 0x00000054, 0x00000001, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x0000007B, 0x00000000, 0x00000160, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x000000C1, 0x00000000, 0x000001C2, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, ScaleGroup, 0x00000054, 0x00000001, 0xFE363C82, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x00000073, 0x00000000, 0x00000163, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, PlayEffect, 0x00000006, 0x00000001, 0x000000CD, 0x00000000, 0x000001DB, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, 0x00000002, 0xFE363C83, 0xF24A7AB4, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001E, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C40009, 0x00C40002, 0x00000000, 0x001000E2, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C40004, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x00000154, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000005, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000016, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FBC_B81FBC -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000015, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000055, 0x00000000, 0x0000019A, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802416C4_B816C4, 0x00000002, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000021, 0x7FFFFE00, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000016, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001E, 0x7FFFFE00, 0x00000043, 0x00000005, TranslateGroup, 0x00000054, 0x00000000, 0x00000064, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802420B0_B820B0 -.word 0x00000000, D_8024127C_B8127C, 0x00000000, 0xC47A0000, 0x00000000, 0x00401505, D_80241FBC_B81FBC, 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, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D0, 0x00000001, D_802412A8_B812A8, 0x00000000, 0xC47A0000, 0x00000000, 0x00000505, D_80241570_B81570, 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, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00000000, 0x00000000, 0x00000000, 0x001A00C9, 0x00000002, D_802412A8_B812A8, 0x00000000, 0xC47A0000, 0x00000000, 0x00000505, D_80241570_B81570, 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, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00000000, 0x00000000, 0x00000000, 0x001A00CA, 0x00000003, D_802412A8_B812A8, 0x00000000, 0xC47A0000, 0x00000000, 0x00000505, D_80241570_B81570, 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, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00000000, 0x00000000, 0x00000000, 0x001A00CB, 0x00000004, D_802412A8_B812A8, 0x00000000, 0xC47A0000, 0x00000000, 0x00000505, D_80241570_B81570, 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, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00000000, 0x00000000, 0x00000000, 0x001A00CC, 0x00000005, D_802412A8_B812A8, 0x00000000, 0xC47A0000, 0x00000000, 0x00000505, D_80241570_B81570, 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, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00000000, 0x00000000, 0x00000000, 0x001A00CD - -dlabel D_80242C50_B82C50 -.word 0x00000006, D_802420B0_B820B0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_16/B82C70.data.s b/ver/us/asm/data/world/area_jan/jan_16/B82C70.data.s deleted file mode 100644 index 7229e35759..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_16/B82C70.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242C70_B82C70 -.word 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0xFFFFFF90, 0x00000000, 0x000000D2, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0xFFFFFE3B, 0x00000000, 0x000000BC, 0x000000AA, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_16/B82CD0.data.s b/ver/us/asm/data/world/area_jan/jan_16/B82CD0.data.s deleted file mode 100644 index b2a62075ee..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_16/B82CD0.data.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80242CD0_B82CD0 -.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_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, jan_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, 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_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, jan_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, jan_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, jan_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_80243634_B83634 -.word 0x00000001, 0x00000048 - -dlabel D_8024363C_B8363C -.word 0x00000001, 0xFFFFFEEF, 0x00000011, 0x00000186 - -dlabel D_8024364C_B8364C -.word D_80243634_B83634, 0x00000000, D_8024363C_B8363C, 0x00000000 - -dlabel D_8024365C_B8365C -.word 0x00000001, 0x0000004A - -dlabel D_80243664_B83664 -.word 0x00000001, 0x000000B5, 0x00000010, 0x000000DE - -dlabel D_80243674_B83674 -.word D_8024365C_B8365C, 0x00000000, D_80243664_B83664, 0x00000000 - -dlabel D_80243684_B83684 -.word 0x00000001, 0x0000004C - -dlabel D_8024368C_B8368C -.word 0x00000001, 0x00000134, 0x00000011, 0x000000DF - -dlabel D_8024369C_B8369C -.word D_80243684_B83684, 0x00000000, D_8024368C_B8368C, 0x00000000 - -dlabel D_802436AC_B836AC -.word 0x00000001, 0x0000004E - -dlabel D_802436B4_B836B4 -.word 0x00000001, 0x000001CD, 0x00000013, 0xFFFFFFC5 - -dlabel D_802436C4_B836C4 -.word D_802436AC_B836AC, 0x00000000, D_802436B4_B836B4, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024364C_B8364C, 0x00000047, 0x00000005, D_80242CD0_B82CD0, 0x00000100, 0x00000027, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80243674_B83674, 0x00000047, 0x00000005, D_80242CD0_B82CD0, 0x00000100, 0x00000028, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024369C_B8369C, 0x00000047, 0x00000005, D_80242CD0_B82CD0, 0x00000100, 0x00000029, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802436C4_B836C4, 0x00000047, 0x00000005, D_80242CD0_B82CD0, 0x00000100, 0x0000002A, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_17/B837E0.data.s b/ver/us/asm/data/world/area_jan/jan_17/B837E0.data.s deleted file mode 100644 index 4601ad5f65..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_17/B837E0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240020_B837E0 -.word 0xC35C0000, 0x00000000, 0x41200000, 0x42B40000, 0x433E0000, 0x43E10000, 0x42DC0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240200, D_80240020_B837E0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x001900FF, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_17/B838C0.data.s b/ver/us/asm/data/world/area_jan/jan_17/B838C0.data.s deleted file mode 100644 index d2729217a1..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_17/B838C0.data.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240100_B838C0 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403C0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024015C_B8391C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802403C8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401B8_B83978 -.word 0x00000047, 0x00000005, D_80240100_B838C0, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024015C_B8391C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000024, 0x00000043, 0x00000002, SetSpriteShading, 0x00060000, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80240360, 0x00000043, 0x00000001, func_80240000_B837C0, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000043, 0x00000002, GetLoadType, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000044, 0x00000001, EnterSavePoint, 0x00000044, 0x00000001, D_802401B8_B83978, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_802401B8_B83978, 0x00000044, 0x00000001, EnterWalk, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000046, 0x00000001, 0x80240080, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_17/B83B20.data.s b/ver/us/asm/data/world/area_jan/jan_17/B83B20.data.s deleted file mode 100644 index fd79abbb03..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_17/B83B20.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240360_B83B20 -.word 0x00000043, 0x00000007, MakeEntity, Entity_SavePoint, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0xFFFFFFC3, 0x00000000, 0xFFFFFFF9, 0x00000000, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_18/B83B90.data.s b/ver/us/asm/data/world/area_jan/jan_18/B83B90.data.s deleted file mode 100644 index 92d9508f4a..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_18/B83B90.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_B83B90 -.word 0x41C80000, 0x43340000, 0x434D0000, 0x432C0000, 0x41A00000, 0x43AC8000, 0xC3520000, 0x40C00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80240180_B83D10, D_80240000_B83B90, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190100 - -dlabel D_80240060_B83BF0 -.word 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240080_B83C10 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802402C0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802400DC_B83C6C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x802402C8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240138_B83CC8 -.word 0x00000047, 0x00000005, D_80240080_B83C10, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802400DC_B83C6C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240180_B83D10 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000024, 0x00000043, 0x00000002, SetSpriteShading, 0xFFFFFFFF, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80240280, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240138_B83CC8, 0x00000044, 0x00000001, EnterWalk, 0x00000046, 0x00000001, D_80240060_B83BF0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_18/B83E10.data.s b/ver/us/asm/data/world/area_jan/jan_18/B83E10.data.s deleted file mode 100644 index ead9e8c7d1..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_18/B83E10.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240280_B83E10 -.word 0x00000043, 0x00000007, MakeItemEntity, 0x00000136, 0xFFFFFF1A, 0x000001CC, 0x00000064, 0x00000011, 0xF840605D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_19/B83E80.data.s b/ver/us/asm/data/world/area_jan/jan_19/B83E80.data.s deleted file mode 100644 index 6d909ec4d7..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_19/B83E80.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240020_B83E80 -.word 0xC35C0000, 0x00000000, 0x41200000, 0x42B40000, 0x433E0000, 0x43E10000, 0x42DC0000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802401A0_B84000, D_80240020_B83E80, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190101 - -dlabel D_80240080_B83EE0 -.word 0x00000043, 0x00000002, ClearAmbientSounds, 0x000000FA, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802400A0_B83F00 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240310, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802400FC_B83F5C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80240318, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240158_B83FB8 -.word 0x00000047, 0x00000005, D_802400A0_B83F00, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_802400FC_B83F5C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802401A0_B84000 -.word 0x00000024, 0x00000002, 0xF5DE0329, 0x00000024, 0x00000043, 0x00000002, SetSpriteShading, 0x00060001, 0x00000043, 0x00000003, SetCamLeadPlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000006, SetCamPerspective, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, SetCamBGColor, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamEnabled, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x802402B0, 0x00000043, 0x00000001, func_80240000_B83E60, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_80240158_B83FB8, 0x00000044, 0x00000001, EnterWalk, 0x00000046, 0x00000001, D_80240080_B83EE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_19/B84110.data.s b/ver/us/asm/data/world/area_jan/jan_19/B84110.data.s deleted file mode 100644 index 0c1ac8d812..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_19/B84110.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802402B0_B84110 -.word 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0xFFFFFF66, 0x00000000, 0xFFFFFFEC, 0x00000096, 0x80000000, 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0x00000091, 0x000001C2, 0x00000032, 0x00000078, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s b/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s deleted file mode 100644 index ee2c599b9d..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_22/B85AE0.data.s +++ /dev/null @@ -1,195 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80241960_B85AE0 -.word 0xC3F00000, 0x00000000, 0x00000000, 0x42B40000, 0xC33E0000, 0x00000000, 0xC3020000, 0x43340000, 0x44960000, 0x42B40000, 0x00000000, 0x43870000, 0x44960000, 0x42B40000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802421B0_B86330, D_80241960_B85AE0, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x001900EF - -dlabel D_802419E0_B85B60 -.word 0x00000043, 0x00000002, GetEntryID, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000078, 0x00000001, 0x00000008, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000027, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000021, 0x00000002, 0x00000016, 0x00000017, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000028, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000018, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000024, 0x00000002, 0xF9718883, 0x00000000, 0x00000057, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000025, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241BC0_B85D40 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024B980, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C1C_B85D9C -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024B988, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241C78_B85DF8 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x8024B990, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241CD4_B85E54 -.word 0x00000047, 0x00000005, D_80241BC0_B85D40, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241C1C_B85D9C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_80241C78_B85DF8, 0x00080000, 0x00000008, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241D38_B85EB8 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x0000007B, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x00000094, 0x00000001, 0x00000043, 0x00000003, SetTexPanner, 0x0000009C, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000001, 0x00000000, 0x00000000, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x0000012C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241DF0_B85F70 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000096, 0x00000002, 0x00000043, 0x00000003, SetTexPanner, 0x00000098, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000002, 0x00000000, 0x00000000, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x0000012C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241E94_B86014 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000091, 0x00000003, 0x00000043, 0x00000003, SetTexPanner, 0x00000092, 0x00000003, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000003, 0x00000000, 0x00000000, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x000000AA, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241F38_B860B8 -.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, SetTexPanner, 0x00000097, 0x00000004, 0x00000043, 0x00000003, SetTexPanner, 0x00000099, 0x00000004, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetTexPanOffset, 0x00000004, 0x00000000, 0x00000000, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000012C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241FDC_B8615C -.word 0x00000022, 0x443B8000, 0x00000000, 0x42480000, 0x00000011, 0x443B8000, 0x00000000, 0x42480000, 0x00000018, 0x44700000, 0x00000000, 0x42480000, 0x00000019, 0x44700000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024202C_B861AC -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000018, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000044, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000076, 0x00000000, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000049, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000028, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000021, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000034, 0x7FFFFE00, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000017, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000046, 0x00000001, 0x8024ABC4, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000016, 0x00000056, 0x00000000, 0x00000044, 0x00000001, D_80244BD0_B88D50, 0x00000008, 0x00000001, 0x000000C8, 0x00000044, 0x00000001, D_80241CD4_B85E54, 0x00000057, 0x00000000, 0x00000016, 0x00000001, 0x00000026, 0x00000044, 0x00000001, D_80241CD4_B85E54, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_80241CD4_B85E54, 0x00000044, 0x00000001, EnterWalk, 0x00000008, 0x00000001, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802421B0_B86330 -.word 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, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000016, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_8024966C_B8D7EC, 0x00000016, 0x00000001, 0x00000026, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_8024966C_B8D7EC, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, D_8024969C_B8D81C, 0x00000023, 0x00000000, 0x00000046, 0x00000001, D_802496C0_B8D840, 0x00000044, 0x00000001, 0x80249EC4, 0x00000044, 0x00000001, D_80242CE4_B86E64, 0x00000044, 0x00000001, 0x8024B8DC, 0x00000044, 0x00000001, 0x8024ADD8, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000003, 0x00000035, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, ResetFromLava, D_80241FDC_B8615C, 0x00000057, 0x00000000, 0x00000044, 0x00000001, D_80241D38_B85EB8, 0x00000044, 0x00000001, D_80241DF0_B85F70, 0x00000044, 0x00000001, D_80241E94_B86014, 0x00000044, 0x00000001, D_80241F38_B860B8, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000009, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000044, 0x00000001, D_8024202C_B861AC, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000026, 0x00000008, 0x00000001, 0x00000041, 0x00000013, 0x00000000, 0x00000046, 0x00000001, D_802419E0_B85B60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802423E0_B86560 -.word 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024240C_B8658C -.word 0x3FC00000, 0x0000001E, 0x0000001E, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001 - -dlabel D_8024243C_B865BC -.word 0x00000043, 0x00000002, jan_22_PatrolNoAttackAI_Main, D_8024240C_B8658C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024245C_B865DC -.word 0x00000000, 0x001C0018, 0x00000000, 0x00000000, D_8024243C_B865BC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80242488_B86608 -.word 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A8080, 0xF24A8080, 0xF24A8080, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802424B4_B86634 -.word 0x00000000, 0x00620050, D_80242488_B86608, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_802424E0_B86660 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_8024250C_B8668C -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80242590_B86710 -.word 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel jan_22_varStash -.word 0x00000000 - -dlabel D_802425C0_B86740 -.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_80242620_B867A0 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242688_B86808 -.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000008, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, IsPlayerOnValidFloor, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, IsPlayerWithin, 0x000000C8, 0x00000000, 0x00000019, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000001, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFB, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000A, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000000, 0x00000013, 0x00000000, 0x00000045, 0x00000002, D_80242620_B867A0, 0xFE363C87, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000043, 0x00000186, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000AA, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C86, 0xFE363C80, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C83, 0xFE363C86, 0xFE363C85, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C88, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0x00000005, 0x00000027, 0x00000002, 0xFE363C85, 0xFFFFFFFB, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C83, 0xFE363C86, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFFB, 0x00000027, 0x00000002, 0xFE363C85, 0x00000005, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0x00000001, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C87, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000043, 0x00000186, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000AA, 0x00000000, 0x0000003C, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0x00000001, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0xF24A7E80, 0x00000043, 0x00000005, PlayerJump, 0x0000010E, 0x000000CD, 0x0000000F, 0x00000014, 0x00000043, 0x00000002, HidePlayerShadow, 0x00000000, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0x0000011D, 0x0000000F, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, PartnerIsFlying, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7E80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0x00000104, 0x000000CD, 0x0000000F, 0x0000000F, 0x00000013, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0xFFFFFFFC, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242CE4_B86E64 -.word 0x00000047, 0x00000005, D_80242688_B86808, 0x00000080, 0x0000001E, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000018, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000001E, 0x7FFFFE00, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0x00000001, 0xF24A7B20, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0x000000B2, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0x000000B2, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x0000001E, 0x7FFFFE00, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0x00000001, 0x00000001, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242E08_B86F88 -.word 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x000000B1, 0x00000000, 0xFFFFFFF6, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x0000007F, 0x00000000, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0x00000098, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0x00000066, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0x0000004D, 0x00000000, 0xFFFFFFF6, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242EA4_B87024 -.word 0x00000058, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x000002A6, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000007, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00980006, 0x00000043, 0x00000006, NpcJump0, 0x00000007, 0x0000010F, 0x00000145, 0xFFFFFFEF, 0x0000001E, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000A, 0x000002A7, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x0000000A, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00980006, 0x00000043, 0x00000006, NpcJump0, 0x0000000A, 0x00000190, 0x000000D7, 0xFFFFFFE9, 0x0000001E, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000006, 0x000002A6, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00980006, 0x00000043, 0x00000006, NpcJump0, 0x00000006, 0x000000D0, 0x0000014F, 0xFFFFFFEF, 0x0000001E, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000008, 0x00000001, 0x00000009, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000008, 0x000002A7, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000008, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00980006, 0x00000043, 0x00000006, NpcJump0, 0x00000008, 0x00000147, 0x000000C8, 0xFFFFFFF8, 0x0000001E, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000009, 0x000002A6, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000009, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00980006, 0x00000043, 0x00000006, NpcJump0, 0x00000009, 0x000000DE, 0x0000011C, 0xFFFFFFF3, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243118_B87298 -.word 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5880, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, jan_22_SetCamera0Flag1000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000100, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C40009, 0x00C40002, 0x00000000, 0x001000C7, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C40009, 0x00C40002, 0x00000000, 0x001000C8, 0x00000043, 0x00000004, SetNpcVar, 0x00000006, 0x00000000, 0x0000000A, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243290_B87410 -.word 0x00000003, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000017, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80243118_B87298, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802432F0_B87470 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000016, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80243290_B87410, 0x00000016, 0x00000001, 0x00000017, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x0000007D, 0x00000000, 0xFFFFFFD8, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80243118_B87298, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802433A0_B87520 -.word 0x0000000A, 0x00000002, 0xF840607A, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00980005, 0x00980001, 0x00000000, 0x001000D2, 0x00000024, 0x00000002, 0xF840607A, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000006, 0x00980005, 0x00980001, 0x00000000, 0x001000D3, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80243420_B875A0 -.word 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000006, NpcJump0, 0xFE363C80, 0x0000001E, 0x00000000, 0xFFFFFFF1, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFE363C80, 0x00980003, 0x00000043, 0x00000003, SetNpcSpeed, 0xFE363C80, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFE363C80, 0xFFFFFF88, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFE363C80, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802434BC_B8763C -.word 0x00000043, 0x00000006, PlaySoundAt, 0x8000001E, 0x00000000, 0x0000010E, 0x00000082, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000008, 0xF24A7E80, 0x00000043, 0x00000003, RandInt, 0x00000004, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x0000000F, PlayEffect, 0x00000018, 0x00000003, 0x00000122, 0x0000009B, 0x00000000, 0x000000F0, 0x00000000, 0x00000000, 0xFE363C80, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x0000000F, PlayEffect, 0x00000018, 0x00000003, 0x00000113, 0x00000096, 0x00000000, 0x000000F0, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000002, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024364C_B877CC -.word 0x00000003, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000017, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000016, 0x7FFFFE00, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000006, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000007, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000008, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000009, 0x00000000, 0x00000043, 0x00000003, NpcFacePlayer, 0x0000000A, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000016, 0x7FFFFE00, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000006, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000045, 0x00000002, D_80242EA4_B87024, 0xFE363C89, 0x00000008, 0x00000001, 0x00000028, 0x00000049, 0x00000001, 0xFE363C89, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000012C, 0x000000FA, 0x00000096, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000012C, 0x000000FA, 0x00000096, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000044, 0x00000001, D_80242E08_B86F88, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, D_80242EA4_B87024, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00980003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00980003, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00980003, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00980003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000009, 0x00000165, 0x00000000, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000003, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000006, 0xF24A8680, 0x00000043, 0x00000005, GetNpcPos, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000006, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000007, 0xF24A8680, 0x00000043, 0x00000005, GetNpcPos, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, NpcJump0, 0x00000007, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000009, 0x0000020C, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000009, 0x00000000, 0x00000000, 0x000000B4, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000009, 0x00000200, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcYaw, 0x00000005, 0x0000005A, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C82, 0x00000050, 0x00000043, 0x00000004, SetPlayerPos, 0x00000091, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000073, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, SetNpcYaw, 0xFFFFFFFC, 0x0000005A, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000005, SetNpcRotation, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x0000000B, 0x00000016, 0x00000001, 0x0000000B, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000A5, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A5, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5880, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000009, 0x00000200, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0x00000104, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000005, SetNpcRotation, 0x00000009, 0x00000000, 0x00000000, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00980003, 0x00000043, 0x00000006, NpcJump0, 0x00000009, 0x0000012C, 0x0000012C, 0xFFFFFFF2, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000009, 0x00000000, 0x00000000, 0x00000000, 0x00000045, 0x00000002, D_802434BC_B8763C, 0xFE363C8A, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00C40009, 0x00C40002, 0x00000000, 0x001000CA, 0x00000008, 0x00000001, 0x00000032, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x0000000A, 0x00000008, 0x00000001, 0x0000008C, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000004, GetNpcVar, 0x00000001, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, StopSound, 0x8000001E, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000014, 0x00000016, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000044, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000076, 0x00000001, 0x00000043, 0x00000003, SetGroupEnabled, 0x00000049, 0x00000001, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000028, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000021, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000034, 0x7FFFFE00, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00980001, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x000000FF, 0x000000CD, 0xFFFFFFE7, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x000000C8, 0x000000B9, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0x00000152, 0x000000D4, 0xFFFFFFEC, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0x0000010B, 0x0000013A, 0xFFFFFFF4, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000A, 0x000002A6, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000043, 0x00000006, NpcJump0, 0x0000000A, 0xFE363C80, 0x00000000, 0x00000028, 0x00000014, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00980005, 0x00980001, 0x00000000, 0x001000CC, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00980001, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x0000012C, 0x000000FA, 0x00000096, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x0000012C, 0x000000FA, 0x00000096, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000A, 0x000002A6, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0x0000015E, 0x00000000, 0x00000064, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00980006, 0x00000043, 0x00000006, NpcJump0, 0x0000000A, 0x00000190, 0x000000D7, 0xFFFFFFE9, 0x00000014, 0x00000043, 0x00000006, SpeakToPlayer, 0x0000000A, 0x00980005, 0x00980001, 0x00000000, 0x001000CD, 0x00000056, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000043, 0x00000186, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000AA, 0x00000000, 0x0000003C, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0x00000009, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0x000000C8, 0xFE363C83, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0x00000001, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000016, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000000A5, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000000A5, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5880, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00C40009, 0x00C40002, 0x00000000, 0x001000CE, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000016, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x0000000A, 0x000002A6, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x0000000A, 0x00000096, 0x00000000, 0x00000014, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00980003, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0x00000041, 0x00000019, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x0000000A, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000009, 0x000002A7, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000009, 0x00000096, 0x00000000, 0x00000014, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00980003, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0x00000050, 0xFFFFFFF6, 0x00000019, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000009, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000008, 0x000002A6, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000008, 0x00000096, 0x00000000, 0x00000014, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00980003, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000008, 0x0000005F, 0x00000019, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000008, 0x0000005A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000007, 0x000002A7, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000007, 0x00000096, 0x00000000, 0x00000014, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00980003, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0x0000006E, 0xFFFFFFF6, 0x0000000F, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000007, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000001, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000019, 0x00000016, 0x00000001, 0x00000019, 0x00000043, 0x00000004, GetNpcVar, 0x00000001, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00C40009, 0x00C40002, 0x00000000, 0x001000D0, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AA280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, D_802425C0_B86740, 0x00000043, 0x00000002, AddKeyItem, 0x0000000F, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000190, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ACA80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8880, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000005, 0x00C40009, 0x00C40002, 0x00000000, 0x001000D1, 0x00000024, 0x00000002, 0xFE363C80, 0x00000007, 0x00000044, 0x00000001, D_80243420_B875A0, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000044, 0x00000001, D_80243420_B875A0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C80, 0x00000009, 0x00000044, 0x00000001, D_80243420_B875A0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000044, 0x00000001, D_80243420_B875A0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00C40004, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000005, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0xFFFFFF88, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000003, BindNpcInteract, 0x00000006, D_802433A0_B87520, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000000, 0x00000043, 0x00000001, jan_22_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8080, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000018, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244A5C_B88BDC -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000016, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024364C_B877CC, 0x00000016, 0x00000001, 0x00000017, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024364C_B877CC, 0x00000044, 0x00000001, D_80242E08_B86F88, 0x00000021, 0x00000002, 0x00000018, 0x00000025, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802433A0_B87520, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0x00000104, 0x000000CD, 0xFFFFFFE7, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000006, 0x00000100, 0x00000000, 0x00000004, 0x00000001, 0x0000001E, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000027, 0x7FFFFE00, 0x00000043, 0x00000002, RemoveNpc, 0x00000006, 0x00000003, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, RemoveNpc, 0x00000007, 0x00000043, 0x00000002, RemoveNpc, 0x00000008, 0x00000043, 0x00000002, RemoveNpc, 0x00000009, 0x00000043, 0x00000002, RemoveNpc, 0x0000000A, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80244BAC_B88D2C -.word 0xC33E0000, 0x00000000, 0xC3480000, 0xC3390000, 0x00000000, 0xC2BE0000, 0xC3340000, 0x00000000, 0x41200000 - -dlabel D_80244BD0_B88D50 -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0xFFFFFF38, 0x00000000, 0xFFFFFF56, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000043, 0x00000004, SetPlayerPos, 0xFFFFFF42, 0x00000000, 0xFFFFFF38, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFFFFFF42, 0x00000000, 0xFFFFFF2E, 0x00000046, 0x00000001, 0x8024AC34, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00C40004, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000005, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0xFFFFFF4C, 0xFFFFFFE2, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x0000007D, 0xFFFFFFD8, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00C40002, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000100, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x0000010E, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010005, 0x00000043, 0x00000005, LoadPath, 0x0000002D, D_80244BAC_B88D2C, 0x00000003, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000056, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000006, 0xFFFFFF38, 0x00000000, 0xFFFFFF42, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00980003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000006, 0xF24A9280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0xFFFFFF6A, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000006, 0x000000B1, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000006, 0x00980001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, SetNpcPos, 0x00000007, 0xFFFFFF38, 0x00000000, 0xFFFFFF1A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00980003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000007, 0xF24A9280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0xFFFFFF6A, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000007, 0x00000098, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000007, 0x00980001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, SetNpcPos, 0x00000008, 0xFFFFFF38, 0x00000000, 0xFFFFFF1A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00980003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000008, 0xF24A9280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000008, 0xFFFFFF6A, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000008, 0x0000007F, 0x00000005, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000008, 0x00980001, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000005, SetNpcPos, 0x00000009, 0xFFFFFF38, 0x00000000, 0xFFFFFF1A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00980003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000009, 0xF24A9280, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0xFFFFFF6A, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x00000009, 0x00000066, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000009, 0x00980001, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, SetNpcPos, 0x0000000A, 0xFFFFFF38, 0x00000000, 0xFFFFFF1A, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00980003, 0x00000043, 0x00000003, SetNpcSpeed, 0x0000000A, 0xF24A9280, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0xFFFFFF6A, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000005, NpcMoveTo, 0x0000000A, 0x0000004D, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x0000000A, 0x00980001, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000017, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024511C_B8929C -.word 0x00000058, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000140, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000096, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245208_B89388 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFE48, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000BC, 0x00000140, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000019, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000096, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, InterruptUsePartner, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000002, RemoveNpc, 0x00000004, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000140, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000C0, 0x00000000, 0x0000003C, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C83, 0xFE363C82, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000001, jan_22_SetCamera0Flag1000, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x001000C1, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000001, 0x00000043, 0x00000002, func_802D2C14, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x0000000A, 0x00000002, 0xF8406044, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60001, 0x00000000, 0x001000BE, 0x00000012, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60001, 0x00000000, 0x001000BF, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000002, 0x00000043, 0x00000002, func_802D2C14, 0x00000000, 0x00000043, 0x00000002, SetTimeFreezeMode, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0x00000046, 0x00000024, 0x00000002, 0xFE363C80, 0x00000046, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000012C, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8C80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000D, 0x00000057, 0x00000000, 0x00000045, 0x00000002, D_8024511C_B8929C, 0xFE363C89, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000001, jan_22_UnsetCamera0Flag1000, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000003, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000023, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000D, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802458B0_B89A30 -.word 0x00000003, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF5DE0180, 0x0000000E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000055, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001000C5, 0x00000000, 0x0000003C, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFC, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, ShowEmote, 0xFFFFFFFC, 0x00000000, 0x00000000, 0x00000014, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000003, 0x00000001, 0x00000002, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C80, 0xFFFFFF06, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x001000C6, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFFFFFE2A, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80245B14_B89C94 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFF9C, 0x00000000, 0x0000003C, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60004, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0xFE363C80, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B60008, 0x00B60001, 0x00000000, 0x001000CB, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000016, 0x00000001, 0x00000014, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x001000CF, 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000000, 0x00000043, 0x00000003, GetSelfVar, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60004, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000000BE, 0x0000003C, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7C80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000000C8, 0x00000000, 0x00000000, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60001, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000015, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000043, 0x00000186, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000000AA, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C86, 0xFE363C80, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C86, 0xFE363C85, 0x00000026, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0x00000001, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, PlaySoundAtModel, 0x00000043, 0x00000186, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x000000AA, 0x00000000, 0x0000003C, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24D9A80, 0x00000043, 0x00000005, ScaleModel, 0x00000040, 0x00000001, 0xFE363C82, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0x0000003D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000003E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802460B0_B8A230 -.word 0x00000043, 0x00000003, GetAngleToPlayer, 0xFFFFFFFF, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C80, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C81, 0x0000001B, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE5, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C8A, 0xFE363C8B, 0xFE363C8C, 0x00000028, 0x00000002, 0xFE363C8A, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000029, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C8A, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C81, 0x00000043, 0x00000002, SetPlayerSpeed, 0xF24A8680, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C82, 0xFE363C84, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x00000001, 0x00000003, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x001000C2, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000003, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000003, 0x00000043, 0x00000005, SetMusicTrack, 0x00000000, 0x00000029, 0x00000001, 0x00000008, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x00000000, 0x000000C8, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABA80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000005, 0x001000C3, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, AdjustCam, 0x00000000, 0xF24BE280, 0x00000000, 0x0000012C, 0x0000000F, 0xF24A6280, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x001000C4, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFF, 0xF24A8E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFF, 0x000001F4, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFFFFFED4, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B60001, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000004, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000000E, 0x00000046, 0x00000001, D_802419E0_B85B60, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246474_B8A5F4 -.word 0x00000043, 0x00000002, GetOwnerEncounterTrigger, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000016, 0x00000001, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x0000001C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xF971888A, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x0042000D, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00B60009, 0x00B60002, 0x00000000, 0x001000BD, 0x00000024, 0x00000002, 0xF971888A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00420010, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802465E0_B8A760 -.word 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000D, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00B6000B, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80245208_B89388, 0x00000043, 0x00000003, BindNpcHit, 0xFFFFFFFF, D_80246474_B8A5F4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246694_B8A814 -.word 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000000E, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x000002EE, 0x00000000, 0x0000001E, 0x00000043, 0x00000003, SetSelfVar, 0x00000000, 0x00000000, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_802460B0_B8A230, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_802458B0_B89A30, 0x00000021, 0x00000002, 0x00000016, 0x00000017, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80245B14_B89C94, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000063, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, GetModelCenter, 0x00000070, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246838_B8A9B8 -.word 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000002, 0x00000001, 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A7BB4, 0x00000001, 0xF24A7BB4, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024687C_B8A9FC -.word 0x00000058, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFF38, 0x00000027, 0x00000002, 0xFE363C84, 0x000000C8, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x01000000, 0x00000001, 0x00000043, 0x00000003, SetSelfEnemyFlagBits, 0x10000000, 0x00000001, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000024, 0x00000002, 0xF971888A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x0000000A, ShowSweat, 0x00000000, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000057, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0x00000000, 0x00000001, 0x0000002D, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000024, 0x00000002, 0xFE363C89, 0x00000003, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C89, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000010E, 0x00000002, 0x00000008, 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF971888A, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000000, 0x0000005A, 0x00000002, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000000, 0x000000E1, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000013, 0x00000000, 0x00000028, 0x00000002, 0xFE363C88, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000002, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246B7C_B8ACFC -.word 0x00000043, 0x00000002, GetBattleOutcome, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000003, SetNpcYaw, 0x00000000, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, GetNpcPos, 0x00000000, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFE2, 0x00000012, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000000, 0x00000027, 0x00000002, 0xFE363C84, 0x0000001E, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C84, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABE80, 0xF24A5C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8680, 0x00000043, 0x00000001, jan_22_SetCamera0Flag1000, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000000, 0x00000140, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60006, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000000, 0xF24A8480, 0x00000043, 0x00000005, NpcMoveTo, 0x00000000, 0xFE363C84, 0xFE363C82, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00B60001, 0x00000043, 0x00000003, NpcFacePlayer, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcVar, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000001, DoNpcDefeat, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246E38_B8AFB8 -.word 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000000D, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00420010, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_8024687C_B8A9FC, 0x00000043, 0x00000003, BindNpcDefeat, 0xFFFFFFFF, D_80246B7C_B8ACFC, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246EB4_B8B034 -.word 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80246FA8_B8B128 -.word 0x00000024, 0x00000002, 0xF971888B, 0x00000000, 0x00000024, 0x00000002, 0xF971888C, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x0000000B, 0xFE363C84, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C84, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C83, 0x00000005, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0xFE363C84, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xF971888B, 0x00000000, 0x00000028, 0x00000002, 0xFE363C84, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C84, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFB, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C84, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF971888C, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802470F8_B8B278 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, PlayerFaceNpc, 0x0000000B, 0x00000001, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFC, 0x0000000B, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247158_B8B2D8 -.word 0x44778000, 0x43520000, 0xC2F00000, 0x44674000, 0x42E60000, 0xC2A00000, 0x44570000, 0x42820000, 0xC2200000, 0x44354000, 0x41200000, 0x00000000 - -dlabel D_80247188_B8B308 -.word 0x00000043, 0x00000001, WaitForPlayerInputEnabled, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000044, 0x00000001, D_80246FA8_B8B128, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000005, LoadPath, 0x0000002D, D_80247158_B8B2D8, 0x00000004, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, GetNextPathPos, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7C1A, 0x00000024, 0x00000002, 0xF971888B, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x00000271, 0x00000014, 0x00000000, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcSpeed, 0xFFFFFFFC, 0xF24A7E80, 0x00000043, 0x00000005, NpcMoveTo, 0xFFFFFFFC, 0x000002BC, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF971888C, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000001, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000002A3, 0x00000028, 0x00000000, 0x00000014, 0x00000045, 0x00000002, D_80246EB4_B8B034, 0xFE363C89, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000145, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABA80, 0xF24A4C80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B6000A, 0x00B60003, 0x00000000, 0x001000D4, 0x00000043, 0x00000004, NpcFaceNpc, 0xFFFFFFFF, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000205, 0x001000D5, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00160001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000005, EndSpeech, 0xFFFFFFFF, 0x00160002, 0x00160001, 0x00000205, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B6000A, 0x00B60003, 0x00000005, 0x001000D6, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x0000000A, 0x00000045, 0x00000002, D_802470F8_B8B278, 0xFE363C88, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0x000002F8, 0x00000023, 0x00000000, 0x00000014, 0x00000049, 0x00000001, 0xFE363C88, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, NpcFacePlayer, 0xFFFFFFFF, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00160002, 0x00160001, 0x00000200, 0x001000D7, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x00000168, 0x0000000A, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00160003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001001F, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000139, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C81, 0x00000032, 0x00000027, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000001, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, PlaySoundAtPlayer, 0x00000188, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x0000000F, PlayEffect, 0x00000052, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00160001, 0x00000045, 0x00000002, D_80246EB4_B8B034, 0xFE363C89, 0x00000043, 0x00000001, PostChapter5StatUpdate, 0x00000043, 0x00000004, ShowMessageAtScreenPos, 0x001D0195, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00160002, 0x00160001, 0x00000200, 0x001000D8, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00040000, 0x00000001, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000019, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, PlayEffect, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000708, 0x00000043, 0x00000005, MakeLerp, 0xFE363C82, 0xFE363C83, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcRotation, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C85, 0x000000B4, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFE363C85, 0x00000064, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00002045, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001002A, 0x00000008, 0x00000001, 0x0000005A, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0x00000003, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000049, 0x00000001, 0xFE363C89, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000027, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0x00000001, 0x00B6000A, 0x00B60003, 0x00000000, 0x001000D9, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00B60005, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A7E80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x00000212, 0x00000000, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247D9C_B8BF1C -.word 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000026, 0x00000043, 0x00000004, SetPlayerPos, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFC, 0x0000010E, 0x00000000, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00B60003, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0x000002BC, 0x00000000, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x000002BC, 0x00000000, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001F4, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, BindNpcIdle, 0xFFFFFFFF, D_80247188_B8B308, 0x00000012, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80247F2C_B8C0AC -.word 0x00000000, D_802423E0_B86560, 0xC2C80000, 0x00000000, 0x41200000, 0x21700100, D_802465E0_B8A760, 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, 0x00000001, D_802423E0_B86560, 0xC2C80000, 0x00000000, 0x41200000, 0x00600101, D_80246694_B8A814, 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_80242590_B86710, 0xC2C80000, 0x00000000, 0x41200000, 0x00200F01, D_80246838_B8A9B8, 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, 0x00000003, D_80242590_B86710, 0xC2C80000, 0x00000000, 0x41200000, 0x00200F01, D_80246838_B8A9B8, 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 - -dlabel D_802486EC_B8C86C -.word 0x00000004, D_8024245C_B865DC, 0xC28C0000, 0x00000000, 0x41200000, 0x00E42D00, D_80246E38_B8AFB8, 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, 0x00000003, 0x00000170, 0x00000000, 0x000000BE, 0x0000019B, 0x00000000, 0x000000BE, 0x0000018C, 0x00000000, 0x000000EF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0xFFFFFFBA, 0x00000000, 0x0000000A, 0x00000064, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00420003, 0x00420005, 0x00420006, 0x00420006, 0x00420003, 0x00420003, 0x00420007, 0x00420007, 0x0042001A, 0x0042001B, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00420003, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802488DC_B8CA5C -.word 0x00000005, D_802424B4_B86634, 0x00000000, 0xC47A0000, 0x00000000, 0x00400705, D_802432F0_B87470, 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, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D0, 0x00000006, D_802424E0_B86660, 0x00000000, 0xC47A0000, 0x00000000, 0x00000505, D_80244A5C_B88BDC, 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, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00000000, 0x00000000, 0x00000000, 0x001A00C9, 0x00000007, D_802424E0_B86660, 0x00000000, 0xC47A0000, 0x00000000, 0x00000505, 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, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, D_802424E0_B86660, 0x00000000, 0xC47A0000, 0x00000000, 0x00000505, 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, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00000000, 0x00000000, 0x00000000, 0x001A00CB, 0x00000009, D_802424E0_B86660, 0x00000000, 0xC47A0000, 0x00000000, 0x00000505, 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, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00000000, 0x00000000, 0x00000000, 0x001A00CC, 0x0000000A, D_802424E0_B86660, 0x00000000, 0xC47A0000, 0x00000000, 0x00000505, 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, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00000000, 0x00000000, 0x00000000, 0x001A00CD - -dlabel D_8024947C_B8D5FC -.word 0x0000000B, D_8024250C_B8668C, 0x44866000, 0x42F00000, 0x43020000, 0x00400705, D_80247D9C_B8BF1C, 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, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160000, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024966C_B8D7EC -.word 0x00000004, D_80247F2C_B8C0AC, 0x00000000, 0x00000001, D_802486EC_B8C86C, 0x14000008, 0x00000001, D_8024947C_B8D5FC, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024969C_B8D81C -.word 0x00000004, D_80247F2C_B8C0AC, 0x00000000, 0x00000006, D_802488DC_B8CA5C, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_802496C0_B8D840 -.word 0x00000056, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000018, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000007, MakeEntity, Entity_HeartBlock, 0x00000433, 0x00000096, 0xFFFFFFCE, 0x00000000, 0x80000000, 0x00000057, 0x00000000, 0x00000043, 0x00000007, MakeItemEntity, 0x000000A2, 0x00000154, 0x00000000, 0xFFFFFFB5, 0x00000011, 0xF8406059, 0x00000043, 0x00000007, MakeEntity, Entity_PinkFlower, 0xFFFFFF95, 0x00000000, 0xFFFFFF9F, 0xFFFFFFF1, 0x80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_22/B8D910.data.s b/ver/us/asm/data/world/area_jan/jan_22/B8D910.data.s deleted file mode 100644 index bbb274b3f5..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_22/B8D910.data.s +++ /dev/null @@ -1,15 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80249790_B8D910 -.word 0x43FD8000, 0x43CB8000, 0xC20C0000, 0x446D8000, 0x43998000, 0xC20C0000 - -dlabel D_802497A8_B8D928 -.word 0x44730000, 0x43770000, 0x42820000, 0x44048000, 0x43240000, 0x42820000 - -dlabel D_802497C0_B8D940 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetCamTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80249828_B8D9A8 -.word 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000002, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000026, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000002, SetPlayerActionState, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000045, 0x00000002, D_802497C0_B8D940, 0xFE363C89, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000007, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000140, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD484, 0x00000028, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0xF4ACD485, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFB, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A7C80, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xF4ACD483, 0xFE363C80, 0xFE363C81, 0x00000008, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFC, 0x00000106, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerJumpscale, 0x00000000, 0x00000043, 0x00000005, PlayerJump, 0xF4ACD483, 0xF4ACD484, 0xF4ACD485, 0x00000007, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0008000D, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000002, PlaySound, 0x80000019, 0x00000058, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD486, 0x00000024, 0x00000002, 0xF70F2E80, 0xF4ACD486, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, func_80241020_B851A0, 0xFAA2B58A, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000B, 0x00000002, 0xF70F2E80, 0xFE363C80, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x000003E8, 0x00000046, 0x00000001, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80241168_B852E8, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD481, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD482, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, func_802412E0_B85460, 0xF4ACD487, 0xF4ACD488, 0x0000000A, 0x00000002, 0xFE363C88, 0x00008000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, PlaySound, 0x00002087, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetPlayerFlagBits, 0x00800000, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B58A, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x80000019, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000026, 0x7FFFFE00, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000026, 0x00008000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000001, 0x00000019, 0x7FFFFE00, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000040, 0x00000000, 0x00000043, 0x00000001, EnablePartnerAI, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, PlaySound, 0x8000001A, 0x00000058, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0xF4ACD486, 0x00000024, 0x00000002, 0xF70F2E81, 0xF4ACD486, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000005, func_802410C4_B85244, 0xFAA2B58B, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000B, 0x00000002, 0xF70F2E81, 0xFE363C80, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000059, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002A, 0x00000002, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000005, MakeLerp, 0xFE363C80, 0x00000000, 0xFE363C82, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, UpdateLerp, 0x00000043, 0x00000002, func_80241168_B852E8, 0x00000001, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD481, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0xF4ACD482, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B58B, 0x00000000, 0x00000043, 0x00000002, StopSound, 0x8000001A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000003E, 0x00000002, 0x00000009, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD480, D_80249790_B8D910, 0x00000024, 0x00000002, 0xF4ACD481, 0x00000063, 0x00000024, 0x00000002, 0xF4ACD482, 0x00000065, 0x00000024, 0x00000002, 0xF4ACD483, 0x000001FB, 0x00000024, 0x00000002, 0xF4ACD484, 0x0000011D, 0x00000024, 0x00000002, 0xF4ACD485, 0xFFFFFFE6, 0x00000024, 0x00000002, 0xF4ACD486, 0x00000002, 0x00000024, 0x00000002, 0xF4ACD487, 0x0000031B, 0x00000024, 0x00000002, 0xF4ACD488, 0x000003AC, 0x00000047, 0x00000005, D_80249828_B8D9A8, 0x00000800, 0x00000022, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x80246780, 0x0000003E, 0x00000002, 0x00000009, 0xFE363C80, 0x0000003C, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xF4ACD480, D_802497A8_B8D928, 0x00000024, 0x00000002, 0xF4ACD481, 0x00000070, 0x00000024, 0x00000002, 0xF4ACD482, 0x00000072, 0x00000024, 0x00000002, 0xF4ACD483, 0x000003CE, 0x00000024, 0x00000002, 0xF4ACD484, 0x00000087, 0x00000024, 0x00000002, 0xF4ACD485, 0x0000004A, 0x00000024, 0x00000002, 0xF4ACD486, 0x00000003, 0x00000024, 0x00000002, 0xF4ACD487, 0x00000320, 0x00000024, 0x00000002, 0xF4ACD488, 0x000003A2, 0x00000047, 0x00000005, D_80249828_B8D9A8, 0x00000800, 0x00000018, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x802467DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_22/B8E200.data.s b/ver/us/asm/data/world/area_jan/jan_22/B8E200.data.s deleted file mode 100644 index b4f0108de1..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_22/B8E200.data.s +++ /dev/null @@ -1,93 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_8024A080_B8E200 -.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_22_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_22_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, GetValueByRef, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, SetValueByRef, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, DropItemEntity, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, jan_22_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_22_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_22_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_22_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_8024A9E4_B8EB64 -.word 0x00000043, 0x00000004, PlaySoundAtCollider, 0x0000000C, 0x0000209F, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFD050F80, 0x00000024, 0x00000002, 0xFE363C81, 0xFD050F81, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000005, 0x00000001, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0xFD050F80, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F81, 0x0000002D, 0x00000002, 0xFE363C82, 0xFE363C80, 0x0000002D, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C84, 0xFE363C82, 0x00000026, 0x00000002, 0xFE363C85, 0xFE363C83, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7DB4, 0x0000002E, 0x00000002, 0xFE363C87, 0xF24A7DB4, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C87, 0xFE363C85, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C87, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0xFD050F80, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0xFD050F81, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_22_PullVine_ShearBushModel, 0x0000001D, 0xFE363C86, 0x00000043, 0x00000003, jan_22_PullVine_ShearBushModel, 0x0000001F, 0xFE363C87, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001D, 0xFFFFFFD3, 0x00000000, 0x00000000, 0x00000043, 0x00000005, TranslateModel, 0x0000001F, 0x0000002D, 0x00000000, 0x00000000, 0x00000043, 0x00000003, jan_22_PullVine_ShearBushModel, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, jan_22_PullVine_ShearBushModel, 0x0000001F, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_8024A9E4_B8EB64, 0x00000043, 0x00000005, MakeLerp, 0x00000000, 0x0000002D, 0x0000001E, 0x00000005, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000026, 0x00000002, 0xFD050F81, 0xFE363C80, 0x00000026, 0x00000002, 0xFD050F80, 0xFD050F81, 0x0000002E, 0x00000002, 0xFD050F80, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024ACE8_B8EE68 -.word 0x00000001, 0x00000021 - -dlabel D_8024ACF0_B8EE70 -.word 0x00000001, 0xFFFFFE3B, 0x0000000F, 0x0000005A - -dlabel D_8024AD00_B8EE80 -.word D_8024ACE8_B8EE68, 0x00000000, D_8024ACF0_B8EE70, 0x00000000 - -dlabel D_8024AD10_B8EE90 -.word 0x00000001, 0x00000023 - -dlabel D_8024AD18_B8EE98 -.word 0x00000001, 0xFFFFFEDC, 0x00000010, 0x00000087 - -dlabel D_8024AD28_B8EEA8 -.word D_8024AD10_B8EE90, 0x00000000, D_8024AD18_B8EE98, 0x00000000 - -dlabel D_8024AD38_B8EEB8 -.word 0x00000001, 0x00000025 - -dlabel D_8024AD40_B8EEC0 -.word 0x00000001, 0xFFFFFF4C, 0x0000000F, 0x00000078 - -dlabel D_8024AD50_B8EED0 -.word D_8024AD38_B8EEB8, 0x00000000, D_8024AD40_B8EEC0, 0x00000000 - -dlabel D_8024AD60_B8EEE0 -.word 0x00000001, 0x00000027 - -dlabel D_8024AD68_B8EEE8 -.word 0x00000001, 0x000001C8, 0x00000010, 0x00000087 - -dlabel D_8024AD78_B8EEF8 -.word D_8024AD60_B8EEE0, 0x00000000, D_8024AD68_B8EEE8, 0x00000000 - -dlabel D_8024AD88_B8EF08 -.word 0x00000001, 0x00000029 - -dlabel D_8024AD90_B8EF10 -.word 0x00000001, 0x00000292, 0x0000000F, 0x0000006E - -dlabel D_8024ADA0_B8EF20 -.word D_8024AD88_B8EF08, 0x00000000, D_8024AD90_B8EF10, 0x00000000 - -dlabel D_8024ADB0_B8EF30 -.word 0x00000001, 0x0000002B - -dlabel D_8024ADB8_B8EF38 -.word 0x00000001, 0x000002C6, 0x0000000F, 0xFFFFFFE2 - -dlabel D_8024ADC8_B8EF48 -.word D_8024ADB0_B8EF30, 0x00000000, D_8024ADB8_B8EF38, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024AD00_B8EE80, 0x00000047, 0x00000005, D_8024A080_B8E200, 0x00000100, 0x0000003B, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024AD28_B8EEA8, 0x00000047, 0x00000005, D_8024A080_B8E200, 0x00000100, 0x0000003C, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024AD50_B8EED0, 0x00000047, 0x00000005, D_8024A080_B8E200, 0x00000100, 0x0000003D, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024AD78_B8EEF8, 0x00000047, 0x00000005, D_8024A080_B8E200, 0x00000100, 0x0000003E, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024ADA0_B8EF20, 0x00000047, 0x00000005, D_8024A080_B8E200, 0x00000100, 0x0000003F, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024ADC8_B8EF48, 0x00000047, 0x00000005, D_8024A080_B8E200, 0x00000100, 0x00000040, 0x00000001, 0x00000000, 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, dup_jan_22_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_22_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_8024B250_B8F3D0 -.word 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, PlaySound, 0x00000165, 0x00000043, 0x00000002, PlaySound, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_22_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, dup_jan_22_TransformFoliage, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, TranslateModel, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup_jan_22_TransformFoliage, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, PlaySoundAtModel, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, dup_jan_22_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_8024B854_B8F9D4 -.word 0x00000001, 0x00000015 - -dlabel D_8024B85C_B8F9DC -.word 0x00000001, 0x00000016 - -dlabel D_8024B864_B8F9E4 -.word 0x00000001, 0x00000157, 0x0000019A, 0x00000064, 0xFFFFFFE2, 0x0000000F, 0xF840606F, 0x00000000 - -dlabel D_8024B884_B8FA04 -.word D_8024B854_B8F9D4, D_8024B85C_B8F9DC, 0x00000000, D_8024B864_B8F9E4, 0x00000000 - -dlabel D_8024B898_B8FA18 -.word 0xC3C08000, 0x00000000, 0xC21C0000, 0x00000000 - -dlabel D_8024B8A8_B8FA28 -.word 0x00000001, 0x00000019 - -dlabel D_8024B8B0_B8FA30 -.word 0x00000001, 0x00000018 - -dlabel D_8024B8B8_B8FA38 -.word D_8024B8A8_B8FA28, D_8024B8B0_B8FA30, 0x00000000, 0x00000000, 0x00000000 - -dlabel D_8024B8CC_B8FA4C -.word 0xC3A40000, 0x00000000, 0xC2F60000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024B884_B8FA04, 0x00000047, 0x00000005, D_8024B250_B8F3D0, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024B250_B8F3D0, 0x00100000, D_8024B898_B8FA18, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, D_8024B8B8_B8FA38, 0x00000047, 0x00000005, D_8024B250_B8F3D0, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, D_8024B250_B8F3D0, 0x00100000, D_8024B8CC_B8FA4C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_23/B8FCD0.data.s b/ver/us/asm/data/world/area_jan/jan_23/B8FCD0.data.s deleted file mode 100644 index a526b26ea1..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_23/B8FCD0.data.s +++ /dev/null @@ -1,21 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_80240000_B8FCD0 -.word 0x43660000, 0x43200000, 0x42D40000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_802405E0_B902B0, D_80240000_B8FCD0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80200000, 0x00190102 - -dlabel D_80240050_B8FD20 -.word 0x00000043, 0x00000002, PlayAmbientSounds, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240070_B8FD40 -.word 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, UseExitHeading, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, ExitWalk, 0x00000043, 0x00000003, GotoMap, 0x80243760, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802400CC_B8FD9C -.word 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x0000006E, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000026, 0x00000002, 0xFD050F85, 0x00000000, 0x00000043, 0x00000002, GetPartnerInUse, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000056, 0x00000000, 0x00000043, 0x00000002, DisablePartnerAI, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFC, 0xF24A8680, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x0000000F, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFFFFFE0C, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFC, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, GetPlayerActionState, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x0000000D, 0x00000004, 0x00000001, 0x0000000B, 0x00000016, 0x00000001, 0x0000000F, 0x00000003, 0x00000001, 0x0000000B, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0x000000FA, 0x00000064, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFFFFFF9C, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xFD050F85, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000023, 0x00000000, 0x00000043, 0x00000002, DisablePlayerPhysics, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, MakeLerp, 0xFE363C83, 0xFFFFFE0C, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, UpdateLerp, 0x00000027, 0x00000002, 0xFE363C84, 0x00000002, 0x00000043, 0x00000004, SetPlayerPos, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, SetPlayerActionState, 0x0000000A, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F85, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0x000000FA, 0x00000064, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000003, GotoMap, 0x80243768, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405A8_B90278 -.word 0x00000047, 0x00000005, D_80240070_B8FD40, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, D_802400CC_B8FD9C, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802405E0_B902B0 -.word 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, 0x00000043, 0x00000003, MakeNpcs, 0x00000000, 0x8024373C, 0x00000043, 0x00000004, ModifyColliderFlags, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, D_802405A8_B90278, 0x00000044, 0x00000001, EnterWalk, 0x00000046, 0x00000001, D_80240050_B8FD20, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/world/area_jan/jan_23/B903A0.data.s b/ver/us/asm/data/world/area_jan/jan_23/B903A0.data.s deleted file mode 100644 index 2716680b10..0000000000 --- a/ver/us/asm/data/world/area_jan/jan_23/B903A0.data.s +++ /dev/null @@ -1,75 +0,0 @@ -.include "macro.inc" - -.section .data - -dlabel D_802406D0_B903A0 -.word 0x00000043, 0x00000005, SetNpcScale, 0xFFFFFFFF, 0xF24A8080, 0xF24A8080, 0xF24A8080, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802406FC_B903CC -.word 0x00000000, 0x00620050, D_802406D0_B903A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240728_B903F8 -.word 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 - -dlabel D_80240754_B90424 -.word 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00C40006, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000010E, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x00000000, 0x00000004, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x0000010E, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000000, 0x00C40003, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x0000010E, 0x00000002, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x00000000, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x0000010E, 0x00000004, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00980001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x00000000, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x00000000, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x00000000, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x00000000, 0x00000001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240984_B90654 -.word 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000001, 0x00000032, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000001, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240AC4_B90794 -.word 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000002, 0x0000003C, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000002, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240C04_B908D4 -.word 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000003, 0x00000032, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000003, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000003, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240D44_B90A14 -.word 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000004, 0x0000003C, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000004, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000004, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240E84_B90B54 -.word 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000005, 0x00000032, 0x00000005, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000005, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000014, 0x00000043, 0x00000005, SetNpcRotation, 0x00000005, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, SetNpcRotation, 0x00000005, 0x00000000, 0x00000000, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000003, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, SetNpcRotationPivot, 0x00000005, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80240FC4_B90C94 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00980003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000001, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0x0000021C, 0x00000055, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000001, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241050_B90D20 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00980003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000002, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0x00000230, 0x00000084, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000002, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802410DC_B90DAC -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00980003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000003, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0x0000024E, 0x00000069, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000003, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241168_B90E38 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00980003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000004, 0xF24A8680, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0x00000267, 0x0000007A, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000004, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_802411F4_B90EC4 -.word 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x0000000A, ShowSweat, 0x00000005, 0x00000001, 0xFFFFFFD3, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00000008, 0x00000001, 0x00000008, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80241258_B90F28 -.word 0x00000008, 0x00000001, 0x0000000A, 0x00000045, 0x00000002, D_802411F4_B90EC4, 0xFE363C89, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00980003, 0x00000043, 0x00000003, SetNpcSpeed, 0x00000005, 0xF24A8A80, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0x00000285, 0x0000004E, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00980001, 0x00000043, 0x00000004, InterpNpcYaw, 0x00000005, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000F, 0x00000049, 0x00000001, 0xFE363C89, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_8024130C_B90FDC -.word 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001CC, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABA80, 0xF24A5680, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C40006, 0x00C40003, 0x00000000, 0x001000DA, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00080007, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C40006, 0x00C40003, 0x00000005, 0x001000DB, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C40008, 0x00C40008, 0x00000005, 0x001000DC, 0x00000024, 0x00000002, 0xFAA2B580, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000080, 0x0000000A, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C40008, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24AAA80, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000386, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000136, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x00000387, 0x00000000, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x000001CC, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000006, 0x00000000, 0x00000043, 0x00000008, SetMotionBlurParams, 0x00000000, 0x00000000, 0x00000000, 0x00000140, 0x000000F0, 0x00000000, 0x0000000A, 0x00000003, 0x00000001, 0x00000002, 0x0000000A, 0x00000002, 0xFAA2B580, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000002, 0x00000013, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C40003, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000027, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000244, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, InterpNpcYaw, 0xFFFFFFFF, 0x0000005A, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00980006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00980006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00980006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00980006, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00980006, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000320, 0x000001C2, 0xFFFFFFEC, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000334, 0x000001C4, 0x00000000, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000348, 0x000001C4, 0x0000001B, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x0000033E, 0x000001C4, 0x00000038, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x0000031B, 0x000001C7, 0x00000014, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000000, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000000, 0x00000056, 0x00000000, 0x00000044, 0x00000001, D_80240984_B90654, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF88, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF06, 0x00000027, 0x00000002, 0xFE363C82, 0x0000003F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x0000020C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000064, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00980001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000001, 0x00000001, 0x00000046, 0x00000001, D_80240FC4_B90C94, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000044, 0x00000001, D_80240AC4_B90794, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF88, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF06, 0x00000027, 0x00000002, 0xFE363C82, 0x0000003F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x0000020D, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000064, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00980001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000002, 0x00000001, 0x00000046, 0x00000001, D_80241050_B90D20, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xFE363C83, 0x00000271, 0x00000024, 0x00000002, 0xFE363C85, 0x000000DC, 0x00000043, 0x00000004, PlayerMoveTo, 0xFE363C83, 0xFE363C85, 0x0000001E, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000000A, 0x00000004, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000044, 0x00000001, D_80240C04_B908D4, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF9C, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF06, 0x00000027, 0x00000002, 0xFE363C82, 0x00000032, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x0000020E, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000005A, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00980001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000003, 0x00000001, 0x00000046, 0x00000001, D_802410DC_B90DAC, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000056, 0x00000000, 0x00000044, 0x00000001, D_80240D44_B90A14, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0x00000000, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF9C, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF06, 0x00000027, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x0000020C, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000064, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00980001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000004, 0x00000001, 0x00000046, 0x00000001, D_80241168_B90E38, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, D_80240E84_B90B54, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0x00000000, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x0000020D, 0x00000000, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0x000002E1, 0x000000C8, 0x00000041, 0x00000064, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00980001, 0x00000043, 0x00000003, EnableNpcShadow, 0x00000005, 0x00000001, 0x00000046, 0x00000001, D_80241258_B90F28, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, InterpPlayerYaw, 0x0000015E, 0x00000004, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C40006, 0x00C40003, 0x00000005, 0x001000DD, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C40006, 0x00C40003, 0x00000005, 0x001000DE, 0x00000046, 0x00000001, D_80240754_B90424, 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C40006, 0x00C40003, 0x00000005, 0x001000DF, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, UseSettingsFrom, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000217, 0x000000C8, 0x000000D7, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, ShakeCam, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, PlaySoundAtNpc, 0xFFFFFFFF, 0x0000020C, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C40004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFBA, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFF9, 0x00000027, 0x00000002, 0xFE363C82, 0x000000AF, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C40002, 0x00000043, 0x00000003, SetNpcJumpscale, 0xFFFFFFFF, 0xF24A8080, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C40004, 0x00000043, 0x00000005, GetNpcPos, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF9C, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFED4, 0x00000027, 0x00000002, 0xFE363C82, 0x000000AF, 0x00000043, 0x00000006, NpcJump0, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C40002, 0x00000043, 0x00000005, SetNpcPos, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0xFFFFFFFF, 0x00000200, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000028, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000001, 0x0000020D, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00980003, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000027, 0x00000002, 0xFE363C82, 0x0000009A, 0x00000043, 0x00000005, NpcMoveTo, 0x00000001, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00980001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000001, 0xF24A8080, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00980003, 0x00000043, 0x00000005, GetNpcPos, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFEC, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFED4, 0x00000027, 0x00000002, 0xFE363C82, 0x0000009A, 0x00000043, 0x00000006, NpcJump0, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000001, 0x00980001, 0x00000043, 0x00000005, SetNpcPos, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000001, 0x00000200, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000002, 0x0000020E, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00980003, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFC9, 0x00000027, 0x00000002, 0xFE363C82, 0x0000006E, 0x00000043, 0x00000005, NpcMoveTo, 0x00000002, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00980001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000002, 0xF24A8080, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00980003, 0x00000043, 0x00000005, GetNpcPos, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFD8, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFED4, 0x00000027, 0x00000002, 0xFE363C82, 0x0000006E, 0x00000043, 0x00000006, NpcJump0, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000002, 0x00980001, 0x00000043, 0x00000005, SetNpcPos, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000002, 0x00000200, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000003, 0x0000020C, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00980003, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFB5, 0x00000027, 0x00000002, 0xFE363C82, 0x00000086, 0x00000043, 0x00000005, NpcMoveTo, 0x00000003, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00980001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000003, 0xF24A8080, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00980003, 0x00000043, 0x00000005, GetNpcPos, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFBA, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFED4, 0x00000027, 0x00000002, 0xFE363C82, 0x00000086, 0x00000043, 0x00000006, NpcJump0, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000003, 0x00980001, 0x00000043, 0x00000005, SetNpcPos, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000003, 0x00000200, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000004, 0x0000020D, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00980003, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF92, 0x00000027, 0x00000002, 0xFE363C82, 0x00000073, 0x00000043, 0x00000005, NpcMoveTo, 0x00000004, 0xFE363C80, 0xFE363C82, 0x00000014, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00980001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000004, 0xF24A8080, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00980003, 0x00000043, 0x00000005, GetNpcPos, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF92, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFED4, 0x00000027, 0x00000002, 0xFE363C82, 0x00000073, 0x00000043, 0x00000006, NpcJump0, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000004, 0x00980001, 0x00000043, 0x00000005, SetNpcPos, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000004, 0x00000200, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000004, PlaySoundAtNpc, 0x00000005, 0x0000020E, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000001, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00980003, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFF9C, 0x00000027, 0x00000002, 0xFE363C82, 0x000000A1, 0x00000043, 0x00000005, NpcMoveTo, 0x00000005, 0xFE363C80, 0xFE363C82, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00980001, 0x00000043, 0x00000003, SetNpcJumpscale, 0x00000005, 0xF24A8080, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00980003, 0x00000043, 0x00000005, GetNpcPos, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFFBA, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFE0C, 0x00000027, 0x00000002, 0xFE363C82, 0x000000A1, 0x00000043, 0x00000006, NpcJump0, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000023, 0x00000043, 0x00000003, SetNpcAnimation, 0x00000005, 0x00980001, 0x00000043, 0x00000005, SetNpcPos, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, SetNpcFlagBits, 0x00000005, 0x00000200, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, SetPanTarget, 0x00000000, 0x00000226, 0xFFFFFF6A, 0x00000190, 0x00000043, 0x00000003, SetCamDistance, 0x00000000, 0x00000244, 0x00000043, 0x00000004, SetCamPitch, 0x00000000, 0xF24ABA80, 0xF24A6A80, 0x00000043, 0x00000003, SetCamSpeed, 0x00000000, 0xF24A81B4, 0x00000043, 0x00000004, PanToTarget, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, WaitForCam, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, ResetCam, 0x00000000, 0xF24A8280, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000015, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242A8C_B9275C -.word 0x00000043, 0x00000006, SpeakToPlayer, 0xFFFFFFFF, 0x00C40006, 0x00C40003, 0x00000000, 0x001000E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242ABC_B9278C -.word 0x00000043, 0x00000003, SetNpcAnimation, 0xFFFFFFFF, 0x00C40003, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000015, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_8024130C_B90FDC, 0x0000001B, 0x00000001, 0x00000018, 0x00000043, 0x00000003, BindNpcInteract, 0xFFFFFFFF, D_80242A8C_B9275C, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, RemoveNpc, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B4C_B9281C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B5C_B9282C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B6C_B9283C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B7C_B9284C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B8C_B9285C -.word 0x00000002, 0x00000000, 0x00000001, 0x00000000 - -dlabel D_80242B9C_B9286C -.word 0x00000000, D_802406FC_B903CC, 0x44138000, 0x43520000, 0x00000000, 0x0000150D, D_80242ABC_B9278C, 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, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00C40002, 0x00000000, 0x00000000, 0x00000000, 0x001A00D0, 0x00000001, D_80240728_B903F8, 0x00000000, 0xC47A0000, 0x00000000, 0x0000050D, D_80242B4C_B9281C, 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, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00000000, 0x00000000, 0x00000000, 0x001A00C9, 0x00000002, D_80240728_B903F8, 0x00000000, 0xC47A0000, 0x00000000, 0x0000050D, D_80242B5C_B9282C, 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, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, D_80240728_B903F8, 0x00000000, 0xC47A0000, 0x00000000, 0x0000050D, D_80242B6C_B9283C, 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, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00000000, 0x00000000, 0x00000000, 0x001A00CB, 0x00000004, D_80240728_B903F8, 0x00000000, 0xC47A0000, 0x00000000, 0x0000050D, D_80242B7C_B9284C, 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, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00000000, 0x00000000, 0x00000000, 0x001A00CC, 0x00000005, D_80240728_B903F8, 0x00000000, 0xC47A0000, 0x00000000, 0x0000050D, D_80242B8C_B9285C, 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, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00980001, 0x00000000, 0x00000000, 0x00000000, 0x001A00CD, 0x00000006, D_80242B9C_B9286C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 2d722bfdb5..0f50dc6197 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -10927,7 +10927,7 @@ segments: - [0x9EDBF0, c, nok_04_2_main] - [0x9EDBF0, c, nok_04_3_entity] - [0x9EDBF0, c, nok_04_4_npc] - - [0x9EEA80, c, nok_04_5_partner] + - [0x9EEA80, c, nok_04_5_new_partner] - [0x9EEB20] - name: nok_11 dir: world/area_nok/nok_11 @@ -12218,200 +12218,176 @@ segments: start: 0xB44770 vram: 0x80240000 subsegments: - - [0xB44770, c] - - [0xB447B0, c] - - [0xB44AC0, c] - - [0xB44D80, c] - - [0xB44F10, c] - - [0xB45150, c] - - [0xB451F0, c] - - [0xB45730, c] - - [0xB45860, data] - - [0xB45A20, data] - - [0xB461B0, data] - - [0xB47EC0, data] - - [0xB47FE0, data] - - [0xB48B70, data] - - [0xB490C0, data] - - [0xB497F0, data] - - [0xB4A4B0, data] - - [0xB4AA20] + - [0xB44770, c, jan_04_0_header] + - [0xB447B0, c, jan_04_1_music] + - [0xB447B0, c, jan_04_2_main] + - [0xB44AC0, c, jan_04_3_entity] + - [0xB44D80, c, jan_04_4_npc] + - [0xB44F10, c, jan_04_5_unused] + - [0xB44F10, c, jan_04_6_trees] + - [0xB451F0, c, jan_04_7_scenes] + - [0xB451F0, c, jan_04_8_treasure] + - [0xB454F0, c, jan_04_9_bushes] + - [0xB45730, c, jan_04_10_demo] + - [0xB45860] - name: jan_05 dir: world/area_jan/jan_05 type: code start: 0xB4AA70 vram: 0x80240000 subsegments: - - [0xB4AA70, c] - - [0xB4AAB0, c] - - [0xB4ADC0, c] - - [0xB4AF10, c] - - [0xB4B260, c] - - [0xB4D140, data] - - [0xB4D200, data] - - [0xB4D7A0, data] - - [0xB4E050, data] - - [0xB4F170, data] - - [0xB517F0, data] - - [0xB523E0, data] - - [0xB52470] + - [0xB4AA70, c, jan_05_0_header] + - [0xB4AAB0, c, jan_05_1_music] + - [0xB4AAB0, c, jan_05_2_main] + - [0xB4ADC0, c, jan_05_3_log] + - [0xB4AF10, c, jan_05_4_bushes] + - [0xB4B260, c, jan_05_5_npc] + - [0xB4CEC0, c, jan_05_6_trees] + - [0xB4D140, c, jan_05_7_entity] + - [0xB4D140] - name: jan_06 dir: world/area_jan/jan_06 type: code start: 0xB52830 vram: 0x80240000 subsegments: - - [0xB52830, c] - - [0xB52B40, c] - - [0xB52BE0, c] - - [0xB52D30, c] - - [0xB52F70, c] - - [0xB54E10, data] - - [0xB55860, data] - - [0xB55F40, data] - - [0xB567F0, data] - - [0xB572C0, data] - - [0xB57320, data] - - [0xB586B0, data] - - [0xB594C0] + - [0xB52830, c, jan_06_0_header] + - [0xB52830, c, jan_06_1_main] + - [0xB52B40, c, jan_06_2_statue] + - [0xB52BE0, c, jan_06_3_log] + - [0xB52D30, c, jan_06_4_trees] + - [0xB52F70, c, jan_06_5_entity] + - [0xB52F70, c, jan_06_6_npc] + - [0xB54BD0, c, jan_06_7_bushes] + - [0xB54E10] - name: jan_07 dir: world/area_jan/jan_07 type: code start: 0xB59870 vram: 0x80240000 subsegments: - - [0xB59870, c] - - [0xB5A610, c] - - [0xB5A850, c] - - [0xB5AA90, data] - - [0xB5AB20, data] - - [0xB5ACA0, data] - - [0xB5CA50, data] - - [0xB5D490, data] - - [0xB5DF60] + - [0xB59870, c, jan_07_0_header] + - [0xB59870, c, jan_07_1_music] + - [0xB59870, c, jan_07_2_main] + - [0xB59870, c, jan_07_3_npc] + - [0xB5A610, c, jan_07_4_trees] + - [0xB5A850, c, jan_07_5_bushes] + - [0xB5AA90] - name: jan_08 dir: world/area_jan/jan_08 type: code start: 0xB5E2B0 vram: 0x80240000 subsegments: - - [0xB5E2B0, c] - - [0xB5E5C0, c] - - [0xB5E910, c] - - [0xB5F650, c] - - [0xB604A0, c] - - [0xB606E0, data] - - [0xB60790, data] - - [0xB620B0, data] - - [0xB62850, data] - - [0xB64B90, data] - - [0xB65740] + - [0xB5E2B0, c, jan_08_0_header] + - [0xB5E2B0, c, jan_08_1_music] + - [0xB5E2B0, c, jan_08_2_main] + - [0xB5E5C0, c, jan_08_3_bushes] + - [0xB5E910, c, jan_08_4_entity] + - [0xB5F650, c, jan_08_5_npc] + - [0xB604A0, c, jan_08_6_trees] + - [0xB606E0] - name: jan_09 dir: world/area_jan/jan_09 type: code start: 0xB65AB0 vram: 0x80240000 subsegments: - - [0xB65AB0, c] - - [0xB660A0, c] - - [0xB663F0, c] - - [0xB67190, c] - - [0xB673D0, data] - - [0xB687D0, data] - - [0xB6B400, data] - - [0xB6BFB0, data] - - [0xB6C020] + - [0xB65AB0, c, jan_09_0_header] + - [0xB65AB0, c, jan_09_1_main] + - [0xB660A0, c, jan_09_2_bushes] + - [0xB663F0, c, jan_09_3_npc] + - [0xB67190, c, jan_09_4_trees] + - [0xB673D0, c, jan_09_5_entity] + - [0xB673D0] - name: jan_10 dir: world/area_jan/jan_10 type: code start: 0xB6C390 vram: 0x80240000 subsegments: - - [0xB6C390, c] - - [0xB6C6A0, c] - - [0xB6D4C0, c] - - [0xB6D610, c] - - [0xB6D890, c] - - [0xB6DAD0, data] - - [0xB6DB60, data] - - [0xB6F1D0, data] - - [0xB6FC50, data] - - [0xB707C0, data] - - [0xB70800] + - [0xB6C390, c, jan_10_0_header] + - [0xB6C390, c, jan_10_1_music] + - [0xB6C390, c, jan_10_2_main] + - [0xB6C6A0, c, jan_10_3_npc] + - [0xB6D4C0, c, jan_10_4_log] + - [0xB6D610, c, jan_10_5_trees] + - [0xB6D890, c, jan_10_6_bushes] + - [0xB6DAD0, c, jan_10_7_entity] + - [0xB6DAD0] - name: jan_11 dir: world/area_jan/jan_11 type: code start: 0xB70860 vram: 0x80240000 subsegments: - - [0xB70860, c] - - [0xB71010, c] - - [0xB71060, data] - - [0xB710F0, data] - - [0xB728B0, data] - - [0xB730A0] + - [0xB70860, c, jan_11_0_header] + - [0xB70860, c, jan_11_1_music] + - [0xB70860, c, jan_11_2_main] + - [0xB71010, c, jan_11_3_npc] + - [0xB71060] - name: jan_12 dir: world/area_jan/jan_12 type: code start: 0xB730B0 vram: 0x80240000 subsegments: - - [0xB730B0, c] - - [0xB73570, c] - - [0xB74310, data] - - [0xB75250, data] - - [0xB75D30, data] - - [0xB76450] + - [0xB730B0, c, jan_12_0_header] + - [0xB730B0, c, jan_12_1_main] + - [0xB730B0, c, jan_12_2_vines] + - [0xB73330, c, jan_12_3_trees] + - [0xB73570, c, jan_12_4_entity] + - [0xB73570, c, jan_12_5_npc] + - [0xB74310] - name: jan_13 dir: world/area_jan/jan_13 type: code start: 0xB767B0 vram: 0x80240000 subsegments: - - [0xB767B0, c] - - [0xB76D80, data] - - [0xB77000, data] - - [0xB794C0, data] - - [0xB79FA0, data] - - [0xB7A020] + - [0xB767B0, c, jan_13_0_header] + - [0xB767B0, c, jan_13_1_main] + - [0xB767B0, c, jan_13_2_puzzle] + - [0xB76B40, c, jan_13_3_trees] + - [0xB76D80, c, jan_13_4_entity] + - [0xB76D80] - name: jan_14 dir: world/area_jan/jan_14 type: code start: 0xB7A050 vram: 0x80240000 subsegments: - - [0xB7A050, c] - - [0xB7A510, c] - - [0xB7B330, data] - - [0xB7B5C0, data] - - [0xB7C630, data] - - [0xB7D2C0, data] - - [0xB7D8B0] + - [0xB7A050, c, jan_14_0_header] + - [0xB7A050, c, jan_14_1_main] + - [0xB7A050, c, jan_14_2_vines] + - [0xB7A2D0, c, jan_14_3_trees] + - [0xB7A510, c, jan_14_4_npc] + - [0xB7B330] - name: jan_15 dir: world/area_jan/jan_15 type: code start: 0xB7D920 vram: 0x80240000 subsegments: - - [0xB7D920, c] - - [0xB7D9E0, c] - - [0xB7DC20, data] - - [0xB7DEE0, data] - - [0xB7F4A0, data] - - [0xB7FF80, data] - - [0xB7FFF0] + - [0xB7D920, c, jan_15_0_header] + - [0xB7D920, c, jan_15_1_main] + - [0xB7D920, c, jan_15_2_npc] + - [0xB7D9E0, c, jan_15_3_trees] + - [0xB7DC20, c, jan_15_4_entity] + - [0xB7DC20] - name: jan_16 dir: world/area_jan/jan_16 type: code start: 0xB80000 vram: 0x80240000 subsegments: - - [0xB80000, c] - - [0xB80300, c] - - [0xB80540, data] - - [0xB82C70, data] - - [0xB82CD0, data] - - [0xB837A0] + - [0xB80000, c, jan_16_0_header] + - [0xB80000, c, jan_16_1_music] + - [0xB80000, c, jan_16_2_main] + - [0xB80300, c, jan_16_3_npc] + - [0xB80300, c, jan_16_4_entity] + - [0xB80300, c, jan_16_5_bushes] + - [0xB80540] - name: jan_17 dir: world/area_jan/jan_17 type: code @@ -12451,23 +12427,26 @@ segments: start: 0xB84180 vram: 0x80240000 subsegments: - - [0xB84180, c] - - [0xB851A0, c] - - [0xB858A0, c] - - [0xB85AE0, data] - - [0xB8D910, data] - - [0xB8E200, data] - - [0xB8FB00] + - [0xB84180, c, jan_22_0_header] + - [0xB84180, c, jan_22_1_music] + - [0xB84180, c, jan_22_2_main] + - [0xB84180, c, jan_22_3_npc] + - [0xB851A0, c, jan_22_4_entity] + - [0xB851A0, c, jan_22_5_zipline] + - [0xB85550, c, jan_22_6_bushes] + - [0xB858A0, c, jan_22_7_trees] + - [0xB85AE0] - name: jan_23 dir: world/area_jan/jan_23 type: code start: 0xB8FCD0 vram: 0x80240000 subsegments: - - [0xB8FCD0, c] - - [0xB8FCD0, data] - - [0xB903A0, data] - - [0xB93430] + - [0xB8FCD0, c, jan_23_0_header] + - [0xB8FCD0, c, jan_23_1_music] + - [0xB8FCD0, c, jan_23_2_main] + - [0xB8FCD0, c, jan_23_3_npc] + - [0xB8FCD0] - name: mim_01 dir: world/area_mim/mim_01 type: code @@ -14744,7 +14723,7 @@ segments: - [0xDDF310, c, omo_12_1_music] - [0xDDF310, c, omo_12_2_main] - [0xDDF310, c, omo_12_3_npc] - - [0xDDF730, c, omo_12_4_partner] + - [0xDDF730, c, omo_12_4_new_partner] - [0xDDF7D0] - name: omo_13 dir: world/area_omo/omo_13 @@ -16819,7 +16798,7 @@ segments: - SpyGuy - MediGuy - Fuzzipede - - JungleGuy + - SpearGuy - HeartPlant - HurtPlant - MBush @@ -16949,7 +16928,7 @@ segments: - GourmetGuy - VillageLeader - LeadersFriend - - RafaelRaven + - RaphaelRaven - Tolielup - GateFlower - Petunia diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 8d4d1eb5a5..bda4854c19 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -1401,7 +1401,7 @@ D_80077A34 = 0x80077A34; // type:data rom:0x52E34 D_80077A38 = 0x80077A38; // type:data rom:0x52E38 D_80077A40 = 0x80077A40; // type:data rom:0x52E40 D_80077A50 = 0x80077A50; // type:data rom:0x52E50 -D_80077AE0 = 0x80077AE0; // type:data rom:0x52EE0 +DemoScenes = 0x80077AE0; // type:data rom:0x52EE0 versionString = 0x80077BD0; // type:data rom:0x52FD0 SCRIPT_NpcDefeat = 0x80077E38; // rom:0x53238 nuAuPreNMI = 0x80078170; // type:data rom:0x53570 @@ -19433,7 +19433,7 @@ func_80240350_B4ADC0 = 0x80240350; // type:func rom:0xB4ADC0 jan_05_foliage_setup_shear_mtx = 0x802404A0; // type:func rom:0xB4AF10 jan_05_TransformFoliage = 0x80240510; // type:func rom:0xB4AF80 func_802406DC_B4B14C = 0x802406DC; // type:func rom:0xB4B14C -jan_05_PullVine_ShearBushModel = 0x80240738; // type:func rom:0xB4B1A8 +jan_05_MoveBush_AnimateShearing = 0x80240738; // type:func rom:0xB4B1A8 jan_05_HeartPlant_SpawnHeart = 0x802407F0; // type:func rom:0xB4B260 jan_05_HoppingAI_HopInit = 0x802408A4; // type:func rom:0xB4B314 jan_05_HoppingAI_Hop = 0x80240AD4; // type:func rom:0xB4B544 @@ -19508,7 +19508,7 @@ jan_08_UpdateTexturePanStepped = 0x80240124; // type:func rom:0xB5E3D4 jan_08_foliage_setup_shear_mtx = 0x80240310; // type:func rom:0xB5E5C0 jan_08_TransformFoliage = 0x80240380; // type:func rom:0xB5E630 func_8024054C_B5E7FC = 0x8024054C; // type:func rom:0xB5E7FC -jan_08_PullVine_ShearBushModel = 0x802405A8; // type:func rom:0xB5E858 +jan_08_MoveBush_AnimateShearing = 0x802405A8; // type:func rom:0xB5E858 jan_08_SuperBlock_SetOverride40 = 0x80240660; // type:func rom:0xB5E910 jan_08_SuperBlock_ClearOverride40 = 0x8024067C; // type:func rom:0xB5E92C jan_08_SuperBlock_HideBlockContent = 0x8024069C; // type:func rom:0xB5E94C @@ -19557,7 +19557,7 @@ jan_09_UpdateTexturePanStepped = 0x80240404; // type:func rom:0xB65EB4 jan_09_foliage_setup_shear_mtx = 0x802405F0; // type:func rom:0xB660A0 jan_09_TransformFoliage = 0x80240660; // type:func rom:0xB66110 func_8024082C_B662DC = 0x8024082C; // type:func rom:0xB662DC -jan_09_PullVine_ShearBushModel = 0x80240888; // type:func rom:0xB66338 +jan_09_MoveBush_AnimateShearing = 0x80240888; // type:func rom:0xB66338 jan_09_SpearGuyAI_LoiterInit = 0x80240940; // type:func rom:0xB663F0 jan_09_SpearGuyAI_Loiter = 0x80240990; // type:func rom:0xB66440 jan_09_MeleeHitbox_30 = 0x80240B54; // type:func rom:0xB66604 @@ -19601,8 +19601,8 @@ jan_11_GetFloorCollider = 0x802407B0; // type:func rom:0xB71010 func_802407DC_B7103C = 0x802407DC; // type:func rom:0xB7103C jan_12_PullVine_WaitForPlayerGrab = 0x80240000; // type:func rom:0xB730B0 jan_12_PullVine_UpdatePosition = 0x802400F8; // type:func rom:0xB731A8 -jan_12_PullVine_apply_shear_mtx = 0x80240170; // type:func rom:0xB73220 -jan_12_PullVine_ShearBushModel = 0x802401CC; // type:func rom:0xB7327C +jan_12_MoveBush_apply_shear_mtx = 0x80240170; // type:func rom:0xB73220 +jan_12_MoveBush_AnimateShearing = 0x802401CC; // type:func rom:0xB7327C jan_12_foliage_setup_shear_mtx = 0x80240280; // type:func rom:0xB73330 jan_12_TransformFoliage = 0x802402F0; // type:func rom:0xB733A0 jan_12_SpearGuyAI_LoiterInit = 0x802404C0; // type:func rom:0xB73570 @@ -19617,7 +19617,7 @@ jan_12_WanderMeleeAI_Main = 0x80240CF0; // type:func rom:0xB73DA0 jan_12_SpearGuyAI_Main = 0x80240FA4; // type:func rom:0xB74054 D_802433B0_B76460 = 0x802433B0; // type:data rom:0xB76460 D_802433D8_B76488 = 0x802433D8; // type:data rom:0xB76488 -func_80240000_B767B0 = 0x80240000; // type:func rom:0xB767B0 +setup_gfx_geyser = 0x80240000; // type:func rom:0xB767B0 func_802401AC_B7695C = 0x802401AC; // type:func rom:0xB7695C func_80240214_B769C4 = 0x80240214; // type:func rom:0xB769C4 func_802402B8_B76A68 = 0x802402B8; // type:func rom:0xB76A68 @@ -19630,8 +19630,8 @@ D_80243890_B7A040 = 0x80243890; // type:data rom:0xB7A040 D_80243898_B7A048 = 0x80243898; // type:data rom:0xB7A048 jan_14_PullVine_WaitForPlayerGrab = 0x80240000; // type:func rom:0xB7A050 jan_14_PullVine_UpdatePosition = 0x802400F8; // type:func rom:0xB7A148 -jan_14_PullVine_apply_shear_mtx = 0x80240170; // type:func rom:0xB7A1C0 -jan_14_PullVine_ShearBushModel = 0x802401CC; // type:func rom:0xB7A21C +jan_14_MoveBush_apply_shear_mtx = 0x80240170; // type:func rom:0xB7A1C0 +jan_14_MoveBush_AnimateShearing = 0x802401CC; // type:func rom:0xB7A21C jan_14_foliage_setup_shear_mtx = 0x80240280; // type:func rom:0xB7A2D0 jan_14_TransformFoliage = 0x802402F0; // type:func rom:0xB7A340 jan_14_HoppingAI_HopInit = 0x802404C0; // type:func rom:0xB7A510 @@ -19669,7 +19669,7 @@ jan_22_StashVars = 0x80240E90; // type:func rom:0xB85010 jan_22_GetItemName = 0x80240F44; // type:func rom:0xB850C4 jan_22_SetCamera0Flag1000 = 0x80240FA8; // type:func rom:0xB85128 jan_22_UnsetCamera0Flag1000 = 0x80240FC4; // type:func rom:0xB85144 -PostChapter5StatUpdate = 0x80240FE0; // type:func rom:0xB85160 +UpgradeStarPowerCh5 = 0x80240FE0; // type:func rom:0xB85160 func_80241020_B851A0 = 0x80241020; // type:func rom:0xB851A0 func_802410C4_B85244 = 0x802410C4; // type:func rom:0xB85244 func_80241168_B852E8 = 0x80241168; // type:func rom:0xB852E8 @@ -19677,7 +19677,7 @@ func_802412E0_B85460 = 0x802412E0; // type:func rom:0xB85460 jan_22_foliage_setup_shear_mtx = 0x802413D0; // type:func rom:0xB85550 jan_22_TransformFoliage = 0x80241440; // type:func rom:0xB855C0 func_8024160C_B8578C = 0x8024160C; // type:func rom:0xB8578C -jan_22_PullVine_ShearBushModel = 0x80241668; // type:func rom:0xB857E8 +jan_22_MoveBush_AnimateShearing = 0x80241668; // type:func rom:0xB857E8 dup_jan_22_foliage_setup_shear_mtx = 0x80241720; // type:func rom:0xB858A0 dup_jan_22_TransformFoliage = 0x80241790; // type:func rom:0xB85910 jan_22_varStash = 0x802425BC; // type:data rom:0xB8673C